From b61b944a14b2e4681e5ebf165c09c9b7cde732e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loix?= <sebastien.loix@elastic.co>
Date: Tue, 2 Apr 2024 09:51:01 +0100
Subject: [PATCH 01/63] [Stateful sidenav]  User profile opt in/out (#179270)

---
 .buildkite/ftr_configs.yml                    |   1 +
 .../src/chrome_service.tsx                    |  19 +-
 .../project_navigation_service.test.ts        |  11 +-
 .../project_navigation_service.ts             |  45 ++--
 .../core-chrome-browser-internal/src/types.ts |   1 +
 .../hooks/use_update_user_profile.test.tsx    |  13 +-
 .../src/hooks/use_update_user_profile.tsx     |  28 +-
 .../kbn-user-profile-components/src/types.ts  |   4 +-
 src/plugins/navigation/kibana.jsonc           |   4 +-
 src/plugins/navigation/public/mocks.ts        |   3 +-
 src/plugins/navigation/public/plugin.test.ts  | 248 ++++++++++++++++--
 src/plugins/navigation/public/plugin.tsx      | 145 +++++++++-
 .../solution_nav_userprofile_toggle/index.ts  |   9 +
 .../solution_nav_userprofile_toggle.test.tsx  |  86 ++++++
 .../solution_nav_userprofile_toggle.tsx       |  91 +++++++
 .../use_solution_nav_userprofile_toggle.ts    |  49 ++++
 src/plugins/navigation/public/types.ts        |  17 +-
 src/plugins/navigation/tsconfig.json          |   4 +
 .../user_profile/user_profile_api_client.ts   |  14 +
 .../theme_darkmode_hook.ts                    |  30 ++-
 .../user_profile_api_client.test.ts           |  32 +++
 .../user_profile/user_profile_api_client.ts   |  47 +++-
 x-pack/plugins/security/public/mocks.ts       |   3 +
 .../plugins/security/public/plugin.test.tsx   | 104 ++++++--
 x-pack/plugins/security/public/plugin.tsx     |   6 +
 x-pack/plugins/security/tsconfig.json         |   1 +
 .../navigation/side_navigation/index.tsx      |   5 +-
 x-pack/plugins/serverless/public/plugin.tsx   |   4 +-
 x-pack/plugins/serverless/public/types.ts     |   1 +
 .../serverless_observability/public/plugin.ts |   2 +-
 .../serverless_search/public/plugin.ts        |   2 +-
 .../test/functional/apps/navigation/config.ts |  53 ++++
 .../apps/navigation/ftr_provider_context.ts   |  13 +
 .../functional/apps/navigation/tests/index.ts |  14 +
 .../navigation/tests/user_optin_optout.ts     |  36 +++
 x-pack/test/functional/services/user_menu.js  |   4 +
 36 files changed, 1018 insertions(+), 131 deletions(-)
 create mode 100644 src/plugins/navigation/public/solution_nav_userprofile_toggle/index.ts
 create mode 100644 src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.test.tsx
 create mode 100644 src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.tsx
 create mode 100644 src/plugins/navigation/public/solution_nav_userprofile_toggle/use_solution_nav_userprofile_toggle.ts
 create mode 100644 x-pack/test/functional/apps/navigation/config.ts
 create mode 100644 x-pack/test/functional/apps/navigation/ftr_provider_context.ts
 create mode 100644 x-pack/test/functional/apps/navigation/tests/index.ts
 create mode 100644 x-pack/test/functional/apps/navigation/tests/user_optin_optout.ts

diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
index 43bee5ba27a7d..93e089866afcc 100644
--- a/.buildkite/ftr_configs.yml
+++ b/.buildkite/ftr_configs.yml
@@ -305,6 +305,7 @@ enabled:
   - x-pack/test/functional/apps/ml/short_tests/config.ts
   - x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
   - x-pack/test/functional/apps/monitoring/config.ts
+  - x-pack/test/functional/apps/navigation/config.ts
   - x-pack/test/functional/apps/observability_logs_explorer/config.ts
   - x-pack/test/functional/apps/dataset_quality/config.ts
   - x-pack/test/functional/apps/painless_lab/config.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
index 0e248a069e326..7f14b54a0863a 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
@@ -9,7 +9,7 @@
 import React, { useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { BehaviorSubject, combineLatest, merge, type Observable, of, ReplaySubject } from 'rxjs';
-import { mergeMap, map, takeUntil } from 'rxjs/operators';
+import { mergeMap, map, takeUntil, filter } from 'rxjs/operators';
 import { parse } from 'url';
 import { EuiLink } from '@elastic/eui';
 import useObservable from 'react-use/lib/useObservable';
@@ -199,7 +199,10 @@ export class ChromeService {
     const customNavLink$ = new BehaviorSubject<ChromeNavLink | undefined>(undefined);
     const helpSupportUrl$ = new BehaviorSubject<string>(docLinks.links.kibana.askElastic);
     const isNavDrawerLocked$ = new BehaviorSubject(localStorage.getItem(IS_LOCKED_KEY) === 'true');
-    const chromeStyle$ = new BehaviorSubject<ChromeStyle>('classic');
+    // ChromeStyle is set to undefined by default, which means that no header will be rendered until
+    // setChromeStyle(). This is to avoid a flickering between the "classic" and "project" header meanwhile
+    // we load the user profile to check if the user opted out of the new solution navigation.
+    const chromeStyle$ = new BehaviorSubject<ChromeStyle | undefined>(undefined);
 
     const getKbnVersionClass = () => {
       // we assume that the version is valid and has the form 'X.X.X'
@@ -283,9 +286,9 @@ export class ChromeService {
       LinkId extends AppDeepLinkId = AppDeepLinkId,
       Id extends string = string,
       ChildrenId extends string = Id
-    >(navigationTree$: Observable<NavigationTreeDefinition<LinkId, Id, ChildrenId>>) {
+    >(id: string, navigationTree$: Observable<NavigationTreeDefinition<LinkId, Id, ChildrenId>>) {
       validateChromeStyle();
-      projectNavigation.initNavigation(navigationTree$);
+      projectNavigation.initNavigation(id, navigationTree$);
     }
 
     const setProjectBreadcrumbs = (
@@ -361,6 +364,8 @@ export class ChromeService {
           );
         }
 
+        if (chromeStyle === undefined) return null;
+
         // render header
         if (chromeStyle === 'project') {
           const projectNavigationComponent$ = projectNavigation.getProjectSideNavComponent$();
@@ -526,7 +531,11 @@ export class ChromeService {
 
       getBodyClasses$: () => bodyClasses$.pipe(takeUntil(this.stop$)),
       setChromeStyle,
-      getChromeStyle$: () => chromeStyle$.pipe(takeUntil(this.stop$)),
+      getChromeStyle$: () =>
+        chromeStyle$.pipe(
+          filter((style): style is ChromeStyle => style !== undefined),
+          takeUntil(this.stop$)
+        ),
       getIsSideNavCollapsed$: () => this.isSideNavCollapsed$.asObservable(),
       project: {
         setHome: setProjectHome,
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.test.ts b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.test.ts
index 1089d1ba46209..52e22f7aef03a 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.test.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.test.ts
@@ -110,6 +110,7 @@ describe('initNavigation()', () => {
 
     beforeAll(() => {
       projectNavigation.initNavigation<any>(
+        'foo',
         of({
           body: [
             {
@@ -184,6 +185,7 @@ describe('initNavigation()', () => {
       const { projectNavigation: projNavigation, getNavigationTree: getNavTree } =
         setupInitNavigation();
       projNavigation.initNavigation<any>(
+        'foo',
         of({
           body: [
             {
@@ -208,6 +210,7 @@ describe('initNavigation()', () => {
       const { projectNavigation: projNavigation } = setupInitNavigation();
 
       projNavigation.initNavigation<any>(
+        'foo',
         of({
           body: [
             {
@@ -392,6 +395,7 @@ describe('initNavigation()', () => {
 
     // 2. initNavigation() is called
     projectNavigation.initNavigation<any>(
+      'foo',
       of({
         body: [
           {
@@ -419,6 +423,7 @@ describe('initNavigation()', () => {
     });
 
     projectNavigation.initNavigation<any>(
+      'foo',
       // @ts-expect-error - We pass a non valid cloudLink that is not TS valid
       of({
         body: [
@@ -524,7 +529,7 @@ describe('breadcrumbs', () => {
     const obs = subj.asObservable();
 
     if (initiateNavigation) {
-      projectNavigation.initNavigation(obs);
+      projectNavigation.initNavigation('foo', obs);
     }
 
     return {
@@ -737,7 +742,7 @@ describe('breadcrumbs', () => {
       { text: 'custom1', href: '/custom1' },
       { text: 'custom2', href: '/custom1/custom2' },
     ]);
-    projectNavigation.initNavigation(of(mockNavigation)); // init navigation
+    projectNavigation.initNavigation('foo', of(mockNavigation)); // init navigation
 
     const breadcrumbs = await firstValueFrom(projectNavigation.getProjectBreadcrumbs$());
     expect(breadcrumbs).toHaveLength(4);
@@ -776,6 +781,7 @@ describe('getActiveNodes$()', () => {
     expect(activeNodes).toEqual([]);
 
     projectNavigation.initNavigation<any>(
+      'foo',
       of({
         body: [
           {
@@ -831,6 +837,7 @@ describe('getActiveNodes$()', () => {
     expect(activeNodes).toEqual([]);
 
     projectNavigation.initNavigation<any>(
+      'foo',
       of({
         body: [
           {
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
index 73b789b5bf349..63675ea742aaf 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
@@ -141,9 +141,10 @@ export class ProjectNavigationService {
         return this.projectName$.asObservable();
       },
       initNavigation: <LinkId extends AppDeepLinkId = AppDeepLinkId>(
-        navTreeDefinition: Observable<NavigationTreeDefinition<LinkId>>
+        id: string,
+        navTreeDefinition$: Observable<NavigationTreeDefinition<LinkId>>
       ) => {
-        this.initNavigation(navTreeDefinition);
+        this.initNavigation(id, navTreeDefinition$);
       },
       getNavigationTreeUi$: this.getNavigationTreeUi$.bind(this),
       getActiveNodes$: () => {
@@ -219,18 +220,19 @@ export class ProjectNavigationService {
    * Initialize a "serverless style" navigation. For stateful deployments (not serverless), this
    * handler initialize one of the solution navigations registered.
    *
+   * @param id Id for the navigation tree definition
    * @param navTreeDefinition$ The navigation tree definition
-   * @param location Optional location to use to detect the active node in the new navigation tree
    */
-  private initNavigation(
-    navTreeDefinition$: Observable<NavigationTreeDefinition>,
-    location?: Location
-  ) {
+  private initNavigation(id: string, navTreeDefinition$: Observable<NavigationTreeDefinition>) {
+    if (this.activeSolutionNavDefinitionId$.getValue() === id) return;
+
+    this.activeSolutionNavDefinitionId$.next(id);
+
     if (this.navigationChangeSubscription) {
       this.navigationChangeSubscription.unsubscribe();
     }
 
-    let redirectLocation = location;
+    let initialised = false;
     this.projectNavigationNavTreeFlattened = {};
     this.navigationChangeSubscription = combineLatest([
       navTreeDefinition$,
@@ -252,8 +254,11 @@ export class ProjectNavigationService {
           this.navigationTreeUi$.next(navigationTreeUI);
 
           this.projectNavigationNavTreeFlattened = flattenNav(navigationTree);
-          this.updateActiveProjectNavigationNodes(redirectLocation);
-          redirectLocation = undefined; // we don't want to redirect on subsequent changes, only when initiating
+
+          // At initialization, we want to force the update of the active nodes, so 2 empty arrays []
+          // are not considered equal and we update the Observable value.
+          this.updateActiveProjectNavigationNodes({ forceUpdate: !initialised });
+          initialised = true;
         },
         error: (err) => {
           this.logger?.error(err);
@@ -292,14 +297,18 @@ export class ProjectNavigationService {
    * and update the activeNodes$ Observable.
    *
    * @param location Optional location to use to detect the active node in the new navigation tree, if not set the current location is used
+   * @param forceUpdate Optional flag to force the update of the active nodes even if the active nodes are the same
    */
-  private updateActiveProjectNavigationNodes(location?: Location) {
+  private updateActiveProjectNavigationNodes({
+    location,
+    forceUpdate = false,
+  }: { location?: Location; forceUpdate?: boolean } = {}) {
     const activeNodes = this.findActiveNodes({ location });
     // Each time we call findActiveNodes() we create a new array of activeNodes. As this array is used
     // in React in useCallback() and useMemo() dependencies arrays it triggers an infinite navigation
     // tree registration loop. To avoid that we only notify the listeners when the activeNodes array
     // has actually changed.
-    const requiresUpdate = !deepEqual(activeNodes, this.activeNodes$.value);
+    const requiresUpdate = forceUpdate ? true : !deepEqual(activeNodes, this.activeNodes$.value);
 
     if (!requiresUpdate) return;
 
@@ -308,7 +317,7 @@ export class ProjectNavigationService {
 
   private onHistoryLocationChange(location: Location) {
     this.location$.next(location);
-    this.updateActiveProjectNavigationNodes(location);
+    this.updateActiveProjectNavigationNodes({ location });
   }
 
   private handleActiveNodesChange() {
@@ -411,6 +420,7 @@ export class ProjectNavigationService {
       if (id === null) {
         this.setChromeStyle('classic');
         this.navigationTree$.next(undefined);
+        this.activeSolutionNavDefinitionId$.next(null);
       } else {
         const definition = definitions[id];
         if (!definition) {
@@ -436,14 +446,11 @@ export class ProjectNavigationService {
           }
         }
 
-        // We want to pass the upcoming location where we are going to navigate to
-        // so we can immediately set the active nodes based on the new location and we
-        // don't have to wait for the location change event to be triggered.
-        this.initNavigation(definition.navigationTree$, location);
+        this.initNavigation(id, definition.navigationTree$);
       }
+    } else if (id !== null) {
+      this.activeSolutionNavDefinitionId$.next(id);
     }
-
-    this.activeSolutionNavDefinitionId$.next(id);
   }
 
   private getSolutionsNavDefinitions$() {
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/types.ts b/packages/core/chrome/core-chrome-browser-internal/src/types.ts
index 5497234cce31b..6413c0a683112 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/types.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/types.ts
@@ -65,6 +65,7 @@ export interface InternalChromeStart extends ChromeStart {
       Id extends string = string,
       ChildrenId extends string = Id
     >(
+      id: string,
       navigationTree$: Observable<NavigationTreeDefinition<LinkId, Id, ChildrenId>>
     ): void;
 
diff --git a/packages/kbn-user-profile-components/src/hooks/use_update_user_profile.test.tsx b/packages/kbn-user-profile-components/src/hooks/use_update_user_profile.test.tsx
index 3f3621b8aae18..e84dccc3ba5c0 100644
--- a/packages/kbn-user-profile-components/src/hooks/use_update_user_profile.test.tsx
+++ b/packages/kbn-user-profile-components/src/hooks/use_update_user_profile.test.tsx
@@ -24,7 +24,10 @@ const security = {
     bulkGet: jest.fn(),
     suggest: jest.fn(),
     update: jest.fn(),
+    partialUpdate: jest.fn(),
     userProfile$: of({}),
+    userProfileLoaded$: of(true),
+    enabled$: of(true),
   },
   uiApi: {},
 };
@@ -42,16 +45,16 @@ const wrapper: WrapperComponent<void> = ({ children }) => (
 );
 
 describe('useUpdateUserProfile() hook', () => {
-  const updateUserProfiles = jest.fn();
+  const partialUpdateUserProfiles = jest.fn();
 
   beforeEach(() => {
     security.userProfiles = {
       ...security.userProfiles,
-      update: updateUserProfiles,
+      partialUpdate: partialUpdateUserProfiles,
       userProfile$: of({}),
     };
 
-    updateUserProfiles.mockReset().mockResolvedValue({});
+    partialUpdateUserProfiles.mockReset().mockResolvedValue({});
     http.get.mockReset();
     http.post.mockReset().mockResolvedValue(undefined);
     notifications.toasts.addSuccess.mockReset();
@@ -65,12 +68,12 @@ describe('useUpdateUserProfile() hook', () => {
       update({ userSettings: { darkMode: 'dark' } });
     });
 
-    expect(updateUserProfiles).toHaveBeenCalledWith({ userSettings: { darkMode: 'dark' } });
+    expect(partialUpdateUserProfiles).toHaveBeenCalledWith({ userSettings: { darkMode: 'dark' } });
   });
 
   test('should update the isLoading state while updating', async () => {
     const updateDone = new BehaviorSubject(false);
-    updateUserProfiles.mockImplementationOnce(async () => {
+    partialUpdateUserProfiles.mockImplementationOnce(async () => {
       await lastValueFrom(updateDone.pipe(first((v) => v === true)));
     });
 
diff --git a/packages/kbn-user-profile-components/src/hooks/use_update_user_profile.tsx b/packages/kbn-user-profile-components/src/hooks/use_update_user_profile.tsx
index 3e015fe92eac5..5d4f59269f5c5 100644
--- a/packages/kbn-user-profile-components/src/hooks/use_update_user_profile.tsx
+++ b/packages/kbn-user-profile-components/src/hooks/use_update_user_profile.tsx
@@ -7,9 +7,10 @@
  */
 
 import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useCallback, useRef, useState, useEffect } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { i18n } from '@kbn/i18n';
+import { merge } from 'lodash';
 
 import type { UserProfileData } from '../types';
 import { useUserProfiles } from '../services';
@@ -52,7 +53,7 @@ export const useUpdateUserProfile = ({
   pageReloadChecker,
 }: Props = {}) => {
   const { userProfileApiClient, notifySuccess } = useUserProfiles();
-  const { userProfile$ } = userProfileApiClient;
+  const { userProfile$, enabled$ } = userProfileApiClient;
   const {
     enabled: notificationSuccessEnabled = true,
     title: notificationTitle = i18nTexts.notificationSuccess.title,
@@ -60,8 +61,10 @@ export const useUpdateUserProfile = ({
   } = notificationSuccess;
   const [isLoading, setIsLoading] = useState(false);
   const userProfileData = useObservable(userProfile$);
+  const userProfileEnabled = useObservable(enabled$);
   // Keep a snapshot before updating the user profile so we can compare previous and updated values
   const userProfileSnapshot = useRef<UserProfileData | null>();
+  const isMounted = useRef(false);
 
   const showSuccessNotification = useCallback(
     ({ isRefreshRequired = false }: { isRefreshRequired?: boolean } = {}) => {
@@ -102,7 +105,9 @@ export const useUpdateUserProfile = ({
 
   const onUserProfileUpdate = useCallback(
     (updatedData: UserProfileData) => {
-      setIsLoading(false);
+      if (isMounted.current) {
+        setIsLoading(false);
+      }
 
       if (notificationSuccessEnabled) {
         const isRefreshRequired = pageReloadChecker?.(userProfileSnapshot.current, updatedData);
@@ -113,14 +118,23 @@ export const useUpdateUserProfile = ({
   );
 
   const update = useCallback(
-    <D extends UserProfileData>(updatedData: D) => {
-      userProfileSnapshot.current = userProfileData;
+    <D extends Partial<UserProfileData>>(updatedData: D) => {
+      userProfileSnapshot.current = merge({}, userProfileData);
       setIsLoading(true);
-      return userProfileApiClient.update(updatedData).then(() => onUserProfileUpdate(updatedData));
+      return userProfileApiClient
+        .partialUpdate(updatedData)
+        .then(() => onUserProfileUpdate(updatedData));
     },
     [userProfileApiClient, onUserProfileUpdate, userProfileData]
   );
 
+  useEffect(() => {
+    isMounted.current = true;
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
   return {
     /** Update the user profile */
     update,
@@ -130,6 +144,8 @@ export const useUpdateUserProfile = ({
     userProfileData,
     /** Flag to indicate if currently updating */
     isLoading,
+    /** Flag to indicate if user profile is enabled */
+    userProfileEnabled,
   };
 };
 
diff --git a/packages/kbn-user-profile-components/src/types.ts b/packages/kbn-user-profile-components/src/types.ts
index 77b6895756bdf..fd514a800437a 100644
--- a/packages/kbn-user-profile-components/src/types.ts
+++ b/packages/kbn-user-profile-components/src/types.ts
@@ -33,6 +33,7 @@ export type DarkModeValue = '' | 'dark' | 'light';
  */
 export interface UserSettingsData {
   darkMode?: DarkModeValue;
+  solutionNavOptOut?: boolean;
 }
 
 export interface UserProfileData {
@@ -43,5 +44,6 @@ export interface UserProfileData {
 
 export interface UserProfileAPIClient {
   userProfile$: Observable<UserProfileData | null>;
-  update: <D extends UserProfileData>(data: D) => Promise<void>;
+  enabled$: Observable<boolean>;
+  partialUpdate: <D extends Partial<UserProfileData>>(data: D) => Promise<void>;
 }
diff --git a/src/plugins/navigation/kibana.jsonc b/src/plugins/navigation/kibana.jsonc
index 6a32cda8d0df0..3c0e6246e66a9 100644
--- a/src/plugins/navigation/kibana.jsonc
+++ b/src/plugins/navigation/kibana.jsonc
@@ -6,8 +6,8 @@
     "id": "navigation",
     "server": true,
     "browser": true,
-    "optionalPlugins": ["cloud"],
+    "optionalPlugins": ["cloud","security"],
     "requiredPlugins": ["unifiedSearch"],
-    "requiredBundles": []
+    "requiredBundles": ["kibanaReact"]
   }
 }
diff --git a/src/plugins/navigation/public/mocks.ts b/src/plugins/navigation/public/mocks.ts
index 3625be538f249..df1d34e15a807 100644
--- a/src/plugins/navigation/public/mocks.ts
+++ b/src/plugins/navigation/public/mocks.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { of } from 'rxjs';
 import { Plugin } from '.';
 
 export type Setup = jest.Mocked<ReturnType<Plugin['setup']>>;
@@ -27,7 +28,7 @@ const createStartContract = (): jest.Mocked<Start> => {
       AggregateQueryTopNavMenu: jest.fn(),
     },
     addSolutionNavigation: jest.fn(),
-    isSolutionNavigationEnabled: jest.fn(),
+    isSolutionNavEnabled$: of(false),
   };
   return startContract;
 };
diff --git a/src/plugins/navigation/public/plugin.test.ts b/src/plugins/navigation/public/plugin.test.ts
index 5a30125f9e5ca..4e5579500d55f 100644
--- a/src/plugins/navigation/public/plugin.test.ts
+++ b/src/plugins/navigation/public/plugin.test.ts
@@ -8,8 +8,11 @@
 
 import { coreMock } from '@kbn/core/public/mocks';
 import { unifiedSearchPluginMock } from '@kbn/unified-search-plugin/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
 import { cloudMock } from '@kbn/cloud-plugin/public/mocks';
-import { of } from 'rxjs';
+import { firstValueFrom, of } from 'rxjs';
+import type { BuildFlavor } from '@kbn/config';
+import type { UserSettingsData } from '@kbn/user-profile-components';
 import {
   DEFAULT_SOLUTION_NAV_UI_SETTING_ID,
   ENABLE_SOLUTION_NAV_UI_SETTING_ID,
@@ -17,7 +20,15 @@ import {
 } from '../common';
 import { NavigationPublicPlugin } from './plugin';
 import { ConfigSchema } from './types';
-import type { BuildFlavor } from '@kbn/config';
+import { SolutionNavUserProfileToggle } from './solution_nav_userprofile_toggle';
+
+jest.mock('rxjs', () => {
+  const original = jest.requireActual('rxjs');
+  return {
+    ...original,
+    debounceTime: () => (source: any) => source,
+  };
+});
 
 const defaultConfig: ConfigSchema['solutionNavigation'] = {
   featureOn: true,
@@ -30,7 +41,10 @@ const setup = (
   partialConfig: Partial<ConfigSchema['solutionNavigation']> & {
     featureOn: boolean;
   },
-  { buildFlavor = 'traditional' }: { buildFlavor?: BuildFlavor } = {}
+  {
+    buildFlavor = 'traditional',
+    userSettings = {},
+  }: { buildFlavor?: BuildFlavor; userSettings?: UserSettingsData } = {}
 ) => {
   const initializerContext = coreMock.createPluginInitializerContext(
     {
@@ -46,6 +60,9 @@ const setup = (
   const coreStart = coreMock.createStart();
   const unifiedSearch = unifiedSearchPluginMock.createStartContract();
   const cloud = cloudMock.createStart();
+  const security = securityMock.createStart();
+  security.userProfiles.userProfileLoaded$ = of(true);
+  security.userProfiles.userProfile$ = of({ userSettings });
 
   const getGlobalSetting$ = jest.fn();
   const settingsGlobalClient = {
@@ -54,7 +71,7 @@ const setup = (
   };
   coreStart.settings.globalClient = settingsGlobalClient;
 
-  return { plugin, coreStart, unifiedSearch, cloud, getGlobalSetting$ };
+  return { plugin, coreStart, unifiedSearch, cloud, security, getGlobalSetting$ };
 };
 
 describe('Navigation Plugin', () => {
@@ -68,9 +85,12 @@ describe('Navigation Plugin', () => {
       expect(coreStart.chrome.project.changeActiveSolutionNavigation).not.toHaveBeenCalled();
     });
 
-    it('should return flag to indicate that the solution navigation is disabled', () => {
+    it('should return flag to indicate that the solution navigation is disabled', async () => {
       const { plugin, coreStart, unifiedSearch } = setup({ featureOn });
-      expect(plugin.start(coreStart, { unifiedSearch }).isSolutionNavigationEnabled()).toBe(false);
+      const isEnabled = await firstValueFrom(
+        plugin.start(coreStart, { unifiedSearch }).isSolutionNavEnabled$
+      );
+      expect(isEnabled).toBe(false);
     });
   });
 
@@ -146,21 +166,211 @@ describe('Navigation Plugin', () => {
       });
     });
 
-    it('should return flag to indicate that the solution navigation is enabled', () => {
-      const { plugin, coreStart, unifiedSearch, cloud } = setup({ featureOn });
-      expect(plugin.start(coreStart, { unifiedSearch, cloud }).isSolutionNavigationEnabled()).toBe(
-        true
-      );
+    it('should add the opt in/out toggle in the user menu', () => {
+      const { plugin, coreStart, unifiedSearch, cloud, security, getGlobalSetting$ } = setup({
+        featureOn,
+      });
+
+      const uiSettingsValues: Record<string, any> = {
+        [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: true,
+        [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'visible',
+        [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+      };
+
+      getGlobalSetting$.mockImplementation((settingId: string) => {
+        const value = uiSettingsValues[settingId] ?? 'unknown';
+        return of(value);
+      });
+
+      plugin.start(coreStart, { unifiedSearch, cloud, security });
+
+      expect(security.navControlService.addUserMenuLinks).toHaveBeenCalled();
+      const [menuLink] = security.navControlService.addUserMenuLinks.mock.calls[0][0];
+      expect((menuLink.content as any)?.type).toBe(SolutionNavUserProfileToggle);
     });
 
-    it('on serverless should return flag to indicate that the solution navigation is disabled', () => {
-      const { plugin, coreStart, unifiedSearch, cloud } = setup(
-        { featureOn },
-        { buildFlavor: 'serverless' }
-      );
-      expect(plugin.start(coreStart, { unifiedSearch, cloud }).isSolutionNavigationEnabled()).toBe(
-        false
-      );
+    describe('isSolutionNavEnabled$', () => {
+      describe('user has not opted in or out (undefined)', () => {
+        const testCases: Array<[Record<string, any>, string, boolean]> = [
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: true,
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'visible',
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should be enabled',
+            true,
+          ],
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: false, // feature not enabled
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'visible',
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should not be enabled',
+            false,
+          ],
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: true,
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'hidden', // not visible
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should not be enabled',
+            false,
+          ],
+        ];
+
+        testCases.forEach(([uiSettingsValues, description, expected]) => {
+          it(description, async () => {
+            const { plugin, coreStart, unifiedSearch, cloud, getGlobalSetting$ } = setup(
+              {
+                featureOn,
+              },
+              { userSettings: { solutionNavOptOut: undefined } } // user has not opted in or out
+            );
+
+            getGlobalSetting$.mockImplementation((settingId: string) => {
+              const value = uiSettingsValues[settingId] ?? 'unknown';
+              return of(value);
+            });
+
+            const { isSolutionNavEnabled$ } = plugin.start(coreStart, { unifiedSearch, cloud });
+            expect(await firstValueFrom(isSolutionNavEnabled$)).toBe(expected);
+          });
+        });
+      });
+
+      describe('user has opted in', () => {
+        const testCases: Array<[Record<string, any>, string, boolean]> = [
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: true,
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'visible',
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should be enabled',
+            true,
+          ],
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: false, // feature not enabled
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'visible',
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should not be enabled',
+            false,
+          ],
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: true,
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'hidden', // not visible
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should be enabled',
+            true,
+          ],
+        ];
+
+        testCases.forEach(([uiSettingsValues, description, expected]) => {
+          it(description, async () => {
+            const { plugin, coreStart, unifiedSearch, cloud, security, getGlobalSetting$ } = setup(
+              {
+                featureOn,
+              },
+              { userSettings: { solutionNavOptOut: false } } // user has opted in
+            );
+
+            getGlobalSetting$.mockImplementation((settingId: string) => {
+              const value = uiSettingsValues[settingId] ?? 'unknown';
+              return of(value);
+            });
+
+            const { isSolutionNavEnabled$ } = plugin.start(coreStart, {
+              security,
+              unifiedSearch,
+              cloud,
+            });
+            expect(await firstValueFrom(isSolutionNavEnabled$)).toBe(expected);
+          });
+        });
+      });
+
+      describe('user has opted out', () => {
+        const testCases: Array<[Record<string, any>, string, boolean]> = [
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: true,
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'visible',
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should not be enabled',
+            false,
+          ],
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: false, // feature not enabled
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'visible',
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should not be enabled',
+            false,
+          ],
+          [
+            {
+              [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: true,
+              [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'hidden',
+              [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+            },
+            'should not be enabled',
+            false,
+          ],
+        ];
+
+        testCases.forEach(([uiSettingsValues, description, expected]) => {
+          it(description, async () => {
+            const { plugin, coreStart, unifiedSearch, cloud, security, getGlobalSetting$ } = setup(
+              {
+                featureOn,
+              },
+              { userSettings: { solutionNavOptOut: true } } // user has opted out
+            );
+
+            getGlobalSetting$.mockImplementation((settingId: string) => {
+              const value = uiSettingsValues[settingId] ?? 'unknown';
+              return of(value);
+            });
+
+            const { isSolutionNavEnabled$ } = plugin.start(coreStart, {
+              security,
+              unifiedSearch,
+              cloud,
+            });
+            expect(await firstValueFrom(isSolutionNavEnabled$)).toBe(expected);
+          });
+        });
+      });
+
+      it('on serverless should flag must be disabled', async () => {
+        const { plugin, coreStart, unifiedSearch, cloud, getGlobalSetting$ } = setup(
+          { featureOn },
+          { buildFlavor: 'serverless' }
+        );
+        const uiSettingsValues: Record<string, any> = {
+          [ENABLE_SOLUTION_NAV_UI_SETTING_ID]: true, // enabled, but we are on serverless
+          [OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID]: 'visible', // should not matter
+          [DEFAULT_SOLUTION_NAV_UI_SETTING_ID]: 'es',
+        };
+
+        getGlobalSetting$.mockImplementation((settingId: string) => {
+          const value = uiSettingsValues[settingId] ?? 'unknown';
+          return of(value);
+        });
+
+        const { isSolutionNavEnabled$ } = plugin.start(coreStart, { unifiedSearch, cloud });
+        const isEnabled = await firstValueFrom(isSolutionNavEnabled$);
+        expect(isEnabled).toBe(false);
+      });
     });
   });
 });
diff --git a/src/plugins/navigation/public/plugin.tsx b/src/plugins/navigation/public/plugin.tsx
index c4b91615e3970..8dcf871f290b0 100644
--- a/src/plugins/navigation/public/plugin.tsx
+++ b/src/plugins/navigation/public/plugin.tsx
@@ -6,9 +6,21 @@
  * Side Public License, v 1.
  */
 import React from 'react';
-import { combineLatest, debounceTime, ReplaySubject, takeUntil } from 'rxjs';
+import {
+  combineLatest,
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  Observable,
+  of,
+  ReplaySubject,
+  skipWhile,
+  switchMap,
+  takeUntil,
+} from 'rxjs';
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { SecurityPluginStart, UserMenuLink } from '@kbn/security-plugin/public';
 import type {
   SolutionNavigationDefinition,
   SolutionNavigationDefinitions,
@@ -17,22 +29,28 @@ import { InternalChromeStart } from '@kbn/core-chrome-browser-internal';
 import { definition as esDefinition } from '@kbn/solution-nav-es';
 import { definition as obltDefinition } from '@kbn/solution-nav-oblt';
 import type { PanelContentProvider } from '@kbn/shared-ux-chrome-navigation';
+import { UserProfileData } from '@kbn/user-profile-components';
 import {
   ENABLE_SOLUTION_NAV_UI_SETTING_ID,
   OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID,
   DEFAULT_SOLUTION_NAV_UI_SETTING_ID,
 } from '../common';
-import {
+import type {
   NavigationPublicSetup,
   NavigationPublicStart,
   NavigationPublicSetupDependencies,
   NavigationPublicStartDependencies,
   ConfigSchema,
   SolutionNavigation,
+  SolutionNavigationOptInStatus,
+  SolutionType,
 } from './types';
 import { TopNavMenuExtensionsRegistry, createTopNav } from './top_nav_menu';
 import { RegisteredTopNavMenuData } from './top_nav_menu/top_nav_menu_data';
 import { SideNavComponent } from './side_navigation';
+import { SolutionNavUserProfileToggle } from './solution_nav_userprofile_toggle';
+
+const DEFAULT_OPT_OUT_NEW_NAV = false;
 
 export class NavigationPublicPlugin
   implements
@@ -48,6 +66,9 @@ export class NavigationPublicPlugin
   private readonly stop$ = new ReplaySubject<void>(1);
   private coreStart?: CoreStart;
   private depsStart?: NavigationPublicStartDependencies;
+  private isSolutionNavEnabled$ = of(false);
+  private userProfileOptOut$: Observable<boolean | undefined> = of(undefined);
+  private userProfileMenuItemAdded = false;
 
   constructor(private initializerContext: PluginInitializerContext<ConfigSchema>) {}
 
@@ -66,10 +87,25 @@ export class NavigationPublicPlugin
     this.coreStart = core;
     this.depsStart = depsStart;
 
-    const { unifiedSearch, cloud } = depsStart;
+    const { unifiedSearch, cloud, security } = depsStart;
     const extensions = this.topNavMenuExtensionsRegistry.getAll();
     const chrome = core.chrome as InternalChromeStart;
 
+    if (security) {
+      this.userProfileOptOut$ = security.userProfiles.userProfileLoaded$.pipe(
+        skipWhile((loaded) => {
+          return !loaded;
+        }),
+        switchMap(() => {
+          return security.userProfiles.userProfile$ as Observable<UserProfileData>;
+        }),
+        map((profile) => {
+          return profile?.userSettings?.solutionNavOptOut;
+        }),
+        distinctUntilChanged()
+      );
+    }
+
     /*
      *
      *  This helps clients of navigation to create
@@ -98,11 +134,31 @@ export class NavigationPublicPlugin
     const onCloud = cloud !== undefined; // The new side nav will initially only be available to cloud users
     const isServerless = this.initializerContext.env.packageInfo.buildFlavor === 'serverless';
     const isSolutionNavEnabled = isSolutionNavigationFeatureOn && onCloud && !isServerless;
+    this.isSolutionNavEnabled$ = of(isSolutionNavEnabled);
 
     if (isSolutionNavEnabled) {
       chrome.project.setCloudUrls(cloud);
       this.addDefaultSolutionNavigation({ chrome });
-      this.susbcribeToSolutionNavUiSettings(core);
+
+      this.isSolutionNavEnabled$ = combineLatest([
+        core.settings.globalClient.get$<boolean>(ENABLE_SOLUTION_NAV_UI_SETTING_ID),
+        core.settings.globalClient.get$<SolutionNavigationOptInStatus>(
+          OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID
+        ),
+        this.userProfileOptOut$,
+      ]).pipe(
+        takeUntil(this.stop$),
+        debounceTime(10),
+        map(([enabled, status, userOptedOut]) => {
+          if (!enabled || userOptedOut === true) return false;
+          if (status === 'hidden' && userOptedOut === undefined) return false;
+          return true;
+        })
+      );
+
+      this.susbcribeToSolutionNavUiSettings({ core, security });
+    } else if (!isServerless) {
+      chrome.setChromeStyle('classic');
     }
 
     return {
@@ -122,7 +178,7 @@ export class NavigationPublicPlugin
         if (!isSolutionNavEnabled) return;
         return this.addSolutionNavigation(solutionNavigation);
       },
-      isSolutionNavigationEnabled: () => isSolutionNavEnabled,
+      isSolutionNavEnabled$: this.isSolutionNavEnabled$,
     };
   }
 
@@ -130,23 +186,46 @@ export class NavigationPublicPlugin
     this.stop$.next();
   }
 
-  private susbcribeToSolutionNavUiSettings(core: CoreStart) {
+  private susbcribeToSolutionNavUiSettings({
+    core,
+    security,
+  }: {
+    core: CoreStart;
+    security?: SecurityPluginStart;
+  }) {
     const chrome = core.chrome as InternalChromeStart;
 
     combineLatest([
-      core.settings.globalClient.get$(ENABLE_SOLUTION_NAV_UI_SETTING_ID),
-      core.settings.globalClient.get$(OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID),
-      core.settings.globalClient.get$(DEFAULT_SOLUTION_NAV_UI_SETTING_ID),
+      core.settings.globalClient.get$<boolean>(ENABLE_SOLUTION_NAV_UI_SETTING_ID),
+      core.settings.globalClient.get$<SolutionNavigationOptInStatus>(
+        OPT_IN_STATUS_SOLUTION_NAV_UI_SETTING_ID
+      ),
+      core.settings.globalClient.get$<SolutionType>(DEFAULT_SOLUTION_NAV_UI_SETTING_ID),
+      this.userProfileOptOut$,
     ])
       .pipe(takeUntil(this.stop$), debounceTime(10))
-      .subscribe(([enabled, status, defaultSolution]) => {
-        if (!enabled) {
+      .subscribe(([enabled, status, defaultSolution, userOptedOut]) => {
+        if (enabled) {
+          // Add menu item in the user profile menu to opt in/out of the new navigation
+          this.addOptInOutUserProfile({ core, security, optInStatusSetting: status, userOptedOut });
+        } else {
+          // TODO. Remove the user profile menu item if the feature is disabled.
+          // But first let's wait as maybe there will be a page refresh when opting out.
+        }
+
+        if (!enabled || userOptedOut === true) {
           chrome.project.changeActiveSolutionNavigation(null);
+          chrome.setChromeStyle('classic');
         } else {
-          // TODO: Here we will need to check if the user has opt-in or not.... (value set in their user profile)
-          const changeImmediately = status === 'visible';
+          const changeToSolutionNav =
+            status === 'visible' || (status === 'hidden' && userOptedOut === false);
+
+          if (!changeToSolutionNav) {
+            chrome.setChromeStyle('classic');
+          }
+
           chrome.project.changeActiveSolutionNavigation(
-            changeImmediately ? defaultSolution : null,
+            changeToSolutionNav ? defaultSolution : null,
             { onlyIfNotSet: true }
           );
         }
@@ -209,4 +288,42 @@ export class NavigationPublicPlugin
 
     chrome.project.updateSolutionNavigations(solutionNavs, true);
   }
+
+  private addOptInOutUserProfile({
+    core,
+    security,
+    optInStatusSetting,
+    userOptedOut,
+  }: {
+    core: CoreStart;
+    userOptedOut?: boolean;
+    optInStatusSetting?: SolutionNavigationOptInStatus;
+    security?: SecurityPluginStart;
+  }) {
+    if (!security || this.userProfileMenuItemAdded) return;
+
+    let defaultOptOutValue = userOptedOut !== undefined ? userOptedOut : DEFAULT_OPT_OUT_NEW_NAV;
+    if (optInStatusSetting === 'visible' && userOptedOut === undefined) {
+      defaultOptOutValue = false;
+    } else if (optInStatusSetting === 'hidden' && userOptedOut === undefined) {
+      defaultOptOutValue = true;
+    }
+
+    const menuLink: UserMenuLink = {
+      content: (
+        <SolutionNavUserProfileToggle
+          core={core}
+          security={security}
+          defaultOptOutValue={defaultOptOutValue}
+        />
+      ),
+      order: 500,
+      label: '',
+      iconType: '',
+      href: '',
+    };
+
+    security.navControlService.addUserMenuLinks([menuLink]);
+    this.userProfileMenuItemAdded = true;
+  }
 }
diff --git a/src/plugins/navigation/public/solution_nav_userprofile_toggle/index.ts b/src/plugins/navigation/public/solution_nav_userprofile_toggle/index.ts
new file mode 100644
index 0000000000000..72d79d0de52a2
--- /dev/null
+++ b/src/plugins/navigation/public/solution_nav_userprofile_toggle/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { SolutionNavUserProfileToggle } from './solution_nav_userprofile_toggle';
diff --git a/src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.test.tsx b/src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.test.tsx
new file mode 100644
index 0000000000000..13dec96df0d16
--- /dev/null
+++ b/src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.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 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 { of } from 'rxjs';
+import { render, fireEvent } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { coreMock } from '@kbn/core/public/mocks';
+import { securityMock } from '@kbn/security-plugin/public/mocks';
+
+import { SolutionNavUserProfileToggle } from './solution_nav_userprofile_toggle';
+
+const mockUseUpdateUserProfile = jest.fn();
+
+jest.mock('@kbn/user-profile-components', () => {
+  const original = jest.requireActual('@kbn/user-profile-components');
+  return {
+    ...original,
+    useUpdateUserProfile: () => mockUseUpdateUserProfile(),
+  };
+});
+
+describe('SolutionNavUserProfileToggle', () => {
+  it('renders correctly and toggles opt out of new nav', () => {
+    const security = securityMock.createStart();
+    const core = coreMock.createStart();
+
+    const mockUpdate = jest.fn();
+    mockUseUpdateUserProfile.mockReturnValue({
+      userProfileData: { userSettings: { solutionNavOptOut: undefined } },
+      isLoading: false,
+      update: mockUpdate,
+      userProfileEnabled: true,
+    });
+
+    const { getByTestId, rerender } = render(
+      <SolutionNavUserProfileToggle core={core} security={security} defaultOptOutValue={false} />
+    );
+
+    const toggleSwitch = getByTestId('solutionNavToggleSwitch');
+    fireEvent.click(toggleSwitch);
+    expect(mockUpdate).toHaveBeenCalledWith({ userSettings: { solutionNavOptOut: true } });
+
+    // Now we want to simulate toggling back to light
+    mockUseUpdateUserProfile.mockReturnValue({
+      userProfileData: { userSettings: { solutionNavOptOut: true } },
+      isLoading: false,
+      update: mockUpdate,
+      userProfileEnabled: true,
+    });
+
+    // Rerender the component to apply the new props
+    rerender(
+      <SolutionNavUserProfileToggle core={core} security={security} defaultOptOutValue={false} />
+    );
+
+    fireEvent.click(toggleSwitch);
+    expect(mockUpdate).toHaveBeenLastCalledWith({ userSettings: { solutionNavOptOut: false } });
+  });
+
+  it('does not render if user profile is disabled', async () => {
+    const security = securityMock.createStart();
+    security.userProfiles.enabled$ = of(false);
+    const core = coreMock.createStart();
+
+    const mockUpdate = jest.fn();
+    mockUseUpdateUserProfile.mockReturnValue({
+      userProfileData: { userSettings: { solutionNavOptOut: undefined } },
+      isLoading: false,
+      update: mockUpdate,
+      userProfileEnabled: false,
+    });
+
+    const { queryByTestId } = render(
+      <SolutionNavUserProfileToggle core={core} security={security} defaultOptOutValue={false} />
+    );
+    const toggleSwitch = await queryByTestId('solutionNavToggleSwitch');
+
+    expect(toggleSwitch).toBeNull();
+  });
+});
diff --git a/src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.tsx b/src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.tsx
new file mode 100644
index 0000000000000..ac33ce5d6e860
--- /dev/null
+++ b/src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.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 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 {
+  EuiContextMenuItem,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSwitch,
+  useEuiTheme,
+  useGeneratedHtmlId,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import type { SecurityPluginStart } from '@kbn/security-plugin/public';
+import { UserProfilesKibanaProvider } from '@kbn/user-profile-components';
+import { CoreStart } from '@kbn/core-lifecycle-browser';
+import { toMountPoint } from '@kbn/kibana-react-plugin/public';
+
+import { useSolutionNavUserProfileToggle } from './use_solution_nav_userprofile_toggle';
+
+interface Props {
+  security: SecurityPluginStart;
+  core: CoreStart;
+  defaultOptOutValue: boolean;
+}
+
+export const SolutionNavUserProfileToggle = ({ security, core, defaultOptOutValue }: Props) => {
+  return (
+    <UserProfilesKibanaProvider core={core} security={security} toMountPoint={toMountPoint}>
+      <SolutionNavUserProfileToggleUi defaultOptOutValue={defaultOptOutValue} />
+    </UserProfilesKibanaProvider>
+  );
+};
+
+function SolutionNavUserProfileToggleUi({ defaultOptOutValue }: { defaultOptOutValue: boolean }) {
+  const toggleTextSwitchId = useGeneratedHtmlId({ prefix: 'toggleSolutionNavSwitch' });
+  const { euiTheme } = useEuiTheme();
+
+  const { userProfileEnabled, toggle, hasOptOut } = useSolutionNavUserProfileToggle({
+    defaultOptOutValue,
+  });
+
+  if (!userProfileEnabled) {
+    return null;
+  }
+
+  return (
+    <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="xs">
+      <EuiFlexItem>
+        <EuiContextMenuItem
+          icon="tableOfContents"
+          size="s"
+          onClick={() => {
+            toggle(!hasOptOut);
+          }}
+          data-test-subj="solutionNavToggle"
+        >
+          {i18n.translate('navigation.userMenuLinks.useClassicNavigation', {
+            defaultMessage: 'Use classic navigation',
+          })}
+        </EuiContextMenuItem>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false} css={{ paddingRight: euiTheme.size.m }}>
+        <EuiSwitch
+          label={
+            hasOptOut
+              ? i18n.translate('navigation.userMenuLinks.classicNavigationOnLabel', {
+                  defaultMessage: 'on',
+                })
+              : i18n.translate('navigation.userMenuLinks.classicNavigationOffLabel', {
+                  defaultMessage: 'off',
+                })
+          }
+          showLabel={false}
+          checked={hasOptOut}
+          onChange={(e) => {
+            toggle(e.target.checked);
+          }}
+          aria-describedby={toggleTextSwitchId}
+          data-test-subj="solutionNavToggleSwitch"
+          compressed
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/src/plugins/navigation/public/solution_nav_userprofile_toggle/use_solution_nav_userprofile_toggle.ts b/src/plugins/navigation/public/solution_nav_userprofile_toggle/use_solution_nav_userprofile_toggle.ts
new file mode 100644
index 0000000000000..3f1a28c843ff0
--- /dev/null
+++ b/src/plugins/navigation/public/solution_nav_userprofile_toggle/use_solution_nav_userprofile_toggle.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { useCallback, useEffect, useState } from 'react';
+import { useUpdateUserProfile } from '@kbn/user-profile-components';
+
+interface Deps {
+  defaultOptOutValue: boolean;
+}
+
+export const useSolutionNavUserProfileToggle = ({ defaultOptOutValue }: Deps) => {
+  const [hasOptOut, setHasOptOut] = useState(defaultOptOutValue);
+  const { userProfileData, isLoading, update, userProfileEnabled } = useUpdateUserProfile();
+
+  const { userSettings: { solutionNavOptOut = defaultOptOutValue } = {} } = userProfileData ?? {};
+
+  const toggle = useCallback(
+    (on: boolean) => {
+      if (isLoading) {
+        return;
+      }
+
+      // optimistic update
+      setHasOptOut(on);
+
+      update({
+        userSettings: {
+          solutionNavOptOut: on,
+        },
+      });
+    },
+    [isLoading, update]
+  );
+
+  useEffect(() => {
+    setHasOptOut(solutionNavOptOut);
+  }, [solutionNavOptOut]);
+
+  return {
+    toggle,
+    hasOptOut,
+    userProfileEnabled,
+  };
+};
diff --git a/src/plugins/navigation/public/types.ts b/src/plugins/navigation/public/types.ts
index b7bfaab6a2957..e9a7c298c1a97 100644
--- a/src/plugins/navigation/public/types.ts
+++ b/src/plugins/navigation/public/types.ts
@@ -6,13 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { AggregateQuery, Query } from '@kbn/es-query';
-import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { AggregateQuery, Query } from '@kbn/es-query';
+import type { Observable } from 'rxjs';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { SolutionNavigationDefinition } from '@kbn/core-chrome-browser';
 import type { CloudSetup, CloudStart } from '@kbn/cloud-plugin/public';
+import type { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/public';
 
 import { TopNavMenuProps, TopNavMenuExtensionsRegistrySetup, createTopNav } from './top_nav_menu';
-import { RegisteredTopNavMenuData } from './top_nav_menu/top_nav_menu_data';
+import type { RegisteredTopNavMenuData } from './top_nav_menu/top_nav_menu_data';
 
 export interface NavigationPublicSetup {
   registerMenuItem: TopNavMenuExtensionsRegistrySetup['register'];
@@ -31,20 +33,19 @@ export interface NavigationPublicStart {
   };
   /** Add a solution navigation to the header nav switcher. */
   addSolutionNavigation: (solutionNavigation: SolutionNavigation) => void;
-  /**
-   * Use this handler verify if the solution navigation is enabled.
-   * @returns true if the solution navigation is enabled, false otherwise.
-   */
-  isSolutionNavigationEnabled: () => boolean;
+  /** Flag to indicate if the solution navigation is enabled.*/
+  isSolutionNavEnabled$: Observable<boolean>;
 }
 
 export interface NavigationPublicSetupDependencies {
   cloud?: CloudSetup;
+  security?: SecurityPluginSetup;
 }
 
 export interface NavigationPublicStartDependencies {
   unifiedSearch: UnifiedSearchPublicPluginStart;
   cloud?: CloudStart;
+  security?: SecurityPluginStart;
 }
 
 export type SolutionNavigationOptInStatus = 'visible' | 'hidden' | 'ask';
diff --git a/src/plugins/navigation/tsconfig.json b/src/plugins/navigation/tsconfig.json
index 1450b9f0aa1a7..197f50d1d568f 100644
--- a/src/plugins/navigation/tsconfig.json
+++ b/src/plugins/navigation/tsconfig.json
@@ -27,6 +27,10 @@
     "@kbn/solution-nav-es",
     "@kbn/solution-nav-oblt",
     "@kbn/config",
+    "@kbn/kibana-react-plugin",
+    "@kbn/security-plugin",
+    "@kbn/user-profile-components",
+    "@kbn/core-lifecycle-browser",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/packages/security/plugin_types_public/src/user_profile/user_profile_api_client.ts b/x-pack/packages/security/plugin_types_public/src/user_profile/user_profile_api_client.ts
index 090d5d5b0fcf4..a397a16e5ad3a 100644
--- a/x-pack/packages/security/plugin_types_public/src/user_profile/user_profile_api_client.ts
+++ b/x-pack/packages/security/plugin_types_public/src/user_profile/user_profile_api_client.ts
@@ -15,6 +15,14 @@ import type { Observable } from 'rxjs';
 
 export interface UserProfileAPIClient {
   readonly userProfile$: Observable<UserProfileData | null>;
+  /**
+   * Indicates if the user profile data has been loaded from the server.
+   * Useful to distinguish between the case when the user profile data is `null` because the HTTP
+   * request has not finished or because there is no user profile data for the current user.
+   */
+  readonly userProfileLoaded$: Observable<boolean>;
+  /** Flag to indicate if the current user has a user profile. Anonymous users don't have user profiles. */
+  readonly enabled$: Observable<boolean>;
   /**
    * Retrieves the user profile of the current user. If the profile isn't available, e.g. for the anonymous users or
    * users authenticated via authenticating proxies, the `null` value is returned.
@@ -63,6 +71,12 @@ export interface UserProfileAPIClient {
    * @param data Application data to be written (merged with existing data).
    */
   update<D extends UserProfileData>(data: D): Promise<void>;
+
+  /**
+   * Partially updates user profile data of the current user, merging the previous data with the provided data.
+   * @param data Application data to be merged with existing data.
+   */
+  partialUpdate<D extends Partial<UserProfileData>>(data: D): Promise<void>;
 }
 
 /**
diff --git a/x-pack/plugins/cloud_integrations/cloud_links/public/maybe_add_cloud_links/theme_darkmode_hook.ts b/x-pack/plugins/cloud_integrations/cloud_links/public/maybe_add_cloud_links/theme_darkmode_hook.ts
index c0a4fcc3a09ac..0e062b693a24f 100644
--- a/x-pack/plugins/cloud_integrations/cloud_links/public/maybe_add_cloud_links/theme_darkmode_hook.ts
+++ b/x-pack/plugins/cloud_integrations/cloud_links/public/maybe_add_cloud_links/theme_darkmode_hook.ts
@@ -9,6 +9,7 @@ import { useCallback, useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
 import { useUpdateUserProfile } from '@kbn/user-profile-components';
+import useMountedState from 'react-use/lib/useMountedState';
 
 interface Deps {
   uiSettingsClient: IUiSettingsClient;
@@ -16,6 +17,8 @@ interface Deps {
 
 export const useThemeDarkmodeToggle = ({ uiSettingsClient }: Deps) => {
   const [isDarkModeOn, setIsDarkModeOn] = useState(false);
+  const isMounted = useMountedState();
+
   // If a value is set in kibana.yml (uiSettings.overrides.theme:darkMode)
   // we don't allow the user to change the theme color.
   const valueSetInKibanaConfig = uiSettingsClient.isOverridden('theme:darkMode');
@@ -37,14 +40,23 @@ export const useThemeDarkmodeToggle = ({ uiSettingsClient }: Deps) => {
     },
   });
 
-  const { userSettings: { darkMode: colorScheme } = { darkMode: undefined } } =
-    userProfileData ?? {};
+  const {
+    userSettings: {
+      darkMode: colorScheme = uiSettingsClient.get('theme:darkMode') === true ? 'dark' : 'light',
+    } = {},
+  } = userProfileData ?? {
+    userSettings: {},
+  };
 
   const toggle = useCallback(
     (on: boolean) => {
       if (isLoading) {
         return;
       }
+
+      // optimistic update
+      setIsDarkModeOn(on);
+
       update({
         userSettings: {
           darkMode: on ? 'dark' : 'light',
@@ -55,17 +67,9 @@ export const useThemeDarkmodeToggle = ({ uiSettingsClient }: Deps) => {
   );
 
   useEffect(() => {
-    let updatedValue = false;
-
-    if (typeof colorScheme !== 'string') {
-      // User profile does not have yet any preference -> default to space dark mode value
-      updatedValue = uiSettingsClient.get('theme:darkMode') ?? false;
-    } else {
-      updatedValue = colorScheme === 'dark';
-    }
-
-    setIsDarkModeOn(updatedValue);
-  }, [colorScheme, uiSettingsClient]);
+    if (!isMounted()) return;
+    setIsDarkModeOn(colorScheme === 'dark');
+  }, [isMounted, colorScheme]);
 
   return {
     isVisible: valueSetInKibanaConfig ? false : Boolean(userProfileData),
diff --git a/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.test.ts b/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.test.ts
index 0c275db2c1a90..f84113d6afddd 100644
--- a/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.test.ts
+++ b/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.test.ts
@@ -5,7 +5,10 @@
  * 2.0.
  */
 
+import { firstValueFrom } from 'rxjs';
+
 import { coreMock } from '@kbn/core/public/mocks';
+import { kibanaResponseFactory } from '@kbn/core-http-router-server-internal';
 
 import { UserProfileAPIClient } from './user_profile_api_client';
 
@@ -20,6 +23,35 @@ describe('UserProfileAPIClient', () => {
     apiClient = new UserProfileAPIClient(coreStart.http);
   });
 
+  it('should enable the user profile after fetching the data', async () => {
+    const promiseEnabled = firstValueFrom(apiClient.enabled$);
+    apiClient.start(); // Start will fetch the user profile data
+    const enabled = await promiseEnabled;
+    expect(enabled).toBe(true);
+  });
+
+  it('should not enable the user profile if we get a 404 from fetching the profile', async () => {
+    const err = new Error('Awwww');
+    (err as any).response = kibanaResponseFactory.notFound();
+    coreStart.http.get.mockRejectedValue(err);
+
+    const promiseEnabled = firstValueFrom(apiClient.enabled$);
+    apiClient.start(); // Start will fetch the user profile data
+
+    const enabled = await promiseEnabled;
+    expect(enabled).toBe(false);
+  });
+
+  it('should enable the user profile for any other error than a 404', async () => {
+    coreStart.http.get.mockRejectedValue(new Error('Awwww'));
+
+    const promiseEnabled = firstValueFrom(apiClient.enabled$);
+    apiClient.start();
+
+    const enabled = await promiseEnabled;
+    expect(enabled).toBe(true);
+  });
+
   it('should get user profile without retrieving any user data', async () => {
     await apiClient.getCurrent();
     expect(coreStart.http.get).toHaveBeenCalledWith('/internal/security/user_profile', {
diff --git a/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.ts b/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.ts
index 597b93236a2a5..9dbd3fa50b595 100644
--- a/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.ts
+++ b/x-pack/plugins/security/public/account_management/user_profile/user_profile_api_client.ts
@@ -7,7 +7,7 @@
 
 import { merge } from 'lodash';
 import type { Observable } from 'rxjs';
-import { BehaviorSubject, Subject } from 'rxjs';
+import { BehaviorSubject, distinctUntilChanged, skipWhile, Subject, switchMap } from 'rxjs';
 
 import type { HttpStart } from '@kbn/core/public';
 import type {
@@ -20,6 +20,8 @@ import type { UserProfileData } from '@kbn/user-profile-components';
 
 import type { GetUserProfileResponse, UserProfile } from '../../../common';
 
+const DEFAULT_DATAPATHS = 'avatar,userSettings';
+
 export class UserProfileAPIClient implements UserProfileAPIClientType {
   private readonly internalDataUpdates$: Subject<UserProfileData> = new Subject();
 
@@ -30,11 +32,31 @@ export class UserProfileAPIClient implements UserProfileAPIClientType {
     this.internalDataUpdates$.asObservable();
 
   private readonly _userProfile$ = new BehaviorSubject<UserProfileData | null>(null);
+  private readonly _enabled$ = new BehaviorSubject(false);
+  private readonly _userProfileLoaded$ = new BehaviorSubject(false);
 
   /** Observable of the current user profile data */
   public readonly userProfile$ = this._userProfile$.asObservable();
+  public readonly userProfileLoaded$ = this._userProfileLoaded$
+    .asObservable()
+    .pipe(distinctUntilChanged());
+  public enabled$: Observable<boolean>;
+
+  constructor(private readonly http: HttpStart) {
+    this.enabled$ = this.userProfileLoaded$.pipe(
+      skipWhile((loaded) => !loaded),
+      switchMap(() => this._enabled$.asObservable()),
+      distinctUntilChanged()
+    );
+  }
 
-  constructor(private readonly http: HttpStart) {}
+  public start() {
+    // Fetch the user profile with default path to initialize the user profile observable.
+    // This will also enable or not the user profile for the user by checking if we receive a 404 on this request.
+    this.getCurrent({ dataPath: DEFAULT_DATAPATHS }).catch(() => {
+      // silently ignore the error
+    });
+  }
 
   /**
    * Retrieves the user profile of the current user. If the profile isn't available, e.g. for the anonymous users or
@@ -51,8 +73,20 @@ export class UserProfileAPIClient implements UserProfileAPIClientType {
       .then((response) => {
         const data = response?.data ?? {};
         const updated = merge(this._userProfile$.getValue(), data);
+
         this._userProfile$.next(updated);
+        this._enabled$.next(true);
+        this._userProfileLoaded$.next(true);
+
         return response;
+      })
+      .catch((err) => {
+        // If we receive a 404 on the request, it means there are no user profile for the user.
+        const notFound = err?.response?.status === 404;
+        this._enabled$.next(notFound ? false : true);
+        this._userProfileLoaded$.next(true);
+
+        return Promise.reject(err);
       });
   }
 
@@ -112,4 +146,13 @@ export class UserProfileAPIClient implements UserProfileAPIClientType {
         return Promise.reject(err);
       });
   }
+
+  /**
+   * Updates user profile data of the current user.
+   * @param data Application data to be written (merged with existing data).
+   */
+  public partialUpdate<D extends Partial<UserProfileData>>(data: D) {
+    const updated = merge(this._userProfile$.getValue(), data);
+    return this.update(updated);
+  }
 }
diff --git a/x-pack/plugins/security/public/mocks.ts b/x-pack/plugins/security/public/mocks.ts
index 2e3b19016fd2e..edfc42aae585e 100644
--- a/x-pack/plugins/security/public/mocks.ts
+++ b/x-pack/plugins/security/public/mocks.ts
@@ -31,7 +31,10 @@ function createStartMock() {
       bulkGet: jest.fn(),
       suggest: jest.fn(),
       update: jest.fn(),
+      partialUpdate: jest.fn(),
       userProfile$: of({}),
+      userProfileLoaded$: of(true),
+      enabled$: of(true),
     },
     uiApi: getUiApiMock.createStart(),
   };
diff --git a/x-pack/plugins/security/public/plugin.test.tsx b/x-pack/plugins/security/public/plugin.test.tsx
index 4a66f7b0cbfdf..d3dadbfb87665 100644
--- a/x-pack/plugins/security/public/plugin.test.tsx
+++ b/x-pack/plugins/security/public/plugin.test.tsx
@@ -15,25 +15,29 @@ import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 import { managementPluginMock } from '@kbn/management-plugin/public/mocks';
 import { stubBroadcastChannel } from '@kbn/test-jest-helpers';
 
+import { UserProfileAPIClient } from './account_management';
 import { ManagementService } from './management';
 import type { PluginStartDependencies } from './plugin';
 import { SecurityPlugin } from './plugin';
 
 stubBroadcastChannel();
 
+const getCoreSetupMock = () => {
+  const coreSetup = coreMock.createSetup({
+    basePath: '/some-base-path',
+  });
+  coreSetup.http.get.mockResolvedValue({});
+  return coreSetup;
+};
+
 describe('Security Plugin', () => {
   describe('#setup', () => {
     it('should be able to setup if optional plugins are not available', () => {
       const plugin = new SecurityPlugin(coreMock.createPluginInitializerContext());
       expect(
-        plugin.setup(
-          coreMock.createSetup({
-            basePath: '/some-base-path',
-          }) as CoreSetup<PluginStartDependencies>,
-          {
-            licensing: licensingMock.createSetup(),
-          }
-        )
+        plugin.setup(getCoreSetupMock(), {
+          licensing: licensingMock.createSetup(),
+        })
       ).toEqual({
         authc: { getCurrentUser: expect.any(Function), areAPIKeysEnabled: expect.any(Function) },
         authz: { isRoleManagementEnabled: expect.any(Function) },
@@ -49,7 +53,7 @@ describe('Security Plugin', () => {
     });
 
     it('setups Management Service if `management` plugin is available', () => {
-      const coreSetupMock = coreMock.createSetup({ basePath: '/some-base-path' });
+      const coreSetupMock = getCoreSetupMock();
       const setupManagementServiceMock = jest
         .spyOn(ManagementService.prototype, 'setup')
         .mockImplementation(() => {});
@@ -81,7 +85,7 @@ describe('Security Plugin', () => {
     });
 
     it('calls core.security.registerSecurityApi', () => {
-      const coreSetupMock = coreMock.createSetup({ basePath: '/some-base-path' });
+      const coreSetupMock = getCoreSetupMock();
 
       const plugin = new SecurityPlugin(coreMock.createPluginInitializerContext());
 
@@ -96,10 +100,7 @@ describe('Security Plugin', () => {
   describe('#start', () => {
     it('should be able to setup if optional plugins are not available', () => {
       const plugin = new SecurityPlugin(coreMock.createPluginInitializerContext());
-      plugin.setup(
-        coreMock.createSetup({ basePath: '/some-base-path' }) as CoreSetup<PluginStartDependencies>,
-        { licensing: licensingMock.createSetup() }
-      );
+      plugin.setup(getCoreSetupMock(), { licensing: licensingMock.createSetup() });
 
       expect(
         plugin.start(coreMock.createStart({ basePath: '/some-base-path' }), {
@@ -127,7 +128,31 @@ describe('Security Plugin', () => {
           },
           "userProfiles": Object {
             "bulkGet": [Function],
+            "enabled$": Observable {
+              "operator": [Function],
+              "source": Observable {
+                "operator": [Function],
+                "source": Observable {
+                  "operator": [Function],
+                  "source": Observable {
+                    "operator": [Function],
+                    "source": Observable {
+                      "source": BehaviorSubject {
+                        "_value": false,
+                        "closed": false,
+                        "currentObservers": null,
+                        "hasError": false,
+                        "isStopped": false,
+                        "observers": Array [],
+                        "thrownError": null,
+                      },
+                    },
+                  },
+                },
+              },
+            },
             "getCurrent": [Function],
+            "partialUpdate": [Function],
             "suggest": [Function],
             "update": [Function],
             "userProfile$": Observable {
@@ -141,6 +166,20 @@ describe('Security Plugin', () => {
                 "thrownError": null,
               },
             },
+            "userProfileLoaded$": Observable {
+              "operator": [Function],
+              "source": Observable {
+                "source": BehaviorSubject {
+                  "_value": false,
+                  "closed": false,
+                  "currentObservers": null,
+                  "hasError": false,
+                  "isStopped": false,
+                  "observers": Array [],
+                  "thrownError": null,
+                },
+              },
+            },
           },
         }
       `);
@@ -156,13 +195,10 @@ describe('Security Plugin', () => {
 
       const plugin = new SecurityPlugin(coreMock.createPluginInitializerContext());
 
-      plugin.setup(
-        coreMock.createSetup({ basePath: '/some-base-path' }) as CoreSetup<PluginStartDependencies>,
-        {
-          licensing: licensingMock.createSetup(),
-          management: managementSetupMock,
-        }
-      );
+      plugin.setup(getCoreSetupMock(), {
+        licensing: licensingMock.createSetup(),
+        management: managementSetupMock,
+      });
 
       const coreStart = coreMock.createStart({ basePath: '/some-base-path' });
       plugin.start(coreStart, {
@@ -173,15 +209,28 @@ describe('Security Plugin', () => {
 
       expect(startManagementServiceMock).toHaveBeenCalledTimes(1);
     });
+
+    it('calls UserProfileAPIClient start() to fetch the user profile', () => {
+      const startUserProfileAPIClient = jest
+        .spyOn(UserProfileAPIClient.prototype, 'start')
+        .mockImplementation(() => {});
+      const plugin = new SecurityPlugin(coreMock.createPluginInitializerContext());
+      plugin.setup(getCoreSetupMock(), { licensing: licensingMock.createSetup() });
+
+      const coreStart = coreMock.createStart({ basePath: '/some-base-path' });
+      plugin.start(coreStart, {
+        dataViews: {} as DataViewsPublicPluginStart,
+        features: {} as FeaturesPluginStart,
+      });
+
+      expect(startUserProfileAPIClient).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('#stop', () => {
     it('does not fail if called before `start`.', () => {
       const plugin = new SecurityPlugin(coreMock.createPluginInitializerContext());
-      plugin.setup(
-        coreMock.createSetup({ basePath: '/some-base-path' }) as CoreSetup<PluginStartDependencies>,
-        { licensing: licensingMock.createSetup() }
-      );
+      plugin.setup(getCoreSetupMock(), { licensing: licensingMock.createSetup() });
 
       expect(() => plugin.stop()).not.toThrow();
     });
@@ -189,10 +238,7 @@ describe('Security Plugin', () => {
     it('does not fail if called during normal plugin life cycle.', () => {
       const plugin = new SecurityPlugin(coreMock.createPluginInitializerContext());
 
-      plugin.setup(
-        coreMock.createSetup({ basePath: '/some-base-path' }) as CoreSetup<PluginStartDependencies>,
-        { licensing: licensingMock.createSetup() }
-      );
+      plugin.setup(getCoreSetupMock(), { licensing: licensingMock.createSetup() });
 
       plugin.start(coreMock.createStart({ basePath: '/some-base-path' }), {
         dataViews: {} as DataViewsPublicPluginStart,
diff --git a/x-pack/plugins/security/public/plugin.tsx b/x-pack/plugins/security/public/plugin.tsx
index b99d2898bc344..1aaf7a882d6a2 100644
--- a/x-pack/plugins/security/public/plugin.tsx
+++ b/x-pack/plugins/security/public/plugin.tsx
@@ -200,6 +200,7 @@ export class SecurityPlugin
 
     this.sessionTimeout.start();
     this.securityCheckupService.start({ http, notifications, docLinks });
+    this.securityApiClients.userProfiles.start();
 
     if (management) {
       this.managementService.start({
@@ -231,7 +232,12 @@ export class SecurityPlugin
         update: this.securityApiClients.userProfiles.update.bind(
           this.securityApiClients.userProfiles
         ),
+        partialUpdate: this.securityApiClients.userProfiles.partialUpdate.bind(
+          this.securityApiClients.userProfiles
+        ),
         userProfile$: this.securityApiClients.userProfiles.userProfile$,
+        userProfileLoaded$: this.securityApiClients.userProfiles.userProfileLoaded$,
+        enabled$: this.securityApiClients.userProfiles.enabled$,
       },
     };
   }
diff --git a/x-pack/plugins/security/tsconfig.json b/x-pack/plugins/security/tsconfig.json
index 9fdbe3fd0e372..46f4e3f51d973 100644
--- a/x-pack/plugins/security/tsconfig.json
+++ b/x-pack/plugins/security/tsconfig.json
@@ -75,6 +75,7 @@
     "@kbn/code-editor-mock",
     "@kbn/core-security-browser",
     "@kbn/core-security-server",
+    "@kbn/core-http-router-server-internal",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/security_solution_serverless/public/navigation/side_navigation/index.tsx b/x-pack/plugins/security_solution_serverless/public/navigation/side_navigation/index.tsx
index 1e2d3a45827b2..5f7a5511d5ab2 100644
--- a/x-pack/plugins/security_solution_serverless/public/navigation/side_navigation/index.tsx
+++ b/x-pack/plugins/security_solution_serverless/public/navigation/side_navigation/index.tsx
@@ -10,6 +10,9 @@ import { type Services } from '../../common/services';
 export const initSideNavigation = (services: Services) => {
   import('./project_navigation').then(({ init }) => {
     const { navigationTree$, panelContentProvider, dataTestSubj } = init(services);
-    services.serverless.initNavigation(navigationTree$, { panelContentProvider, dataTestSubj });
+    services.serverless.initNavigation('security', navigationTree$, {
+      panelContentProvider,
+      dataTestSubj,
+    });
   });
 };
diff --git a/x-pack/plugins/serverless/public/plugin.tsx b/x-pack/plugins/serverless/public/plugin.tsx
index d26e9b66b8d47..95a9ff43c4270 100644
--- a/x-pack/plugins/serverless/public/plugin.tsx
+++ b/x-pack/plugins/serverless/public/plugin.tsx
@@ -81,8 +81,8 @@ export class ServerlessPlugin
     return {
       setSideNavComponentDeprecated: (sideNavigationComponent) =>
         project.setSideNavComponent(sideNavigationComponent),
-      initNavigation: (navigationTree$, { panelContentProvider, dataTestSubj } = {}) => {
-        project.initNavigation(navigationTree$);
+      initNavigation: (id, navigationTree$, { panelContentProvider, dataTestSubj } = {}) => {
+        project.initNavigation(id, navigationTree$);
         project.setSideNavComponent(() => (
           <SideNavComponent
             navProps={{
diff --git a/x-pack/plugins/serverless/public/types.ts b/x-pack/plugins/serverless/public/types.ts
index a2fa775314931..7613cd50c0743 100644
--- a/x-pack/plugins/serverless/public/types.ts
+++ b/x-pack/plugins/serverless/public/types.ts
@@ -26,6 +26,7 @@ export interface ServerlessPluginStart {
   ) => void;
   setProjectHome(homeHref: string): void;
   initNavigation(
+    id: string,
     navigationTree$: Observable<NavigationTreeDefinition>,
     config?: {
       dataTestSubj?: string;
diff --git a/x-pack/plugins/serverless_observability/public/plugin.ts b/x-pack/plugins/serverless_observability/public/plugin.ts
index d7936f5cd6225..76c278f9e374a 100644
--- a/x-pack/plugins/serverless_observability/public/plugin.ts
+++ b/x-pack/plugins/serverless_observability/public/plugin.ts
@@ -55,7 +55,7 @@ export class ServerlessObservabilityPlugin
 
     const navigationTree$ = of(navigationTree);
     serverless.setProjectHome('/app/observability/landing');
-    serverless.initNavigation(navigationTree$, { dataTestSubj: 'svlObservabilitySideNav' });
+    serverless.initNavigation('oblt', navigationTree$, { dataTestSubj: 'svlObservabilitySideNav' });
 
     const extendCardNavDefinitions = serverless.getNavigationCards(
       security.authz.isRoleManagementEnabled(),
diff --git a/x-pack/plugins/serverless_search/public/plugin.ts b/x-pack/plugins/serverless_search/public/plugin.ts
index 027d651a6b23a..d9019f911444a 100644
--- a/x-pack/plugins/serverless_search/public/plugin.ts
+++ b/x-pack/plugins/serverless_search/public/plugin.ts
@@ -125,7 +125,7 @@ export class ServerlessSearchPlugin
     serverless.setProjectHome('/app/elasticsearch');
 
     const navigationTree$ = of(navigationTree);
-    serverless.initNavigation(navigationTree$, { dataTestSubj: 'svlSearchSideNav' });
+    serverless.initNavigation('search', navigationTree$, { dataTestSubj: 'svlSearchSideNav' });
 
     const extendCardNavDefinitions = serverless.getNavigationCards(
       security.authz.isRoleManagementEnabled()
diff --git a/x-pack/test/functional/apps/navigation/config.ts b/x-pack/test/functional/apps/navigation/config.ts
new file mode 100644
index 0000000000000..00b98c1db316a
--- /dev/null
+++ b/x-pack/test/functional/apps/navigation/config.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 { FtrConfigProviderContext } from '@kbn/test';
+import { services, pageObjects } from './ftr_provider_context';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const kibanaFunctionalConfig = await readConfigFile(require.resolve('../../config.base.js'));
+
+  return {
+    testFiles: [require.resolve('./tests')],
+    servers: {
+      ...kibanaFunctionalConfig.get('servers'),
+    },
+    services,
+    pageObjects,
+
+    junit: {
+      reportName: 'X-Pack Navigation Functional Tests',
+    },
+
+    esTestCluster: {
+      ...kibanaFunctionalConfig.get('esTestCluster'),
+      license: 'trial',
+      serverArgs: [`xpack.license.self_generated.type='trial'`],
+    },
+    apps: {
+      ...kibanaFunctionalConfig.get('apps'),
+    },
+
+    kbnTestServer: {
+      ...kibanaFunctionalConfig.get('kbnTestServer'),
+      serverArgs: [
+        ...kibanaFunctionalConfig.get('kbnTestServer.serverArgs'),
+        '--navigation.solutionNavigation.featureOn=true',
+        '--navigation.solutionNavigation.enabled=true',
+        '--navigation.solutionNavigation.optInStatus=visible',
+        '--navigation.solutionNavigation.defaultSolution=es',
+        // Note: the base64 string in the cloud.id config contains the ES endpoint required in the functional tests
+        '--xpack.cloud.id=ftr_fake_cloud_id:aGVsbG8uY29tOjQ0MyRFUzEyM2FiYyRrYm4xMjNhYmM=',
+        '--xpack.cloud.base_url=https://cloud.elastic.co',
+        '--xpack.cloud.deployment_url=/deployments/deploymentId',
+        '--xpack.cloud.organization_url=/organization/organizationId',
+        '--xpack.cloud.billing_url=/billing',
+        '--xpack.cloud.profile_url=/user/userId',
+      ],
+    },
+  };
+}
diff --git a/x-pack/test/functional/apps/navigation/ftr_provider_context.ts b/x-pack/test/functional/apps/navigation/ftr_provider_context.ts
new file mode 100644
index 0000000000000..31e162e9731a7
--- /dev/null
+++ b/x-pack/test/functional/apps/navigation/ftr_provider_context.ts
@@ -0,0 +1,13 @@
+/*
+ * 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 { GenericFtrProviderContext } from '@kbn/test';
+import { services } from '../../services';
+import { pageObjects } from '../../page_objects';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
+export { services, pageObjects };
diff --git a/x-pack/test/functional/apps/navigation/tests/index.ts b/x-pack/test/functional/apps/navigation/tests/index.ts
new file mode 100644
index 0000000000000..3f0f6acaf2231
--- /dev/null
+++ b/x-pack/test/functional/apps/navigation/tests/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('navigation - functional tests', function () {
+    loadTestFile(require.resolve('./user_optin_optout'));
+  });
+}
diff --git a/x-pack/test/functional/apps/navigation/tests/user_optin_optout.ts b/x-pack/test/functional/apps/navigation/tests/user_optin_optout.ts
new file mode 100644
index 0000000000000..59d4733564d46
--- /dev/null
+++ b/x-pack/test/functional/apps/navigation/tests/user_optin_optout.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 { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'header', 'home', 'dashboard', 'security']);
+  const testSubjects = getService('testSubjects');
+  const userMenu = getService('userMenu');
+
+  describe('user opt in/out', function describeIndexTests() {
+    it('should allow the user to opt in or out', async () => {
+      await PageObjects.common.navigateToApp('home');
+
+      // we are in the new nav, search solution
+      await testSubjects.existOrFail('kibanaProjectHeader');
+
+      await userMenu.openMenu();
+      await testSubjects.existOrFail('solutionNavToggle');
+
+      // Opt OUT of the new navigation
+      await testSubjects.click('solutionNavToggle');
+      // we are in the old nav
+      await testSubjects.missingOrFail('kibanaProjectHeader');
+
+      // Opt back IN to the new navigation
+      await userMenu.openMenu();
+      await testSubjects.click('solutionNavToggle');
+      await testSubjects.existOrFail('kibanaProjectHeader');
+    });
+  });
+}
diff --git a/x-pack/test/functional/services/user_menu.js b/x-pack/test/functional/services/user_menu.js
index e3f589386fc2e..2b77cd086563d 100644
--- a/x-pack/test/functional/services/user_menu.js
+++ b/x-pack/test/functional/services/user_menu.js
@@ -29,6 +29,10 @@ export function UserMenuProvider({ getService }) {
       return await testSubjects.exists('userMenu > logoutLink');
     }
 
+    async openMenu() {
+      await this._ensureMenuOpen();
+    }
+
     async closeMenu() {
       if (!(await testSubjects.exists('userMenu'))) {
         return;

From 9106bf72440306540d9a24d376eed00b0b68eb2c Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:52:51 +0200
Subject: [PATCH 02/63] [ES|QL] fix job path (#179785)

## Summary

After packaging the ES|QL grammar stuff the `git add` didn't change
accordingly for the new path, hence the error.
This PR fixes it.
---
 .buildkite/scripts/steps/esql_grammar_sync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/scripts/steps/esql_grammar_sync.sh b/.buildkite/scripts/steps/esql_grammar_sync.sh
index 33091b7524387..88c6871794b3b 100755
--- a/.buildkite/scripts/steps/esql_grammar_sync.sh
+++ b/.buildkite/scripts/steps/esql_grammar_sync.sh
@@ -113,7 +113,7 @@ main () {
 
   git checkout -b "$BRANCH_NAME"
 
-  git add esql/antlr/*
+  git add antlr/*
   git commit -m "Update ES|QL grammars"
 
   report_main_step "Changes committed. Creating pull request."

From e290d2c1ab3978fba759a01077afb74235830e8f Mon Sep 17 00:00:00 2001
From: Pablo Machado <pablo.nevesmachado@elastic.co>
Date: Tue, 2 Apr 2024 10:55:42 +0200
Subject: [PATCH 03/63] [SecuritySolutions] Fix Entity Analytics dashboard
 fires many risk_score/index_status requests (#179510)

## Summary

The Entity Analytics Dashboard page called the
`/risk_score/index_status` API many times, which led to a very long
loading time.

I wrapped all API calls inside `useEntityAnalyticsRoute` with `useMemo`
to quick-fix the multiple unnecessary HTTP calls.



### 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
- [x] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
---
 .../public/entity_analytics/api/api.ts        | 283 +++++++++---------
 1 file changed, 143 insertions(+), 140 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/entity_analytics/api/api.ts b/x-pack/plugins/security_solution/public/entity_analytics/api/api.ts
index 32ed3999bc747..dd80bf7989235 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/api/api.ts
+++ b/x-pack/plugins/security_solution/public/entity_analytics/api/api.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { useMemo } from 'react';
 import type { AssetCriticalityRecord } from '../../../common/api/entity_analytics/asset_criticality';
 import type { RiskScoreEntity } from '../../../common/search_strategy';
 import {
@@ -36,150 +37,152 @@ import { useKibana } from '../../common/lib/kibana/kibana_react';
 export const useEntityAnalyticsRoutes = () => {
   const http = useKibana().services.http;
 
-  /**
-   * Fetches preview risks scores
-   */
-  const fetchRiskScorePreview = ({
-    signal,
-    params,
-  }: {
-    signal?: AbortSignal;
-    params: RiskScorePreviewRequestSchema;
-  }) =>
-    http.fetch<CalculateScoresResponse>(RISK_SCORE_PREVIEW_URL, {
-      version: '1',
-      method: 'POST',
-      body: JSON.stringify(params),
+  return useMemo(() => {
+    /**
+     * Fetches preview risks scores
+     */
+    const fetchRiskScorePreview = ({
       signal,
-    });
-
-  /**
-   * Fetches risks engine status
-   */
-  const fetchRiskEngineStatus = ({ signal }: { signal?: AbortSignal }) =>
-    http.fetch<GetRiskEngineStatusResponse>(RISK_ENGINE_STATUS_URL, {
-      version: '1',
-      method: 'GET',
-      signal,
-    });
-
-  /**
-   * Init risk score engine
-   */
-  const initRiskEngine = () =>
-    http.fetch<InitRiskEngineResponse>(RISK_ENGINE_INIT_URL, {
-      version: '1',
-      method: 'POST',
-    });
-
-  /**
-   * Enable risk score engine
-   */
-  const enableRiskEngine = () =>
-    http.fetch<EnableRiskEngineResponse>(RISK_ENGINE_ENABLE_URL, {
-      version: '1',
-      method: 'POST',
-    });
-
-  /**
-   * Disable risk score engine
-   */
-  const disableRiskEngine = () =>
-    http.fetch<DisableRiskEngineResponse>(RISK_ENGINE_DISABLE_URL, {
-      version: '1',
-      method: 'POST',
-    });
-
-  /**
-   * Get risk engine privileges
-   */
-  const fetchRiskEnginePrivileges = () =>
-    http.fetch<EntityAnalyticsPrivileges>(RISK_ENGINE_PRIVILEGES_URL, {
-      version: '1',
-      method: 'GET',
-    });
-
-  /**
-   * Get asset criticality privileges
-   */
-  const fetchAssetCriticalityPrivileges = () =>
-    http.fetch<EntityAnalyticsPrivileges>(ASSET_CRITICALITY_PRIVILEGES_URL, {
-      version: '1',
-      method: 'GET',
-    });
-
-  /**
-   * Create asset criticality
-   */
-  const createAssetCriticality = async (
-    params: Pick<AssetCriticality, 'idField' | 'idValue' | 'criticalityLevel'>
-  ): Promise<AssetCriticalityRecord> =>
-    http.fetch<AssetCriticalityRecord>(ASSET_CRITICALITY_URL, {
-      version: '1',
-      method: 'POST',
-      body: JSON.stringify({
-        id_value: params.idValue,
-        id_field: params.idField,
-        criticality_level: params.criticalityLevel,
-      }),
-    });
-
-  /**
-   * Get asset criticality
-   */
-  const fetchAssetCriticality = async (
-    params: Pick<AssetCriticality, 'idField' | 'idValue'>
-  ): Promise<AssetCriticalityRecord> => {
-    return http.fetch<AssetCriticalityRecord>(ASSET_CRITICALITY_URL, {
-      version: '1',
-      method: 'GET',
-      query: { id_value: params.idValue, id_field: params.idField },
-    });
-  };
-
-  const getRiskScoreIndexStatus = ({
-    query,
-    signal,
-  }: {
-    query: {
-      indexName: string;
-      entity: RiskScoreEntity;
+      params,
+    }: {
+      signal?: AbortSignal;
+      params: RiskScorePreviewRequestSchema;
+    }) =>
+      http.fetch<CalculateScoresResponse>(RISK_SCORE_PREVIEW_URL, {
+        version: '1',
+        method: 'POST',
+        body: JSON.stringify(params),
+        signal,
+      });
+
+    /**
+     * Fetches risks engine status
+     */
+    const fetchRiskEngineStatus = ({ signal }: { signal?: AbortSignal }) =>
+      http.fetch<GetRiskEngineStatusResponse>(RISK_ENGINE_STATUS_URL, {
+        version: '1',
+        method: 'GET',
+        signal,
+      });
+
+    /**
+     * Init risk score engine
+     */
+    const initRiskEngine = () =>
+      http.fetch<InitRiskEngineResponse>(RISK_ENGINE_INIT_URL, {
+        version: '1',
+        method: 'POST',
+      });
+
+    /**
+     * Enable risk score engine
+     */
+    const enableRiskEngine = () =>
+      http.fetch<EnableRiskEngineResponse>(RISK_ENGINE_ENABLE_URL, {
+        version: '1',
+        method: 'POST',
+      });
+
+    /**
+     * Disable risk score engine
+     */
+    const disableRiskEngine = () =>
+      http.fetch<DisableRiskEngineResponse>(RISK_ENGINE_DISABLE_URL, {
+        version: '1',
+        method: 'POST',
+      });
+
+    /**
+     * Get risk engine privileges
+     */
+    const fetchRiskEnginePrivileges = () =>
+      http.fetch<EntityAnalyticsPrivileges>(RISK_ENGINE_PRIVILEGES_URL, {
+        version: '1',
+        method: 'GET',
+      });
+
+    /**
+     * Get asset criticality privileges
+     */
+    const fetchAssetCriticalityPrivileges = () =>
+      http.fetch<EntityAnalyticsPrivileges>(ASSET_CRITICALITY_PRIVILEGES_URL, {
+        version: '1',
+        method: 'GET',
+      });
+
+    /**
+     * Create asset criticality
+     */
+    const createAssetCriticality = async (
+      params: Pick<AssetCriticality, 'idField' | 'idValue' | 'criticalityLevel'>
+    ): Promise<AssetCriticalityRecord> =>
+      http.fetch<AssetCriticalityRecord>(ASSET_CRITICALITY_URL, {
+        version: '1',
+        method: 'POST',
+        body: JSON.stringify({
+          id_value: params.idValue,
+          id_field: params.idField,
+          criticality_level: params.criticalityLevel,
+        }),
+      });
+
+    /**
+     * Get asset criticality
+     */
+    const fetchAssetCriticality = async (
+      params: Pick<AssetCriticality, 'idField' | 'idValue'>
+    ): Promise<AssetCriticalityRecord> => {
+      return http.fetch<AssetCriticalityRecord>(ASSET_CRITICALITY_URL, {
+        version: '1',
+        method: 'GET',
+        query: { id_value: params.idValue, id_field: params.idField },
+      });
     };
-    signal?: AbortSignal;
-  }): Promise<{
-    isDeprecated: boolean;
-    isEnabled: boolean;
-  }> =>
-    http.fetch<{ isDeprecated: boolean; isEnabled: boolean }>(RISK_SCORE_INDEX_STATUS_API_URL, {
-      version: '1',
-      method: 'GET',
+
+    const getRiskScoreIndexStatus = ({
       query,
-      asSystemRequest: true,
       signal,
-    });
-
-  /**
-   * Fetches risk engine settings
-   */
-  const fetchRiskEngineSettings = () =>
-    http.fetch<RiskEngineSettingsResponse>(RISK_ENGINE_SETTINGS_URL, {
-      version: '1',
-      method: 'GET',
-    });
-
-  return {
-    fetchRiskScorePreview,
-    fetchRiskEngineStatus,
-    initRiskEngine,
-    enableRiskEngine,
-    disableRiskEngine,
-    fetchRiskEnginePrivileges,
-    fetchAssetCriticalityPrivileges,
-    createAssetCriticality,
-    fetchAssetCriticality,
-    getRiskScoreIndexStatus,
-    fetchRiskEngineSettings,
-  };
+    }: {
+      query: {
+        indexName: string;
+        entity: RiskScoreEntity;
+      };
+      signal?: AbortSignal;
+    }): Promise<{
+      isDeprecated: boolean;
+      isEnabled: boolean;
+    }> =>
+      http.fetch<{ isDeprecated: boolean; isEnabled: boolean }>(RISK_SCORE_INDEX_STATUS_API_URL, {
+        version: '1',
+        method: 'GET',
+        query,
+        asSystemRequest: true,
+        signal,
+      });
+
+    /**
+     * Fetches risk engine settings
+     */
+    const fetchRiskEngineSettings = () =>
+      http.fetch<RiskEngineSettingsResponse>(RISK_ENGINE_SETTINGS_URL, {
+        version: '1',
+        method: 'GET',
+      });
+
+    return {
+      fetchRiskScorePreview,
+      fetchRiskEngineStatus,
+      initRiskEngine,
+      enableRiskEngine,
+      disableRiskEngine,
+      fetchRiskEnginePrivileges,
+      fetchAssetCriticalityPrivileges,
+      createAssetCriticality,
+      fetchAssetCriticality,
+      getRiskScoreIndexStatus,
+      fetchRiskEngineSettings,
+    };
+  }, [http]);
 };
 
 export type AssetCriticality = SnakeToCamelCase<AssetCriticalityRecord>;

From 73347f6cb2aeff8534f39778101ed1db91e80d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 2 Apr 2024 10:57:51 +0200
Subject: [PATCH 04/63] [Part of #176153] Saved objects (#179752)

---
 .../src/lib/apis/bulk_update.ts                                | 3 +--
 .../src/lib/apis/update.ts                                     | 3 +--
 .../core-saved-objects-common/src/server_types.ts              | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.ts
index b195141924659..7b8163107ac6b 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/bulk_update.ts
@@ -262,9 +262,8 @@ export const performBulkUpdate = async <T>(
 
       const typeDefinition = registry.getType(type)!;
       const updatedAttributes = mergeForUpdate({
-        // @ts-expect-error upgrade typescript v4.9.5
         targetAttributes: {
-          ...migrated!.attributes,
+          ...(migrated!.attributes as Record<string, unknown>),
         },
         updatedAttributes: await encryptionHelper.optionallyEncryptAttributes(
           type,
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.ts
index e25320f8a842e..ee76a0243b3eb 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.ts
@@ -247,9 +247,8 @@ export const executeUpdate = async <T>(
     // therefor we can safely process with the "standard" update sequence.
 
     const updatedAttributes = mergeForUpdate({
-      // @ts-expect-error upgrade typescript v4.9.5
       targetAttributes: {
-        ...migrated!.attributes,
+        ...(migrated!.attributes as Record<string, unknown>),
       },
       updatedAttributes: await encryptionHelper.optionallyEncryptAttributes(
         type,
diff --git a/packages/core/saved-objects/core-saved-objects-common/src/server_types.ts b/packages/core/saved-objects/core-saved-objects-common/src/server_types.ts
index 9ea8f1c9f0668..8b3ffe0b733d6 100644
--- a/packages/core/saved-objects/core-saved-objects-common/src/server_types.ts
+++ b/packages/core/saved-objects/core-saved-objects-common/src/server_types.ts
@@ -66,7 +66,7 @@ export interface SavedObjectReference {
 export interface SavedObject<T = unknown> {
   /** The ID of this Saved Object, guaranteed to be unique for all objects of the same `type` */
   id: string;
-  /**  The type of Saved Object. Each plugin can define it's own custom Saved Object types. */
+  /**  The type of Saved Object. Each plugin can define its own custom Saved Object types. */
   type: string;
   /** An opaque version number which changes on each successful write operation. Can be used for implementing optimistic concurrency control. */
   version?: string;

From 4461b86a7fcb844cfbd7f158266c29f38b0f0d62 Mon Sep 17 00:00:00 2001
From: Luke G <11671118+lgestc@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:00:03 +0200
Subject: [PATCH 05/63] fix threat intelligence loading screen (#178701)

## Summary

This PR fixes custom empty page layout in Threat Intelligence page, and
also optimizes some of the loading that happens during the init phase
(integrations retrieval).

**Before**

![image](https://github.com/elastic/kibana/assets/11671118/11fa9ce2-f075-4940-a9ae-75f327d4b7cb)

Broken api calls made:


![image](https://github.com/elastic/kibana/assets/11671118/4bc4b1a2-6424-42d4-9390-e51a36f943b7)

**After**


![image](https://github.com/elastic/kibana/assets/11671118/d67b4ea8-e862-41d6-830e-f0b38af297c7)


### Checklist
---
 .../page_template_inner.test.tsx.snap         |  12 ++
 .../impl/src/page_template_inner.test.tsx     |  11 ++
 .../impl/src/page_template_inner.tsx          |   6 +
 .../page/kibana_template/types/index.d.ts     |   6 +
 .../app/home/template_wrapper/index.test.tsx  |  26 +++-
 .../app/home/template_wrapper/index.tsx       |  60 ++++----
 .../public/threat_intelligence/routes.tsx     |  82 ++++++-----
 .../public/containers/enterprise_guard.tsx    |   6 +-
 .../containers/indicators_page_wrapper.tsx    |  16 ++-
 .../containers/integrations_guard.test.tsx    |  13 +-
 .../public/containers/integrations_guard.tsx  |  23 +--
 .../public/hooks/use_integrations.ts          |  36 ++++-
 .../public/mocks/mock_security_context.tsx    |   8 +-
 .../public/mocks/story_providers.tsx          |   8 +-
 .../public/mocks/test_providers.tsx           |   5 +-
 .../public/modules/empty_page/empty_page.tsx  | 133 +++++++++---------
 .../threat_intelligence/public/types.ts       |  22 +--
 17 files changed, 291 insertions(+), 182 deletions(-)

diff --git a/packages/shared-ux/page/kibana_template/impl/src/__snapshots__/page_template_inner.test.tsx.snap b/packages/shared-ux/page/kibana_template/impl/src/__snapshots__/page_template_inner.test.tsx.snap
index 9b89225ff7ce3..87d4c10015c20 100644
--- a/packages/shared-ux/page/kibana_template/impl/src/__snapshots__/page_template_inner.test.tsx.snap
+++ b/packages/shared-ux/page/kibana_template/impl/src/__snapshots__/page_template_inner.test.tsx.snap
@@ -8,6 +8,18 @@ exports[`KibanaPageTemplateInner isEmpty no pageHeader 1`] = `
 />
 `;
 
+exports[`KibanaPageTemplateInner isEmpty no pageHeader, isEmptyState, emptyPageBody 1`] = `
+<_EuiPageTemplate
+  className="kbnPageTemplate"
+  minHeight={0}
+  offset={0}
+>
+  <div>
+    custom empty page body
+  </div>
+</_EuiPageTemplate>
+`;
+
 exports[`KibanaPageTemplateInner isEmpty pageHeader & children 1`] = `
 <_EuiPageTemplate
   className="kbnPageTemplate"
diff --git a/packages/shared-ux/page/kibana_template/impl/src/page_template_inner.test.tsx b/packages/shared-ux/page/kibana_template/impl/src/page_template_inner.test.tsx
index d7278ac889669..145a5177f3069 100644
--- a/packages/shared-ux/page/kibana_template/impl/src/page_template_inner.test.tsx
+++ b/packages/shared-ux/page/kibana_template/impl/src/page_template_inner.test.tsx
@@ -48,6 +48,17 @@ describe('KibanaPageTemplateInner', () => {
       );
       expect(component).toMatchSnapshot();
     });
+
+    test('no pageHeader, isEmptyState, emptyPageBody', () => {
+      const component = shallow(
+        <KibanaPageTemplateInner
+          isEmptyState={true}
+          pageHeader={undefined}
+          emptyPageBody={<div>{'custom empty page body'}</div>}
+        />
+      );
+      expect(component).toMatchSnapshot();
+    });
   });
 
   test('page sidebar', () => {
diff --git a/packages/shared-ux/page/kibana_template/impl/src/page_template_inner.tsx b/packages/shared-ux/page/kibana_template/impl/src/page_template_inner.tsx
index 5da29ba797041..df72e52282ebe 100644
--- a/packages/shared-ux/page/kibana_template/impl/src/page_template_inner.tsx
+++ b/packages/shared-ux/page/kibana_template/impl/src/page_template_inner.tsx
@@ -31,6 +31,7 @@ export const KibanaPageTemplateInner: FC<Props> = ({
   isEmptyState,
   pageSideBar,
   pageSideBarProps,
+  emptyPageBody,
   ...rest
 }) => {
   let header;
@@ -52,6 +53,11 @@ export const KibanaPageTemplateInner: FC<Props> = ({
     header = <EuiPageTemplate.Header {...pageHeader} />;
   }
 
+  // NOTE: with emptyPageBody, page contents are replaced entirely with the provided element
+  if (isEmptyState && emptyPageBody) {
+    children = emptyPageBody;
+  }
+
   let sideBar;
   if (pageSideBar) {
     const sideBarProps = { ...pageSideBarProps };
diff --git a/packages/shared-ux/page/kibana_template/types/index.d.ts b/packages/shared-ux/page/kibana_template/types/index.d.ts
index a8181876204e2..4162502897bf7 100644
--- a/packages/shared-ux/page/kibana_template/types/index.d.ts
+++ b/packages/shared-ux/page/kibana_template/types/index.d.ts
@@ -25,6 +25,12 @@ export type KibanaPageTemplateProps = EuiPageTemplateProps & {
    * Converts the `pageHeader` contents into an EuiEmptyPrompt when no `children` are present
    */
   isEmptyState?: boolean;
+
+  /**
+   * Combined with isEmptyState, this prop allows complete override of the empty page
+   */
+  emptyPageBody?: ReactNode;
+
   /**
    * Quick creation of EuiSideNav. Hooks up mobile instance too
    */
diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
index 322249daeaac1..c1d3760813a15 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.test.tsx
@@ -8,7 +8,7 @@
 import { render, waitFor } from '@testing-library/react';
 import React from 'react';
 import { TestProviders } from '../../../common/mock';
-import { SecuritySolutionTemplateWrapper } from '.';
+import { SecuritySolutionTemplateWrapper, type SecuritySolutionTemplateWrapperProps } from '.';
 import { SecurityPageName } from '../../types';
 
 const mockUseShowTimeline = jest.fn((): [boolean] => [false]);
@@ -56,15 +56,15 @@ jest.mock('../../../common/utils/route/use_route_spy', () => ({
   useRouteSpy: () => mockUseRouteSpy(),
 }));
 
-const renderComponent = () => {
-  return render(
+const renderComponent = ({
+  children = <div>{'child of wrapper'}</div>,
+  ...props
+}: SecuritySolutionTemplateWrapperProps = {}) =>
+  render(
     <TestProviders>
-      <SecuritySolutionTemplateWrapper>
-        <div>{'child of wrapper'}</div>
-      </SecuritySolutionTemplateWrapper>
+      <SecuritySolutionTemplateWrapper {...props}>{children}</SecuritySolutionTemplateWrapper>
     </TestProviders>
   );
-};
 
 describe('SecuritySolutionTemplateWrapper', () => {
   beforeEach(() => {
@@ -91,4 +91,16 @@ describe('SecuritySolutionTemplateWrapper', () => {
       expect(queryByText('Timeline')).not.toBeInTheDocument();
     });
   });
+
+  it('Should render emptyPageBody when isEmptyState is true', async () => {
+    mockUseShowTimeline.mockReturnValue([false]);
+
+    const { getByText } = renderComponent({
+      isEmptyState: true,
+      emptyPageBody: <div>{'empty page body'}</div>,
+      children: null,
+    });
+
+    expect(getByText('empty page body')).toBeInTheDocument();
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
index 34e339e974a23..a7dabdb81f0b4 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useMemo } from 'react';
+import React, { type ReactNode, useMemo } from 'react';
 import styled from 'styled-components';
 import { EuiThemeProvider, useEuiTheme, type EuiThemeComputed } from '@elastic/eui';
 import { IS_DRAGGING_CLASS_NAME } from '@kbn/securitysolution-t-grid';
@@ -46,7 +46,14 @@ const StyledKibanaPageTemplate = styled(KibanaPageTemplate)<
   }
 `;
 
-export const SecuritySolutionTemplateWrapper: React.FC<Omit<KibanaPageTemplateProps, 'ref'>> =
+export type SecuritySolutionTemplateWrapperProps = Omit<KibanaPageTemplateProps, 'ref'> & {
+  /**
+   * Combined with isEmptyState, this prop allows complete override of the empty page
+   */
+  emptyPageBody?: ReactNode;
+};
+
+export const SecuritySolutionTemplateWrapper: React.FC<SecuritySolutionTemplateWrapperProps> =
   React.memo(({ children, ...rest }) => {
     const solutionNavProps = useSecuritySolutionNavigation();
     const [isTimelineBottomBarVisible] = useShowTimeline();
@@ -55,6 +62,7 @@ export const SecuritySolutionTemplateWrapper: React.FC<Omit<KibanaPageTemplatePr
       getTimelineShowStatus(state, TimelineId.active)
     );
     const [routeProps] = useRouteSpy();
+    const isNotEmpty = !rest.isEmptyState;
     const isPreview = routeProps?.pageName === SecurityPageName.rulesCreate;
 
     // The bottomBar by default has a set 'dark' colorMode that doesn't match the global colorMode from the Advanced Settings
@@ -76,29 +84,33 @@ export const SecuritySolutionTemplateWrapper: React.FC<Omit<KibanaPageTemplatePr
         restrictWidth={false}
         {...rest}
       >
-        <GlobalKQLHeader />
-        <KibanaPageTemplate.Section
-          className="securityPageWrapper"
-          data-test-subj="pageContainer"
-          paddingSize={rest.paddingSize ?? 'l'}
-          alignment="top"
-          component="div"
-          grow={true}
-        >
-          <ExpandableFlyoutProvider urlKey={isPreview ? undefined : URL_PARAM_KEY.flyout}>
-            {children}
-            <SecuritySolutionFlyout />
-          </ExpandableFlyoutProvider>
-        </KibanaPageTemplate.Section>
-        {isTimelineBottomBarVisible && (
-          <KibanaPageTemplate.BottomBar data-test-subj="timeline-bottom-bar-container">
-            <EuiThemeProvider colorMode={globalColorMode}>
-              <ExpandableFlyoutProvider urlKey={URL_PARAM_KEY.timelineFlyout}>
-                <Timeline />
-                <TimelineFlyout />
+        {isNotEmpty && (
+          <>
+            <GlobalKQLHeader />
+            <KibanaPageTemplate.Section
+              className="securityPageWrapper"
+              data-test-subj="pageContainer"
+              paddingSize={rest.paddingSize ?? 'l'}
+              alignment="top"
+              component="div"
+              grow={true}
+            >
+              <ExpandableFlyoutProvider urlKey={isPreview ? undefined : URL_PARAM_KEY.flyout}>
+                {children}
+                <SecuritySolutionFlyout />
               </ExpandableFlyoutProvider>
-            </EuiThemeProvider>
-          </KibanaPageTemplate.BottomBar>
+            </KibanaPageTemplate.Section>
+            {isTimelineBottomBarVisible && (
+              <KibanaPageTemplate.BottomBar data-test-subj="timeline-bottom-bar-container">
+                <EuiThemeProvider colorMode={globalColorMode}>
+                  <ExpandableFlyoutProvider urlKey={URL_PARAM_KEY.timelineFlyout}>
+                    <Timeline />
+                    <TimelineFlyout />
+                  </ExpandableFlyoutProvider>
+                </EuiThemeProvider>
+              </KibanaPageTemplate.BottomBar>
+            )}
+          </>
         )}
       </StyledKibanaPageTemplate>
     );
diff --git a/x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx b/x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx
index 23eb66c345fda..0cc2891077b68 100644
--- a/x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx
+++ b/x-pack/plugins/security_solution/public/threat_intelligence/routes.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
+import React, { memo, useMemo } from 'react';
 import type { SecuritySolutionPluginContext } from '@kbn/threat-intelligence-plugin/public';
 import { THREAT_INTELLIGENCE_BASE_PATH } from '@kbn/threat-intelligence-plugin/public';
 import type { Store } from 'redux';
@@ -40,49 +40,53 @@ const ThreatIntelligence = memo(() => {
 
   const securitySolutionStore = getStore() as Store;
 
-  const securitySolutionContext: SecuritySolutionPluginContext = {
-    securitySolutionStore,
+  const canWriteBlocklist = useUserPrivileges().endpointPrivileges.canWriteBlocklist;
 
-    getFiltersGlobalComponent: () => FiltersGlobal,
-    getPageWrapper: () => SecuritySolutionPageWrapper,
-    licenseService,
-    sourcererDataView: sourcererDataView as unknown as SelectedDataView,
-    getUseInvestigateInTimeline: useInvestigateInTimeline,
+  const securitySolutionContext: SecuritySolutionPluginContext = useMemo(
+    () => ({
+      securitySolutionStore,
+      getFiltersGlobalComponent: () => FiltersGlobal,
+      getPageWrapper: () => SecuritySolutionPageWrapper,
+      licenseService,
+      sourcererDataView: sourcererDataView as unknown as SelectedDataView,
+      getUseInvestigateInTimeline: useInvestigateInTimeline,
 
-    blockList: {
-      canWriteBlocklist: useUserPrivileges().endpointPrivileges.canWriteBlocklist,
-      exceptionListApiClient: BlocklistsApiClient.getInstance(http),
-      useSetUrlParams,
-      // @ts-ignore
-      getFlyoutComponent: () => ArtifactFlyout,
-      // @ts-ignore
-      getFormComponent: () => BlockListForm,
-    },
+      blockList: {
+        canWriteBlocklist,
+        exceptionListApiClient: BlocklistsApiClient.getInstance(http),
+        useSetUrlParams,
+        // @ts-ignore
+        getFlyoutComponent: () => ArtifactFlyout,
+        // @ts-ignore
+        getFormComponent: () => BlockListForm,
+      } as unknown as SecuritySolutionPluginContext['blockList'],
 
-    useQuery: () => useSelector(inputsSelectors.globalQuerySelector()),
-    useFilters: () => useSelector(inputsSelectors.globalFiltersQuerySelector()),
-    useGlobalTime,
+      useQuery: () => useSelector(inputsSelectors.globalQuerySelector()),
+      useFilters: () => useSelector(inputsSelectors.globalFiltersQuerySelector()),
+      useGlobalTime,
 
-    registerQuery: (query) =>
-      securitySolutionStore.dispatch(
-        setQuery({
-          inputId: InputsModelId.global,
-          id: query.id,
-          refetch: query.refetch,
-          inspect: null,
-          loading: query.loading,
-        })
-      ),
-    deregisterQuery: (query) =>
-      securitySolutionStore.dispatch(
-        deleteOneQuery({
-          inputId: InputsModelId.global,
-          id: query.id,
-        })
-      ),
+      registerQuery: (query) =>
+        securitySolutionStore.dispatch(
+          setQuery({
+            inputId: InputsModelId.global,
+            id: query.id,
+            refetch: query.refetch,
+            inspect: null,
+            loading: query.loading,
+          })
+        ),
+      deregisterQuery: (query) =>
+        securitySolutionStore.dispatch(
+          deleteOneQuery({
+            inputId: InputsModelId.global,
+            id: query.id,
+          })
+        ),
 
-    SiemSearchBar,
-  };
+      SiemSearchBar,
+    }),
+    [canWriteBlocklist, http, securitySolutionStore, sourcererDataView]
+  );
 
   return (
     <SecurityRoutePageWrapper pageName={SecurityPageName.threatIntelligence}>
diff --git a/x-pack/plugins/threat_intelligence/public/containers/enterprise_guard.tsx b/x-pack/plugins/threat_intelligence/public/containers/enterprise_guard.tsx
index 98c79339ad78d..34b5166dc8487 100644
--- a/x-pack/plugins/threat_intelligence/public/containers/enterprise_guard.tsx
+++ b/x-pack/plugins/threat_intelligence/public/containers/enterprise_guard.tsx
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import React, { FC } from 'react';
+import React, { FC, memo } from 'react';
 
 import { Paywall } from '../components/paywall';
 import { useSecurityContext } from '../hooks/use_security_context';
 import { SecuritySolutionPluginTemplateWrapper } from './security_solution_plugin_template_wrapper';
 
-export const EnterpriseGuard: FC = ({ children }) => {
+export const EnterpriseGuard: FC = memo(({ children }) => {
   const { licenseService } = useSecurityContext();
 
   if (licenseService.isEnterprise()) {
@@ -23,4 +23,4 @@ export const EnterpriseGuard: FC = ({ children }) => {
       <Paywall />
     </SecuritySolutionPluginTemplateWrapper>
   );
-};
+});
diff --git a/x-pack/plugins/threat_intelligence/public/containers/indicators_page_wrapper.tsx b/x-pack/plugins/threat_intelligence/public/containers/indicators_page_wrapper.tsx
index 5202e481af37d..23fe00175f7e2 100644
--- a/x-pack/plugins/threat_intelligence/public/containers/indicators_page_wrapper.tsx
+++ b/x-pack/plugins/threat_intelligence/public/containers/indicators_page_wrapper.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { VFC } from 'react';
+import React, { memo, useMemo, VFC } from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { CasesPermissions } from '@kbn/cases-plugin/common';
 import { IndicatorsPage } from '../modules/indicators/pages/indicators';
@@ -15,15 +15,17 @@ import { useKibana } from '../hooks/use_kibana';
 
 export const APP_ID = 'securitySolution';
 
+const queryClient = new QueryClient();
+
+const casesContextOwner = [APP_ID];
+
 export const IndicatorsPageWrapper: VFC = () => {
   const { cases } = useKibana().services;
-  const CasesContext = cases.ui.getCasesContext();
-  const permissions: CasesPermissions = cases.helpers.canUseCases();
-
-  const queryClient = new QueryClient();
+  const CasesContext = useMemo(() => cases.ui.getCasesContext(), [cases.ui]);
+  const permissions: CasesPermissions = useMemo(() => cases.helpers.canUseCases(), [cases.helpers]);
 
   return (
-    <CasesContext owner={[APP_ID]} permissions={permissions}>
+    <CasesContext owner={casesContextOwner} permissions={permissions}>
       <QueryClientProvider client={queryClient}>
         <IntegrationsGuard>
           <SecuritySolutionPluginTemplateWrapper>
@@ -37,4 +39,4 @@ export const IndicatorsPageWrapper: VFC = () => {
 
 // Note: This is for lazy loading
 // eslint-disable-next-line import/no-default-export
-export default IndicatorsPageWrapper;
+export default memo(IndicatorsPageWrapper);
diff --git a/x-pack/plugins/threat_intelligence/public/containers/integrations_guard.test.tsx b/x-pack/plugins/threat_intelligence/public/containers/integrations_guard.test.tsx
index 8fe9345edee31..f4abeb68bafa7 100644
--- a/x-pack/plugins/threat_intelligence/public/containers/integrations_guard.test.tsx
+++ b/x-pack/plugins/threat_intelligence/public/containers/integrations_guard.test.tsx
@@ -75,18 +75,19 @@ describe('IntegrationsGuard', () => {
   });
 
   it('should render loading when integrations only are loading', async () => {
-    (
-      useIndicatorsTotalCount as jest.MockedFunction<typeof useIndicatorsTotalCount>
-    ).mockReturnValue({
-      count: 0,
-      isLoading: true,
-    });
     (
       useIntegrationsPageLink as jest.MockedFunction<typeof useIntegrationsPageLink>
     ).mockReturnValue('');
     (useTIDocumentationLink as jest.MockedFunction<typeof useTIDocumentationLink>).mockReturnValue(
       ''
     );
+
+    (
+      useIndicatorsTotalCount as jest.MockedFunction<typeof useIndicatorsTotalCount>
+    ).mockReturnValue({
+      count: 0,
+      isLoading: true,
+    });
     (useIntegrations as jest.MockedFunction<typeof useIntegrations>).mockReturnValue({
       isLoading: true,
       data: [],
diff --git a/x-pack/plugins/threat_intelligence/public/containers/integrations_guard.tsx b/x-pack/plugins/threat_intelligence/public/containers/integrations_guard.tsx
index cb2064680c178..aac955e2434de 100644
--- a/x-pack/plugins/threat_intelligence/public/containers/integrations_guard.tsx
+++ b/x-pack/plugins/threat_intelligence/public/containers/integrations_guard.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { EuiLoadingLogo } from '@elastic/eui';
-import React, { FC } from 'react';
+import { EuiLoadingLogo, EuiPageTemplate } from '@elastic/eui';
+import React, { FC, memo } from 'react';
 import { LOADING_LOGO_TEST_ID } from './test_ids';
 import { useIntegrations } from '../hooks/use_integrations';
 import { EmptyPage } from '../modules/empty_page/empty_page';
@@ -19,21 +19,28 @@ import { SecuritySolutionPluginTemplateWrapper } from './security_solution_plugi
  * If none are received, show the EmptyPage with a link to go install integrations.
  * While the indicators call and the integrations call are loading, display a loading screen.
  */
-export const IntegrationsGuard: FC = ({ children }) => {
+export const IntegrationsGuard: FC = memo(({ children }) => {
   const { isLoading: indicatorsTotalCountLoading, count: indicatorsTotalCount } =
     useIndicatorsTotalCount();
 
-  const { isLoading: integrationLoading, data: installedTIIntegrations } = useIntegrations();
+  const { isLoading: integrationLoading, data: installedTIIntegrations } = useIntegrations({
+    enabled: !indicatorsTotalCountLoading,
+  });
 
   if (integrationLoading || indicatorsTotalCountLoading) {
     return (
-      <SecuritySolutionPluginTemplateWrapper isEmptyState>
-        <EuiLoadingLogo data-test-subj={LOADING_LOGO_TEST_ID} logo="logoSecurity" size="xl" />
-      </SecuritySolutionPluginTemplateWrapper>
+      <SecuritySolutionPluginTemplateWrapper
+        isEmptyState
+        emptyPageBody={
+          <EuiPageTemplate.EmptyPrompt color="transparent">
+            <EuiLoadingLogo data-test-subj={LOADING_LOGO_TEST_ID} logo="logoSecurity" size="xl" />
+          </EuiPageTemplate.EmptyPrompt>
+        }
+      />
     );
   }
 
   // show indicators page if there are indicators, or if some ti integrations have been added
   const showIndicatorsPage = indicatorsTotalCount > 0 || (installedTIIntegrations || []).length > 0;
   return showIndicatorsPage ? <>{children}</> : <EmptyPage />;
-};
+});
diff --git a/x-pack/plugins/threat_intelligence/public/hooks/use_integrations.ts b/x-pack/plugins/threat_intelligence/public/hooks/use_integrations.ts
index b0e9b0432c0e4..caf337275b46d 100644
--- a/x-pack/plugins/threat_intelligence/public/hooks/use_integrations.ts
+++ b/x-pack/plugins/threat_intelligence/public/hooks/use_integrations.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { QueryFunctionContext, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useCallback, useEffect, useRef } from 'react';
 import { filterIntegrations } from '../utils/filter_integrations';
 import { useKibana } from './use_kibana';
 
@@ -25,27 +26,50 @@ export interface Integration {
   status: IntegrationInstallStatus;
 }
 
+const queryKey = ['integrations'];
+
 /**
  * Retrieves integrations from the Fleet plugin endpoint /api/fleet/epm/packages.
  * The integrations are then filtered, and we only keep the installed ones,
  * with category threat_intel and excluding the ti_utils integration.
  * We cancel the query in case it's taking too long to not block the Indicators page for the user.
  */
-export const useIntegrations = () => {
+export const useIntegrations = ({ enabled }: { enabled: boolean }) => {
+  const timeoutRef = useRef<number>();
+
   const { http } = useKibana().services;
-  const queryKey = ['integrations'];
 
   // retrieving the list of integrations from the fleet plugin's endpoint
-  const fetchIntegrations = () => http.get<IntegrationResponse>(INTEGRATIONS_URL);
+  const fetchIntegrations = useCallback(
+    (context: QueryFunctionContext) =>
+      http.get<IntegrationResponse>(INTEGRATIONS_URL, {
+        version: '2023-10-31',
+        signal: context.signal,
+      }),
+    [http]
+  );
 
   const query = useQuery(queryKey, fetchIntegrations, {
     select: (data: IntegrationResponse) => (data ? filterIntegrations(data.items) : []),
+    enabled,
   });
 
   const queryClient = useQueryClient();
 
-  // cancel slow integrations call to unblock the UI
-  setTimeout(() => queryClient.cancelQueries(queryKey), INTEGRATIONS_CALL_TIMEOUT);
+  useEffect(() => {
+    // cancel slow integrations call to unblock the UI
+    timeoutRef.current = setTimeout(() => {
+      queryClient.cancelQueries(queryKey);
+    }, INTEGRATIONS_CALL_TIMEOUT) as unknown as number;
+
+    return () => {
+      if (!timeoutRef.current) {
+        return;
+      }
+
+      clearTimeout(timeoutRef.current);
+    };
+  }, [queryClient]);
 
   return query;
 };
diff --git a/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx b/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx
index 6cd464a35d352..f70399331b56e 100644
--- a/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx
+++ b/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx
@@ -14,10 +14,6 @@ export const getSecuritySolutionContextMock = (): SecuritySolutionPluginContext
     () =>
     ({ children }) =>
       <div>{children}</div>,
-  getPageWrapper:
-    () =>
-    ({ children }) =>
-      <div>{children}</div>,
   licenseService: {
     isEnterprise(): boolean {
       return true;
@@ -26,6 +22,10 @@ export const getSecuritySolutionContextMock = (): SecuritySolutionPluginContext
       return true;
     },
   },
+  getPageWrapper:
+    () =>
+    ({ children }) =>
+      <div>{children}</div>,
   sourcererDataView: {
     browserFields: {},
     selectedPatterns: [],
diff --git a/x-pack/plugins/threat_intelligence/public/mocks/story_providers.tsx b/x-pack/plugins/threat_intelligence/public/mocks/story_providers.tsx
index 249a9d05afbc9..900a677911ee2 100644
--- a/x-pack/plugins/threat_intelligence/public/mocks/story_providers.tsx
+++ b/x-pack/plugins/threat_intelligence/public/mocks/story_providers.tsx
@@ -57,8 +57,12 @@ export interface StoryProvidersComponentProps {
 const securityLayout = {
   getPluginWrapper:
     (): FC =>
-    ({ children }) =>
-      <div>{children}</div>,
+    ({ children, isEmptyState, emptyPageBody }: any) => {
+      if (isEmptyState && emptyPageBody) {
+        return <>{emptyPageBody}</>;
+      }
+      return <>{children}</>;
+    },
 };
 
 const defaultServices = {
diff --git a/x-pack/plugins/threat_intelligence/public/mocks/test_providers.tsx b/x-pack/plugins/threat_intelligence/public/mocks/test_providers.tsx
index 57e1dee846c0a..638d91f0a42f0 100644
--- a/x-pack/plugins/threat_intelligence/public/mocks/test_providers.tsx
+++ b/x-pack/plugins/threat_intelligence/public/mocks/test_providers.tsx
@@ -126,7 +126,10 @@ export const mockedServices = {
   securityLayout: {
     getPluginWrapper:
       () =>
-      ({ children }: any) => {
+      ({ children, isEmptyState, emptyPageBody }: any) => {
+        if (isEmptyState && emptyPageBody) {
+          return <>{emptyPageBody}</>;
+        }
         return <>{children}</>;
       },
   },
diff --git a/x-pack/plugins/threat_intelligence/public/modules/empty_page/empty_page.tsx b/x-pack/plugins/threat_intelligence/public/modules/empty_page/empty_page.tsx
index 4ed55fc9731f5..eb6f04d0e3ad8 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/empty_page/empty_page.tsx
+++ b/x-pack/plugins/threat_intelligence/public/modules/empty_page/empty_page.tsx
@@ -24,76 +24,79 @@ export const EmptyPage: VFC = () => {
   const documentationLink = useTIDocumentationLink();
 
   return (
-    <SecuritySolutionPluginTemplateWrapper isEmptyState>
-      <EuiEmptyPrompt
-        icon={<EuiImage size="fullWidth" alt={IMAGE} src={illustration} />}
-        title={
-          <h3>
-            <FormattedMessage
-              id="xpack.threatIntelligence.common.emptyPage.title"
-              defaultMessage="Get started with Elastic Threat Intelligence"
-            />
-          </h3>
-        }
-        titleSize="s"
-        layout="horizontal"
-        color="transparent"
-        body={
-          <>
-            <p>
+    <SecuritySolutionPluginTemplateWrapper
+      isEmptyState
+      emptyPageBody={
+        <EuiEmptyPrompt
+          icon={<EuiImage size="fullWidth" alt={IMAGE} src={illustration} />}
+          title={
+            <h3>
               <FormattedMessage
-                id="xpack.threatIntelligence.common.emptyPage.body1"
-                defaultMessage="Elastic Threat Intelligence makes it easy to analyze and investigate potential security
-            threats by aggregating data from multiple sources in one place."
+                id="xpack.threatIntelligence.common.emptyPage.title"
+                defaultMessage="Get started with Elastic Threat Intelligence"
               />
-            </p>
-            <p>
-              <FormattedMessage
-                id="xpack.threatIntelligence.common.emptyPage.body2"
-                defaultMessage="You’ll be able to view data from all activated threat intelligence feeds and take action
+            </h3>
+          }
+          titleSize="s"
+          layout="horizontal"
+          color="transparent"
+          body={
+            <>
+              <p>
+                <FormattedMessage
+                  id="xpack.threatIntelligence.common.emptyPage.body1"
+                  defaultMessage="Elastic Threat Intelligence makes it easy to analyze and investigate potential security
+            threats by aggregating data from multiple sources in one place."
+                />
+              </p>
+              <p>
+                <FormattedMessage
+                  id="xpack.threatIntelligence.common.emptyPage.body2"
+                  defaultMessage="You’ll be able to view data from all activated threat intelligence feeds and take action
             from this page."
-              />
-            </p>
-            <p>
-              <FormattedMessage
-                id="xpack.threatIntelligence.common.emptyPage.body3"
-                defaultMessage="To get started with Elastic Threat Intelligence, enable one or more Threat Intelligence
+                />
+              </p>
+              <p>
+                <FormattedMessage
+                  id="xpack.threatIntelligence.common.emptyPage.body3"
+                  defaultMessage="To get started with Elastic Threat Intelligence, enable one or more Threat Intelligence
             Integrations from the Integrations page or ingest data using filebeat. For more
             information, view the {docsLink}."
-                values={{
-                  docsLink: (
-                    <EuiLink
-                      href={documentationLink}
-                      target="_blank"
-                      data-test-subj={DOCS_LINK_TEST_ID}
-                    >
-                      <FormattedMessage
-                        id="xpack.threatIntelligence.common.emptyPage.docsLinkText"
-                        defaultMessage="Security app documentation"
-                      />
-                    </EuiLink>
-                  ),
-                }}
+                  values={{
+                    docsLink: (
+                      <EuiLink
+                        href={documentationLink}
+                        target="_blank"
+                        data-test-subj={DOCS_LINK_TEST_ID}
+                      >
+                        <FormattedMessage
+                          id="xpack.threatIntelligence.common.emptyPage.docsLinkText"
+                          defaultMessage="Security app documentation"
+                        />
+                      </EuiLink>
+                    ),
+                  }}
+                />
+              </p>
+            </>
+          }
+          actions={
+            <EuiButton
+              data-test-subj={INTEGRATION_LINK_ID}
+              href={integrationsPageLink}
+              color="primary"
+              iconType="plusInCircle"
+              fill
+            >
+              <FormattedMessage
+                id="xpack.threatIntelligence.common.emptyPage.buttonText"
+                defaultMessage="Add Integrations"
               />
-            </p>
-          </>
-        }
-        actions={
-          <EuiButton
-            data-test-subj={INTEGRATION_LINK_ID}
-            href={integrationsPageLink}
-            color="primary"
-            iconType="plusInCircle"
-            fill
-          >
-            <FormattedMessage
-              id="xpack.threatIntelligence.common.emptyPage.buttonText"
-              defaultMessage="Add Integrations"
-            />
-          </EuiButton>
-        }
-        data-test-subj={EMPTY_PROMPT_TEST_ID}
-      />
-    </SecuritySolutionPluginTemplateWrapper>
+            </EuiButton>
+          }
+          data-test-subj={EMPTY_PROMPT_TEST_ID}
+        />
+      }
+    />
   );
 };
diff --git a/x-pack/plugins/threat_intelligence/public/types.ts b/x-pack/plugins/threat_intelligence/public/types.ts
index 39e26c50486b4..45da610592cee 100644
--- a/x-pack/plugins/threat_intelligence/public/types.ts
+++ b/x-pack/plugins/threat_intelligence/public/types.ts
@@ -92,6 +92,17 @@ export interface BlockListFormProps {
   item: CreateExceptionListItemSchema;
 }
 
+export interface Blocking {
+  canWriteBlocklist: boolean;
+  exceptionListApiClient: unknown;
+  useSetUrlParams: () => (
+    params: Record<string, string | number | null | undefined>,
+    replace?: boolean | undefined
+  ) => void;
+  getFlyoutComponent: () => NamedExoticComponent<BlockListFlyoutProps>;
+  getFormComponent: () => NamedExoticComponent<BlockListFormProps>;
+}
+
 /**
  * Methods exposed from the security solution to the threat intelligence application.
  */
@@ -151,16 +162,7 @@ export interface SecuritySolutionPluginContext {
   /**
    * Add to blocklist feature
    */
-  blockList: {
-    canWriteBlocklist: boolean;
-    exceptionListApiClient: unknown;
-    useSetUrlParams: () => (
-      params: Record<string, string | number | null | undefined>,
-      replace?: boolean | undefined
-    ) => void;
-    getFlyoutComponent: () => NamedExoticComponent<BlockListFlyoutProps>;
-    getFormComponent: () => NamedExoticComponent<BlockListFormProps>;
-  };
+  blockList: Blocking;
 }
 
 /**

From a38196699eddc283b41d259c64c70b0162736ab3 Mon Sep 17 00:00:00 2001
From: Liam Thompson <32779855+leemthompo@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:12:33 +0200
Subject: [PATCH 06/63] [Ent Search] Fix connector client UI copy (#179579)

Fixes broken copy instructions and updates links
---
 packages/kbn-doc-links/src/get_doc_links.ts   |  1 +
 packages/kbn-doc-links/src/types.ts           |  1 +
 .../connector_configuration.tsx               | 60 ++++++++-----------
 .../shared/doc_links/doc_links.ts             |  3 +
 .../translations/translations/fr-FR.json      |  4 --
 .../translations/translations/ja-JP.json      |  4 --
 .../translations/translations/zh-CN.json      |  4 --
 7 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
index 413062e56a878..7e3a622eff928 100644
--- a/packages/kbn-doc-links/src/get_doc_links.ts
+++ b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -157,6 +157,7 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
       bulkApi: `${ELASTICSEARCH_DOCS}docs-bulk.html`,
       configuration: `${ENTERPRISE_SEARCH_DOCS}configuration.html`,
       connectors: `${ENTERPRISE_SEARCH_DOCS}connectors.html`,
+      connectorsClientDeploy: `${ENTERPRISE_SEARCH_DOCS}deploy-connector-client.html`,
       connectorsMappings: `${ENTERPRISE_SEARCH_DOCS}connectors-usage.html#connectors-usage-index-create-configure-existing-index`,
       connectorsAzureBlobStorage: `${ENTERPRISE_SEARCH_DOCS}connectors-azure-blob.html`,
       connectorsBox: `${ENTERPRISE_SEARCH_DOCS}connectors-box.html`,
diff --git a/packages/kbn-doc-links/src/types.ts b/packages/kbn-doc-links/src/types.ts
index 564aa8730e5cd..a1d4bd8863d11 100644
--- a/packages/kbn-doc-links/src/types.ts
+++ b/packages/kbn-doc-links/src/types.ts
@@ -122,6 +122,7 @@ export interface DocLinks {
     readonly bulkApi: string;
     readonly configuration: string;
     readonly connectors: string;
+    readonly connectorsClientDeploy: string;
     readonly connectorsMappings: string;
     readonly connectorsAzureBlobStorage: string;
     readonly connectorsBox: string;
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
index cb6a0f16eea92..17f23d63d2caa 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_configuration.tsx
@@ -101,7 +101,8 @@ export const ConnectorConfiguration: React.FC = () => {
                     i18n.translate(
                       'xpack.enterpriseSearch.content.connectorDetail.configuration.apiKey.noApiKeyLabel',
                       {
-                        defaultMessage: 'Please set an index name before generating an API key',
+                        defaultMessage:
+                          'Before you can generate an API key, you need to attach an index. Scroll to the bottom of this page for instructions.',
                       }
                     )
                   ),
@@ -117,41 +118,21 @@ export const ConnectorConfiguration: React.FC = () => {
                 {
                   children: (
                     <>
-                      <EuiText size="s">
-                        <FormattedMessage
-                          id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.secondParagraph"
-                          defaultMessage="The connectors repository contains several {link}. Use our framework to accelerate developing connectors for custom data sources."
-                          values={{
-                            link: (
-                              <EuiLink
-                                href="https://github.com/elastic/connectors-python/tree/main/connectors"
-                                target="_blank"
-                                external
-                              >
-                                {i18n.translate(
-                                  'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.clientExamplesLink',
-                                  { defaultMessage: 'connector client examples' }
-                                )}
-                              </EuiLink>
-                            ),
-                          }}
-                        />
-                      </EuiText>
                       <EuiSpacer />
                       <EuiText size="s">
                         <FormattedMessage
                           id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.thirdParagraph"
-                          defaultMessage="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 Search. The service type will determine which type of data source the connector is configured for."
+                          defaultMessage="In this step, you will need to clone or fork the elastic/connectors repository, and copy the API key and connector ID values to the config.yml file. Here's an {exampleLink}."
                           values={{
-                            link: (
+                            exampleLink: (
                               <EuiLink
-                                href="https://github.com/elastic/connectors-python/blob/main/config.yml"
+                                href="https://github.com/elastic/connectors-python/blob/main/config.yml.example"
                                 target="_blank"
                                 external
                               >
                                 {i18n.translate(
                                   'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.configurationFileLink',
-                                  { defaultMessage: 'configuration file' }
+                                  { defaultMessage: 'example config file' }
                                 )}
                               </EuiLink>
                             ),
@@ -171,13 +152,24 @@ export const ConnectorConfiguration: React.FC = () => {
                       </EuiCodeBlock>
                       <EuiSpacer />
                       <EuiText size="s">
-                        {i18n.translate(
-                          'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorDeployedText',
-                          {
-                            defaultMessage:
-                              'Once configured, deploy the connector on your infrastructure.',
-                          }
-                        )}
+                        <FormattedMessage
+                          id="xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.fourthParagraph"
+                          defaultMessage="Because this connector is self-managed, you need to deploy the connector service on your own infrastructure. You can build from source or use Docker. Refer to the {link} for your deployment options."
+                          values={{
+                            link: (
+                              <EuiLink
+                                href={docLinks.connectorsClientDeploy}
+                                target="_blank"
+                                external
+                              >
+                                {i18n.translate(
+                                  'xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.deploymentModeLink',
+                                  { defaultMessage: 'documentation' }
+                                )}
+                              </EuiLink>
+                            ),
+                          }}
+                        />
                       </EuiText>
                     </>
                   ),
@@ -188,7 +180,7 @@ export const ConnectorConfiguration: React.FC = () => {
                   title: i18n.translate(
                     'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.deployConnector.title',
                     {
-                      defaultMessage: 'Deploy connector',
+                      defaultMessage: 'Set up and deploy connector',
                     }
                   ),
                   titleSize: 'xs',
@@ -264,7 +256,7 @@ export const ConnectorConfiguration: React.FC = () => {
                   title: i18n.translate(
                     'xpack.enterpriseSearch.content.connector_detail.configurationConnector.steps.enhance.title',
                     {
-                      defaultMessage: 'Enhance your connector client',
+                      defaultMessage: 'Configure your connector',
                     }
                   ),
                   titleSize: 'xs',
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
index 3706a73af2627..f6cddf36057ae 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/doc_links/doc_links.ts
@@ -65,6 +65,7 @@ class DocLinks {
   public clientsRustOverview: string;
   public cloudIndexManagement: string;
   public connectors: string;
+  public connectorsClientDeploy: string;
   public connectorsMappings: string;
   public connectorsAzureBlobStorage: string;
   public connectorsBox: string;
@@ -240,6 +241,7 @@ class DocLinks {
     this.clientsRustOverview = '';
     this.cloudIndexManagement = '';
     this.connectors = '';
+    this.connectorsClientDeploy = '';
     this.connectorsMappings = '';
     this.connectorsAzureBlobStorage = '';
     this.connectorsBox = '';
@@ -418,6 +420,7 @@ class DocLinks {
     this.connectors = docLinks.links.enterpriseSearch.connectors;
     this.connectorsMappings = docLinks.links.enterpriseSearch.connectorsMappings;
     this.connectorsAzureBlobStorage = docLinks.links.enterpriseSearch.connectorsAzureBlobStorage;
+    this.connectorsClientDeploy = docLinks.links.enterpriseSearch.connectorsClientDeploy;
     this.connectorsBox = docLinks.links.enterpriseSearch.connectorsBox;
     this.connectorsConfluence = docLinks.links.enterpriseSearch.connectorsConfluence;
     this.connectorsContentExtraction = docLinks.links.enterpriseSearch.connectorsContentExtraction;
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index ada9af7cce3ed..a0057befbed14 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -13923,8 +13923,6 @@
     "xpack.enterpriseSearch.connectorStats.incompleteBadgeLabel": "{number} incomplet(s)",
     "xpack.enterpriseSearch.connectorStats.runningSyncsTextLabel": "{syncs} synchronisations en cours",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorConnected": "Votre connecteur {name} s'est bien connecté à Search.",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.secondParagraph": "Le référentiel de connecteurs contient plusieurs {link}. Utilisez notre cadre pour accélérer le développement de connecteurs pour des sources de données personnalisées.",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.thirdParagraph": "Dans cette étape, vous devez cloner ou dupliquer le référentiel, puis copier la clé d'API et l'ID de connecteur générés au {link} associé. L'ID de connecteur identifiera ce connecteur auprès de Search. Le type de service détermine pour quel type de source de données le connecteur est configuré.",
     "xpack.enterpriseSearch.content.connectors.connectorsTable.columns.actions.viewIndex.caption": "Voir l'index {connectorName}",
     "xpack.enterpriseSearch.content.connectors.connectorTable.column.actions.deleteIndex": "Supprimer le connecteur {connectorName}",
     "xpack.enterpriseSearch.content.connectors.deleteModal.syncsWarning.indexNameDescription": "Cette action ne peut pas être annulée. Veuillez saisir {connectorName} pour confirmer.",
@@ -15212,9 +15210,7 @@
     "xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.title": "Créer une clé d'API d'analyse",
     "xpack.enterpriseSearch.content.cannotConnect.body": "En savoir plus.",
     "xpack.enterpriseSearch.content.cannotConnect.title": "Impossible de se connecter à Enterprise Search",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.clientExamplesLink": "exemples de clients connecteurs",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.configurationFileLink": "fichier de configuration",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorDeployedText": "Une fois le connecteur configuré, déployez-le dans votre infrastructure.",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnector.button.label": "Revérifier maintenant",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorText": "Votre connecteur ne s'est pas connecté à Search. Résolvez vos problèmes de configuration et actualisez la page.",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorTitle": "En attente de votre connecteur",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 9eef765b09d0d..06a3c6238fb94 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -13902,8 +13902,6 @@
     "xpack.enterpriseSearch.connectorStats.incompleteBadgeLabel": "{number}件が未完了です",
     "xpack.enterpriseSearch.connectorStats.runningSyncsTextLabel": "{syncs}実行中の同期",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorConnected": "コネクター{name}は、正常にSearchに接続されました。",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.secondParagraph": "コネクターリポジトリには複数の{link}が含まれています。当社のフレームワークを使用すると、カスタムデータソース用のコネクターの開発を加速できます。",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.thirdParagraph": "このステップでは、リポジトリを複製または分割し、関連付けられた{link}に対する生成されたAPIキーとコネクターIDをコピーします。コネクターIDは、Searchに対するこのコネクターを特定します。サービスタイプは、コネクターが構成されているデータソースのタイプを決定します。",
     "xpack.enterpriseSearch.content.connectors.connectorsTable.columns.actions.viewIndex.caption": "インデックス{connectorName}を表示",
     "xpack.enterpriseSearch.content.connectors.connectorTable.column.actions.deleteIndex": "コネクター\"{connectorName}\"を削除",
     "xpack.enterpriseSearch.content.connectors.deleteModal.syncsWarning.indexNameDescription": "この操作は元に戻すことができません。{connectorName}を入力して確認してください。",
@@ -15190,9 +15188,7 @@
     "xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.title": "分析APIキーを作成",
     "xpack.enterpriseSearch.content.cannotConnect.body": "詳細。",
     "xpack.enterpriseSearch.content.cannotConnect.title": "エンタープライズ サーチに接続できません",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.clientExamplesLink": "コネクタークライアントの例",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.configurationFileLink": "構成ファイル",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorDeployedText": "構成したら、インフラでコネクターをデプロイします。",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnector.button.label": "今すぐ再確認",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorText": "コネクターはSearchに接続されていません。構成のトラブルシューティングを行い、ページを更新してください。",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorTitle": "コネクターを待機しています",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index b372891385ec8..12c75c281fbbf 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -13928,8 +13928,6 @@
     "xpack.enterpriseSearch.connectorStats.incompleteBadgeLabel": "{number} 个未完成",
     "xpack.enterpriseSearch.connectorStats.runningSyncsTextLabel": "{syncs} 个正在运行的同步",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorConnected": "您的连接器 {name} 已成功连接到 Search。",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.secondParagraph": "连接器存储库包含几个 {link}。使用我们的框架可加速为定制数据源开发连接器。",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.description.thirdParagraph": "在此步骤中，您需要克隆或分叉存储库，然后将生成的 API 密钥和连接器 ID 复制到关联的 {link}。连接器 ID 会将此连接器标识到 Search。此服务类型将决定要将连接器配置用于哪些类型的数据源。",
     "xpack.enterpriseSearch.content.connectors.connectorsTable.columns.actions.viewIndex.caption": "查看索引 {connectorName}",
     "xpack.enterpriseSearch.content.connectors.connectorTable.column.actions.deleteIndex": "删除连接器 {connectorName}",
     "xpack.enterpriseSearch.content.connectors.deleteModal.syncsWarning.indexNameDescription": "此操作无法撤消。请尝试 {connectorName} 以确认。",
@@ -15217,9 +15215,7 @@
     "xpack.enterpriseSearch.content.analytics.api.generateAnalyticsApiKeyModal.title": "创建分析 API 密钥",
     "xpack.enterpriseSearch.content.cannotConnect.body": "更多信息。",
     "xpack.enterpriseSearch.content.cannotConnect.title": "无法连接到 Enterprise Search",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.clientExamplesLink": "连接器客户端示例",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.configurationFileLink": "配置文件",
-    "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.connectorDeployedText": "配置后，请在您的基础设施上部署连接器。",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnector.button.label": "立即重新检查",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorText": "您的连接器尚未连接到 Search。排除配置故障并刷新页面。",
     "xpack.enterpriseSearch.content.connector_detail.configurationConnector.connectorPackage.waitingForConnectorTitle": "等候您的连接器",

From 3497a5da79b7f5473305b28f11e42f6acbf068c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 2 Apr 2024 11:17:03 +0200
Subject: [PATCH 07/63] [Part of #176153] Server mocks (#179756)

---
 src/core/server/mocks.ts                                     | 5 +++--
 .../server/__mocks__/request_context.ts                      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index 4618204e7c70a..89fbd1a560758 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -145,8 +145,9 @@ export type CustomRequestHandlerMock<T> = {
   [Key in keyof T]: T[Key] extends Promise<unknown> ? T[Key] : Promise<T[Key]>;
 };
 
-const createCustomRequestHandlerContextMock = <T>(contextParts: T): CustomRequestHandlerMock<T> => {
-  // @ts-expect-error upgrade typescript v4.9.5
+const createCustomRequestHandlerContextMock = <T extends Record<string, unknown>>(
+  contextParts: T
+): CustomRequestHandlerMock<T> => {
   const mock = Object.entries(contextParts).reduce(
     (context, [key, value]) => {
       // @ts-expect-error type matching from inferred types is hard
diff --git a/x-pack/plugins/ecs_data_quality_dashboard/server/__mocks__/request_context.ts b/x-pack/plugins/ecs_data_quality_dashboard/server/__mocks__/request_context.ts
index eaa90f75c5890..895a0b4116d9a 100644
--- a/x-pack/plugins/ecs_data_quality_dashboard/server/__mocks__/request_context.ts
+++ b/x-pack/plugins/ecs_data_quality_dashboard/server/__mocks__/request_context.ts
@@ -28,7 +28,7 @@ export const createMockClients = () => {
 
 type MockClients = ReturnType<typeof createMockClients>;
 
-const convertRequestContextMock = <T>(context: T) => {
+const convertRequestContextMock = <T extends Record<string, unknown>>(context: T) => {
   return coreMock.createCustomRequestHandlerContext(context);
 };
 

From b55b55e88c4283c1a649e755193571b063314936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 2 Apr 2024 11:19:48 +0200
Subject: [PATCH 08/63] [Part of #176153] HTTP service (#179754)

---
 .../src/validator.ts                          | 19 ++++---------------
 .../src/cookie_session_storage.ts             |  5 ++---
 .../src/http_server.ts                        |  7 ++++---
 .../src/cookie_session_storage.mocks.ts       |  2 +-
 .../core-http-server/src/http_contract.ts     |  2 +-
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/packages/core/http/core-http-router-server-internal/src/validator.ts b/packages/core/http/core-http-router-server-internal/src/validator.ts
index 69cb6b253b826..80d6e96b2ccb0 100644
--- a/packages/core/http/core-http-router-server-internal/src/validator.ts
+++ b/packages/core/http/core-http-router-server-internal/src/validator.ts
@@ -7,7 +7,7 @@
  */
 
 import { Stream } from 'stream';
-import { ValidationError, Type, schema, isConfigSchema } from '@kbn/config-schema';
+import { ValidationError, schema, isConfigSchema } from '@kbn/config-schema';
 import type {
   RouteValidationSpec,
   RouteValidationFunction,
@@ -18,15 +18,6 @@ import type {
 } from '@kbn/core-http-server';
 import { RouteValidationError } from '@kbn/core-http-server';
 
-// Ugly as hell but we need this conditional typing to have proper type inference
-type RouteValidationResultType<T extends RouteValidationSpec<any> | undefined> = NonNullable<
-  T extends RouteValidationFunction<any>
-    ? ReturnType<T>['value']
-    : T extends Type<any>
-    ? T['type']
-    : undefined
->;
-
 /**
  * Route validator class to define the validation logic for each new route.
  *
@@ -92,9 +83,9 @@ export class RouteValidator<P = {}, Q = {}, B = {}> {
     unsafe?: boolean,
     data?: unknown,
     namespace?: string
-  ): RouteValidationResultType<typeof validationRule> {
+  ): T {
     if (typeof validationRule === 'undefined') {
-      return {};
+      return {} as T;
     }
     let precheckedData = this.preValidateSchema(data).validate(data, {}, namespace);
 
@@ -125,12 +116,10 @@ export class RouteValidator<P = {}, Q = {}, B = {}> {
     validationRule: RouteValidationSpec<T>,
     data?: unknown,
     namespace?: string
-  ): RouteValidationResultType<typeof validationRule> {
+  ): T {
     if (isConfigSchema(validationRule)) {
-      // @ts-expect-error upgrade typescript v4.9.5
       return validationRule.validate(data, {}, namespace);
     } else if (typeof validationRule === 'function') {
-      // @ts-expect-error upgrade typescript v4.9.5
       return this.validateFunction(validationRule, data, namespace);
     } else {
       throw new ValidationError(
diff --git a/packages/core/http/core-http-server-internal/src/cookie_session_storage.ts b/packages/core/http/core-http-server-internal/src/cookie_session_storage.ts
index 94dbd10970cc5..ab3dd92aa6f7b 100644
--- a/packages/core/http/core-http-server-internal/src/cookie_session_storage.ts
+++ b/packages/core/http/core-http-server-internal/src/cookie_session_storage.ts
@@ -18,7 +18,7 @@ import type {
 } from '@kbn/core-http-server';
 import { ensureRawRequest } from '@kbn/core-http-router-server-internal';
 
-class ScopedCookieSessionStorage<T extends Record<string, any>> implements SessionStorage<T> {
+class ScopedCookieSessionStorage<T extends object> implements SessionStorage<T> {
   constructor(
     private readonly log: Logger,
     private readonly server: Server,
@@ -72,7 +72,7 @@ function validateOptions(options: SessionStorageCookieOptions<any>) {
  * @param server - hapi server to create SessionStorage for
  * @param cookieOptions - cookies configuration
  */
-export async function createCookieSessionStorageFactory<T>(
+export async function createCookieSessionStorageFactory<T extends object>(
   log: Logger,
   server: Server,
   cookieOptions: SessionStorageCookieOptions<T>,
@@ -113,7 +113,6 @@ export async function createCookieSessionStorageFactory<T>(
 
   return {
     asScoped(request: KibanaRequest) {
-      // @ts-expect-error upgrade typescript v4.9.5
       return new ScopedCookieSessionStorage<T>(log, server, ensureRawRequest(request));
     },
   };
diff --git a/packages/core/http/core-http-server-internal/src/http_server.ts b/packages/core/http/core-http-server-internal/src/http_server.ts
index ae9025d5cd9a7..c023f39206868 100644
--- a/packages/core/http/core-http-server-internal/src/http_server.ts
+++ b/packages/core/http/core-http-server-internal/src/http_server.ts
@@ -292,8 +292,9 @@ export class HttpServer {
       registerAuth: this.registerAuth.bind(this),
       registerOnPostAuth: this.registerOnPostAuth.bind(this),
       registerOnPreResponse: this.registerOnPreResponse.bind(this),
-      createCookieSessionStorageFactory: <T>(cookieOptions: SessionStorageCookieOptions<T>) =>
-        this.createCookieSessionStorageFactory(cookieOptions, config.basePath),
+      createCookieSessionStorageFactory: <T extends object>(
+        cookieOptions: SessionStorageCookieOptions<T>
+      ) => this.createCookieSessionStorageFactory(cookieOptions, config.basePath),
       basePath: basePathService,
       csp: config.csp,
       auth: {
@@ -554,7 +555,7 @@ export class HttpServer {
     this.server.ext('onPreResponse', adoptToHapiOnPreResponseFormat(fn, this.log));
   }
 
-  private async createCookieSessionStorageFactory<T>(
+  private async createCookieSessionStorageFactory<T extends object>(
     cookieOptions: SessionStorageCookieOptions<T>,
     basePath?: string
   ) {
diff --git a/packages/core/http/core-http-server-mocks/src/cookie_session_storage.mocks.ts b/packages/core/http/core-http-server-mocks/src/cookie_session_storage.mocks.ts
index 279858a257eb1..5f70893c9114b 100644
--- a/packages/core/http/core-http-server-mocks/src/cookie_session_storage.mocks.ts
+++ b/packages/core/http/core-http-server-mocks/src/cookie_session_storage.mocks.ts
@@ -22,7 +22,7 @@ type ReturnMocked<T> = {
 
 type DeepMocked<T> = jest.Mocked<ReturnMocked<T>>;
 
-const creatSessionStorageFactoryMock = <T>() => {
+const creatSessionStorageFactoryMock = <T extends object>() => {
   const mocked: DeepMocked<SessionStorageFactory<T>> = {
     asScoped: jest.fn(),
   };
diff --git a/packages/core/http/core-http-server/src/http_contract.ts b/packages/core/http/core-http-server/src/http_contract.ts
index 8ac34b26a386c..09250abf8adae 100644
--- a/packages/core/http/core-http-server/src/http_contract.ts
+++ b/packages/core/http/core-http-server/src/http_contract.ts
@@ -218,7 +218,7 @@ export interface HttpServiceSetup<
    * Creates cookie based session storage factory {@link SessionStorageFactory}
    * @param cookieOptions {@link SessionStorageCookieOptions} - options to configure created cookie session storage.
    */
-  createCookieSessionStorageFactory: <T>(
+  createCookieSessionStorageFactory: <T extends object>(
     cookieOptions: SessionStorageCookieOptions<T>
   ) => Promise<SessionStorageFactory<T>>;
 

From b6670ae48a565dfd18faaefd506ee20e762f9761 Mon Sep 17 00:00:00 2001
From: Jeramy Soucy <jeramy.soucy@elastic.co>
Date: Tue, 2 Apr 2024 11:28:24 +0200
Subject: [PATCH 09/63] =?UTF-8?q?Upgrade=20webpack-dev-middleware@5.3.3?=
 =?UTF-8?q?=E2=86=925.3.4=20(#179738)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Upgrades development dependency `webpack-dev-middleware` from v5.3.3 to
v5.3.4.
---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 5fdede7d8e075..e518c0672b74e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -31180,9 +31180,9 @@ webpack-dev-middleware@^3.7.3:
     webpack-log "^2.0.0"
 
 webpack-dev-middleware@^5.3.1:
-  version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
-  integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517"
+  integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==
   dependencies:
     colorette "^2.0.10"
     memfs "^3.4.3"

From 0f2599c55df846fa48dc5e766ee2fa03d88b565f Mon Sep 17 00:00:00 2001
From: Coen Warmer <coen.warmer@gmail.com>
Date: Tue, 2 Apr 2024 11:29:54 +0200
Subject: [PATCH 10/63] [AI Assistant for Observability] Add aria-label to AI
 Assistant button (#179718)

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

## Summary

Adds an `aria-label` for the AI Assistant for Observability button.
---
 .../public/components/nav_control/index.tsx                   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/nav_control/index.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/nav_control/index.tsx
index 074a13815dd0c..b9f44142e946b 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/nav_control/index.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/nav_control/index.tsx
@@ -98,6 +98,10 @@ export function NavControl({}: {}) {
   return (
     <>
       <EuiButton
+        aria-label={i18n.translate(
+          'xpack.observabilityAiAssistant.navControl.euiButton.openObservabilityAIAssistantLabel',
+          { defaultMessage: 'Open Observability AI Assistant chat' }
+        )}
         data-test-subj="observabilityAiAssistantAppNavControlButton"
         css={buttonCss}
         onClick={() => {

From 622380d50bfb6012049e3f3382ba65121427dd42 Mon Sep 17 00:00:00 2001
From: Coen Warmer <coen.warmer@gmail.com>
Date: Tue, 2 Apr 2024 11:34:40 +0200
Subject: [PATCH 11/63] [AI Assistant for Observability] Add aria-label to AI
 Assistant flyout (#179720)

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

## Summary

Adds an aria-label for the AI Assistant for Observability flyout.
---
 .../public/components/chat/chat_flyout.tsx                    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/chat/chat_flyout.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/chat/chat_flyout.tsx
index 46f64e7a9f003..4194f9a2ca0c4 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/chat/chat_flyout.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/chat/chat_flyout.tsx
@@ -147,6 +147,10 @@ export function ChatFlyout({
       }}
     >
       <EuiFlyoutResizable
+        aria-label={i18n.translate(
+          'xpack.observabilityAiAssistant.chatFlyout.euiFlyoutResizable.aiAssistantForObservabilityLabel',
+          { defaultMessage: 'AI Assistant for Observability Chat Flyout' }
+        )}
         className={flyoutClassName}
         closeButtonProps={{
           css: {

From a1abf16b77abec5af79d66663939d676205e3cbe Mon Sep 17 00:00:00 2001
From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:45:41 +0200
Subject: [PATCH 12/63] [Fleet] fix UI error when entering an invalid semver
 (#179631)

## Summary

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

The UI calls the semver version check functions on every keystroke, it
seems the semver functions throw error if the input is not a valid
semver (e.g. `8.14` instead of `8.14.0`). Added try-catch around the
logic which is called from the UI.

To verify:
- run a stack 8.14.0-SNAPSHOT with fleet-server
- enroll an agent with version 8.13.0
- upgrade agent, type in `8.14`
- verify that the UI error is no longer visible
- the submit button should only be enabled if typing a valid semver e.g.
`8.14.0`

<img width="1139" alt="image"
src="https://github.com/elastic/kibana/assets/90178898/756e1995-f16b-4689-af19-5ffcdb57b18e">
<img width="829" alt="image"
src="https://github.com/elastic/kibana/assets/90178898/1dd7ea6f-5686-4163-b367-850563abc336">


### 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
---
 .../check_fleet_server_versions.test.ts       | 27 +++++++
 .../services/check_fleet_server_versions.ts   | 73 ++++++++++---------
 .../agent_upgrade_modal/index.test.tsx        | 40 ++++++++++
 .../components/agent_upgrade_modal/index.tsx  | 18 ++++-
 4 files changed, 124 insertions(+), 34 deletions(-)

diff --git a/x-pack/plugins/fleet/common/services/check_fleet_server_versions.test.ts b/x-pack/plugins/fleet/common/services/check_fleet_server_versions.test.ts
index 1afca26bca254..3ed6f2fb81ae0 100644
--- a/x-pack/plugins/fleet/common/services/check_fleet_server_versions.test.ts
+++ b/x-pack/plugins/fleet/common/services/check_fleet_server_versions.test.ts
@@ -7,6 +7,7 @@
 
 import {
   checkFleetServerVersion,
+  getFleetServerVersionMessage,
   isAgentVersionLessThanFleetServer,
 } from './check_fleet_server_versions';
 
@@ -66,4 +67,30 @@ describe('isAgentVersionLessThanFleetServer', () => {
     ] as any;
     expect(isAgentVersionLessThanFleetServer('8.5.0', fleetServers)).toBe(false);
   });
+
+  it('should not throw if version is not a semver', () => {
+    const fleetServers = [
+      { local_metadata: { elastic: { agent: { version: '8.13.0' } } } },
+      { local_metadata: { elastic: { agent: { version: '8.14.0' } } } },
+    ] as any;
+    const version = '8.14';
+
+    const result = isAgentVersionLessThanFleetServer(version, fleetServers);
+
+    expect(result).toEqual(false);
+  });
+});
+
+describe('getFleetServerVersionMessage', () => {
+  it('should not throw if version is not a semver', () => {
+    const fleetServers = [
+      { local_metadata: { elastic: { agent: { version: '8.13.0' } } } },
+      { local_metadata: { elastic: { agent: { version: '8.14.0' } } } },
+    ] as any;
+    const version = '8.14';
+
+    const result = getFleetServerVersionMessage(version, fleetServers);
+
+    expect(result).toEqual('Invalid Version: 8.14');
+  });
 });
diff --git a/x-pack/plugins/fleet/common/services/check_fleet_server_versions.ts b/x-pack/plugins/fleet/common/services/check_fleet_server_versions.ts
index 2f98938861c8e..000332c66aa89 100644
--- a/x-pack/plugins/fleet/common/services/check_fleet_server_versions.ts
+++ b/x-pack/plugins/fleet/common/services/check_fleet_server_versions.ts
@@ -41,24 +41,27 @@ export const getFleetServerVersionMessage = (
   if (!maxFleetServerVersion || !versionToUpgradeNumber) {
     return;
   }
-
-  if (
-    !force &&
-    semverGt(versionToUpgradeNumber, maxFleetServerVersion) &&
-    !differsOnlyInPatch(versionToUpgradeNumber, maxFleetServerVersion)
-  ) {
-    return `Cannot upgrade to version ${versionToUpgradeNumber} because it is higher than the latest fleet server version ${maxFleetServerVersion}.`;
-  }
-
-  const fleetServerMajorGt =
-    semverMajor(maxFleetServerVersion) > semverMajor(versionToUpgradeNumber);
-  const fleetServerMajorEqMinorGte =
-    semverMajor(maxFleetServerVersion) === semverMajor(versionToUpgradeNumber) &&
-    semverMinor(maxFleetServerVersion) >= semverMinor(versionToUpgradeNumber);
-
-  // When force is enabled, only the major and minor versions are checked
-  if (force && !(fleetServerMajorGt || fleetServerMajorEqMinorGte)) {
-    return `Cannot force upgrade to version ${versionToUpgradeNumber} because it does not satisfy the major and minor of the latest fleet server version ${maxFleetServerVersion}.`;
+  try {
+    if (
+      !force &&
+      semverGt(versionToUpgradeNumber, maxFleetServerVersion) &&
+      !differsOnlyInPatch(versionToUpgradeNumber, maxFleetServerVersion)
+    ) {
+      return `Cannot upgrade to version ${versionToUpgradeNumber} because it is higher than the latest fleet server version ${maxFleetServerVersion}.`;
+    }
+
+    const fleetServerMajorGt =
+      semverMajor(maxFleetServerVersion) > semverMajor(versionToUpgradeNumber);
+    const fleetServerMajorEqMinorGte =
+      semverMajor(maxFleetServerVersion) === semverMajor(versionToUpgradeNumber) &&
+      semverMinor(maxFleetServerVersion) >= semverMinor(versionToUpgradeNumber);
+
+    // When force is enabled, only the major and minor versions are checked
+    if (force && !(fleetServerMajorGt || fleetServerMajorEqMinorGte)) {
+      return `Cannot force upgrade to version ${versionToUpgradeNumber} because it does not satisfy the major and minor of the latest fleet server version ${maxFleetServerVersion}.`;
+    }
+  } catch (e) {
+    return e.message;
   }
 };
 
@@ -80,21 +83,25 @@ export const isAgentVersionLessThanFleetServer = (
   if (!maxFleetServerVersion || !versionToUpgradeNumber) {
     return false;
   }
-  if (
-    !force &&
-    semverGt(versionToUpgradeNumber, maxFleetServerVersion) &&
-    !differsOnlyInPatch(versionToUpgradeNumber, maxFleetServerVersion)
-  )
-    return false;
-
-  const fleetServerMajorGt =
-    semverMajor(maxFleetServerVersion) > semverMajor(versionToUpgradeNumber);
-  const fleetServerMajorEqMinorGte =
-    semverMajor(maxFleetServerVersion) === semverMajor(versionToUpgradeNumber) &&
-    semverMinor(maxFleetServerVersion) >= semverMinor(versionToUpgradeNumber);
-
-  // When force is enabled, only the major and minor versions are checked
-  if (force && !(fleetServerMajorGt || fleetServerMajorEqMinorGte)) {
+  try {
+    if (
+      !force &&
+      semverGt(versionToUpgradeNumber, maxFleetServerVersion) &&
+      !differsOnlyInPatch(versionToUpgradeNumber, maxFleetServerVersion)
+    )
+      return false;
+
+    const fleetServerMajorGt =
+      semverMajor(maxFleetServerVersion) > semverMajor(versionToUpgradeNumber);
+    const fleetServerMajorEqMinorGte =
+      semverMajor(maxFleetServerVersion) === semverMajor(versionToUpgradeNumber) &&
+      semverMinor(maxFleetServerVersion) >= semverMinor(versionToUpgradeNumber);
+
+    // When force is enabled, only the major and minor versions are checked
+    if (force && !(fleetServerMajorGt || fleetServerMajorEqMinorGte)) {
+      return false;
+    }
+  } catch (e) {
     return false;
   }
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
index fd25be2132584..dc08d052a9152 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
@@ -169,6 +169,46 @@ describe('AgentUpgradeAgentModal', () => {
       });
     });
 
+    it('should display invalid input if version is not a valid semver', async () => {
+      const { utils } = renderAgentUpgradeAgentModal({
+        agents: [
+          {
+            id: 'agent1',
+            local_metadata: { host: 'abc', elastic: { agent: { version: '8.12.0' } } },
+          },
+        ] as any,
+        agentCount: 1,
+      });
+
+      await waitFor(() => {
+        const input = utils.getByTestId('agentUpgradeModal.VersionInput');
+        fireEvent.input(input, { target: { value: '8.14' } });
+        expect(
+          utils.getByText('Invalid version, please use a valid semver version, e.g. 8.14.0')
+        ).toBeInTheDocument();
+      });
+    });
+
+    it('should not display invalid input if version is a valid semver', async () => {
+      const { utils } = renderAgentUpgradeAgentModal({
+        agents: [
+          {
+            id: 'agent1',
+            local_metadata: { host: 'abc', elastic: { agent: { version: '8.12.0' } } },
+          },
+        ] as any,
+        agentCount: 1,
+      });
+
+      await waitFor(() => {
+        const input = utils.getByTestId('agentUpgradeModal.VersionInput');
+        fireEvent.input(input, { target: { value: '8.14.0+build123456789' } });
+        expect(
+          utils.queryByText('Invalid version, please use a valid semver version, e.g. 8.14.0')
+        ).toBeNull();
+      });
+    });
+
     it('should display available version options', async () => {
       mockSendGetAgentsAvailableVersions.mockClear();
       mockSendGetAgentsAvailableVersions.mockResolvedValue({
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
index e86dac0385dc2..89531c2b01181 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
@@ -28,6 +28,7 @@ import type { EuiComboBoxOptionOption } from '@elastic/eui';
 
 import semverGt from 'semver/functions/gt';
 import semverLt from 'semver/functions/lt';
+import semverValid from 'semver/functions/valid';
 
 import {
   AGENT_UPGRADE_COOLDOWN_IN_MIN,
@@ -267,6 +268,18 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
     }
   }, [agents, fleetServerAgents, isSingleAgent, latestAgentVersion, selectedVersion]);
 
+  const semverErrors = useMemo(() => {
+    if (!selectedVersion[0].value) return undefined;
+    if (!semverValid(selectedVersion[0].value)) {
+      return (
+        <FormattedMessage
+          id="xpack.fleet.upgradeAgents.invalidSemverError"
+          defaultMessage="Invalid version, please use a valid semver version, e.g. 8.14.0"
+        />
+      );
+    }
+  }, [selectedVersion]);
+
   const [selectedMaintenanceWindow, setSelectedMaintenanceWindow] = useState([
     isSmallBatch ? maintenanceOptions[0] : maintenanceOptions[1],
   ]);
@@ -501,13 +514,15 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
           defaultMessage: 'Upgrade version',
         })}
         fullWidth
-        isInvalid={isInvalid}
+        isInvalid={isInvalid || !!semverErrors}
         error={
           isInvalid ? (
             <FormattedMessage
               id="xpack.fleet.upgradeAgents.versionRequiredText"
               defaultMessage="Version is required"
             />
+          ) : !!semverErrors ? (
+            semverErrors
           ) : undefined
         }
       >
@@ -522,6 +537,7 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
               setSelectedVersionStr(newValue);
               setSelectedVersion([{ label: newValue, value: newValue }]);
             }}
+            isInvalid={!!semverErrors}
           />
         ) : (
           <EuiComboBox

From d73a8f824d084db5cd04a5e4fe05b3d255b79ab2 Mon Sep 17 00:00:00 2001
From: Coen Warmer <coen.warmer@gmail.com>
Date: Tue, 2 Apr 2024 13:28:50 +0200
Subject: [PATCH 13/63] [Observability AI Assistant] Fix dark mode (#179716)

---
 .../get_edit_lens_configuration.tsx           | 19 ++++++++------
 .../open_lens_config/edit_action_helpers.ts   |  1 +
 .../components/buttons/new_chat_button.tsx    | 25 ++++++-------------
 .../public/components/chat/chat_body.tsx      | 11 ++++----
 4 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/get_edit_lens_configuration.tsx b/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/get_edit_lens_configuration.tsx
index c243ac9b84193..d83a8f0aec4cb 100644
--- a/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/get_edit_lens_configuration.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/get_edit_lens_configuration.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useCallback, useState } from 'react';
-import { EuiFlyout, EuiLoadingSpinner, EuiOverlayMask } from '@elastic/eui';
+import { EuiFlyout, EuiLoadingSpinner, EuiOverlayMask, EuiThemeProvider } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { I18nProvider } from '@kbn/i18n-react';
 import { Provider } from 'react-redux';
@@ -99,6 +99,7 @@ export async function getEditLensConfiguration(
     startDependencies,
     getLensAttributeService(coreStart, startDependencies)
   );
+  const theme = coreStart.theme.getTheme();
 
   return ({
     attributes,
@@ -223,13 +224,15 @@ export async function getEditLensConfiguration(
 
     return getWrapper(
       <Provider store={lensStore}>
-        <I18nProvider>
-          <KibanaContextProvider services={lensServices}>
-            <RootDragDropProvider>
-              <LensEditConfigurationFlyout {...configPanelProps} />
-            </RootDragDropProvider>
-          </KibanaContextProvider>
-        </I18nProvider>
+        <EuiThemeProvider colorMode={theme.darkMode ? 'dark' : 'light'}>
+          <I18nProvider>
+            <KibanaContextProvider services={lensServices}>
+              <RootDragDropProvider>
+                <LensEditConfigurationFlyout {...configPanelProps} />
+              </RootDragDropProvider>
+            </KibanaContextProvider>
+          </I18nProvider>
+        </EuiThemeProvider>
       </Provider>
     );
   };
diff --git a/x-pack/plugins/lens/public/trigger_actions/open_lens_config/edit_action_helpers.ts b/x-pack/plugins/lens/public/trigger_actions/open_lens_config/edit_action_helpers.ts
index 9e738dea11ed7..476ac6f3e6505 100644
--- a/x-pack/plugins/lens/public/trigger_actions/open_lens_config/edit_action_helpers.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/open_lens_config/edit_action_helpers.ts
@@ -45,6 +45,7 @@ export async function executeEditAction({
   const rootEmbeddable = embeddable.getRoot();
   const overlayTracker = tracksOverlays(rootEmbeddable) ? rootEmbeddable : undefined;
   const ConfigPanel = await embeddable.openConfingPanel(startDependencies, isNewPanel, deletePanel);
+
   if (ConfigPanel) {
     const handle = overlays.openFlyout(
       toMountPoint(
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/buttons/new_chat_button.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/buttons/new_chat_button.tsx
index 6dadba00f2394..75cede6344c59 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/buttons/new_chat_button.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/buttons/new_chat_button.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { SVGProps } from 'react';
+import React from 'react';
 import { EuiButton, EuiButtonIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
@@ -13,8 +13,11 @@ export function NewChatButton(
 ) {
   const { collapsed, ...nextProps } = props;
   return !props.collapsed ? (
-    <EuiButton data-test-subj="observabilityAiAssistantNewChatButton" fill {...nextProps}>
-      <EuiIconNewChat style={{ fill: 'white' }} />
+    <EuiButton
+      data-test-subj="observabilityAiAssistantNewChatButton"
+      iconType="newChat"
+      {...nextProps}
+    >
       {i18n.translate('xpack.observabilityAiAssistant.newChatButton', {
         defaultMessage: 'New chat',
       })}
@@ -22,23 +25,9 @@ export function NewChatButton(
   ) : (
     <EuiButtonIcon
       data-test-subj="observabilityAiAssistantNewChatButtonButton"
-      iconType={EuiIconNewChat}
+      iconType="newChat"
       size="xs"
       {...nextProps}
     />
   );
 }
-
-// To-do: replace with Eui icon once https://github.com/elastic/eui/pull/7524 is merged.
-export function EuiIconNewChat({ ...props }: SVGProps<SVGSVGElement>) {
-  return (
-    <svg xmlns="http://www.w3.org/2000/svg" width={16} height={16} viewBox="0 0 16 16" {...props}>
-      <path d="M8 4a.5.5 0 0 1 .5.5V6H10a.5.5 0 0 1 0 1H8.5v1.5a.5.5 0 0 1-1 0V7H6a.5.5 0 0 1 0-1h1.5V4.5A.5.5 0 0 1 8 4Z" />
-      <path
-        fillRule="evenodd"
-        d="M1 4a2.5 2.5 0 0 1 2.5-2.5h9A2.5 2.5 0 0 1 15 4v5a2.5 2.5 0 0 1-2.5 2.5H7.707L4.5 14.707V11.5h-1A2.5 2.5 0 0 1 1 9V4Zm2.5-1.5A1.5 1.5 0 0 0 2 4v5a1.5 1.5 0 0 0 1.5 1.5h2v1.793L7.293 10.5H12.5A1.5 1.5 0 0 0 14 9V4a1.5 1.5 0 0 0-1.5-1.5h-9Z"
-        clipRule="evenodd"
-      />
-    </svg>
-  );
-}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/chat/chat_body.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/chat/chat_body.tsx
index b5cd2cd0683e3..4a5d7d38c3e63 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/chat/chat_body.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/components/chat/chat_body.tsx
@@ -90,6 +90,11 @@ const animClassName = css`
     ${euiThemeVars.euiAnimSlightBounce} ${euiThemeVars.euiAnimSpeedNormal} forwards;
 `;
 
+const containerClassName = css`
+  min-width: 0;
+  max-height: 100%;
+`;
+
 const PADDING_AND_BORDER = 32;
 
 export function ChatBody({
@@ -154,12 +159,6 @@ export function ChatBody({
     }
   }
 
-  const containerClassName = css`
-    background: white;
-    min-width: 0;
-    max-height: 100%;
-  `;
-
   const headerContainerClassName = css`
     padding-right: ${showLinkToConversationsApp ? '32px' : '0'};
   `;

From 849f8fb1ac8e0d3ced6ab885cdcfe67ddbe0a241 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jeanlouis.leysens@elastic.co>
Date: Tue, 2 Apr 2024 13:38:59 +0200
Subject: [PATCH 14/63] [HTTP/CDN] Set `connect-src` to HTTPS only when CDN is
 configured (#179609)

## Summary

Close https://github.com/elastic/kibana/issues/179061
---
 .github/CODEOWNERS                                       | 1 +
 .../src/{ => cdn_config}/cdn_config.test.ts              | 2 +-
 .../src/{ => cdn_config}/cdn_config.ts                   | 7 +++++--
 .../core-http-server-internal/src/cdn_config/index.ts    | 9 +++++++++
 4 files changed, 16 insertions(+), 3 deletions(-)
 rename packages/core/http/core-http-server-internal/src/{ => cdn_config}/cdn_config.test.ts (98%)
 rename packages/core/http/core-http-server-internal/src/{ => cdn_config}/cdn_config.ts (81%)
 create mode 100644 packages/core/http/core-http-server-internal/src/cdn_config/index.ts

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1088b4e8a1176..badb25a143bb4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1252,6 +1252,7 @@ x-pack/plugins/cloud_integrations/cloud_full_story/server/config.ts @elastic/kib
 /x-pack/test/security_functional/ @elastic/kibana-security
 /x-pack/test/spaces_api_integration/ @elastic/kibana-security
 /x-pack/test/saved_object_api_integration/ @elastic/kibana-security
+/packages/core/http/core-http-server-internal/src/cdn_config/ @elastic/kibana-security @elastic/kibana-core
 #CC# /x-pack/plugins/security/ @elastic/kibana-security
 
 # Response Ops team
diff --git a/packages/core/http/core-http-server-internal/src/cdn_config.test.ts b/packages/core/http/core-http-server-internal/src/cdn_config/cdn_config.test.ts
similarity index 98%
rename from packages/core/http/core-http-server-internal/src/cdn_config.test.ts
rename to packages/core/http/core-http-server-internal/src/cdn_config/cdn_config.test.ts
index b6a954782f523..a728966b5e916 100644
--- a/packages/core/http/core-http-server-internal/src/cdn_config.test.ts
+++ b/packages/core/http/core-http-server-internal/src/cdn_config/cdn_config.test.ts
@@ -41,7 +41,7 @@ describe('CdnConfig', () => {
   it('generates the expected CSP additions', () => {
     const cdnConfig = CdnConfig.from({ url: 'https://foo.bar:9999' });
     expect(cdnConfig.getCspConfig()).toEqual({
-      connect_src: ['foo.bar:9999'],
+      connect_src: ['https:'],
       font_src: ['foo.bar:9999'],
       img_src: ['foo.bar:9999'],
       script_src: ['foo.bar:9999'],
diff --git a/packages/core/http/core-http-server-internal/src/cdn_config.ts b/packages/core/http/core-http-server-internal/src/cdn_config/cdn_config.ts
similarity index 81%
rename from packages/core/http/core-http-server-internal/src/cdn_config.ts
rename to packages/core/http/core-http-server-internal/src/cdn_config/cdn_config.ts
index e6fa29200ac74..68a255a62f5c2 100644
--- a/packages/core/http/core-http-server-internal/src/cdn_config.ts
+++ b/packages/core/http/core-http-server-internal/src/cdn_config/cdn_config.ts
@@ -7,7 +7,7 @@
  */
 
 import { URL, format } from 'node:url';
-import type { CspAdditionalConfig } from './csp';
+import type { CspAdditionalConfig } from '../csp';
 
 export interface Input {
   url?: string;
@@ -34,13 +34,16 @@ export class CdnConfig {
   public getCspConfig(): CspAdditionalConfig {
     const host = this.host;
     if (!host) return {};
+    // Since CDN is only used in specific envs we set `connect_src` to allow any
+    // but require https. This hardens security a bit, but allows apps like
+    // maps to still work as expected.
     return {
+      connect_src: ['https:'],
       font_src: [host],
       img_src: [host],
       script_src: [host],
       style_src: [host],
       worker_src: [host],
-      connect_src: [host],
     };
   }
 
diff --git a/packages/core/http/core-http-server-internal/src/cdn_config/index.ts b/packages/core/http/core-http-server-internal/src/cdn_config/index.ts
new file mode 100644
index 0000000000000..e2e30ffbea243
--- /dev/null
+++ b/packages/core/http/core-http-server-internal/src/cdn_config/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { CdnConfig, type Input } from './cdn_config';

From da697032c7ba74a2bba8338f64354cb6b0393ea5 Mon Sep 17 00:00:00 2001
From: Luke G <11671118+lgestc@users.noreply.github.com>
Date: Tue, 2 Apr 2024 13:46:07 +0200
Subject: [PATCH 15/63] Fix threat intel edit filters (#179607)

## Summary

The following PR needs to be merged first:
https://github.com/elastic/kibana/pull/178701

This fixes
https://github.com/elastic/kibana/issues/174764#issuecomment-1992363217
and https://github.com/elastic/kibana/issues/179030

**To reproduce:**

Add whatever filter in the Threat Intelligence (via table filter in),
then click it (in the top bar) - filter edit popover is not filled in
with data.

On Alerts page though, it is filled in correctly - and it should look
like that on TI:


![image](https://github.com/elastic/kibana/assets/11671118/0de5f076-83dd-48f3-810b-75d1572536e3)
---
 .../app/home/template_wrapper/index.tsx       |  5 +++-
 .../public/mocks/mock_security_context.tsx    |  3 ++
 .../query_bar/components/filter_in.test.tsx   | 30 +++++++++++++++----
 .../query_bar/components/filter_out.test.tsx  | 29 ++++++++++++++----
 .../query_bar/hooks/use_filter_in_out.test.ts | 27 +++++++++++++++++
 .../query_bar/hooks/use_filter_in_out.ts      | 12 ++++++--
 .../public/modules/query_bar/utils/filter.ts  | 18 +++++++++--
 7 files changed, 106 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
index a7dabdb81f0b4..19e8d55aa2dd5 100644
--- a/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/template_wrapper/index.tsx
@@ -62,13 +62,16 @@ export const SecuritySolutionTemplateWrapper: React.FC<SecuritySolutionTemplateW
       getTimelineShowStatus(state, TimelineId.active)
     );
     const [routeProps] = useRouteSpy();
-    const isNotEmpty = !rest.isEmptyState;
     const isPreview = routeProps?.pageName === SecurityPageName.rulesCreate;
 
     // The bottomBar by default has a set 'dark' colorMode that doesn't match the global colorMode from the Advanced Settings
     // To keep the mode in sync, we pass in the globalColorMode to the bottom bar here
     const { euiTheme, colorMode: globalColorMode } = useEuiTheme();
 
+    // There is some logic in the StyledKibanaPageTemplate that checks for children presence, and we dont even need to render the children
+    // here if isEmptyState is set
+    const isNotEmpty = !rest.isEmptyState;
+
     /*
      * StyledKibanaPageTemplate is a styled EuiPageTemplate. Security solution currently passes the header
      * and page content as the children of StyledKibanaPageTemplate, as opposed to using the pageHeader prop,
diff --git a/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx b/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx
index f70399331b56e..4e1ecf0bbe885 100644
--- a/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx
+++ b/x-pack/plugins/threat_intelligence/public/mocks/mock_security_context.tsx
@@ -27,6 +27,9 @@ export const getSecuritySolutionContextMock = (): SecuritySolutionPluginContext
     ({ children }) =>
       <div>{children}</div>,
   sourcererDataView: {
+    sourcererDataView: {
+      id: 'security-solution-default',
+    },
     browserFields: {},
     selectedPatterns: [],
     indexPattern: { fields: [], title: '' },
diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in.test.tsx b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in.test.tsx
index f4cb5f231e2e8..0a44481f5cb25 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in.test.tsx
+++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_in.test.tsx
@@ -18,6 +18,8 @@ import {
   FilterInContextMenu,
 } from './filter_in';
 
+import { TestProvidersComponent } from '../../../mocks/test_providers';
+
 jest.mock('../../indicators/hooks/use_filters_context');
 
 const mockIndicator: Indicator = generateMockIndicator();
@@ -33,20 +35,27 @@ describe('<FilterInButtonIcon /> <FilterInContextMenu /> <FilterInCellAction />'
   });
 
   it('should render null (wrong data input)', () => {
-    const { container } = render(<FilterInButtonIcon data={''} field={mockField} />);
+    const { container } = render(<FilterInButtonIcon data={''} field={mockField} />, {
+      wrapper: TestProvidersComponent,
+    });
 
     expect(container).toBeEmptyDOMElement();
   });
 
   it('should render null (wrong field input)', () => {
-    const { container } = render(<FilterInButtonIcon data={mockIndicator} field={''} />);
+    const { container } = render(<FilterInButtonIcon data={mockIndicator} field={''} />, {
+      wrapper: TestProvidersComponent,
+    });
 
     expect(container).toBeEmptyDOMElement();
   });
 
   it('should render one EuiButtonIcon', () => {
     const { getByTestId } = render(
-      <FilterInButtonIcon data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />
+      <FilterInButtonIcon data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />,
+      {
+        wrapper: TestProvidersComponent,
+      }
     );
 
     expect(getByTestId(TEST_ID)).toHaveClass('euiButtonIcon');
@@ -54,7 +63,10 @@ describe('<FilterInButtonIcon /> <FilterInContextMenu /> <FilterInCellAction />'
 
   it('should render one EuiButtonEmpty', () => {
     const { getByTestId } = render(
-      <FilterInButtonEmpty data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />
+      <FilterInButtonEmpty data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />,
+      {
+        wrapper: TestProvidersComponent,
+      }
     );
 
     expect(getByTestId(TEST_ID)).toHaveClass('euiButtonEmpty');
@@ -62,7 +74,10 @@ describe('<FilterInButtonIcon /> <FilterInContextMenu /> <FilterInCellAction />'
 
   it('should render one EuiContextMenuItem (for EuiContextMenu use)', () => {
     const { getByTestId } = render(
-      <FilterInContextMenu data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />
+      <FilterInContextMenu data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />,
+      {
+        wrapper: TestProvidersComponent,
+      }
     );
 
     expect(getByTestId(TEST_ID)).toHaveClass('euiContextMenuItem');
@@ -83,7 +98,10 @@ describe('<FilterInButtonIcon /> <FilterInContextMenu /> <FilterInCellAction />'
         field={mockField}
         Component={mockComponent}
         data-test-subj={TEST_ID}
-      />
+      />,
+      {
+        wrapper: TestProvidersComponent,
+      }
     );
 
     expect(getByTestId(TEST_ID)).toBeInTheDocument();
diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out.test.tsx b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out.test.tsx
index 3155805c05a2d..1bc4d0e4da158 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out.test.tsx
+++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/components/filter_out.test.tsx
@@ -17,6 +17,7 @@ import {
   FilterOutCellAction,
   FilterOutContextMenu,
 } from './filter_out';
+import { TestProvidersComponent } from '../../../mocks/test_providers';
 
 jest.mock('../../indicators/hooks/use_filters_context');
 
@@ -33,20 +34,27 @@ describe('<FilterOutButtonIcon /> <FilterOutButtonEmpty /> <FilterOutContextMenu
   });
 
   it('should render an empty component (wrong data input)', () => {
-    const { container } = render(<FilterOutButtonIcon data={''} field={mockField} />);
+    const { container } = render(<FilterOutButtonIcon data={''} field={mockField} />, {
+      wrapper: TestProvidersComponent,
+    });
 
     expect(container).toBeEmptyDOMElement();
   });
 
   it('should render an empty component (wrong field input)', () => {
-    const { container } = render(<FilterOutButtonIcon data={mockIndicator} field={''} />);
+    const { container } = render(<FilterOutButtonIcon data={mockIndicator} field={''} />, {
+      wrapper: TestProvidersComponent,
+    });
 
     expect(container).toBeEmptyDOMElement();
   });
 
   it('should render one EuiButtonIcon', () => {
     const { getByTestId } = render(
-      <FilterOutButtonIcon data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />
+      <FilterOutButtonIcon data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />,
+      {
+        wrapper: TestProvidersComponent,
+      }
     );
 
     expect(getByTestId(TEST_ID)).toHaveClass('euiButtonIcon');
@@ -54,7 +62,10 @@ describe('<FilterOutButtonIcon /> <FilterOutButtonEmpty /> <FilterOutContextMenu
 
   it('should render one EuiButtonEmpty', () => {
     const { getByTestId } = render(
-      <FilterOutButtonEmpty data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />
+      <FilterOutButtonEmpty data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />,
+      {
+        wrapper: TestProvidersComponent,
+      }
     );
 
     expect(getByTestId(TEST_ID)).toHaveClass('euiButtonEmpty');
@@ -62,7 +73,10 @@ describe('<FilterOutButtonIcon /> <FilterOutButtonEmpty /> <FilterOutContextMenu
 
   it('should render one EuiContextMenuItem (for EuiContextMenu use)', () => {
     const { getByTestId } = render(
-      <FilterOutContextMenu data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />
+      <FilterOutContextMenu data={mockIndicator} field={mockField} data-test-subj={TEST_ID} />,
+      {
+        wrapper: TestProvidersComponent,
+      }
     );
 
     expect(getByTestId(TEST_ID)).toHaveClass('euiContextMenuItem');
@@ -83,7 +97,10 @@ describe('<FilterOutButtonIcon /> <FilterOutButtonEmpty /> <FilterOutContextMenu
         field={mockField}
         Component={mockComponent}
         data-test-subj={TEST_ID}
-      />
+      />,
+      {
+        wrapper: TestProvidersComponent,
+      }
     );
 
     expect(getByTestId(TEST_ID)).toBeInTheDocument();
diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.test.ts b/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.test.ts
index 9e22684bb4c31..7e435d944145b 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.test.ts
+++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.test.ts
@@ -14,6 +14,9 @@ import {
 import { TestProvidersComponent } from '../../../mocks/test_providers';
 import { useFilterInOut, UseFilterInValue } from './use_filter_in_out';
 import { FilterIn } from '../utils/filter';
+import { updateFiltersArray } from '../utils/filter';
+
+jest.mock('../utils/filter', () => ({ updateFiltersArray: jest.fn() }));
 
 describe('useFilterInOut()', () => {
   let hookResult: RenderHookResult<{}, UseFilterInValue, Renderer<unknown>>;
@@ -53,4 +56,28 @@ describe('useFilterInOut()', () => {
 
     expect(hookResult.result.current).toHaveProperty('filterFn');
   });
+
+  describe('calling filterFn', () => {
+    it('should call dependencies ', () => {
+      const indicator: string = '0.0.0.0';
+      const field: string = 'threat.indicator.name';
+      const filterType = FilterIn;
+
+      hookResult = renderHook(() => useFilterInOut({ indicator, field, filterType }), {
+        wrapper: TestProvidersComponent,
+      });
+
+      expect(hookResult.result.current).toHaveProperty('filterFn');
+
+      hookResult.result.current.filterFn?.();
+
+      expect(jest.mocked(updateFiltersArray)).toHaveBeenCalledWith(
+        [],
+        'threat.indicator.name',
+        '0.0.0.0',
+        undefined,
+        'security-solution-default'
+      );
+    });
+  });
 });
diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.ts b/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.ts
index 72388d8a9a8a6..b6526cf76d456 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.ts
+++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/hooks/use_filter_in_out.ts
@@ -11,6 +11,7 @@ import { fieldAndValueValid, getIndicatorFieldAndValue } from '../../indicators/
 import { useIndicatorsFiltersContext } from '../../indicators/hooks/use_filters_context';
 import { Indicator } from '../../../../common/types/indicator';
 import { FilterIn, FilterOut, updateFiltersArray } from '../utils/filter';
+import { useSourcererDataView } from '../../indicators/hooks/use_sourcerer_data_view';
 
 export interface UseFilterInParam {
   /**
@@ -44,6 +45,7 @@ export const useFilterInOut = ({
   filterType,
 }: UseFilterInParam): UseFilterInValue => {
   const { filterManager } = useIndicatorsFiltersContext();
+  const { sourcererDataView } = useSourcererDataView();
 
   const { key, value } =
     typeof indicator === 'string'
@@ -52,9 +54,15 @@ export const useFilterInOut = ({
 
   const filterFn = useCallback((): void => {
     const existingFilters = filterManager.getFilters();
-    const newFilters: Filter[] = updateFiltersArray(existingFilters, key, value, filterType);
+    const newFilters: Filter[] = updateFiltersArray(
+      existingFilters,
+      key,
+      value,
+      filterType,
+      sourcererDataView?.id
+    );
     filterManager.setFilters(newFilters);
-  }, [filterManager, filterType, key, value]);
+  }, [filterManager, filterType, key, sourcererDataView?.id, value]);
 
   if (!fieldAndValueValid(key, value)) {
     return {} as unknown as UseFilterInValue;
diff --git a/x-pack/plugins/threat_intelligence/public/modules/query_bar/utils/filter.ts b/x-pack/plugins/threat_intelligence/public/modules/query_bar/utils/filter.ts
index 1bb1661a4e750..451132ce234f9 100644
--- a/x-pack/plugins/threat_intelligence/public/modules/query_bar/utils/filter.ts
+++ b/x-pack/plugins/threat_intelligence/public/modules/query_bar/utils/filter.ts
@@ -17,7 +17,17 @@ export const FilterOut = false;
  * @param negate Set to true when we create a negated filter (e.g. NOT threat.indicator.type: url)
  * @returns The new {@link Filter}
  */
-const createFilter = (key: string, value: string, negate: boolean): Filter => ({
+const createFilter = ({
+  key,
+  value,
+  negate,
+  index,
+}: {
+  key: string;
+  value: string;
+  negate: boolean;
+  index?: string;
+}): Filter => ({
   meta: {
     alias: null,
     negate,
@@ -25,6 +35,7 @@ const createFilter = (key: string, value: string, negate: boolean): Filter => ({
     type: 'phrase',
     key,
     params: { query: value },
+    index,
   },
   query: { match_phrase: { [key]: value } },
 });
@@ -71,9 +82,10 @@ export const updateFiltersArray = (
   existingFilters: Filter[],
   key: string,
   value: string | null,
-  filterType: boolean
+  filterType: boolean,
+  index?: string
 ): Filter[] => {
-  const newFilter = createFilter(key, value as string, !filterType);
+  const newFilter = createFilter({ key, value: value as string, negate: !filterType, index });
 
   const filter: Filter | undefined = filterExistsInFiltersArray(
     existingFilters,

From f89c3e06cc3e7f1b7d6f1293254393a2ceb8f734 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Tue, 2 Apr 2024 14:13:51 +0200
Subject: [PATCH 16/63] [ZDT migration] support root field addition (#179595)

## Summary

Fix https://github.com/elastic/kibana/issues/179258

Change the version compatibility and mapping generation
(`checkVersionCompatibility` and `generateAdditiveMappingDiff`) of the
ZDT migration algorithm to support the scenario were root fields are
added (adding new fields to our base mappings)
---
 .../src/core/build_active_mappings.ts         |   4 +
 .../src/core/compare_mappings.test.ts         |  28 +++
 .../src/zdt/model/stages/init.test.ts         |   2 +-
 .../src/zdt/model/stages/init.ts              |   2 +-
 .../check_version_compatibility.test.mocks.ts |  10 ++
 .../utils/check_version_compatibility.test.ts | 116 +++++++++++--
 .../zdt/utils/check_version_compatibility.ts  |  45 ++++-
 ...nerate_additive_mapping_diff.test.mocks.ts |  27 +++
 .../generate_additive_mapping_diff.test.ts    | 161 +++++++++++++++++-
 .../utils/generate_additive_mapping_diff.ts   |  22 ++-
 .../zdt_2/root_field_addition.test.ts         | 124 ++++++++++++++
 11 files changed, 514 insertions(+), 27 deletions(-)
 create mode 100644 packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.test.mocks.ts
 create mode 100644 src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts

diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/core/build_active_mappings.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/core/build_active_mappings.ts
index e3de61646d749..898a1114f8e57 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/core/build_active_mappings.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/core/build_active_mappings.ts
@@ -40,6 +40,10 @@ export function buildActiveMappings(
  * @returns {IndexMapping}
  */
 export function getBaseMappings(): IndexMapping {
+  // Important: the ZDT algorithm won't trigger a reindex on documents
+  // when changes on root field mappings are detected, meaning that adding
+  // a non-indexed root field and then later switching it to indexed is
+  // not support atm and would require changes to the ZDT algo.
   return {
     dynamic: 'strict',
     properties: {
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/core/compare_mappings.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/core/compare_mappings.test.ts
index eec6e52090cae..29a1d6cfe4849 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/core/compare_mappings.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/core/compare_mappings.test.ts
@@ -118,4 +118,32 @@ describe('getUpdatedRootFields', () => {
 
     expect(updatedFields).toEqual(['namespace', 'references']);
   });
+
+  it('ignores fields not being present on the base mapping for the diff', () => {
+    const updatedFields = getUpdatedRootFields({
+      properties: {
+        ...getBaseMappings().properties,
+        someUnknownField: {
+          type: 'text',
+        },
+      },
+    });
+
+    expect(updatedFields).toEqual([]);
+  });
+
+  it('ignores fields not being present on the base mapping even with nested props', () => {
+    const updatedFields = getUpdatedRootFields({
+      properties: {
+        ...getBaseMappings().properties,
+        someTypeProps: {
+          properties: {
+            foo: { type: 'text' },
+          },
+        },
+      },
+    });
+
+    expect(updatedFields).toEqual([]);
+  });
 });
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.ts
index a68d6c266a652..bdaabfcc863cd 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.ts
@@ -345,7 +345,7 @@ describe('Stage: init', () => {
         expect(generateAdditiveMappingDiffMock).toHaveBeenCalledTimes(1);
         expect(generateAdditiveMappingDiffMock).toHaveBeenCalledWith({
           types: ['foo', 'bar'].map((type) => context.typeRegistry.getType(type)),
-          meta: fetchIndexResponse[currentIndex].mappings._meta,
+          mapping: fetchIndexResponse[currentIndex].mappings,
           deletedTypes: context.deletedTypes,
         });
       });
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.ts
index ceb97cb045987..7524e7b2d9f09 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.ts
@@ -164,7 +164,7 @@ export const init: ModelStage<
     case 'greater':
       const additiveMappingChanges = generateAdditiveMappingDiff({
         types,
-        meta: currentMappings._meta ?? {},
+        mapping: currentMappings,
         deletedTypes: context.deletedTypes,
       });
       return {
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.test.mocks.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.test.mocks.ts
index 8d7cbe657758c..e2ff1de594076 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.test.mocks.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.test.mocks.ts
@@ -19,3 +19,13 @@ jest.doMock('@kbn/core-saved-objects-base-server-internal', () => {
     getVirtualVersionMap: getVirtualVersionMapMock,
   };
 });
+
+export const getUpdatedRootFieldsMock = jest.fn();
+
+jest.doMock('../../core/compare_mappings', () => {
+  const actual = jest.requireActual('../../core/compare_mappings');
+  return {
+    ...actual,
+    getUpdatedRootFields: getUpdatedRootFieldsMock,
+  };
+});
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.test.ts
index 528855417e90f..640b60d5aeb3f 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.test.ts
@@ -10,6 +10,7 @@ import {
   compareVirtualVersionsMock,
   getVirtualVersionMapMock,
   getVirtualVersionsFromMappingsMock,
+  getUpdatedRootFieldsMock,
 } from './check_version_compatibility.test.mocks';
 import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
 import type {
@@ -30,6 +31,7 @@ describe('checkVersionCompatibility', () => {
     compareVirtualVersionsMock.mockReset().mockReturnValue({});
     getVirtualVersionMapMock.mockReset().mockReturnValue({});
     getVirtualVersionsFromMappingsMock.mockReset().mockReturnValue({ status: 'equal' });
+    getUpdatedRootFieldsMock.mockReset().mockReturnValue([]);
 
     types = [createType({ name: 'foo' }), createType({ name: 'bar' })];
 
@@ -88,24 +90,112 @@ describe('checkVersionCompatibility', () => {
     });
   });
 
-  it('returns the result of the compareModelVersions call', () => {
-    const expected: CompareModelVersionResult = {
-      status: 'lesser',
-      details: {
-        greater: [],
-        lesser: [],
-        equal: [],
-      },
-    };
-    compareVirtualVersionsMock.mockReturnValue(expected);
-
-    const result = checkVersionCompatibility({
+  it('calls getUpdatedRootFields with the correct parameters', () => {
+    checkVersionCompatibility({
       types,
       mappings,
       source: 'mappingVersions',
       deletedTypes,
     });
 
-    expect(result).toEqual(expected);
+    expect(getUpdatedRootFieldsMock).toHaveBeenCalledTimes(1);
+    expect(getUpdatedRootFieldsMock).toHaveBeenCalledWith(mappings);
+  });
+
+  describe('without updated root fields', () => {
+    it('returns the result of the compareModelVersions call', () => {
+      const expected: CompareModelVersionResult = {
+        status: 'lesser',
+        details: { greater: [], lesser: [], equal: [] },
+      };
+      compareVirtualVersionsMock.mockReturnValue(expected);
+
+      const result = checkVersionCompatibility({
+        types,
+        mappings,
+        source: 'mappingVersions',
+        deletedTypes,
+      });
+
+      expect(result).toEqual({
+        status: expected.status,
+        versionDetails: expected.details,
+        updatedRootFields: [],
+      });
+    });
+  });
+
+  describe('with updated root fields', () => {
+    beforeEach(() => {
+      getUpdatedRootFieldsMock.mockReturnValue(['rootA']);
+    });
+
+    it('returns the correct status for `greater` version status check', () => {
+      const expected: CompareModelVersionResult = {
+        status: 'greater',
+        details: { greater: [], lesser: [], equal: [] },
+      };
+      compareVirtualVersionsMock.mockReturnValue(expected);
+
+      const result = checkVersionCompatibility({
+        types,
+        mappings,
+        source: 'mappingVersions',
+        deletedTypes,
+      });
+
+      expect(result.status).toEqual('greater');
+    });
+
+    it('returns the correct status for `lesser` version status check', () => {
+      const expected: CompareModelVersionResult = {
+        status: 'lesser',
+        details: { greater: [], lesser: [], equal: [] },
+      };
+      compareVirtualVersionsMock.mockReturnValue(expected);
+
+      const result = checkVersionCompatibility({
+        types,
+        mappings,
+        source: 'mappingVersions',
+        deletedTypes,
+      });
+
+      expect(result.status).toEqual('conflict');
+    });
+
+    it('returns the correct status for `equal` version status check', () => {
+      const expected: CompareModelVersionResult = {
+        status: 'equal',
+        details: { greater: [], lesser: [], equal: [] },
+      };
+      compareVirtualVersionsMock.mockReturnValue(expected);
+
+      const result = checkVersionCompatibility({
+        types,
+        mappings,
+        source: 'mappingVersions',
+        deletedTypes,
+      });
+
+      expect(result.status).toEqual('greater');
+    });
+
+    it('returns the correct status for `conflict` version status check', () => {
+      const expected: CompareModelVersionResult = {
+        status: 'conflict',
+        details: { greater: [], lesser: [], equal: [] },
+      };
+      compareVirtualVersionsMock.mockReturnValue(expected);
+
+      const result = checkVersionCompatibility({
+        types,
+        mappings,
+        source: 'mappingVersions',
+        deletedTypes,
+      });
+
+      expect(result.status).toEqual('conflict');
+    });
   });
 });
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.ts
index 651875e92c438..8dc60c639a56a 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/check_version_compatibility.ts
@@ -12,8 +12,10 @@ import {
   compareVirtualVersions,
   getVirtualVersionMap,
   type IndexMapping,
-  type CompareModelVersionResult,
+  type CompareModelVersionStatus,
+  type CompareModelVersionDetails,
 } from '@kbn/core-saved-objects-base-server-internal';
+import { getUpdatedRootFields } from '../../core/compare_mappings';
 
 interface CheckVersionCompatibilityOpts {
   mappings: IndexMapping;
@@ -22,12 +24,20 @@ interface CheckVersionCompatibilityOpts {
   deletedTypes: string[];
 }
 
+type CheckVersionCompatibilityStatus = 'greater' | 'lesser' | 'equal' | 'conflict';
+
+interface CheckVersionCompatibilityResult {
+  status: CheckVersionCompatibilityStatus;
+  versionDetails: CompareModelVersionDetails;
+  updatedRootFields: string[];
+}
+
 export const checkVersionCompatibility = ({
   mappings,
   types,
   source,
   deletedTypes,
-}: CheckVersionCompatibilityOpts): CompareModelVersionResult => {
+}: CheckVersionCompatibilityOpts): CheckVersionCompatibilityResult => {
   const appVersions = getVirtualVersionMap(types);
   const indexVersions = getVirtualVersionsFromMappings({
     mappings,
@@ -37,5 +47,34 @@ export const checkVersionCompatibility = ({
   if (!indexVersions) {
     throw new Error(`Cannot check version: ${source} not present in the mapping meta`);
   }
-  return compareVirtualVersions({ appVersions, indexVersions, deletedTypes });
+
+  const updatedRootFields = getUpdatedRootFields(mappings);
+  const modelVersionStatus = compareVirtualVersions({ appVersions, indexVersions, deletedTypes });
+  const status = getCompatibilityStatus(modelVersionStatus.status, updatedRootFields.length > 0);
+
+  return {
+    status,
+    updatedRootFields,
+    versionDetails: modelVersionStatus.details,
+  };
+};
+
+const getCompatibilityStatus = (
+  versionStatus: CompareModelVersionStatus,
+  hasUpdatedRootFields: boolean
+): CheckVersionCompatibilityStatus => {
+  if (!hasUpdatedRootFields) {
+    return versionStatus;
+  }
+  switch (versionStatus) {
+    case 'lesser':
+      // lower model versions but additional root mappings => conflict
+      return 'conflict';
+    case 'equal':
+      // no change on model versions but additional root mappings => greater
+      return 'greater';
+    default:
+      // greater and conflict are not impacted
+      return versionStatus;
+  }
 };
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.test.mocks.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.test.mocks.ts
new file mode 100644
index 0000000000000..b6cd5f063873f
--- /dev/null
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.test.mocks.ts
@@ -0,0 +1,27 @@
+/*
+ * 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 const getBaseMappingsMock = jest.fn();
+
+jest.doMock('../../core/build_active_mappings', () => {
+  const actual = jest.requireActual('../../core/build_active_mappings');
+  return {
+    ...actual,
+    getBaseMappings: getBaseMappingsMock,
+  };
+});
+
+export const getUpdatedRootFieldsMock = jest.fn();
+
+jest.doMock('../../core/compare_mappings', () => {
+  const actual = jest.requireActual('../../core/compare_mappings');
+  return {
+    ...actual,
+    getUpdatedRootFields: getUpdatedRootFieldsMock,
+  };
+});
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.test.ts
index 9083e4657b4ba..04f8754e9fe48 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.test.ts
@@ -6,9 +6,15 @@
  * Side Public License, v 1.
  */
 
+import {
+  getBaseMappingsMock,
+  getUpdatedRootFieldsMock,
+} from './generate_additive_mapping_diff.test.mocks';
+
 import type { SavedObjectsModelVersion } from '@kbn/core-saved-objects-server';
-import type { IndexMappingMeta } from '@kbn/core-saved-objects-base-server-internal';
+import type { IndexMappingMeta, IndexMapping } from '@kbn/core-saved-objects-base-server-internal';
 import { generateAdditiveMappingDiff } from './generate_additive_mapping_diff';
+import { getBaseMappings } from '../../core/build_active_mappings';
 import { createType } from '../test_helpers';
 
 describe('generateAdditiveMappingDiff', () => {
@@ -19,6 +25,11 @@ describe('generateAdditiveMappingDiff', () => {
     changes: [{ type: 'mappings_addition', addedMappings: {} }],
   };
 
+  beforeEach(() => {
+    getBaseMappingsMock.mockReset().mockReturnValue({ properties: {} });
+    getUpdatedRootFieldsMock.mockReset().mockReturnValue([]);
+  });
+
   const getTypes = () => {
     const foo = createType({
       name: 'foo',
@@ -41,6 +52,13 @@ describe('generateAdditiveMappingDiff', () => {
     return { foo, bar };
   };
 
+  const mappingFromMeta = (meta: IndexMappingMeta): IndexMapping => {
+    return {
+      properties: getBaseMappings().properties,
+      _meta: meta,
+    };
+  };
+
   it('aggregates the mappings of the types with versions higher than in the index', () => {
     const { foo, bar } = getTypes();
     const types = [foo, bar];
@@ -53,7 +71,7 @@ describe('generateAdditiveMappingDiff', () => {
 
     const addedMappings = generateAdditiveMappingDiff({
       types,
-      meta,
+      mapping: mappingFromMeta(meta),
       deletedTypes,
     });
 
@@ -75,7 +93,7 @@ describe('generateAdditiveMappingDiff', () => {
 
     const addedMappings = generateAdditiveMappingDiff({
       types,
-      meta,
+      mapping: mappingFromMeta(meta),
       deletedTypes,
     });
 
@@ -97,7 +115,7 @@ describe('generateAdditiveMappingDiff', () => {
 
     const addedMappings = generateAdditiveMappingDiff({
       types,
-      meta,
+      mapping: mappingFromMeta(meta),
       deletedTypes,
     });
 
@@ -120,7 +138,7 @@ describe('generateAdditiveMappingDiff', () => {
     expect(() =>
       generateAdditiveMappingDiff({
         types,
-        meta,
+        mapping: mappingFromMeta(meta),
         deletedTypes,
       })
     ).toThrowErrorMatchingInlineSnapshot(
@@ -136,11 +154,142 @@ describe('generateAdditiveMappingDiff', () => {
     expect(() =>
       generateAdditiveMappingDiff({
         types,
-        meta,
+        mapping: mappingFromMeta(meta),
         deletedTypes,
       })
     ).toThrowErrorMatchingInlineSnapshot(
       `"Cannot generate additive mapping diff: mappingVersions not present on index meta"`
     );
   });
+
+  it('throws an error if _meta is not present on the index', () => {
+    expect(() =>
+      generateAdditiveMappingDiff({
+        types: [],
+        mapping: {
+          properties: {},
+        },
+        deletedTypes: [],
+      })
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"Cannot generate additive mapping diff: meta not present on index"`
+    );
+  });
+
+  it('includes the root fields that were added', () => {
+    const { foo, bar } = getTypes();
+    const types = [foo, bar];
+    const meta: IndexMappingMeta = {
+      mappingVersions: {
+        foo: '10.2.0',
+        bar: '8.5.0',
+      },
+    };
+
+    getBaseMappingsMock.mockReturnValue({
+      properties: {
+        rootA: { type: 'keyword' },
+        rootB: { type: 'keyword' },
+      },
+    });
+    getUpdatedRootFieldsMock.mockReturnValue(['rootA']);
+
+    const addedMappings = generateAdditiveMappingDiff({
+      types,
+      mapping: mappingFromMeta(meta),
+      deletedTypes,
+    });
+
+    expect(addedMappings).toEqual({
+      rootA: { type: 'keyword' },
+    });
+  });
+
+  it('includes the root fields that were modified', () => {
+    const { foo, bar } = getTypes();
+    const types = [foo, bar];
+    const meta: IndexMappingMeta = {
+      mappingVersions: {
+        foo: '10.2.0',
+        bar: '8.5.0',
+      },
+    };
+
+    getBaseMappingsMock.mockReturnValue({
+      properties: {
+        rootA: { type: 'keyword' },
+        rootB: { type: 'keyword' },
+        references: {
+          type: 'nested',
+          properties: {
+            name: {
+              type: 'keyword',
+            },
+            type: {
+              type: 'keyword',
+            },
+            id: {
+              type: 'keyword',
+            },
+          },
+        },
+      },
+    });
+    getUpdatedRootFieldsMock.mockReturnValue(['rootA', 'references']);
+
+    const addedMappings = generateAdditiveMappingDiff({
+      types,
+      mapping: mappingFromMeta(meta),
+      deletedTypes,
+    });
+
+    expect(addedMappings).toEqual({
+      rootA: { type: 'keyword' },
+      references: {
+        type: 'nested',
+        properties: {
+          name: {
+            type: 'keyword',
+          },
+          type: {
+            type: 'keyword',
+          },
+          id: {
+            type: 'keyword',
+          },
+        },
+      },
+    });
+  });
+
+  it('combines the changes from the types and from the root fields', () => {
+    const { foo, bar } = getTypes();
+    const types = [foo, bar];
+    const meta: IndexMappingMeta = {
+      mappingVersions: {
+        foo: '10.1.0',
+        bar: '7.9.0',
+      },
+    };
+
+    getBaseMappingsMock.mockReturnValue({
+      properties: {
+        rootA: { type: 'keyword' },
+        rootB: { type: 'keyword' },
+      },
+    });
+    getUpdatedRootFieldsMock.mockReturnValue(['rootA']);
+
+    const addedMappings = generateAdditiveMappingDiff({
+      types,
+      mapping: mappingFromMeta(meta),
+      deletedTypes,
+    });
+
+    expect(addedMappings).toEqual({
+      foo: foo.mappings,
+      bar: bar.mappings,
+      rootA: { type: 'keyword' },
+    });
+  });
 });
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.ts
index 0ef7437b2d6c3..2c6d51881b844 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/generate_additive_mapping_diff.ts
@@ -11,15 +11,17 @@ import type {
   SavedObjectsMappingProperties,
 } from '@kbn/core-saved-objects-server';
 import {
-  IndexMappingMeta,
+  type IndexMapping,
   getVirtualVersionsFromMappingMeta,
   getVirtualVersionMap,
   getModelVersionDelta,
 } from '@kbn/core-saved-objects-base-server-internal';
+import { getUpdatedRootFields } from '../../core/compare_mappings';
+import { getBaseMappings } from '../../core/build_active_mappings';
 
 interface GenerateAdditiveMappingsDiffOpts {
   types: SavedObjectsType[];
-  meta: IndexMappingMeta;
+  mapping: IndexMapping;
   deletedTypes: string[];
 }
 
@@ -32,9 +34,15 @@ interface GenerateAdditiveMappingsDiffOpts {
  */
 export const generateAdditiveMappingDiff = ({
   types,
-  meta,
+  mapping,
   deletedTypes,
 }: GenerateAdditiveMappingsDiffOpts): SavedObjectsMappingProperties => {
+  const meta = mapping._meta;
+  if (!meta) {
+    // should never occur given we only generate additive mapping diff when we've recognized a zdt index
+    throw new Error('Cannot generate additive mapping diff: meta not present on index');
+  }
+
   const typeVersions = getVirtualVersionMap(types);
   const mappingVersion = getVirtualVersionsFromMappingMeta({
     meta,
@@ -69,5 +77,13 @@ export const generateAdditiveMappingDiff = ({
     addedMappings[type] = typeMap[type].mappings;
   });
 
+  const changedRootFields = getUpdatedRootFields(mapping);
+  if (changedRootFields.length) {
+    const baseMappings = getBaseMappings();
+    changedRootFields.forEach((changedRootField) => {
+      addedMappings[changedRootField] = baseMappings.properties[changedRootField];
+    });
+  }
+
   return addedMappings;
 };
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts
new file mode 100644
index 0000000000000..47f853187b18f
--- /dev/null
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts
@@ -0,0 +1,124 @@
+/*
+ * 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.
+ */
+
+const mockGetBaseMappings = jest.fn();
+
+// No other way to simulate a change in root mappings unfortunately
+jest.mock(
+  '@kbn/core-saved-objects-migration-server-internal/src/core/build_active_mappings',
+  () => {
+    const actual = jest.requireActual(
+      '@kbn/core-saved-objects-migration-server-internal/src/core/build_active_mappings'
+    );
+    return {
+      ...actual,
+      getBaseMappings: () => mockGetBaseMappings(),
+    };
+  }
+);
+
+import Path from 'path';
+import fs from 'fs/promises';
+import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
+import '../jest_matchers';
+import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
+import { delay, parseLogFile } from '../test_utils';
+import { getBaseMigratorParams, getFooType } from '../fixtures/zdt_base.fixtures';
+
+export const logFilePath = Path.join(__dirname, 'root_field_addition.test.log');
+
+describe('ZDT upgrades - introducing new root fields', () => {
+  let esServer: TestElasticsearchUtils['es'];
+
+  beforeAll(async () => {
+    await fs.unlink(logFilePath).catch(() => {});
+    esServer = await startElasticsearch();
+  });
+
+  afterAll(async () => {
+    await esServer?.stop();
+    await delay(10);
+  });
+
+  const baseMappings = {
+    dynamic: 'strict',
+    properties: {
+      type: {
+        type: 'keyword',
+      },
+      namespace: {
+        type: 'keyword',
+      },
+      coreMigrationVersion: {
+        type: 'keyword',
+      },
+      typeMigrationVersion: {
+        type: 'version',
+      },
+    },
+  };
+
+  const createBaseline = async () => {
+    mockGetBaseMappings.mockReturnValue(baseMappings);
+
+    const fooType = getFooType();
+    const { runMigrations } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      types: [fooType],
+    });
+    await runMigrations();
+  };
+
+  it('should support adding the new root fields', async () => {
+    await createBaseline();
+
+    const updatedMappings = {
+      ...baseMappings,
+      properties: {
+        ...baseMappings.properties,
+        someNewRootField: {
+          type: 'keyword',
+        },
+        anotherNewRootField: {
+          type: 'text',
+        },
+      },
+    };
+    mockGetBaseMappings.mockReturnValue(updatedMappings);
+
+    const fooType = getFooType();
+
+    const { runMigrations, client } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      logFilePath,
+      types: [fooType],
+    });
+
+    await runMigrations();
+
+    const records = await parseLogFile(logFilePath);
+
+    expect(records).toContainLogEntries(
+      [
+        'mapping version check result: greater',
+        'INIT -> UPDATE_INDEX_MAPPINGS',
+        'INDEX_STATE_UPDATE_DONE -> DOCUMENTS_UPDATE_INIT',
+        '-> DONE',
+        'Migration completed',
+      ],
+      { ordered: true }
+    );
+
+    const mappings = await client.indices.getMapping({ index: '.kibana_1' });
+
+    expect(mappings['.kibana_1'].mappings.properties).toEqual({
+      ...updatedMappings.properties,
+      foo: fooType.mappings,
+    });
+  });
+});

From 66af26285c401a33dac4e02ff558858d2af55b80 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Tue, 2 Apr 2024 08:27:43 -0400
Subject: [PATCH 17/63] [Security Solution][Endpoint] Change Response Actions
 client for SentinelOne to support Sub-Action new `UnsecuredActionsClient`
 (#179388)

## Summary

Changes are in support of Bi-Directional response actions and includes:

- `EndpointAppContextService.getInternalResponseActionsClient()` now
supports retrieving clients for non-endpoint EDR systems (ex.
SentinelOne)
- Refactored SentinelOne Response Actions Client and pulled logic around
using the Connector into its own class. This new class allows it to
normalize the use of connectors regardless of the Action plugin service
being used (`ActionClient` or `IUnsecuredActionsClient`)
- `CompleteExternalActionsTaskRunner` was adjust to ignore errors for
`agentType`'s that are not configured in the system (don't log useless
errors)
- The `run_sentinelone_host.js` script was enhanced to **not** create
multiple VMs running SentinelOne agent on them if one is already
running. A new CLI argument - `forceNewS1Host` - was also added to by
pass this behaviour and allow for a VM to always be created





### 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
---
 .../scripts/endpoint/common/fleet_services.ts |   4 +-
 .../scripts/endpoint/common/vm_services.ts    |  61 ++++++-
 .../endpoint/sentinelone_host/index.ts        |  65 ++++++--
 .../endpoint/endpoint_app_context_services.ts |  61 ++++---
 .../complete_external_actions_task.ts         |   6 +-
 ...plete_external_actions_task_runner.test.ts |  16 ++
 .../complete_external_actions_task_runner.ts  |  36 +++-
 .../server/endpoint/mocks.ts                  |   6 +-
 .../services/actions/clients/errors.ts        |  10 ++
 ...rmalized_external_connector_client.test.ts | 156 ++++++++++++++++++
 .../normalized_external_connector_client.ts   | 113 +++++++++++++
 .../services/actions/clients/mocks.ts         |  18 +-
 .../sentinel_one_actions_client.test.ts       |  46 +-----
 .../sentinel_one_actions_client.ts            |  87 +++-------
 .../security_solution/server/plugin.ts        |   1 +
 .../server/plugin_contract.ts                 |   2 +
 .../agent_type_support.ts                     |   2 +-
 17 files changed, 527 insertions(+), 163 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.test.ts
 create mode 100644 x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.ts

diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/fleet_services.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/fleet_services.ts
index c208e87ab166e..5a99dcc8322db 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/common/fleet_services.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/common/fleet_services.ts
@@ -517,7 +517,7 @@ export const getLatestAgentDownloadVersion = async (
   log?: ToolingLog
 ): Promise<string> => {
   const artifactsUrl = 'https://artifacts-api.elastic.co/v1/versions';
-  const semverMatch = `<=${version}`;
+  const semverMatch = `<=${version.replace(`-SNAPSHOT`, '')}`;
   const artifactVersionsResponse: { versions: string[] } = await nodeFetch(artifactsUrl).then(
     (response) => {
       if (!response.ok) {
@@ -551,6 +551,8 @@ export const getLatestAgentDownloadVersion = async (
     semverMatch
   );
 
+  log?.verbose(`Matched [${matchedVersion}] for .maxStatisfying(${semverMatch})`);
+
   if (!matchedVersion) {
     throw new Error(`Unable to find a semver version that meets ${semverMatch}`);
   }
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/vm_services.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/vm_services.ts
index 4209b554b2732..084e068768e8f 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/common/vm_services.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/common/vm_services.ts
@@ -170,15 +170,12 @@ export const generateVmName = (identifier: string = baseGenerator.randomUser()):
  * @param threshold
  */
 export const getMultipassVmCountNotice = async (threshold: number = 1): Promise<string> => {
-  const response = await execa.command(`multipass list --format=json`);
+  const listOfVMs = await findVm('multipass');
 
-  const output: { list: Array<{ ipv4: string; name: string; release: string; state: string }> } =
-    JSON.parse(response.stdout);
-
-  if (output.list.length > threshold) {
+  if (listOfVMs.data.length > threshold) {
     return `-----------------------------------------------------------------
 ${chalk.red('NOTE:')} ${chalk.bold(
-      chalk.red(`You currently have ${chalk.red(output.list.length)} VMs running.`)
+      chalk.red(`You currently have ${chalk.red(listOfVMs.data.length)} VMs running.`)
     )}
       Remember to delete those no longer being used.
       View running VMs: ${chalk.cyan('multipass list')}
@@ -378,3 +375,55 @@ export const getHostVmClient = (
     ? createVagrantHostVmClient(hostname, vagrantFile, log)
     : createMultipassHostVmClient(hostname, log);
 };
+
+/**
+ * Retrieve a list of running VM names
+ * @param type
+ * @param name
+ * @param log
+ */
+export const findVm = async (
+  type: SupportedVmManager,
+  /** Filter results by VM name */
+  name?: string | RegExp,
+  log: ToolingLog = createToolingLogger()
+): Promise<{ data: string[] }> => {
+  log.verbose(`Finding [${type}] VMs with name [${name}]`);
+
+  if (type === 'multipass') {
+    const list = JSON.parse((await execa.command(`multipass list --format json`)).stdout) as {
+      list: Array<{
+        ipv4: string[];
+        name: string;
+        release: string;
+        state: string;
+      }>;
+    };
+
+    log.verbose(`List of VM running:`, list);
+
+    if (!list.list || list.list.length === 0) {
+      return { data: [] };
+    }
+
+    return {
+      data: !name
+        ? list.list.map((vmEntry) => vmEntry.name)
+        : list.list.reduce((acc, vmEntry) => {
+            if (typeof name === 'string') {
+              if (vmEntry.name === name) {
+                acc.push(vmEntry.name);
+              }
+            } else {
+              if (name.test(vmEntry.name)) {
+                acc.push(vmEntry.name);
+              }
+            }
+
+            return acc;
+          }, [] as string[]),
+    };
+  }
+
+  throw new Error(`findVm() does not yet have support for [${type}]`);
+};
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/sentinelone_host/index.ts b/x-pack/plugins/security_solution/scripts/endpoint/sentinelone_host/index.ts
index 871d5bcf83606..2811fe9e57d09 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/sentinelone_host/index.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/sentinelone_host/index.ts
@@ -27,7 +27,13 @@ import {
   installSentinelOneAgent,
   S1Client,
 } from './common';
-import { createVm, generateVmName, getMultipassVmCountNotice } from '../common/vm_services';
+import {
+  createMultipassHostVmClient,
+  createVm,
+  findVm,
+  generateVmName,
+  getMultipassVmCountNotice,
+} from '../common/vm_services';
 import { createKbnClient } from '../common/stack_services';
 
 export const cli = async () => {
@@ -51,7 +57,7 @@ console and pushes the data to Elasticsearch.`,
         's1ApiToken',
         'vmName',
       ],
-      boolean: ['forceFleetServer'],
+      boolean: ['forceFleetServer', 'forceNewS1Host'],
       default: {
         kibanaUrl: 'http://127.0.0.1:5601',
         username: 'elastic',
@@ -69,6 +75,10 @@ console and pushes the data to Elasticsearch.`,
                           Default: re-uses existing dev policy (if found) or creates a new one
       --forceFleetServer  Optional. If fleet server should be started/configured even if it seems
                           like it is already setup.
+      --forceNewS1Host    Optional. Force a new VM host to be created and enrolled with SentinelOne.
+                          By default, a check is done to see if a host running SentinelOne is
+                          already running and if so, a new one will not be created - unless this
+                          option is used
       --username          Optional. User name to be used for auth against elasticsearch and
                           kibana (Default: elastic).
       --password          Optional. Password associated with the username (Default: changeme)
@@ -86,6 +96,7 @@ const runCli: RunFn = async ({ log, flags }) => {
   const s1ApiToken = flags.s1ApiToken as string;
   const policy = flags.policy as string;
   const forceFleetServer = flags.forceFleetServer as boolean;
+  const forceNewS1Host = flags.forceNewS1Host as boolean;
   const getRequiredArgMessage = (argName: string) => `${argName} argument is required`;
 
   createToolingLogger.setDefaultLogLevelFromCliFlags(flags);
@@ -102,22 +113,40 @@ const runCli: RunFn = async ({ log, flags }) => {
     password,
   });
 
-  const hostVm = await createVm({
-    type: 'multipass',
-    name: vmName,
-    log,
-    memory: '2G',
-    disk: '10G',
-  });
-
-  const s1Info = await installSentinelOneAgent({
-    hostVm,
-    log,
-    s1Client,
-  });
-
-  log.info(`SentinelOne Agent Status:
-${s1Info.status}`);
+  const runningS1VMs = (
+    await findVm(
+      'multipass',
+      flags.vmName ? vmName : new RegExp(`^${vmName.substring(0, vmName.lastIndexOf('-'))}`)
+    )
+  ).data;
+
+  // Avoid enrolling another VM with SentinelOne if we already have one running
+  const hostVm =
+    forceNewS1Host || runningS1VMs.length === 0
+      ? await createVm({
+          type: 'multipass',
+          name: vmName,
+          log,
+          memory: '2G',
+          disk: '10G',
+        }).then((vm) => {
+          return installSentinelOneAgent({
+            hostVm: vm,
+            log,
+            s1Client,
+          }).then((s1Info) => {
+            log.info(`SentinelOne Agent Status:\n${s1Info.status}`);
+
+            return vm;
+          });
+        })
+      : await Promise.resolve(createMultipassHostVmClient(runningS1VMs[0], log)).then((vm) => {
+          log.info(
+            `A host VM running SentinelOne Agent is already running - will reuse it.\nTIP: Use 'forceNewS1Host' to force the creation of a new one if desired`
+          );
+
+          return vm;
+        });
 
   const {
     id: agentPolicyId,
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 250ac6f9be599..fa435135681f1 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
@@ -23,9 +23,9 @@ import type {
 import type { PluginStartContract as AlertsPluginStartContract } from '@kbn/alerting-plugin/server';
 import type { CloudSetup } from '@kbn/cloud-plugin/server';
 import type { FleetActionsClientInterface } from '@kbn/fleet-plugin/server/services/actions/types';
-import { EndpointError } from '../../common/endpoint/errors';
+import type { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
 import type { ResponseActionsClient } from './services';
-import { EndpointActionsClient } from './services';
+import { getResponseActionsClient } from './services';
 import {
   getAgentPolicyCreateCallback,
   getAgentPolicyUpdateCallback,
@@ -54,7 +54,6 @@ import type { FeatureUsageService } from './services/feature_usage/service';
 import type { ExperimentalFeatures } from '../../common/experimental_features';
 import type { ProductFeaturesService } from '../lib/product_features_service/product_features_service';
 import type { ResponseActionAgentType } from '../../common/endpoint/service/response_actions/constants';
-
 export interface EndpointAppContextServiceSetupContract {
   securitySolutionRequestContextFactory: IRequestContextFactory;
   cloud: CloudSetup;
@@ -83,6 +82,7 @@ export interface EndpointAppContextServiceStartContract {
   esClient: ElasticsearchClient;
   productFeaturesService: ProductFeaturesService;
   savedObjectsClient: SavedObjectsClientContract;
+  connectorActions: ActionsPluginStartContract;
 }
 
 /**
@@ -276,34 +276,57 @@ export class EndpointAppContextService {
   public getInternalResponseActionsClient({
     agentType = 'endpoint',
     username = 'elastic',
+    taskId,
+    taskType,
   }: {
     agentType?: ResponseActionAgentType;
     username?: string;
+    /** Used with background task and needed for `UnsecuredActionsClient`  */
+    taskId?: string;
+    /** Used with background task and needed for `UnsecuredActionsClient`  */
+    taskType?: string;
   }): ResponseActionsClient {
     if (!this.startDependencies?.esClient) {
       throw new EndpointAppContentServicesNotStartedError();
     }
 
-    if (agentType !== `endpoint`) {
-      throw new EndpointError(
-        `Agent type [${agentType}] does not support usage of response actions via non-HTTP requests!`
-      );
+    let connectorActionsClient =
+      this.startDependencies.connectorActions.getUnsecuredActionsClient();
+
+    // If we have a task id and type, then call is coming from a background task and we need to use those
+    // values with the Action's plugin `UnsecuredActionsClient`'s `.execute()` method. To do so in a
+    // transparent way to the existing response action client, we create a Proxy here and trap the
+    // `GET execute` property and wrap it a function that will automatically inject this data into
+    // `execute()` calls
+    if (taskId && taskType) {
+      connectorActionsClient = new Proxy(connectorActionsClient, {
+        get(target, prop, receiver) {
+          if (prop === 'execute') {
+            return function (execArgs: Parameters<typeof connectorActionsClient['execute']>[0]) {
+              return target.execute({
+                ...execArgs,
+                relatedSavedObjects: [
+                  ...(execArgs.relatedSavedObjects ?? []),
+                  {
+                    id: taskId,
+                    type: taskType,
+                  },
+                ],
+              });
+            };
+          }
+
+          return Reflect.get(target, prop, receiver);
+        },
+      });
     }
 
-    // TODO:PT switch to using `getResponseActionsClient()` instead once we support getting internal versions of connectorsActions
-    // return getResponseActionsClient(agentType, {
-    //   endpointService: this,
-    //   esClient: this.startDependencies.esClient,
-    //   username: 'elastic',
-    //   isAutomated: true,
-    //   connectorActions: undefined, // FIXME:PT get internal client here
-    // });
-
-    return new EndpointActionsClient({
-      username,
-      esClient: this.startDependencies.esClient,
+    return getResponseActionsClient(agentType, {
       endpointService: this,
+      esClient: this.startDependencies.esClient,
+      username,
       isAutomated: true,
+      connectorActions: connectorActionsClient,
     });
   }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task.ts
index ba60fcc37a045..a9c81fbd69e2c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task.ts
@@ -98,10 +98,14 @@ export class CompleteExternalResponseActionsTask {
             );
           }
 
+          const { id: taskId, taskType } = taskInstance;
+
           return new CompleteExternalActionsTaskRunner(
             this.options.endpointAppContext.service,
             this.esClient,
-            this.taskInterval
+            this.taskInterval,
+            taskId,
+            taskType
           );
         },
       },
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.test.ts
index a5f7b3e1d14b5..90c392d450adf 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.test.ts
@@ -13,6 +13,7 @@ import { responseActionsClientMock } from '../../services/actions/clients/mocks'
 import { EndpointActionGenerator } from '../../../../common/endpoint/data_generators/endpoint_action_generator';
 import { ENDPOINT_ACTION_RESPONSES_INDEX } from '../../../../common/endpoint/constants';
 import { waitFor } from '@testing-library/react';
+import { ResponseActionsConnectorNotConfiguredError } from '../../services/actions/clients/errors';
 
 describe('CompleteExternalTaskRunner class', () => {
   let endpointContextServicesMock: ReturnType<typeof createMockEndpointAppContextService>;
@@ -52,6 +53,21 @@ describe('CompleteExternalTaskRunner class', () => {
     );
   });
 
+  it('should NOT log an error if agentType is not configured with a connector', async () => {
+    (endpointContextServicesMock.getInternalResponseActionsClient as jest.Mock).mockImplementation(
+      () => {
+        const clientMock = responseActionsClientMock.create();
+        (clientMock.processPendingActions as jest.Mock).mockImplementation(async () => {
+          throw new ResponseActionsConnectorNotConfiguredError('foo');
+        });
+        return clientMock;
+      }
+    );
+    await runnerInstance.run();
+
+    expect(endpointContextServicesMock.createLogger().error).not.toHaveBeenCalled();
+  });
+
   it('should call `processPendingAction` for each external agent type', async () => {
     await runnerInstance.run();
     const getInternalResponseActionsClientMock = (
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.ts b/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.ts
index c42127ad09cc1..bb6fcc0c897d7 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.ts
@@ -8,6 +8,7 @@
 import type { CancellableTask, RunContext, RunResult } from '@kbn/task-manager-plugin/server/task';
 import type { Logger, ElasticsearchClient } from '@kbn/core/server';
 import type { BulkRequest } from '@elastic/elasticsearch/lib/api/types';
+import { ResponseActionsConnectorNotConfiguredError } from '../../services/actions/clients/errors';
 import { catchAndWrapError } from '../../utils';
 import { stringify } from '../../utils/stringify';
 import { RESPONSE_ACTION_AGENT_TYPE } from '../../../../common/endpoint/service/response_actions/constants';
@@ -32,7 +33,9 @@ export class CompleteExternalActionsTaskRunner
   constructor(
     private readonly endpointContextServices: EndpointAppContextService,
     private readonly esClient: ElasticsearchClient,
-    private readonly nextRunInterval: string = '60s'
+    private readonly nextRunInterval: string = '60s',
+    private readonly taskId?: string,
+    private readonly taskType?: string
   ) {
     this.log = this.endpointContextServices.createLogger(
       // Adding a unique identifier to the end of the class name to help identify log entries related to this run
@@ -111,15 +114,30 @@ export class CompleteExternalActionsTaskRunner
             return null;
           }
 
-          // FIXME:PT need to implement logic that first checks if a given agent type is currently supported - like do we have what we need to "talk" to them?
-
           const agentTypeActionsClient =
-            this.endpointContextServices.getInternalResponseActionsClient({ agentType });
-
-          return agentTypeActionsClient.processPendingActions({
-            abortSignal: this.abortController.signal,
-            addToQueue: this.updatesQueue.addToQueue.bind(this.updatesQueue),
-          });
+            this.endpointContextServices.getInternalResponseActionsClient({
+              agentType,
+              taskType: this.taskType,
+              taskId: this.taskId,
+            });
+
+          return agentTypeActionsClient
+            .processPendingActions({
+              abortSignal: this.abortController.signal,
+              addToQueue: this.updatesQueue.addToQueue.bind(this.updatesQueue),
+            })
+            .catch((err) => {
+              // ignore errors due to connector not being configured - no point in logging errors if a customer
+              // is not using response actions for the given agent type
+              if (err instanceof ResponseActionsConnectorNotConfiguredError) {
+                this.log.debug(
+                  `Skipping agentType [${agentType}]: No stack connector configured for this agent type`
+                );
+                return null;
+              }
+
+              this.errors.push(err.message);
+            });
         }
       )
     );
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index 344d3bbd1f2f9..f3d39737a7cf2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -46,6 +46,8 @@ import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-m
 import { casesPluginMock } from '@kbn/cases-plugin/server/mocks';
 import { createCasesClientMock } from '@kbn/cases-plugin/server/client/mocks';
 import type { AddVersionOpts, VersionedRouteConfig } from '@kbn/core-http-server';
+import { unsecuredActionsClientMock } from '@kbn/actions-plugin/server/unsecured_actions_client/unsecured_actions_client.mock';
+import type { PluginStartContract } from '@kbn/actions-plugin/server';
 import { responseActionsClientMock } from './services/actions/clients/mocks';
 import { getEndpointAuthzInitialStateMock } from '../../common/endpoint/service/authz/mocks';
 import { createMockConfig, requestContextMock } from '../lib/detection_engine/routes/__mocks__';
@@ -72,7 +74,6 @@ import { EndpointFleetServicesFactory } from './services/fleet';
 import { createLicenseServiceMock } from '../../common/license/mocks';
 import { createFeatureUsageServiceMock } from './services/feature_usage/mocks';
 import { createProductFeaturesServiceMock } from '../lib/product_features_service/mocks';
-
 /**
  * Creates a mocked EndpointAppContext.
  */
@@ -229,6 +230,9 @@ export const createMockEndpointAppContextServiceStartContract =
       esClient: elasticsearchClientMock.createElasticsearchClient(),
       productFeaturesService,
       savedObjectsClient: savedObjectsClientMock.create(),
+      connectorActions: {
+        getUnsecuredActionsClient: jest.fn().mockReturnValue(unsecuredActionsClientMock.create()),
+      } as unknown as jest.Mocked<PluginStartContract>,
     };
   };
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/errors.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/errors.ts
index 2e644f9a3a760..d79986e899fe0 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/errors.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/errors.ts
@@ -44,3 +44,13 @@ export class UnsupportedResponseActionsAgentTypeError extends ResponseActionsCli
     super(message, statusCode, meta);
   }
 }
+
+export class ResponseActionsConnectorNotConfiguredError extends ResponseActionsClientError {
+  constructor(
+    connectorTypeId: string,
+    public readonly statusCode: number = 400,
+    public readonly meta?: unknown
+  ) {
+    super(`No stack connector instance configured for [${connectorTypeId}]`, statusCode, meta);
+  }
+}
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.test.ts
new file mode 100644
index 0000000000000..5c9d6154226e8
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.test.ts
@@ -0,0 +1,156 @@
+/*
+ * 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 { ActionsClientMock } from '@kbn/actions-plugin/server/actions_client/actions_client.mock';
+import { responseActionsClientMock } from '../mocks';
+import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
+import type { Logger } from '@kbn/logging';
+import type { NormalizedExternalConnectorClientExecuteOptions } from './normalized_external_connector_client';
+import { NormalizedExternalConnectorClient } from './normalized_external_connector_client';
+import { ResponseActionsConnectorNotConfiguredError } from '../errors';
+import type { IUnsecuredActionsClient } from '@kbn/actions-plugin/server';
+import { unsecuredActionsClientMock } from '@kbn/actions-plugin/server/unsecured_actions_client/unsecured_actions_client.mock';
+
+describe('`NormalizedExternalConnectorClient` class', () => {
+  let logger: Logger;
+  let executeInputOptions: NormalizedExternalConnectorClientExecuteOptions;
+
+  beforeEach(() => {
+    logger = loggingSystemMock.create().get('mock');
+    executeInputOptions = { params: { subAction: 'sub-action-1', subActionParams: {} } };
+  });
+
+  describe('#getConnectorInstance()', () => {
+    let actionPluginConnectorClient: ActionsClientMock;
+
+    beforeEach(() => {
+      actionPluginConnectorClient = responseActionsClientMock.createConnectorActionsClient({
+        getAllResponse: [responseActionsClientMock.createConnector({ actionTypeId: 'foo' })],
+      });
+    });
+
+    it('should search for the connector when first API call is done', async () => {
+      const testInstance = new NormalizedExternalConnectorClient(
+        'foo',
+        actionPluginConnectorClient,
+        logger
+      );
+
+      expect(actionPluginConnectorClient.getAll).not.toHaveBeenCalled();
+
+      await testInstance.execute({ params: { subAction: 'sub-action-1', subActionParams: {} } });
+
+      expect(actionPluginConnectorClient.getAll).toHaveBeenCalledTimes(1);
+
+      // Subsequent calls to `.execute()` should not trigger logic to find Connector instance again
+      await testInstance.execute(executeInputOptions);
+
+      expect(actionPluginConnectorClient.getAll).toHaveBeenCalledTimes(1);
+    });
+
+    it('should error if unable to retrieve all connector instances (`.getAll()`) ', async () => {
+      (actionPluginConnectorClient.getAll as jest.Mock).mockImplementation(async () => {
+        throw new Error('oh oh');
+      });
+      const testInstance = new NormalizedExternalConnectorClient(
+        'foo',
+        actionPluginConnectorClient,
+        logger
+      );
+      const executePromise = testInstance.execute(executeInputOptions);
+
+      await expect(executePromise).rejects.toHaveProperty(
+        'message',
+        'Unable to retrieve list of stack connectors in order to find one for [foo]: oh oh'
+      );
+      await expect(executePromise).rejects.toHaveProperty('statusCode', 400);
+    });
+
+    it.each([
+      ['is not defined', () => []],
+      [
+        'is deprecated',
+        () => [
+          responseActionsClientMock.createConnector({ actionTypeId: 'foo', isDeprecated: true }),
+        ],
+      ],
+      [
+        'is missing secrets',
+        () => [
+          responseActionsClientMock.createConnector({
+            actionTypeId: 'foo',
+            isMissingSecrets: true,
+          }),
+        ],
+      ],
+    ])('should error if a connector instance %s', async (_, getResponse) => {
+      (actionPluginConnectorClient.getAll as jest.Mock).mockResolvedValue(getResponse());
+      const testInstance = new NormalizedExternalConnectorClient(
+        'foo',
+        actionPluginConnectorClient,
+        logger
+      );
+      const executePromise = testInstance.execute(executeInputOptions);
+
+      await expect(executePromise).rejects.toEqual(
+        new ResponseActionsConnectorNotConfiguredError('foo')
+      );
+    });
+  });
+
+  describe('with ActionClient', () => {
+    let actionPluginConnectorClient: ActionsClientMock;
+
+    beforeEach(() => {
+      actionPluginConnectorClient = responseActionsClientMock.createConnectorActionsClient({
+        getAllResponse: [responseActionsClientMock.createConnector({ actionTypeId: 'foo' })],
+      });
+    });
+
+    it('should call Action Plugin client `.execute()` with expected arguments', async () => {
+      const testInstance = new NormalizedExternalConnectorClient(
+        'foo',
+        actionPluginConnectorClient,
+        logger
+      );
+      await testInstance.execute(executeInputOptions);
+
+      expect(actionPluginConnectorClient.execute).toHaveBeenCalledWith({
+        actionId: 'connector-mock-id-1',
+        params: executeInputOptions.params,
+      });
+    });
+  });
+
+  describe('with IUnsecuredActionsClient', () => {
+    let actionPluginConnectorClient: IUnsecuredActionsClient;
+
+    beforeEach(() => {
+      actionPluginConnectorClient = unsecuredActionsClientMock.create();
+
+      (actionPluginConnectorClient.getAll as jest.Mock).mockResolvedValue([
+        responseActionsClientMock.createConnector({ actionTypeId: 'foo' }),
+      ]);
+    });
+
+    it('should call Action Plugin client `.execute()` with expected arguments', async () => {
+      const testInstance = new NormalizedExternalConnectorClient(
+        'foo',
+        actionPluginConnectorClient,
+        logger
+      );
+      await testInstance.execute(executeInputOptions);
+
+      expect(actionPluginConnectorClient.execute).toHaveBeenCalledWith({
+        id: 'connector-mock-id-1',
+        requesterId: 'background_task',
+        spaceId: 'default',
+        params: executeInputOptions.params,
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.ts
new file mode 100644
index 0000000000000..2c0647b43ad73
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.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.
+ */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import type { IUnsecuredActionsClient, ActionsClient } from '@kbn/actions-plugin/server';
+import type { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
+import type { Logger } from '@kbn/logging';
+import type { ConnectorWithExtraFindData } from '@kbn/actions-plugin/server/application/connector/types';
+import { once } from 'lodash';
+import { stringify } from '../../../../utils/stringify';
+import { ResponseActionsClientError, ResponseActionsConnectorNotConfiguredError } from '../errors';
+
+export interface NormalizedExternalConnectorClientExecuteOptions<
+  TParams extends Record<string, any> = Record<string, any>,
+  TSubAction = unknown
+> {
+  params: {
+    subAction: TSubAction;
+    subActionParams: TParams;
+  };
+  spaceId?: string;
+}
+
+/**
+ * Handles setting up the usage of Stack Connectors for Response Actions and normalizes usage of
+ * Connector's Sub-Actions plugin between the `ActionsClient` and the `IUnsecuredActionsClient`
+ * client interfaces. It also provides better typing support.
+ */
+export class NormalizedExternalConnectorClient {
+  protected readonly getConnectorInstance: () => Promise<ConnectorWithExtraFindData>;
+
+  constructor(
+    protected readonly connectorTypeId: string,
+    protected readonly connectorsClient: ActionsClient | IUnsecuredActionsClient,
+    protected readonly log: Logger
+  ) {
+    this.getConnectorInstance = once(async () => {
+      let connectorList: ConnectorWithExtraFindData[] = [];
+
+      try {
+        connectorList = await this.getAll();
+      } catch (err) {
+        throw new ResponseActionsClientError(
+          `Unable to retrieve list of stack connectors in order to find one for [${this.connectorTypeId}]: ${err.message}`,
+          // failure here is likely due to Authz, but because we don't have a good way to determine that,
+          // the `statusCode` below is set to `400` instead of `401`.
+          400,
+          err
+        );
+      }
+      const connector = connectorList.find(({ actionTypeId, isDeprecated, isMissingSecrets }) => {
+        return actionTypeId === this.connectorTypeId && !isDeprecated && !isMissingSecrets;
+      });
+
+      if (!connector) {
+        this.log.debug(stringify(connectorList));
+        throw new ResponseActionsConnectorNotConfiguredError(this.connectorTypeId);
+      }
+
+      this.log.debug(
+        `Using [${this.connectorTypeId}] stack connector: "${connector.name}" (ID: ${connector.id})`
+      );
+
+      return connector;
+    });
+  }
+
+  private isUnsecuredActionsClient(
+    client: ActionsClient | IUnsecuredActionsClient
+  ): client is IUnsecuredActionsClient {
+    // The methods below only exist in the normal `ActionsClient`
+    return !('create' in client) && !('delete' in client) && !('update' in client);
+  }
+
+  public async execute<
+    TResponse = unknown,
+    TParams extends Record<string, any> = Record<string, any>
+  >({
+    spaceId = 'default',
+    params,
+  }: NormalizedExternalConnectorClientExecuteOptions<TParams>): Promise<
+    ActionTypeExecutorResult<TResponse>
+  > {
+    const { id: connectorId } = await this.getConnectorInstance();
+
+    if (this.isUnsecuredActionsClient(this.connectorsClient)) {
+      return this.connectorsClient.execute({
+        requesterId: 'background_task',
+        id: connectorId,
+        spaceId,
+        params,
+      }) as Promise<ActionTypeExecutorResult<TResponse>>;
+    }
+
+    return this.connectorsClient.execute({
+      actionId: connectorId,
+      params,
+    }) as Promise<ActionTypeExecutorResult<TResponse>>;
+  }
+
+  protected async getAll(spaceId: string = 'default'): ReturnType<ActionsClient['getAll']> {
+    if (this.isUnsecuredActionsClient(this.connectorsClient)) {
+      return this.connectorsClient.getAll(spaceId);
+    }
+
+    return this.connectorsClient.getAll();
+  }
+}
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/mocks.ts
index 62e13de5002b3..39497e18f18e3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/mocks.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import type { ActionsClientMock } from '@kbn/actions-plugin/server/actions_client/actions_client.mock';
 import { actionsClientMock } from '@kbn/actions-plugin/server/actions_client/actions_client.mock';
 import type { ConnectorWithExtraFindData } from '@kbn/actions-plugin/server/application/connector/types';
 import type { DeepPartial } from 'utility-types';
@@ -252,6 +253,20 @@ const createConnectorActionExecuteResponseMock = <TData>(
   return merge(result, overrides);
 };
 
+const createConnectorActionsClientMock = ({
+  getAllResponse,
+}: {
+  getAllResponse?: ConnectorWithExtraFindData[];
+} = {}): ActionsClientMock => {
+  const client = actionsClientMock.create();
+
+  (client.getAll as jest.Mock).mockImplementation(async () => {
+    return getAllResponse ?? [];
+  });
+
+  return client;
+};
+
 export const responseActionsClientMock = Object.freeze({
   create: createResponseActionClientMock,
   createConstructorOptions: createConstructorOptionsMock,
@@ -268,7 +283,8 @@ export const responseActionsClientMock = Object.freeze({
   createIndexedResponse: createEsIndexTransportResponseMock,
 
   // Some common mocks when working with connector actions
-  createConnectorActionsClient: actionsClientMock.create,
+  createConnectorActionsClient: createConnectorActionsClientMock,
+  /** Create a mock connector instance */
   createConnector: createConnectorMock,
   createConnectorActionExecuteResponse: createConnectorActionExecuteResponseMock,
 });
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.test.ts
index 0fdd9612bdaa2..b2e521060edfc 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.test.ts
@@ -9,7 +9,7 @@ import type { ResponseActionsClient } from '../lib/types';
 import { responseActionsClientMock } from '../mocks';
 import { SentinelOneActionsClient } from './sentinel_one_actions_client';
 import { getActionDetailsById as _getActionDetailsById } from '../../action_details_by_id';
-import { ResponseActionsClientError, ResponseActionsNotSupportedError } from '../errors';
+import { ResponseActionsNotSupportedError } from '../errors';
 import type { ActionsClientMock } from '@kbn/actions-plugin/server/actions_client/actions_client.mock';
 import type { SentinelOneActionsClientOptionsMock } from './mocks';
 import { sentinelOneMock } from './mocks';
@@ -64,50 +64,6 @@ describe('SentinelOneActionsClient class', () => {
     }
   );
 
-  it('should error if unable to retrieve list of connectors', async () => {
-    connectorActionsMock.getAll.mockImplementation(async () => {
-      throw new Error('oh oh');
-    });
-    const responsePromise = s1ActionsClient.isolate(createS1IsolationOptions());
-
-    await expect(responsePromise).rejects.toBeInstanceOf(ResponseActionsClientError);
-    await expect(responsePromise).rejects.toHaveProperty(
-      'message',
-      expect.stringContaining('Unable to retrieve list of stack connectors:')
-    );
-    await expect(responsePromise).rejects.toHaveProperty('statusCode', 400);
-  });
-
-  it('should error if retrieving connectors fails', async () => {
-    (connectorActionsMock.getAll as jest.Mock).mockImplementation(async () => {
-      throw new Error('oh oh');
-    });
-
-    await expect(s1ActionsClient.isolate(createS1IsolationOptions())).rejects.toMatchObject({
-      message: `Unable to retrieve list of stack connectors: oh oh`,
-      statusCode: 400,
-    });
-  });
-
-  it.each([
-    ['no connector defined', async () => []],
-    [
-      'deprecated connector',
-      async () => [responseActionsClientMock.createConnector({ isDeprecated: true })],
-    ],
-    [
-      'missing secrets',
-      async () => [responseActionsClientMock.createConnector({ isMissingSecrets: true })],
-    ],
-  ])('should error if: %s', async (_, getAllImplementation) => {
-    (connectorActionsMock.getAll as jest.Mock).mockImplementation(getAllImplementation);
-
-    await expect(s1ActionsClient.isolate(createS1IsolationOptions())).rejects.toMatchObject({
-      message: `No SentinelOne stack connector found`,
-      statusCode: 400,
-    });
-  });
-
   it('should error if multiple agent ids are received', async () => {
     const payload = createS1IsolationOptions();
     payload.endpoint_ids.push('second-host-id');
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.ts
index b0c6dd6c0211f..ac40e5726997c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.ts
@@ -5,78 +5,49 @@
  * 2.0.
  */
 
-import type { ActionsClient } from '@kbn/actions-plugin/server';
+import type { ActionsClient, IUnsecuredActionsClient } from '@kbn/actions-plugin/server';
 import {
   SENTINELONE_CONNECTOR_ID,
   SUB_ACTION,
 } from '@kbn/stack-connectors-plugin/common/sentinelone/constants';
-import type { ConnectorWithExtraFindData } from '@kbn/actions-plugin/server/application/connector/types';
-import { once } from 'lodash';
 import type { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import type {
-  SentinelOneGetAgentsResponse,
   SentinelOneGetAgentsParams,
+  SentinelOneGetAgentsResponse,
 } from '@kbn/stack-connectors-plugin/common/sentinelone/types';
+import type { NormalizedExternalConnectorClientExecuteOptions } from '../lib/normalized_external_connector_client';
+import { NormalizedExternalConnectorClient } from '../lib/normalized_external_connector_client';
 import type {
   CommonResponseActionMethodOptions,
   ProcessPendingActionsMethodOptions,
 } from '../../..';
 import type { ResponseActionAgentType } from '../../../../../../common/endpoint/service/response_actions/constants';
-import type { SentinelOneConnectorExecuteOptions } from './types';
 import { stringify } from '../../../../utils/stringify';
 import { ResponseActionsClientError } from '../errors';
 import type { ActionDetails, LogsEndpointAction } from '../../../../../../common/endpoint/types';
 import type { IsolationRouteRequestBody } from '../../../../../../common/api/endpoint';
 import type {
   ResponseActionsClientOptions,
-  ResponseActionsClientWriteActionRequestToEndpointIndexOptions,
   ResponseActionsClientValidateRequestResponse,
+  ResponseActionsClientWriteActionRequestToEndpointIndexOptions,
 } from '../lib/base_response_actions_client';
 import { ResponseActionsClientImpl } from '../lib/base_response_actions_client';
 
 export type SentinelOneActionsClientOptions = ResponseActionsClientOptions & {
-  connectorActions: ActionsClient;
+  connectorActions: ActionsClient | IUnsecuredActionsClient;
 };
 
 export class SentinelOneActionsClient extends ResponseActionsClientImpl {
   protected readonly agentType: ResponseActionAgentType = 'sentinel_one';
-  private readonly connectorActionsClient: ActionsClient;
-  private readonly getConnector: () => Promise<ConnectorWithExtraFindData>;
+  private readonly connectorActionsClient: NormalizedExternalConnectorClient;
 
   constructor({ connectorActions, ...options }: SentinelOneActionsClientOptions) {
     super(options);
-    this.connectorActionsClient = connectorActions;
-
-    this.getConnector = once(async () => {
-      let connectorList: ConnectorWithExtraFindData[] = [];
-
-      try {
-        connectorList = await this.connectorActionsClient.getAll();
-      } catch (err) {
-        throw new ResponseActionsClientError(
-          `Unable to retrieve list of stack connectors: ${err.message}`,
-          // failure here is likely due to Authz, but because we don't have a good way to determine that,
-          // the `statusCode` below is set to `400` instead of `401`.
-          400,
-          err
-        );
-      }
-      const connector = connectorList.find(({ actionTypeId, isDeprecated, isMissingSecrets }) => {
-        return actionTypeId === SENTINELONE_CONNECTOR_ID && !isDeprecated && !isMissingSecrets;
-      });
-
-      if (!connector) {
-        throw new ResponseActionsClientError(
-          `No SentinelOne stack connector found`,
-          400,
-          connectorList
-        );
-      }
-
-      this.log.debug(`Using SentinelOne stack connector: ${connector.name} (${connector.id})`);
-
-      return connector;
-    });
+    this.connectorActionsClient = new NormalizedExternalConnectorClient(
+      SENTINELONE_CONNECTOR_ID,
+      connectorActions,
+      this.log
+    );
   }
 
   protected async writeActionRequestToEndpointIndex(
@@ -101,9 +72,7 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
     actionType: SUB_ACTION,
     actionParams: object
   ): Promise<ActionTypeExecutorResult<unknown>> {
-    const { id: connectorId } = await this.getConnector();
     const executeOptions: Parameters<typeof this.connectorActionsClient.execute>[0] = {
-      actionId: connectorId,
       params: {
         subAction: actionType,
         subActionParams: actionParams,
@@ -133,10 +102,12 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
     return actionSendResponse;
   }
 
+  /** Gets agent details directly from SentinelOne */
   private async getAgentDetails(id: string): Promise<SentinelOneGetAgentsResponse['data'][number]> {
-    const { id: connectorId } = await this.getConnector();
-    const executeOptions: SentinelOneConnectorExecuteOptions<SentinelOneGetAgentsParams> = {
-      actionId: connectorId,
+    const executeOptions: NormalizedExternalConnectorClientExecuteOptions<
+      SentinelOneGetAgentsParams,
+      SUB_ACTION
+    > = {
       params: {
         subAction: SUB_ACTION.GET_AGENTS,
         subActionParams: {
@@ -145,23 +116,15 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
       },
     };
 
-    let s1ApiResponse: SentinelOneGetAgentsResponse | undefined;
-
-    try {
-      const response = (await this.connectorActionsClient.execute(
+    const s1ApiResponse: SentinelOneGetAgentsResponse | undefined = (
+      (await this.connectorActionsClient.execute(
         executeOptions
-      )) as ActionTypeExecutorResult<SentinelOneGetAgentsResponse>;
+      )) as ActionTypeExecutorResult<SentinelOneGetAgentsResponse>
+    ).data;
 
-      this.log.debug(`Response for SentinelOne agent id [${id}] returned:\n${stringify(response)}`);
-
-      s1ApiResponse = response.data;
-    } catch (err) {
-      throw new ResponseActionsClientError(
-        `Error while attempting to retrieve SentinelOne host with agent id [${id}]`,
-        500,
-        err
-      );
-    }
+    this.log.debug(
+      `Response for SentinelOne agent id [${id}] returned:\n${stringify(s1ApiResponse)}`
+    );
 
     if (!s1ApiResponse || !s1ApiResponse.data[0]) {
       throw new ResponseActionsClientError(`SentinelOne agent id [${id}] not found`, 404);
@@ -309,5 +272,7 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
     // if (abortSignal.aborted) {
     //   return;
     // }
+    // Dev test entry below
+    // await this.getAgentDetails('123').catch(() => {});
   }
 }
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index ec0e3cb16160c..4fd430038bc4e 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -645,6 +645,7 @@ export class Plugin implements ISecuritySolutionPlugin {
       esClient: core.elasticsearch.client.asInternalUser,
       productFeaturesService,
       savedObjectsClient,
+      connectorActions: plugins.actions,
     });
 
     if (plugins.taskManager) {
diff --git a/x-pack/plugins/security_solution/server/plugin_contract.ts b/x-pack/plugins/security_solution/server/plugin_contract.ts
index 1a0dd6bccc15c..e441b0d3f5e03 100644
--- a/x-pack/plugins/security_solution/server/plugin_contract.ts
+++ b/x-pack/plugins/security_solution/server/plugin_contract.ts
@@ -42,6 +42,7 @@ import type { SharePluginStart } from '@kbn/share-plugin/server';
 import type { GuidedOnboardingPluginSetup } from '@kbn/guided-onboarding-plugin/server';
 import type { PluginSetup as UnifiedSearchServerPluginSetup } from '@kbn/unified-search-plugin/server';
 import type { ElasticAssistantPluginStart } from '@kbn/elastic-assistant-plugin/server';
+import type { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
 import type { ProductFeaturesService } from './lib/product_features_service/product_features_service';
 import type { ExperimentalFeatures } from '../common';
 
@@ -84,6 +85,7 @@ export interface SecuritySolutionPluginStartDependencies {
   taskManager?: TaskManagerPluginStart;
   telemetry?: TelemetryPluginStart;
   share: SharePluginStart;
+  actions: ActionsPluginStartContract;
 }
 
 export interface SecuritySolutionPluginSetup {
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_response_actions/agent_type_support.ts b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_response_actions/agent_type_support.ts
index 2be0752f62475..87167a8926030 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_response_actions/agent_type_support.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/endpoint_response_actions/agent_type_support.ts
@@ -25,7 +25,7 @@ export default function ({ getService }: FtrProviderContext) {
           .expect(400, {
             statusCode: 400,
             error: 'Bad Request',
-            message: 'No SentinelOne stack connector found',
+            message: 'No stack connector instance configured for [.sentinelone]',
           });
       });
     });

From 61b80ca4e14d0713f22c574d7bc8c0894260cf45 Mon Sep 17 00:00:00 2001
From: Tre <wayne.seymour@elastic.co>
Date: Tue, 2 Apr 2024 13:34:32 +0100
Subject: [PATCH 18/63] [Serverless] validate response (#179794)

## Summary

Assertions were failing on
[serverless](https://buildkite.com/elastic/appex-qa-serverless-kibana-ftr-tests/builds/1339).

So use helper methods to print out more info
in case of failure.
---
 .../common/management/data_views/serverless.ts      | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/x-pack/test_serverless/functional/test_suites/common/management/data_views/serverless.ts b/x-pack/test_serverless/functional/test_suites/common/management/data_views/serverless.ts
index bf7b6b4115d6c..83f70a465a49e 100644
--- a/x-pack/test_serverless/functional/test_suites/common/management/data_views/serverless.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/management/data_views/serverless.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import expect from 'expect';
 import { DATA_VIEW_PATH } from '@kbn/data-views-plugin/server';
 import { ELASTIC_HTTP_VERSION_HEADER } from '@kbn/core-http-common';
 import { INITIAL_REST_VERSION } from '@kbn/data-views-plugin/server/constants';
@@ -19,6 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
   const testSubjects = getService('testSubjects');
+  const svlCommonApi = getService('svlCommonApi');
 
   describe('Serverless tests', function () {
     describe('disables scripted fields', function () {
@@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       before(async () => {
         await esArchiver.load(archivePath);
 
-        const response = await supertest
+        const { body, status } = await supertest
           .post(DATA_VIEW_PATH)
           .set('kbn-xsrf', 'some-xsrf-token')
           .send({
@@ -37,8 +37,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             override: true,
           });
 
-        expect(response.status).toBe(200);
-        dataViewId = response.body.data_view.id;
+        svlCommonApi.assertResponseStatusCode(200, status, body);
+        dataViewId = body.data_view.id;
       });
 
       after(async () => {
@@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
         );
 
-        const response = await supertest
+        const { body, status } = await supertest
           .post(DATA_VIEW_PATH)
           .set('kbn-xsrf', 'some-xsrf-token')
           .send({
@@ -76,7 +76,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             override: true,
           })
           .set(ELASTIC_HTTP_VERSION_HEADER, INITIAL_REST_VERSION);
-        dataViewId = response.body.data_view.id;
+        svlCommonApi.assertResponseStatusCode(200, status, body);
+        dataViewId = body.data_view.id;
       });
 
       after(async () => {

From 883beee4dffd757fa8f1f7ac541b0457d92ba1ba Mon Sep 17 00:00:00 2001
From: Michael Olorunnisola <michael.olorunnisola@elastic.co>
Date: Tue, 2 Apr 2024 08:34:51 -0400
Subject: [PATCH 19/63] [Security Solution] Integrate Vanilla Unified Data
 Table in Timeline (#176064)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Fixes below issues

- https://github.com/elastic/security-team/issues/8726
- https://github.com/elastic/security-team/issues/7234

## Details

### Objective

The objective of this PR is to implement basic unified data table
replacing the current timeline table. It is intended to behave exactly
like discover table. Below are the functionalities of the timeline table
that are out of scope of this PR and will be included in the follow up
PR.

|Before|After|
|---|---|
|<video
src="https://github.com/elastic/kibana/assets/7485038/fd8e4a42-06ed-4705-96cf-3ed0a22caa46"
/>|<video
src="https://github.com/elastic/kibana/assets/7485038/d248856f-dcc0-4d5b-a710-b1218a4898f5"
/>|

This feature can be enabled with below feature flag:

```yaml
xpack.securitySolution.enableExperimental:
  - unifiedComponentsInTimelineEnabled

```

### Out of scope functionalities
- Row Renderers - https://github.com/elastic/security-team/issues/8728
- Notes / Pinned Events / Analyzer / Session View Link -
https://github.com/elastic/security-team/issues/8727
- Drag / Drop from table --> data providers.
- Telemetry

### Desk Testing Guide

Below are some areas which have changes and would warrant some desk
testing.

One pre-requisite is to enable feature flag
`unifiedComponentsInTimelineEnabled` which will replace traditional
timeline table with the new unified timeline table.

1. **Pagination**
- If total number of events are > sample size ( default 500 ), table
footer on last page should display the notification so that user can
`Load More` on-demand.
- Page changes should be instant, because it is just client-side
pagination where we download multiple pages ( 500 events ) at once.
3. **Flyouts**
    - Event Detail ( Open / Close ) - should be new Expandable flyout
    - Host / User / IP details flyout ( Open / Close)
4. Unified List
    - Add column by dragging & by clicking ⨁ control.
- Remove columns by clicking on column header & by clicking on ❌ control
3. Full screen mode
6. Last updated date
7. Columns Order
    - Change columns order from table controls
8. Sort Order
    - timestamp
    - Any number column
    - Any string column
9. Column Actions
    - Move Right/Left
    - Sort Asc/Desc
    - Copy Column and Column Name
    - Edit Data View Field with custom label
8. Table Control - Display Options
- <img width="517" alt="image"
src="https://github.com/elastic/kibana/assets/7485038/efd4514a-20f1-4461-8686-78366bc9a611">
    - Try different row heights and Sample sizes.


## Current Observations of Unified table vis-a-vis discover UI + Issues
- [ ] Discover has custom UI on toolbar visibility when compared to
vanilla unified data table
- [x] Full screen behaviour of unified data table
- [x] column width calculation is not automatic.
    - [x] Unsaved Timeline
    - [x] Saved Timeline
- [x] Host/Network Flyout is not opening when timeline is not saved
    - [x] Flyout is not closing after it has been opened
- [ ] Row highlighting for building block -> Will be covered with
Actions Column
- [x] Additional Controls
   - [x] Row Renderer Selection
   - [x] Last updated Date
   - [x] Full Screen
 - [ ] Table controls tab order
- [ ] Refactor singleton ActiveTimeline class ( Inform @PhilippeOberti )
 - [ ] Total Count not visible

### 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
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] 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)

---------

Co-authored-by: Jatin Kathuria <jatin.kathuria@elastic.co>
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 ...use_data_grid_column_cell_actions.test.tsx |  64 +-
 .../src/components/data_table.scss            |   8 +
 .../src/components/data_table.test.tsx        |  43 +-
 .../src/components/data_table.tsx             |  17 +-
 .../data_table_document_selection.tsx         |   5 +-
 .../components/data_table_expand_button.tsx   |   7 +-
 .../src/utils/get_render_cell_value.tsx       |  31 +-
 .../field_list_sidebar.tsx                    |   1 +
 .../field_list_sidebar_container.tsx          | 483 ++++++------
 .../application/context/context_app.scss      |   2 +-
 test/functional/services/data_grid.ts         |   4 +-
 .../common/experimental_features.ts           |  25 +-
 .../drag_drop_context_wrapper.test.tsx.snap   |  15 +
 .../markdown_editor/plugins/insight/index.tsx |  16 +-
 .../plugins/insight/use_insight_query.ts      |   9 +-
 .../use_get_sourcerer_data_view.test.ts       |  59 ++
 .../sourcerer/use_get_sourcerer_data_view.tsx |  41 +
 .../with_data_view/data_view_error.tsx        |  22 +
 .../components/with_data_view/index.test.tsx  |  57 ++
 .../components/with_data_view/index.tsx       |  45 ++
 .../components/with_data_view/translations.ts |  23 +
 .../public/common/containers/source/mock.ts   |  53 +-
 .../common/containers/sourcerer/mocks.ts      |  22 +-
 .../__mocks__/use_experimental_features.ts    |  19 +
 .../timeline/use_init_timeline_url_param.ts   |   7 +-
 ...query_timeline_by_id_on_url_change.test.ts |   2 +
 .../use_query_timeline_by_id_on_url_change.ts |  16 +-
 .../common/lib/kibana/kibana_react.mock.ts    |  43 +-
 .../public/common/mock/global_state.ts        |   5 +-
 .../public/common/mock/timeline_results.ts    |   3 +
 .../utils/timeline/use_timeline_click.tsx     |   8 +-
 .../alerts_histogram_panel/index.test.tsx     |  15 +-
 .../components/alerts_table/actions.test.tsx  |   2 +
 .../components/alerts_table/actions.tsx       |   2 +-
 .../use_investigate_in_timeline.tsx           |  14 +-
 .../rules/use_rule_from_timeline.test.ts      |   1 +
 .../rules/use_rule_from_timeline.tsx          |   8 +-
 .../components/recent_timelines/index.tsx     |   8 +-
 .../edit_data_provider/helpers.test.tsx       |   1 +
 .../actions/new_timeline_button.test.tsx      |   2 +
 .../components/new_timeline/index.test.tsx    |   2 +
 .../components/open_timeline/helpers.test.ts  | 169 +++++
 .../components/open_timeline/helpers.ts       |  45 +-
 .../components/open_timeline/index.tsx        |  18 +-
 .../timelines/components/side_panel/index.tsx |  12 +-
 .../__snapshots__/index.test.tsx.snap         |  15 +
 .../body/column_headers/helpers.test.ts       |  12 +
 .../components/timeline/body/constants.ts     |   2 +
 .../body/renderers/formatted_field.tsx        |  10 +-
 .../renderers/formatted_field_udt.test.tsx    |  41 +
 .../body/renderers/formatted_field_udt.tsx    |  50 ++
 .../body/unified_timeline_body.test.tsx       | 119 +++
 .../timeline/body/unified_timeline_body.tsx   |  91 +++
 .../timeline/eql_tab_content/index.tsx        |  10 +-
 .../components/timeline/footer/index.tsx      |  32 +-
 .../timeline/footer/last_updated.test.tsx     |  61 ++
 .../timeline/footer/last_updated.tsx          |  43 ++
 .../timelines/components/timeline/index.tsx   |   9 +-
 .../timeline/pinned_tab_content/index.tsx     |   8 +-
 .../timeline/query_tab_content/index.test.tsx |   3 +-
 .../timeline/query_tab_content/index.tsx      | 175 +++--
 .../query_tab_unified_components.test.tsx     | 701 ++++++++++++++++++
 .../data_table/index.test.tsx                 | 397 ++++++++++
 .../unified_components/data_table/index.tsx   | 360 +++++++++
 .../toolbar_additional_controls.tsx           |  99 +++
 .../data_table/translations.ts                |  66 ++
 .../unified_components/default_headers.tsx    |  53 ++
 .../get_fields_list_creation_options.ts       |  59 ++
 .../unified_components/index.test.tsx         | 688 +++++++++++++++++
 .../timeline/unified_components/index.tsx     | 411 ++++++++++
 .../resizable_layout.test.tsx                 |  47 ++
 .../unified_components/resizable_layout.tsx   |  88 +++
 .../timeline/unified_components/styles.tsx    | 148 ++++
 .../timeline/unified_components/utils.test.ts |  60 ++
 .../timeline/unified_components/utils.ts      |  44 ++
 .../containers/active_timeline_context.ts     |  39 +
 .../timelines/containers/index.test.tsx       |  15 +-
 .../public/timelines/containers/index.tsx     |  35 +-
 .../hooks/use_create_timeline.test.tsx        |   2 +
 .../timelines/hooks/use_create_timeline.tsx   |   8 +-
 .../public/timelines/store/actions.ts         |  16 +
 .../public/timelines/store/defaults.ts        |   4 +-
 .../public/timelines/store/helpers.test.ts    |  33 +
 .../public/timelines/store/helpers.ts         |  27 +
 .../store/middlewares/timeline_save.test.ts   |   1 +
 .../public/timelines/store/model.ts           |   4 +
 .../public/timelines/store/reducer.ts         |  35 +
 .../plugins/security_solution/public/types.ts |   3 +
 .../plugins/security_solution/tsconfig.json   |   9 +-
 .../unified_components/query_tab.cy.ts        |  74 ++
 .../cypress/screens/unified_timeline.ts       |  51 ++
 .../cypress/tasks/discover.ts                 |   4 +
 .../cypress/tasks/unified_timeline.ts         |  41 +
 93 files changed, 5239 insertions(+), 518 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/common/components/sourcerer/use_get_sourcerer_data_view.test.ts
 create mode 100644 x-pack/plugins/security_solution/public/common/components/sourcerer/use_get_sourcerer_data_view.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/components/with_data_view/data_view_error.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/components/with_data_view/index.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/components/with_data_view/index.tsx
 create mode 100644 x-pack/plugins/security_solution/public/common/components/with_data_view/translations.ts
 create mode 100644 x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_experimental_features.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_udt.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_udt.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/footer/last_updated.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/footer/last_updated.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/toolbar_additional_controls.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/translations.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/default_headers.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/get_fields_list_creation_options.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/index.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/index.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/resizable_layout.test.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/resizable_layout.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/utils.test.ts
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/utils.ts
 create mode 100644 x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/unified_components/query_tab.cy.ts
 create mode 100644 x-pack/test/security_solution_cypress/cypress/screens/unified_timeline.ts
 create mode 100644 x-pack/test/security_solution_cypress/cypress/tasks/unified_timeline.ts

diff --git a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx
index 014cb526c81fe..a2a2a1e15ade5 100644
--- a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx
+++ b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx
@@ -161,22 +161,24 @@ describe('useDataGridColumnsCellActions', () => {
     cellAction1.getByTestId(`dataGridColumnCellAction-${action1.id}`).click();
 
     await waitFor(() => {
-      expect(action1.execute).toHaveBeenCalledWith(
-        expect.objectContaining({
-          data: [
-            {
-              value: fieldValues[field1.name][1],
-              field: {
-                name: field1.name,
-                type: field1.type,
-                aggregatable: true,
-                searchable: true,
-              },
+      expect(action1.execute).toHaveBeenCalledWith({
+        data: [
+          {
+            value: fieldValues[field1.name][1],
+            field: {
+              name: field1.name,
+              type: field1.type,
+              aggregatable: true,
+              searchable: true,
             },
-          ],
-          trigger: { id: useDataGridColumnsCellActionsProps.triggerId },
-        })
-      );
+          },
+        ],
+        metadata: {
+          some: 'value',
+        },
+        nodeRef: expect.any(Object),
+        trigger: { id: useDataGridColumnsCellActionsProps.triggerId },
+      });
     });
 
     const cellAction2 = renderCellAction(result.current[1][1], { rowIndex: 2 });
@@ -184,22 +186,24 @@ describe('useDataGridColumnsCellActions', () => {
     cellAction2.getByTestId(`dataGridColumnCellAction-${action2.id}`).click();
 
     await waitFor(() => {
-      expect(action2.execute).toHaveBeenCalledWith(
-        expect.objectContaining({
-          data: [
-            {
-              value: fieldValues[field2.name][2],
-              field: {
-                name: field2.name,
-                type: field2.type,
-                aggregatable: true,
-                searchable: true,
-              },
+      expect(action2.execute).toHaveBeenCalledWith({
+        data: [
+          {
+            value: fieldValues[field2.name][2],
+            field: {
+              name: field2.name,
+              type: field2.type,
+              aggregatable: true,
+              searchable: true,
             },
-          ],
-          trigger: { id: useDataGridColumnsCellActionsProps.triggerId },
-        })
-      );
+          },
+        ],
+        metadata: {
+          some: 'value',
+        },
+        nodeRef: expect.any(Object),
+        trigger: { id: useDataGridColumnsCellActionsProps.triggerId },
+      });
     });
   });
 
diff --git a/packages/kbn-unified-data-table/src/components/data_table.scss b/packages/kbn-unified-data-table/src/components/data_table.scss
index 6e710e87e9aab..e9a95d87d8a30 100644
--- a/packages/kbn-unified-data-table/src/components/data_table.scss
+++ b/packages/kbn-unified-data-table/src/components/data_table.scss
@@ -9,6 +9,14 @@
   font-family: $euiCodeFontFamily;
 }
 
+.unifiedDataTable__cell--expanded {
+  background-color: $euiColorHighlight;
+}
+
+.unifiedDataTable__cell--selected {
+  background-color: $euiColorHighlight;
+}
+
 .unifiedDataTable__cellPopover {
   // Fixes https://github.com/elastic/kibana/issues/145216 in Chrome
   .lines-content.monaco-editor-background {
diff --git a/packages/kbn-unified-data-table/src/components/data_table.test.tsx b/packages/kbn-unified-data-table/src/components/data_table.test.tsx
index 8a46322cc97d3..f0c3c797c6dd4 100644
--- a/packages/kbn-unified-data-table/src/components/data_table.test.tsx
+++ b/packages/kbn-unified-data-table/src/components/data_table.test.tsx
@@ -74,6 +74,9 @@ function getProps(): UnifiedDataTableProps {
       data: services.data,
       theme: services.theme,
     },
+    cellActionsMetadata: {
+      someKey: 'someValue',
+    },
   };
 }
 
@@ -254,13 +257,16 @@ describe('UnifiedDataTable', () => {
         columns: ['message'],
         onFieldEdited: jest.fn(),
       });
-      expect(mockUseDataGridColumnsCellActions).toHaveBeenCalledWith(
-        expect.objectContaining({
-          triggerId: undefined,
-          getCellValue: expect.any(Function),
-          fields: undefined,
-        })
-      );
+      expect(mockUseDataGridColumnsCellActions).toHaveBeenCalledWith({
+        triggerId: undefined,
+        getCellValue: expect.any(Function),
+        fields: undefined,
+        dataGridRef: expect.any(Object),
+        metadata: {
+          dataViewId: 'the-data-view-id',
+          someKey: 'someValue',
+        },
+      });
     });
 
     it('should call useDataGridColumnsCellActions properly when cellActionsTriggerId defined', async () => {
@@ -270,16 +276,19 @@ describe('UnifiedDataTable', () => {
         onFieldEdited: jest.fn(),
         cellActionsTriggerId: 'test',
       });
-      expect(mockUseDataGridColumnsCellActions).toHaveBeenCalledWith(
-        expect.objectContaining({
-          triggerId: 'test',
-          getCellValue: expect.any(Function),
-          fields: [
-            dataViewMock.getFieldByName('@timestamp')?.toSpec(),
-            dataViewMock.getFieldByName('message')?.toSpec(),
-          ],
-        })
-      );
+      expect(mockUseDataGridColumnsCellActions).toHaveBeenCalledWith({
+        triggerId: 'test',
+        getCellValue: expect.any(Function),
+        fields: [
+          dataViewMock.getFieldByName('@timestamp')?.toSpec(),
+          dataViewMock.getFieldByName('message')?.toSpec(),
+        ],
+        dataGridRef: expect.any(Object),
+        metadata: {
+          dataViewId: 'the-data-view-id',
+          someKey: 'someValue',
+        },
+      });
     });
   });
 
diff --git a/packages/kbn-unified-data-table/src/components/data_table.tsx b/packages/kbn-unified-data-table/src/components/data_table.tsx
index f935f0ff7daac..09a2f2f8e065b 100644
--- a/packages/kbn-unified-data-table/src/components/data_table.tsx
+++ b/packages/kbn-unified-data-table/src/components/data_table.tsx
@@ -367,6 +367,12 @@ export interface UnifiedDataTableProps {
    * Optional row line height override. Default is 1.6em.
    */
   rowLineHeightOverride?: string;
+  /**
+   * Custom set of properties used by some actions.
+   * An action might require a specific set of metadata properties to render.
+   * This data is sent directly to actions.
+   */
+  cellActionsMetadata?: Record<string, unknown>;
 }
 
 export const EuiDataGridMemoized = React.memo(EuiDataGrid);
@@ -430,11 +436,13 @@ export const UnifiedDataTable = ({
   componentsTourSteps,
   gridStyleOverride,
   rowLineHeightOverride,
+  cellActionsMetadata,
   customGridColumnsConfiguration,
   customControlColumnsConfiguration,
 }: UnifiedDataTableProps) => {
   const { fieldFormats, toastNotifications, dataViewFieldEditor, uiSettings, storage, data } =
     services;
+
   const { darkMode } = useObservable(services.theme?.theme$ ?? of(themeDefault), themeDefault);
   const dataGridRef = useRef<EuiDataGridRefProps>(null);
   const [selectedDocs, setSelectedDocs] = useState<string[]>([]);
@@ -671,14 +679,17 @@ export const UnifiedDataTable = ({
         : undefined,
     [cellActionsTriggerId, isPlainRecord, visibleColumns, dataView]
   );
-  const cellActionsMetadata = useMemo(() => ({ dataViewId: dataView.id }), [dataView]);
+  const allCellActionsMetadata = useMemo(
+    () => ({ dataViewId: dataView.id, ...(cellActionsMetadata ?? {}) }),
+    [dataView, cellActionsMetadata]
+  );
 
   const columnsCellActions = useDataGridColumnsCellActions({
     fields: cellActionsFields,
     getCellValue,
     triggerId: cellActionsTriggerId,
     dataGridRef,
-    metadata: cellActionsMetadata,
+    metadata: allCellActionsMetadata,
   });
 
   const {
@@ -730,6 +741,7 @@ export const UnifiedDataTable = ({
         customGridColumnsConfiguration,
       }),
     [
+      showColumnTokens,
       columnsMeta,
       columnsCellActions,
       customGridColumnsConfiguration,
@@ -743,7 +755,6 @@ export const UnifiedDataTable = ({
       isSortEnabled,
       onFilter,
       settings,
-      showColumnTokens,
       toastNotifications,
       uiSettings,
       valueToStringConverter,
diff --git a/packages/kbn-unified-data-table/src/components/data_table_document_selection.tsx b/packages/kbn-unified-data-table/src/components/data_table_document_selection.tsx
index db6ed7680b0be..771c2e5fdfd5b 100644
--- a/packages/kbn-unified-data-table/src/components/data_table_document_selection.tsx
+++ b/packages/kbn-unified-data-table/src/components/data_table_document_selection.tsx
@@ -19,7 +19,6 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { euiDarkVars as themeDark, euiLightVars as themeLight } from '@kbn/ui-theme';
 import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
 import type { DataTableRecord } from '@kbn/discover-utils/types';
@@ -40,9 +39,7 @@ export const SelectButton = ({ rowIndex, setCellProps }: EuiDataGridCellValueEle
   useEffect(() => {
     if (expanded && doc && expanded.id === doc.id) {
       setCellProps({
-        style: {
-          backgroundColor: isDarkMode ? themeDark.euiColorHighlight : themeLight.euiColorHighlight,
-        },
+        className: 'unifiedDataTable__cell--selected',
       });
     } else {
       setCellProps({ style: undefined });
diff --git a/packages/kbn-unified-data-table/src/components/data_table_expand_button.tsx b/packages/kbn-unified-data-table/src/components/data_table_expand_button.tsx
index 9538df4d3da03..76210b6aeee23 100644
--- a/packages/kbn-unified-data-table/src/components/data_table_expand_button.tsx
+++ b/packages/kbn-unified-data-table/src/components/data_table_expand_button.tsx
@@ -8,7 +8,6 @@
 
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import { EuiButtonIcon, EuiDataGridCellValueElementProps, EuiToolTip } from '@elastic/eui';
-import { euiLightVars as themeLight, euiDarkVars as themeDark } from '@kbn/ui-theme';
 import { i18n } from '@kbn/i18n';
 import { UnifiedDataTableContext } from '../table_context';
 import { DataTableRowControl } from './data_table_row_control';
@@ -27,13 +26,11 @@ export const ExpandButton = ({ rowIndex, setCellProps }: EuiDataGridCellValueEle
   useEffect(() => {
     if (current.isAnchor) {
       setCellProps({
-        className: 'dscDocsGrid__cell--highlight',
+        className: 'unifiedDataTable__cell--highlight',
       });
     } else if (expanded && current && expanded.id === current.id) {
       setCellProps({
-        style: {
-          backgroundColor: isDarkMode ? themeDark.euiColorHighlight : themeLight.euiColorHighlight,
-        },
+        className: 'unifiedDataTable__cell--expanded',
       });
     } else {
       setCellProps({ style: undefined });
diff --git a/packages/kbn-unified-data-table/src/utils/get_render_cell_value.tsx b/packages/kbn-unified-data-table/src/utils/get_render_cell_value.tsx
index d1806b2c27326..8abd06c7c391f 100644
--- a/packages/kbn-unified-data-table/src/utils/get_render_cell_value.tsx
+++ b/packages/kbn-unified-data-table/src/utils/get_render_cell_value.tsx
@@ -8,7 +8,6 @@
 
 import React, { useContext, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
-import { euiLightVars as themeLight, euiDarkVars as themeDark } from '@kbn/ui-theme';
 import type { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import {
   EuiDataGridCellValueElementProps,
@@ -62,22 +61,16 @@ export const getRenderCellValueFn = ({
     const ctx = useContext(UnifiedDataTableContext);
 
     useEffect(() => {
-      if (!externalCustomRenderers) {
-        if (row?.isAnchor) {
-          setCellProps({
-            className: 'dscDocsGrid__cell--highlight',
-          });
-        } else if (ctx.expanded && row && ctx.expanded.id === row.id) {
-          setCellProps({
-            style: {
-              backgroundColor: ctx.isDarkMode
-                ? themeDark.euiColorHighlight
-                : themeLight.euiColorHighlight,
-            },
-          });
-        } else {
-          setCellProps({ style: undefined });
-        }
+      if (row?.isAnchor) {
+        setCellProps({
+          className: 'unifiedDataTable__cell--highlight',
+        });
+      } else if (ctx.expanded && row && ctx.expanded.id === row.id) {
+        setCellProps({
+          className: 'unifiedDataTable__cell--expanded',
+        });
+      } else {
+        setCellProps({ style: undefined });
       }
     }, [ctx, row, setCellProps]);
 
@@ -87,7 +80,7 @@ export const getRenderCellValueFn = ({
 
     if (!!externalCustomRenderers && !!externalCustomRenderers[columnId]) {
       return (
-        <>
+        <span className={CELL_CLASS}>
           {externalCustomRenderers[columnId]({
             rowIndex,
             columnId,
@@ -101,7 +94,7 @@ export const getRenderCellValueFn = ({
             fieldFormats,
             closePopover,
           })}
-        </>
+        </span>
       );
     }
 
diff --git a/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar.tsx b/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar.tsx
index b39be6f72715e..fe2f0c0345314 100644
--- a/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar.tsx
+++ b/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar.tsx
@@ -354,6 +354,7 @@ export const UnifiedFieldListSidebarComponent: React.FC<UnifiedFieldListSidebarP
     'data-test-subj':
       stateService.creationOptions.dataTestSubj?.fieldListAddFieldButtonTestSubj ??
       'unifiedFieldListAddField',
+    className: 'unifiedFieldListSidebar__addBtn',
   };
   const buttonAddFieldLabel = i18n.translate(
     'unifiedFieldList.fieldListSidebar.addFieldButtonLabel',
diff --git a/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar_container.tsx b/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar_container.tsx
index 2d67cf72e83a8..7bf3317aabe22 100644
--- a/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar_container.tsx
+++ b/packages/kbn-unified-field-list/src/containers/unified_field_list_sidebar/field_list_sidebar_container.tsx
@@ -7,6 +7,7 @@
  */
 
 import React, {
+  memo,
   useCallback,
   useState,
   forwardRef,
@@ -104,260 +105,268 @@ export type UnifiedFieldListSidebarContainerProps = Omit<
  * Desktop: Sidebar view, all elements are visible
  * Mobile: A button to trigger a flyout with all elements
  */
-const UnifiedFieldListSidebarContainer = forwardRef<
-  UnifiedFieldListSidebarContainerApi,
-  UnifiedFieldListSidebarContainerProps
->(function UnifiedFieldListSidebarContainer(props, componentRef) {
-  const {
-    getCreationOptions,
-    services,
-    dataView,
-    workspaceSelectedFieldNames,
-    prependInFlyout,
-    variant = 'responsive',
-    onFieldEdited,
-  } = props;
-  const [stateService] = useState<UnifiedFieldListSidebarContainerStateService>(
-    createStateService({ options: getCreationOptions() })
-  );
-  const { data, dataViewFieldEditor } = services;
-  const [isFieldListFlyoutVisible, setIsFieldListFlyoutVisible] = useState<boolean>(false);
-  const [sidebarVisibility] = useState(() =>
-    getSidebarVisibility({
-      localStorageKey: stateService.creationOptions.localStorageKeyPrefix
-        ? `${stateService.creationOptions.localStorageKeyPrefix}:sidebarClosed`
-        : undefined,
-    })
-  );
-  const isSidebarCollapsed = useObservable(sidebarVisibility.isCollapsed$, false);
+const UnifiedFieldListSidebarContainer = memo(
+  forwardRef<UnifiedFieldListSidebarContainerApi, UnifiedFieldListSidebarContainerProps>(
+    function UnifiedFieldListSidebarContainer(props, componentRef) {
+      const {
+        getCreationOptions,
+        services,
+        dataView,
+        workspaceSelectedFieldNames,
+        prependInFlyout,
+        variant = 'responsive',
+        onFieldEdited,
+      } = props;
+      const [stateService] = useState<UnifiedFieldListSidebarContainerStateService>(
+        createStateService({ options: getCreationOptions() })
+      );
+      const { data, dataViewFieldEditor } = services;
+      const [isFieldListFlyoutVisible, setIsFieldListFlyoutVisible] = useState<boolean>(false);
+      const [sidebarVisibility] = useState(() =>
+        getSidebarVisibility({
+          localStorageKey: stateService.creationOptions.localStorageKeyPrefix
+            ? `${stateService.creationOptions.localStorageKeyPrefix}:sidebarClosed`
+            : undefined,
+        })
+      );
+      const isSidebarCollapsed = useObservable(sidebarVisibility.isCollapsed$, false);
 
-  const canEditDataView =
-    Boolean(dataViewFieldEditor?.userPermissions.editIndexPattern()) ||
-    Boolean(dataView && !dataView.isPersisted());
-  const closeFieldEditor = useRef<() => void | undefined>();
-  const setFieldEditorRef = useCallback((ref: () => void | undefined) => {
-    closeFieldEditor.current = ref;
-  }, []);
+      const canEditDataView =
+        Boolean(dataViewFieldEditor?.userPermissions.editIndexPattern()) ||
+        Boolean(dataView && !dataView.isPersisted());
+      const closeFieldEditor = useRef<() => void | undefined>();
+      const setFieldEditorRef = useCallback((ref: () => void | undefined) => {
+        closeFieldEditor.current = ref;
+      }, []);
 
-  const closeFieldListFlyout = useCallback(() => {
-    setIsFieldListFlyoutVisible(false);
-  }, []);
+      const closeFieldListFlyout = useCallback(() => {
+        setIsFieldListFlyoutVisible(false);
+      }, []);
 
-  const querySubscriberResult = useQuerySubscriber({
-    data,
-    timeRangeUpdatesType: stateService.creationOptions.timeRangeUpdatesType,
-  });
-  const searchMode: SearchMode | undefined = querySubscriberResult.searchMode;
-  const isAffectedByGlobalFilter = Boolean(querySubscriberResult.filters?.length);
+      const querySubscriberResult = useQuerySubscriber({
+        data,
+        timeRangeUpdatesType: stateService.creationOptions.timeRangeUpdatesType,
+      });
+      const searchMode: SearchMode | undefined = querySubscriberResult.searchMode;
+      const isAffectedByGlobalFilter = Boolean(querySubscriberResult.filters?.length);
 
-  const { isProcessing, refetchFieldsExistenceInfo } = useExistingFieldsFetcher({
-    disableAutoFetching: stateService.creationOptions.disableFieldsExistenceAutoFetching,
-    dataViews: searchMode === 'documents' && dataView ? [dataView] : [],
-    query: querySubscriberResult.query,
-    filters: querySubscriberResult.filters,
-    fromDate: querySubscriberResult.fromDate,
-    toDate: querySubscriberResult.toDate,
-    services,
-  });
+      const { isProcessing, refetchFieldsExistenceInfo } = useExistingFieldsFetcher({
+        disableAutoFetching: stateService.creationOptions.disableFieldsExistenceAutoFetching,
+        dataViews: searchMode === 'documents' && dataView ? [dataView] : [],
+        query: querySubscriberResult.query,
+        filters: querySubscriberResult.filters,
+        fromDate: querySubscriberResult.fromDate,
+        toDate: querySubscriberResult.toDate,
+        services,
+      });
 
-  const editField = useMemo(
-    () =>
-      dataView && dataViewFieldEditor && searchMode === 'documents' && canEditDataView
-        ? (fieldName?: string) => {
-            const ref = dataViewFieldEditor.openEditor({
-              ctx: {
-                dataView,
-              },
-              fieldName,
-              onSave: async () => {
-                if (onFieldEdited) {
-                  await onFieldEdited({ editedFieldName: fieldName });
-                }
-              },
-            });
-            setFieldEditorRef(ref);
-            closeFieldListFlyout();
-          }
-        : undefined,
-    [
-      searchMode,
-      canEditDataView,
-      dataViewFieldEditor,
-      dataView,
-      setFieldEditorRef,
-      closeFieldListFlyout,
-      onFieldEdited,
-    ]
-  );
+      const editField = useMemo(
+        () =>
+          dataView && dataViewFieldEditor && searchMode === 'documents' && canEditDataView
+            ? (fieldName?: string) => {
+                const ref = dataViewFieldEditor.openEditor({
+                  ctx: {
+                    dataView,
+                  },
+                  fieldName,
+                  onSave: async () => {
+                    if (onFieldEdited) {
+                      await onFieldEdited({ editedFieldName: fieldName });
+                    }
+                  },
+                });
+                setFieldEditorRef(ref);
+                closeFieldListFlyout();
+              }
+            : undefined,
+        [
+          searchMode,
+          canEditDataView,
+          dataViewFieldEditor,
+          dataView,
+          setFieldEditorRef,
+          closeFieldListFlyout,
+          onFieldEdited,
+        ]
+      );
 
-  const deleteField = useMemo(
-    () =>
-      dataView && dataViewFieldEditor && editField
-        ? (fieldName: string) => {
-            const ref = dataViewFieldEditor.openDeleteModal({
-              ctx: {
-                dataView,
-              },
-              fieldName,
-              onDelete: async () => {
-                if (onFieldEdited) {
-                  await onFieldEdited({ removedFieldName: fieldName });
-                }
-              },
-            });
-            setFieldEditorRef(ref);
-            closeFieldListFlyout();
-          }
-        : undefined,
-    [
-      dataView,
-      setFieldEditorRef,
-      editField,
-      closeFieldListFlyout,
-      dataViewFieldEditor,
-      onFieldEdited,
-    ]
-  );
+      const deleteField = useMemo(
+        () =>
+          dataView && dataViewFieldEditor && editField
+            ? (fieldName: string) => {
+                const ref = dataViewFieldEditor.openDeleteModal({
+                  ctx: {
+                    dataView,
+                  },
+                  fieldName,
+                  onDelete: async () => {
+                    if (onFieldEdited) {
+                      await onFieldEdited({ removedFieldName: fieldName });
+                    }
+                  },
+                });
+                setFieldEditorRef(ref);
+                closeFieldListFlyout();
+              }
+            : undefined,
+        [
+          dataView,
+          setFieldEditorRef,
+          editField,
+          closeFieldListFlyout,
+          dataViewFieldEditor,
+          onFieldEdited,
+        ]
+      );
 
-  useEffect(() => {
-    const cleanup = () => {
-      if (closeFieldEditor?.current) {
-        closeFieldEditor?.current();
-      }
-    };
-    return () => {
-      // Make sure to close the editor when unmounting
-      cleanup();
-    };
-  }, []);
+      useEffect(() => {
+        const cleanup = () => {
+          if (closeFieldEditor?.current) {
+            closeFieldEditor?.current();
+          }
+        };
+        return () => {
+          // Make sure to close the editor when unmounting
+          cleanup();
+        };
+      }, []);
 
-  useImperativeHandle(
-    componentRef,
-    () => ({
-      sidebarVisibility,
-      refetchFieldsExistenceInfo,
-      closeFieldListFlyout,
-      createField: editField,
-      editField,
-      deleteField,
-    }),
-    [sidebarVisibility, refetchFieldsExistenceInfo, closeFieldListFlyout, editField, deleteField]
-  );
+      useImperativeHandle(
+        componentRef,
+        () => ({
+          sidebarVisibility,
+          refetchFieldsExistenceInfo,
+          closeFieldListFlyout,
+          createField: editField,
+          editField,
+          deleteField,
+        }),
+        [
+          sidebarVisibility,
+          refetchFieldsExistenceInfo,
+          closeFieldListFlyout,
+          editField,
+          deleteField,
+        ]
+      );
 
-  if (!dataView) {
-    return null;
-  }
+      if (!dataView) {
+        return null;
+      }
 
-  const commonSidebarProps: UnifiedFieldListSidebarProps = {
-    ...props,
-    searchMode,
-    stateService,
-    isProcessing,
-    isAffectedByGlobalFilter,
-    onEditField: editField,
-    onDeleteField: deleteField,
-    compressed: stateService.creationOptions.compressed ?? false,
-    buttonAddFieldVariant: stateService.creationOptions.buttonAddFieldVariant ?? 'primary',
-  };
+      const commonSidebarProps: UnifiedFieldListSidebarProps = {
+        ...props,
+        searchMode,
+        stateService,
+        isProcessing,
+        isAffectedByGlobalFilter,
+        onEditField: editField,
+        onDeleteField: deleteField,
+        compressed: stateService.creationOptions.compressed ?? false,
+        buttonAddFieldVariant: stateService.creationOptions.buttonAddFieldVariant ?? 'primary',
+      };
 
-  if (stateService.creationOptions.showSidebarToggleButton) {
-    commonSidebarProps.isSidebarCollapsed = isSidebarCollapsed;
-    commonSidebarProps.onToggleSidebar = sidebarVisibility.toggle;
-  }
+      if (stateService.creationOptions.showSidebarToggleButton) {
+        commonSidebarProps.isSidebarCollapsed = isSidebarCollapsed;
+        commonSidebarProps.onToggleSidebar = sidebarVisibility.toggle;
+      }
 
-  const buttonPropsToTriggerFlyout = stateService.creationOptions.buttonPropsToTriggerFlyout;
+      const buttonPropsToTriggerFlyout = stateService.creationOptions.buttonPropsToTriggerFlyout;
 
-  const renderListVariant = () => {
-    return <UnifiedFieldListSidebar {...commonSidebarProps} />;
-  };
+      const renderListVariant = () => {
+        return <UnifiedFieldListSidebar {...commonSidebarProps} />;
+      };
 
-  const renderButtonVariant = () => {
-    return (
-      <>
-        <div className="unifiedFieldListSidebar__mobile">
-          <EuiButton
-            {...buttonPropsToTriggerFlyout}
-            contentProps={{
-              ...buttonPropsToTriggerFlyout?.contentProps,
-              className: 'unifiedFieldListSidebar__mobileButton',
-            }}
-            fullWidth
-            onClick={() => setIsFieldListFlyoutVisible(true)}
-          >
-            <FormattedMessage
-              id="unifiedFieldList.fieldListSidebar.fieldsMobileButtonLabel"
-              defaultMessage="Fields"
-            />
-            <EuiBadge
-              className="unifiedFieldListSidebar__mobileBadge"
-              color={workspaceSelectedFieldNames?.[0] === '_source' ? 'default' : 'accent'}
-            >
-              {!workspaceSelectedFieldNames?.length || workspaceSelectedFieldNames[0] === '_source'
-                ? 0
-                : workspaceSelectedFieldNames.length}
-            </EuiBadge>
-          </EuiButton>
-        </div>
-        {isFieldListFlyoutVisible && (
-          <EuiPortal>
-            <EuiFlyout
-              size="s"
-              onClose={() => setIsFieldListFlyoutVisible(false)}
-              aria-labelledby="flyoutTitle"
-              ownFocus
-            >
-              <EuiFlyoutHeader hasBorder>
-                <EuiTitle size="s">
-                  <h2 id="flyoutTitle">
-                    <EuiLink color="text" onClick={() => setIsFieldListFlyoutVisible(false)}>
-                      <EuiIcon
-                        className="eui-alignBaseline"
-                        aria-label={i18n.translate(
-                          'unifiedFieldList.fieldListSidebar.flyoutBackIcon',
-                          {
-                            defaultMessage: 'Back',
-                          }
-                        )}
-                        type="arrowLeft"
-                      />{' '}
-                      <strong>
-                        {i18n.translate('unifiedFieldList.fieldListSidebar.flyoutHeading', {
-                          defaultMessage: 'Field list',
-                        })}
-                      </strong>
-                    </EuiLink>
-                  </h2>
-                </EuiTitle>
-              </EuiFlyoutHeader>
-              <UnifiedFieldListSidebar
-                {...commonSidebarProps}
-                alwaysShowActionButton={true}
-                buttonAddFieldVariant="primary" // always for the flyout
-                isSidebarCollapsed={undefined}
-                prepend={prependInFlyout?.()}
-              />
-            </EuiFlyout>
-          </EuiPortal>
-        )}
-      </>
-    );
-  };
+      const renderButtonVariant = () => {
+        return (
+          <>
+            <div className="unifiedFieldListSidebar__mobile">
+              <EuiButton
+                {...buttonPropsToTriggerFlyout}
+                contentProps={{
+                  ...buttonPropsToTriggerFlyout?.contentProps,
+                  className: 'unifiedFieldListSidebar__mobileButton',
+                }}
+                fullWidth
+                onClick={() => setIsFieldListFlyoutVisible(true)}
+              >
+                <FormattedMessage
+                  id="unifiedFieldList.fieldListSidebar.fieldsMobileButtonLabel"
+                  defaultMessage="Fields"
+                />
+                <EuiBadge
+                  className="unifiedFieldListSidebar__mobileBadge"
+                  color={workspaceSelectedFieldNames?.[0] === '_source' ? 'default' : 'accent'}
+                >
+                  {!workspaceSelectedFieldNames?.length ||
+                  workspaceSelectedFieldNames[0] === '_source'
+                    ? 0
+                    : workspaceSelectedFieldNames.length}
+                </EuiBadge>
+              </EuiButton>
+            </div>
+            {isFieldListFlyoutVisible && (
+              <EuiPortal>
+                <EuiFlyout
+                  size="s"
+                  onClose={() => setIsFieldListFlyoutVisible(false)}
+                  aria-labelledby="flyoutTitle"
+                  ownFocus
+                >
+                  <EuiFlyoutHeader hasBorder>
+                    <EuiTitle size="s">
+                      <h2 id="flyoutTitle">
+                        <EuiLink color="text" onClick={() => setIsFieldListFlyoutVisible(false)}>
+                          <EuiIcon
+                            className="eui-alignBaseline"
+                            aria-label={i18n.translate(
+                              'unifiedFieldList.fieldListSidebar.flyoutBackIcon',
+                              {
+                                defaultMessage: 'Back',
+                              }
+                            )}
+                            type="arrowLeft"
+                          />{' '}
+                          <strong>
+                            {i18n.translate('unifiedFieldList.fieldListSidebar.flyoutHeading', {
+                              defaultMessage: 'Field list',
+                            })}
+                          </strong>
+                        </EuiLink>
+                      </h2>
+                    </EuiTitle>
+                  </EuiFlyoutHeader>
+                  <UnifiedFieldListSidebar
+                    {...commonSidebarProps}
+                    alwaysShowActionButton={true}
+                    buttonAddFieldVariant="primary" // always for the flyout
+                    isSidebarCollapsed={undefined}
+                    prepend={prependInFlyout?.()}
+                  />
+                </EuiFlyout>
+              </EuiPortal>
+            )}
+          </>
+        );
+      };
 
-  if (variant === 'button-and-flyout-always') {
-    return renderButtonVariant();
-  }
+      if (variant === 'button-and-flyout-always') {
+        return renderButtonVariant();
+      }
 
-  if (variant === 'list-always') {
-    return renderListVariant();
-  }
+      if (variant === 'list-always') {
+        return renderListVariant();
+      }
 
-  return (
-    <>
-      <EuiHideFor sizes={['xs', 's']}>{renderListVariant()}</EuiHideFor>
-      <EuiShowFor sizes={['xs', 's']}>{renderButtonVariant()}</EuiShowFor>
-    </>
-  );
-});
+      return (
+        <>
+          <EuiHideFor sizes={['xs', 's']}>{renderListVariant()}</EuiHideFor>
+          <EuiShowFor sizes={['xs', 's']}>{renderButtonVariant()}</EuiShowFor>
+        </>
+      );
+    }
+  )
+);
 
 // Necessary for React.lazy
 // eslint-disable-next-line import/no-default-export
diff --git a/src/plugins/discover/public/application/context/context_app.scss b/src/plugins/discover/public/application/context/context_app.scss
index 19ae9a7471302..150fc7e70e52e 100644
--- a/src/plugins/discover/public/application/context/context_app.scss
+++ b/src/plugins/discover/public/application/context/context_app.scss
@@ -14,7 +14,7 @@
   flex: 1 1 100%;
   overflow: auto;
 
-  &__cell--highlight {
+  .unifiedDataTable__cell--highlight {
     background-color: tintOrShade($euiColorPrimary, 90%, 70%);
   }
 }
diff --git a/test/functional/services/data_grid.ts b/test/functional/services/data_grid.ts
index ee735f6ed17d6..348864a716e7e 100644
--- a/test/functional/services/data_grid.ts
+++ b/test/functional/services/data_grid.ts
@@ -151,7 +151,7 @@ export class DataGridService extends FtrService {
 
   public async getFields(options?: SelectOptions) {
     const selector = options?.isAnchorRow
-      ? '.euiDataGridRowCell.dscDocsGrid__cell--highlight'
+      ? '.euiDataGridRowCell.unifiedDataTable__cell--highlight'
       : '.euiDataGridRowCell';
     const cells = await this.find.allByCssSelector(selector);
 
@@ -215,7 +215,7 @@ export class DataGridService extends FtrService {
     }
 
     const selector = options?.isAnchorRow
-      ? '.euiDataGridRowCell.dscDocsGrid__cell--highlight'
+      ? '.euiDataGridRowCell.unifiedDataTable__cell--highlight'
       : '.euiDataGridRowCell';
     const cells = await table.findAllByCssSelector(selector);
 
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
index a09d49723d75a..a6eba0197b490 100644
--- a/x-pack/plugins/security_solution/common/experimental_features.ts
+++ b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -202,6 +202,21 @@ export const allowedExperimentalValues = Object.freeze({
    * Expires: on Feb 20, 2024
    */
   jsonPrebuiltRulesDiffingEnabled: true,
+  /*
+   * Disables discover esql tab within timeline
+   *
+   */
+  timelineEsqlTabDisabled: false,
+  /*
+   * Enables Discover components, UnifiedFieldList and UnifiedDataTable in Timeline.
+   */
+  unifiedComponentsInTimelineEnabled: false,
+
+  /*
+   * Disables date pickers and sourcerer in analyzer if needed.
+   *
+   */
+  analyzerDatePickersAndSourcererDisabled: false,
 
   /**
    * Enables per-field rule diffs tab in the prebuilt rule upgrade flyout
@@ -213,16 +228,6 @@ export const allowedExperimentalValues = Object.freeze({
    * Expires: on Apr 23, 2024
    */
   perFieldPrebuiltRulesDiffingEnabled: true,
-
-  /**
-   * Disables discover esql tab within timeline
-   */
-  timelineEsqlTabDisabled: false,
-
-  /**
-   * Disables date pickers and sourcerer in analyzer if needed.
-   */
-  analyzerDatePickersAndSourcererDisabled: false,
 });
 
 type ExperimentalConfigKeys = Array<keyof ExperimentalFeatures>;
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap
index 5ec3b5e158138..c4941d1ff08b9 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap
@@ -647,6 +647,21 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
           },
         },
       },
+      "process": Object {
+        "fields": Object {
+          "process.args": Object {
+            "aggregatable": true,
+            "esTypes": Array [
+              "keyword",
+            ],
+            "format": "",
+            "name": "process.args",
+            "readFromDocValues": true,
+            "searchable": true,
+            "type": "string",
+          },
+        },
+      },
       "source": Object {
         "fields": Object {
           "source.ip": Object {
diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/index.tsx b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/index.tsx
index 7efbebb776cd7..2faca21677863 100644
--- a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/index.tsx
@@ -32,7 +32,6 @@ import {
 import numeral from '@elastic/numeral';
 import { css } from '@emotion/react';
 import type { EuiMarkdownEditorUiPluginEditorProps } from '@elastic/eui/src/components/markdown_editor/markdown_types';
-import { DataView } from '@kbn/data-views-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { Filter } from '@kbn/es-query';
 import { FilterStateStore } from '@kbn/es-query';
@@ -57,6 +56,7 @@ import { filtersToInsightProviders } from './provider';
 import { useLicense } from '../../../../hooks/use_license';
 import { isProviderValid } from './helpers';
 import * as i18n from './translations';
+import { useGetScopedSourcererDataView } from '../../../sourcerer/use_get_sourcerer_data_view';
 
 interface InsightComponentProps {
   label?: string;
@@ -277,21 +277,17 @@ const InsightEditorComponent = ({
   onCancel,
 }: EuiMarkdownEditorUiPluginEditorProps<InsightComponentProps & { relativeTimerange: string }>) => {
   const isEditMode = node != null;
-  const { sourcererDataView, indexPattern } = useSourcererDataView(SourcererScopeName.default);
+  const { indexPattern } = useSourcererDataView(SourcererScopeName.default);
   const {
     unifiedSearch: {
       ui: { FiltersBuilderLazy },
     },
     uiSettings,
-    fieldFormats,
   } = useKibana().services;
-  const dataView = useMemo(() => {
-    if (sourcererDataView != null) {
-      return new DataView({ spec: sourcererDataView, fieldFormats });
-    } else {
-      return null;
-    }
-  }, [sourcererDataView, fieldFormats]);
+
+  const dataView = useGetScopedSourcererDataView({
+    sourcererScope: SourcererScopeName.default,
+  });
 
   const [providers, setProviders] = useState<Provider[][]>([[]]);
   const dateRangeChoices = useMemo(() => {
diff --git a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/use_insight_query.ts b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/use_insight_query.ts
index ee859c70289b3..ffb5abd39d4a5 100644
--- a/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/use_insight_query.ts
+++ b/x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/use_insight_query.ts
@@ -9,6 +9,7 @@ import { useMemo, useState } from 'react';
 import type { Filter } from '@kbn/es-query';
 import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import type { DataProvider } from '@kbn/timelines-plugin/common';
+import { DataLoadingState } from '@kbn/unified-data-table';
 import { TimelineId } from '../../../../../../common/types/timeline';
 import { useKibana } from '../../../../lib/kibana';
 import { combineQueries } from '../../../../lib/kuery';
@@ -64,7 +65,7 @@ export const useInsightQuery = ({
     }
   }, [browserFields, dataProviders, esQueryConfig, hasError, indexPattern, filters]);
 
-  const [isQueryLoading, { events, totalCount }] = useTimelineEvents({
+  const [dataLoadingState, { events, totalCount }] = useTimelineEvents({
     dataViewId,
     fields: ['*'],
     filterQuery: combinedQueries?.filterQuery,
@@ -77,6 +78,12 @@ export const useInsightQuery = ({
       ? { startDate: relativeTimerange?.from, endDate: relativeTimerange?.to }
       : {}),
   });
+
+  const isQueryLoading = useMemo(
+    () => [DataLoadingState.loading, DataLoadingState.loadingMore].includes(dataLoadingState),
+    [dataLoadingState]
+  );
+
   const [oldestEvent] = events;
   const timestamp =
     oldestEvent && oldestEvent.data && oldestEvent.data.find((d) => d.field === '@timestamp');
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_get_sourcerer_data_view.test.ts b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_get_sourcerer_data_view.test.ts
new file mode 100644
index 0000000000000..eb7a6c34ce80d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_get_sourcerer_data_view.test.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 { DataView } from '@kbn/data-views-plugin/common';
+import { renderHook } from '@testing-library/react-hooks';
+import { useSourcererDataView } from '../../containers/sourcerer';
+import { mockSourcererScope } from '../../containers/sourcerer/mocks';
+import { SourcererScopeName } from '../../store/sourcerer/model';
+import type { UseGetScopedSourcererDataViewArgs } from './use_get_sourcerer_data_view';
+import { useGetScopedSourcererDataView } from './use_get_sourcerer_data_view';
+
+const renderHookCustom = (args: UseGetScopedSourcererDataViewArgs) => {
+  return renderHook<UseGetScopedSourcererDataViewArgs, DataView | undefined>(
+    ({ sourcererScope }) => useGetScopedSourcererDataView({ sourcererScope }),
+    {
+      initialProps: {
+        ...args,
+      },
+    }
+  );
+};
+
+jest.mock('../../containers/sourcerer');
+
+const mockGetSourcererDataView = jest.fn(() => mockSourcererScope);
+
+describe('useGetScopedSourcererDataView', () => {
+  beforeEach(() => {
+    (useSourcererDataView as jest.Mock).mockImplementation(mockGetSourcererDataView);
+  });
+  it('should return DataView when correct spec is provided', () => {
+    const { result } = renderHookCustom({ sourcererScope: SourcererScopeName.timeline });
+
+    expect(result.current).toBeInstanceOf(DataView);
+  });
+  it('should return undefined when no spec is provided', () => {
+    mockGetSourcererDataView.mockReturnValueOnce({
+      ...mockSourcererScope,
+      sourcererDataView: undefined,
+    });
+    const { result } = renderHookCustom({ sourcererScope: SourcererScopeName.timeline });
+    expect(result.current).toBeUndefined();
+  });
+  it('should return undefined when no spec is provided and should update the return when spec is updated to correct value', () => {
+    mockGetSourcererDataView.mockReturnValueOnce({
+      ...mockSourcererScope,
+      sourcererDataView: undefined,
+    });
+    const { rerender, result } = renderHookCustom({ sourcererScope: SourcererScopeName.timeline });
+    expect(result.current).toBeUndefined();
+
+    rerender({ sourcererScope: SourcererScopeName.timeline });
+    expect(result.current).toBeInstanceOf(DataView);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/sourcerer/use_get_sourcerer_data_view.tsx b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_get_sourcerer_data_view.tsx
new file mode 100644
index 0000000000000..af49a784164cf
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/sourcerer/use_get_sourcerer_data_view.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 { useMemo } from 'react';
+import { DataView } from '@kbn/data-views-plugin/public';
+import { useSourcererDataView } from '../../containers/sourcerer';
+import { useKibana } from '../../lib/kibana';
+import type { SourcererScopeName } from '../../store/sourcerer/model';
+
+export interface UseGetScopedSourcererDataViewArgs {
+  sourcererScope: SourcererScopeName;
+}
+
+/*
+ *
+ * returns the created dataView based on sourcererDataView spec
+ * returned from useSourcererDataView
+ *
+ * */
+export const useGetScopedSourcererDataView = ({
+  sourcererScope,
+}: UseGetScopedSourcererDataViewArgs): DataView | undefined => {
+  const {
+    services: { fieldFormats },
+  } = useKibana();
+  const { sourcererDataView } = useSourcererDataView(sourcererScope);
+
+  const dataView = useMemo(() => {
+    if (sourcererDataView) {
+      return new DataView({ spec: sourcererDataView, fieldFormats });
+    } else {
+      return undefined;
+    }
+  }, [sourcererDataView, fieldFormats]);
+
+  return dataView;
+};
diff --git a/x-pack/plugins/security_solution/public/common/components/with_data_view/data_view_error.tsx b/x-pack/plugins/security_solution/public/common/components/with_data_view/data_view_error.tsx
new file mode 100644
index 0000000000000..b2d8af69d9ba7
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/with_data_view/data_view_error.tsx
@@ -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 React from 'react';
+import { EuiEmptyPrompt } from '@elastic/eui';
+import * as i18n from './translations';
+
+export const DataViewErrorComponent = () => {
+  return (
+    <EuiEmptyPrompt
+      data-test-subj="dataViewErrorComponent"
+      iconType="error"
+      color="danger"
+      title={<h2>{i18n.DATA_VIEW_MANDATORY}</h2>}
+      body={<p>{i18n.DATA_VIEW_MANDATORY_MSG}</p>}
+    />
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/common/components/with_data_view/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/with_data_view/index.test.tsx
new file mode 100644
index 0000000000000..9d7c88041abe7
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/with_data_view/index.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, { useEffect } from 'react';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { render, screen } from '@testing-library/react';
+import { withDataView } from '.';
+import { useGetScopedSourcererDataView } from '../sourcerer/use_get_sourcerer_data_view';
+
+interface TestComponentProps {
+  dataView: DataView;
+}
+
+jest.mock('../sourcerer/use_get_sourcerer_data_view');
+
+const TEST_ID = {
+  DATA_VIEW_ERROR_COMPONENT: 'dataViewErrorComponent',
+  TEST_COMPONENT: 'test_component',
+  FALLBACK_COMPONENT: 'fallback_component',
+};
+
+const FallbackComponent: React.FC = () => <div data-test-subj={TEST_ID.FALLBACK_COMPONENT} />;
+
+const dataViewMockFn = jest.fn();
+
+const TestComponent = (props: TestComponentProps) => {
+  useEffect(() => {
+    dataViewMockFn(props.dataView);
+  }, [props.dataView]);
+  return <div data-test-subj={TEST_ID.TEST_COMPONENT} />;
+};
+
+describe('withDataViewId', () => {
+  beforeEach(() => {
+    (useGetScopedSourcererDataView as jest.Mock).mockReturnValue(undefined);
+  });
+  it('should render default error components when there is not fallback provided and dataViewId is null', async () => {
+    const RenderedComponent = withDataView(TestComponent);
+    render(<RenderedComponent />);
+    expect(screen.getByTestId(TEST_ID.DATA_VIEW_ERROR_COMPONENT)).toBeVisible();
+  });
+  it('should render provided fallback and dataViewId is null', async () => {
+    const RenderedComponent = withDataView(TestComponent, <FallbackComponent />);
+    render(<RenderedComponent />);
+    expect(screen.getByTestId(TEST_ID.FALLBACK_COMPONENT)).toBeVisible();
+  });
+  it('should render provided component when dataViewId is not null', async () => {
+    (useGetScopedSourcererDataView as jest.Mock).mockReturnValue({ id: 'test' });
+    const RenderedComponent = withDataView(TestComponent);
+    render(<RenderedComponent />);
+    expect(screen.getByTestId(TEST_ID.TEST_COMPONENT)).toBeVisible();
+    expect(dataViewMockFn).toHaveBeenCalledWith({ id: 'test' });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/with_data_view/index.tsx b/x-pack/plugins/security_solution/public/common/components/with_data_view/index.tsx
new file mode 100644
index 0000000000000..3f157332482fc
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/with_data_view/index.tsx
@@ -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 React from 'react';
+import type { ComponentType } from 'react';
+import type { ReactElement } from 'react-markdown';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { DataViewErrorComponent } from './data_view_error';
+import { useGetScopedSourcererDataView } from '../sourcerer/use_get_sourcerer_data_view';
+import { SourcererScopeName } from '../../store/sourcerer/model';
+
+type OmitDataView<T> = T extends { dataView: DataView } ? Omit<T, 'dataView'> : T;
+
+interface WithDataViewArg {
+  dataView: DataView;
+}
+
+/**
+ *
+ * This HOC makes sure the dataView is populated
+ * otherwise it will render the provided/default Error component
+ *
+ * */
+export const withDataView = <P extends WithDataViewArg>(
+  Component: ComponentType<P & WithDataViewArg>,
+  fallback?: ReactElement
+) => {
+  const ComponentWithDataView = (props: OmitDataView<P>) => {
+    const dataView = useGetScopedSourcererDataView({
+      sourcererScope: SourcererScopeName.timeline,
+    });
+
+    if (!dataView) {
+      return fallback ?? <DataViewErrorComponent />;
+    }
+
+    return <Component {...(props as unknown as P)} dataView={dataView} />;
+  };
+
+  return ComponentWithDataView;
+};
diff --git a/x-pack/plugins/security_solution/public/common/components/with_data_view/translations.ts b/x-pack/plugins/security_solution/public/common/components/with_data_view/translations.ts
new file mode 100644
index 0000000000000..a0104b594a9e3
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/with_data_view/translations.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 { i18n } from '@kbn/i18n';
+
+export const DATA_VIEW_MANDATORY = i18n.translate(
+  'xpack.securitySolution.components.dataViewMandatory',
+  {
+    defaultMessage: 'The DataView is required, but was not provided',
+  }
+);
+
+export const DATA_VIEW_MANDATORY_MSG = i18n.translate(
+  'xpack.securitySolution.components.dataViewMandatoryDetailMessage',
+  {
+    defaultMessage:
+      'The DataView is not selected properly. Please select the appropriate DataView and index patterns',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/common/containers/source/mock.ts b/x-pack/plugins/security_solution/public/common/containers/source/mock.ts
index f253e694aa81c..74c494b239318 100644
--- a/x-pack/plugins/security_solution/public/common/containers/source/mock.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/source/mock.ts
@@ -6,6 +6,7 @@
  */
 
 import type { MappingRuntimeFieldType } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { flatten } from 'lodash';
 import { DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import type { BrowserFields } from '../../../../common/search_strategy/index_fields';
 
@@ -47,40 +48,6 @@ export const mocksSource = {
   ],
 };
 
-export const mockIndexFields = [
-  {
-    aggregatable: true,
-    name: '@timestamp',
-    searchable: true,
-    type: 'date',
-    readFromDocValues: true,
-  },
-  { aggregatable: true, name: 'agent.ephemeral_id', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'agent.hostname', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'agent.id', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'agent.name', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'auditd.data.a0', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'auditd.data.a1', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'auditd.data.a2', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'client.address', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'client.bytes', searchable: true, type: 'number' },
-  { aggregatable: true, name: 'client.domain', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'client.geo.country_iso_code', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'cloud.account.id', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'cloud.availability_zone', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'container.id', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'container.image.name', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'container.image.tag', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'destination.address', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'destination.bytes', searchable: true, type: 'number' },
-  { aggregatable: true, name: 'destination.domain', searchable: true, type: 'string' },
-  { aggregatable: true, name: 'destination.ip', searchable: true, type: 'ip' },
-  { aggregatable: true, name: 'destination.port', searchable: true, type: 'long' },
-  { aggregatable: true, name: 'source.ip', searchable: true, type: 'ip' },
-  { aggregatable: true, name: 'source.port', searchable: true, type: 'long' },
-  { aggregatable: true, name: 'event.end', searchable: true, type: 'date' },
-];
-
 export const mockBrowserFields: BrowserFields = {
   agent: {
     fields: {
@@ -575,8 +542,26 @@ export const mockBrowserFields: BrowserFields = {
       },
     },
   },
+
+  process: {
+    fields: {
+      'process.args': {
+        name: 'process.args',
+        type: 'string',
+        esTypes: ['keyword'],
+        searchable: true,
+        aggregatable: true,
+        readFromDocValues: true,
+        format: '',
+      },
+    },
+  },
 };
 
+export const mockIndexFields = flatten(
+  Object.values(mockBrowserFields).map((fieldItem) => Object.values(fieldItem.fields ?? {}))
+);
+
 const runTimeType: MappingRuntimeFieldType = 'keyword' as const;
 
 export const mockRuntimeMappings = {
diff --git a/x-pack/plugins/security_solution/public/common/containers/sourcerer/mocks.ts b/x-pack/plugins/security_solution/public/common/containers/sourcerer/mocks.ts
index cfa0b1dadec15..98949d47047de 100644
--- a/x-pack/plugins/security_solution/public/common/containers/sourcerer/mocks.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/sourcerer/mocks.ts
@@ -5,7 +5,10 @@
  * 2.0.
  */
 
+import { mockGlobalState } from '../../mock';
+import type { SelectedDataView } from '../../store/sourcerer/model';
 import { initSourcererScope } from '../../store/sourcerer/model';
+import { mockBrowserFields, mockRuntimeMappings } from '../source/mock';
 
 export const mockPatterns = [
   'auditbeat-*',
@@ -17,24 +20,23 @@ export const mockPatterns = [
   'journalbeat-*',
 ];
 
-export const mockSourcererScope = {
+export const mockSourcererScope: SelectedDataView = {
   ...initSourcererScope,
-  scopePatterns: mockPatterns,
   browserFields: {
+    ...mockBrowserFields,
     _id: {
       fields: {
         _id: {
-          __typename: 'IndexField',
           aggregatable: false,
           category: '_id',
           description: 'Each document has an _id that uniquely identifies it',
-          esTypes: null,
+          esTypes: undefined,
           example: 'Y-6TfmcB0WOhS6qyMv3s',
-          format: null,
+          format: undefined,
           indexes: mockPatterns,
           name: '_id',
           searchable: true,
-          subType: null,
+          subType: undefined,
           type: 'string',
         },
       },
@@ -44,16 +46,20 @@ export const mockSourcererScope = {
     fields: [
       {
         aggregatable: false,
-        esTypes: null,
+        esTypes: undefined,
         name: '_id',
         searchable: true,
-        subType: null,
+        subType: undefined,
         type: 'string',
       },
     ],
     title: mockPatterns.join(),
   },
+  sourcererDataView: mockGlobalState.sourcerer.defaultDataView,
   selectedPatterns: mockPatterns,
   indicesExist: true,
   loading: false,
+  dataViewId: mockGlobalState.sourcerer.defaultDataView.id,
+  runtimeMappings: mockRuntimeMappings,
+  patternList: mockPatterns,
 };
diff --git a/x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_experimental_features.ts b/x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_experimental_features.ts
new file mode 100644
index 0000000000000..2084685c9b6a0
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/hooks/__mocks__/use_experimental_features.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.
+ */
+
+import type { ExperimentalFeatures } from '../../../../common/experimental_features';
+import { allowedExperimentalValues } from '../../../../common/experimental_features';
+
+export const useIsExperimentalFeatureEnabled = jest
+  .fn()
+  .mockImplementation((feature: keyof ExperimentalFeatures): boolean => {
+    if (feature in allowedExperimentalValues) {
+      return allowedExperimentalValues[feature];
+    }
+
+    throw new Error(`Invalid experimental value ${feature}}`);
+  });
diff --git a/x-pack/plugins/security_solution/public/common/hooks/timeline/use_init_timeline_url_param.ts b/x-pack/plugins/security_solution/public/common/hooks/timeline/use_init_timeline_url_param.ts
index 4c596481b4605..bb3c595ee3d9d 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/timeline/use_init_timeline_url_param.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/timeline/use_init_timeline_url_param.ts
@@ -16,6 +16,10 @@ import { URL_PARAM_KEY } from '../use_url_state';
 import { useIsExperimentalFeatureEnabled } from '../use_experimental_features';
 
 export const useInitTimelineFromUrlParam = () => {
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
+
   const isEsqlTabDisabled = useIsExperimentalFeatureEnabled('timelineEsqlTabDisabled');
 
   const queryTimelineById = useQueryTimelineById();
@@ -33,10 +37,11 @@ export const useInitTimelineFromUrlParam = () => {
           timelineId: initialState.id,
           openTimeline: initialState.isOpen,
           savedSearchId: initialState.savedSearchId,
+          unifiedComponentsInTimelineEnabled,
         });
       }
     },
-    [isEsqlTabDisabled, queryTimelineById]
+    [isEsqlTabDisabled, queryTimelineById, unifiedComponentsInTimelineEnabled]
   );
 
   useEffect(() => {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/timeline/use_query_timeline_by_id_on_url_change.test.ts b/x-pack/plugins/security_solution/public/common/hooks/timeline/use_query_timeline_by_id_on_url_change.test.ts
index 985c69c71a849..ef86f71777484 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/timeline/use_query_timeline_by_id_on_url_change.test.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/timeline/use_query_timeline_by_id_on_url_change.test.ts
@@ -10,6 +10,8 @@ import { useQueryTimelineByIdOnUrlChange } from './use_query_timeline_by_id_on_u
 import { renderHook } from '@testing-library/react-hooks';
 import { timelineDefaults } from '../../../timelines/store/defaults';
 
+jest.mock('../use_experimental_features');
+
 jest.mock('../../../timelines/components/open_timeline/helpers');
 
 const mockFlyoutTimeline = jest
diff --git a/x-pack/plugins/security_solution/public/common/hooks/timeline/use_query_timeline_by_id_on_url_change.ts b/x-pack/plugins/security_solution/public/common/hooks/timeline/use_query_timeline_by_id_on_url_change.ts
index 60d4ff10b8de1..a3f498daa4fce 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/timeline/use_query_timeline_by_id_on_url_change.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/timeline/use_query_timeline_by_id_on_url_change.ts
@@ -21,6 +21,7 @@ import {
   getQueryStringFromLocation,
 } from '../../utils/global_query_string/helpers';
 import { URL_PARAM_KEY } from '../use_url_state';
+import { useIsExperimentalFeatureEnabled } from '../use_experimental_features';
 
 /**
  * After the initial load of the security solution, timeline is not updated when the timeline URL search value is changed
@@ -41,6 +42,10 @@ export const useQueryTimelineByIdOnUrlChange = () => {
   const oldSearch = usePrevious(search);
   const timelineIdFromReduxStore = flyoutTimeline?.savedObjectId ?? '';
 
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
+
   const [previousTimeline, currentTimeline] = useMemo(() => {
     const oldUrlStateString = getQueryStringKeyValue({
       urlKey: URL_PARAM_KEY.timeline,
@@ -69,9 +74,18 @@ export const useQueryTimelineByIdOnUrlChange = () => {
         graphEventId,
         timelineId: newId,
         openTimeline: true,
+        unifiedComponentsInTimelineEnabled,
       });
     }
-  }, [timelineIdFromReduxStore, oldId, newId, activeTab, graphEventId, queryTimelineById]);
+  }, [
+    timelineIdFromReduxStore,
+    oldId,
+    newId,
+    activeTab,
+    graphEventId,
+    queryTimelineById,
+    unifiedComponentsInTimelineEnabled,
+  ]);
 };
 
 export const getQueryStringKeyValue = ({ search, urlKey }: { search: string; urlKey: string }) =>
diff --git a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
index 5cd2363e32d0c..f950d53d1212f 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
@@ -54,6 +54,10 @@ import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
 import { savedSearchPluginMock } from '@kbn/saved-search-plugin/public/mocks';
 import { contractStartServicesMock } from '../../../mocks';
 import { getDefaultConfigSettings } from '../../../../common/config_settings';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { indexPatternFieldEditorPluginMock } from '@kbn/data-view-field-editor-plugin/public/mocks';
+import { UpsellingService } from '@kbn/security-solution-upselling/service';
+import { calculateBounds } from '@kbn/data-plugin/common';
 
 const mockUiSettings: Record<string, unknown> = {
   [DEFAULT_TIME_RANGE]: { from: 'now-15m', to: 'now', mode: 'quick' },
@@ -125,6 +129,24 @@ export const createStartServicesMock = (
   const mockSetHeaderActionMenu = jest.fn();
   const mockTimelineFilterManager = createFilterManagerMock();
 
+  /*
+   * Below mocks are needed by unified field list
+   * when data service is passed through as a prop
+   *
+   * */
+  data.query.timefilter.timefilter.getAbsoluteTime = jest.fn(() => ({
+    from: '2021-08-31T22:00:00.000Z',
+    to: '2022-09-01T09:16:29.553Z',
+  }));
+  data.query.timefilter.timefilter.getTime = jest.fn(() => {
+    return { from: 'now-15m', to: 'now' };
+  });
+  data.query.timefilter.timefilter.getRefreshInterval = jest.fn(() => {
+    return { pause: true, value: 1000 };
+  });
+  data.query.timefilter.timefilter.calculateBounds = jest.fn(calculateBounds);
+  /** ************************************************* */
+
   return {
     ...core,
     ...contractStartServicesMock,
@@ -137,14 +159,7 @@ export const createStartServicesMock = (
     dataViews: dataViewServiceMock,
     data: {
       ...data,
-      dataViews: {
-        create: jest.fn(),
-        getIdsWithTitle: jest.fn(),
-        get: jest.fn(),
-        getIndexPattern: jest.fn(),
-        getFieldsForWildcard: jest.fn(),
-        getRuntimeMappings: jest.fn(),
-      },
+      dataViews: dataViewServiceMock,
       query: {
         ...data.query,
         savedQueries: {
@@ -206,6 +221,15 @@ export const createStartServicesMock = (
       getHoverActions: jest.fn().mockReturnValue({
         getAddToTimelineButton: jest.fn(),
       }),
+      getUseAddToTimeline: jest.fn().mockReturnValue(
+        jest.fn().mockReturnValue({
+          startDragToTimeline: jest.fn(),
+          beginDrag: jest.fn(),
+          dragLocation: jest.fn(),
+          endDrag: jest.fn(),
+          cancelDrag: jest.fn(),
+        })
+      ),
     },
     osquery: {
       OsqueryResults: jest.fn().mockReturnValue(null),
@@ -222,6 +246,9 @@ export const createStartServicesMock = (
     uiActions: uiActionsPluginMock.createStartContract(),
     savedSearch: savedSearchPluginMock.createStartContract(),
     setHeaderActionMenu: mockSetHeaderActionMenu,
+    fieldFormats: fieldFormatsMock,
+    dataViewFieldEditor: indexPatternFieldEditorPluginMock.createStartContract(),
+    upselling: new UpsellingService(),
     timelineFilterManager: mockTimelineFilterManager,
   } as unknown as StartServices;
 };
diff --git a/x-pack/plugins/security_solution/public/common/mock/global_state.ts b/x-pack/plugins/security_solution/public/common/mock/global_state.ts
index f36dec94e29b5..b59b30f629c9a 100644
--- a/x-pack/plugins/security_solution/public/common/mock/global_state.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/global_state.ts
@@ -6,7 +6,7 @@
  */
 
 import { TableId } from '@kbn/securitysolution-data-table';
-import type { DataViewSpec } from '@kbn/data-views-plugin/public';
+import type { DataViewSpec, FieldSpec } from '@kbn/data-views-plugin/public';
 import { HostsFields } from '../../../common/api/search_strategy/hosts/model/sort';
 import { InputsModelId } from '../store/inputs/constants';
 import {
@@ -58,7 +58,7 @@ export const mockSourcererState: SourcererState = {
     ...initialSourcererState.defaultDataView,
     browserFields: mockBrowserFields,
     id: DEFAULT_DATA_VIEW_ID,
-    indexFields: mockIndexFields,
+    indexFields: mockIndexFields as FieldSpec[],
     fields: mockFieldMap,
     loading: false,
     patternList: [...DEFAULT_INDEX_PATTERN, `${DEFAULT_SIGNALS_INDEX}-spacename`],
@@ -383,6 +383,7 @@ export const mockGlobalState: State = {
         savedSearchId: null,
         savedSearch: null,
         isDataProviderVisible: true,
+        sampleSize: 500,
       },
     },
     insertTimeline: null,
diff --git a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
index c88e4fc3e8547..757eb40f1fcb0 100644
--- a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
@@ -2034,6 +2034,7 @@ export const mockTimelineModel: TimelineModel = {
   savedSearchId: null,
   savedSearch: null,
   isDataProviderVisible: false,
+  sampleSize: 500,
 };
 
 export const mockDataTableModel: DataTableModel = {
@@ -2216,6 +2217,8 @@ export const defaultTimelineProps: CreateTimelineProps = {
     savedSearchId: null,
     savedSearch: null,
     isDataProviderVisible: false,
+    sampleSize: 500,
+    rowHeight: 3,
   },
   to: '2018-11-05T19:03:25.937Z',
   notes: null,
diff --git a/x-pack/plugins/security_solution/public/common/utils/timeline/use_timeline_click.tsx b/x-pack/plugins/security_solution/public/common/utils/timeline/use_timeline_click.tsx
index f5e866f240e16..de7614999cf8f 100644
--- a/x-pack/plugins/security_solution/public/common/utils/timeline/use_timeline_click.tsx
+++ b/x-pack/plugins/security_solution/public/common/utils/timeline/use_timeline_click.tsx
@@ -8,19 +8,25 @@
 import { useCallback } from 'react';
 import { useQueryTimelineById } from '../../../timelines/components/open_timeline/helpers';
 import type { TimelineErrorCallback } from '../../../timelines/components/open_timeline/types';
+import { useIsExperimentalFeatureEnabled } from '../../hooks/use_experimental_features';
 
 export const useTimelineClick = () => {
   const queryTimelineById = useQueryTimelineById();
 
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
+
   const handleTimelineClick = useCallback(
     (timelineId: string, onError: TimelineErrorCallback, graphEventId?: string) => {
       queryTimelineById({
         graphEventId,
         timelineId,
         onError,
+        unifiedComponentsInTimelineEnabled,
       });
     },
-    [queryTimelineById]
+    [queryTimelineById, unifiedComponentsInTimelineEnabled]
   );
 
   return handleTimelineClick;
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
index a362f6a542531..13d2a8e940c9d 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/index.test.tsx
@@ -21,8 +21,10 @@ import * as helpers from './helpers';
 import { mockAlertSearchResponse } from './mock_data';
 import { ChartContextMenu } from '../../../pages/detection_engine/chart_panels/chart_context_menu';
 import { AlertsHistogramPanel, LEGEND_WITH_COUNTS_WIDTH } from '.';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { LensEmbeddable } from '../../../../common/components/visualization_actions/lens_embeddable';
+import type { ExperimentalFeatures } from '../../../../../common';
+import { allowedExperimentalValues } from '../../../../../common';
+import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 
 jest.mock('../../../../common/containers/query_toggle');
 
@@ -110,7 +112,12 @@ jest.mock('../common/hooks', () => {
   };
 });
 
-const mockUseIsExperimentalFeatureEnabled = useIsExperimentalFeatureEnabled as jest.Mock;
+const mockUseIsExperimentalFeatureEnabled = jest.fn((feature: keyof ExperimentalFeatures) => {
+  if (feature === 'alertsPageChartsEnabled') return false;
+  if (feature === 'chartEmbeddablesEnabled') return false;
+  return allowedExperimentalValues[feature];
+});
+
 jest.mock('../../../../common/hooks/use_experimental_features');
 jest.mock('../../../hooks/alerts_visualization/use_alert_histogram_count', () => ({
   useAlertHistogramCount: jest.fn().mockReturnValue(999),
@@ -131,6 +138,10 @@ describe('AlertsHistogramPanel', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockUseQueryToggle.mockReturnValue({ toggleStatus: true, setToggleStatus: mockSetToggle });
+
+    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
+      mockUseIsExperimentalFeatureEnabled
+    );
   });
 
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
index 76e9aab7081ce..5049ccd92e116 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
@@ -454,6 +454,8 @@ describe('alert actions', () => {
             savedSearchId: null,
             savedSearch: null,
             isDataProviderVisible: false,
+            rowHeight: 3,
+            sampleSize: 500,
           },
           to: '2018-11-05T19:03:25.937Z',
           ruleNote: '# this is some markdown documentation',
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
index 30ff3978ef5b9..b9a3ce21b58fd 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
@@ -950,7 +950,6 @@ export const sendAlertToTimelineAction = async ({
       : ruleTimelineId
     : '';
   const { to, from } = determineToAndFrom({ ecs });
-
   // For now we do not want to populate the template timeline if we have alertIds
   if (!isEmpty(timelineId)) {
     try {
@@ -974,6 +973,7 @@ export const sendAlertToTimelineAction = async ({
           )
         ),
       ]);
+
       const resultingTimeline: TimelineResult = getOr({}, 'data.getOneTimeline', responseTimeline);
       const eventData: TimelineEventsDetailsItem[] = eventDataResp.data ?? [];
       if (!isEmpty(resultingTimeline)) {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.tsx
index c620e78a83887..0cbd2daa58221 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/use_investigate_in_timeline.tsx
@@ -18,6 +18,7 @@ import { useApi } from '@kbn/securitysolution-list-hooks';
 
 import type { Filter } from '@kbn/es-query';
 import type { EcsSecurityExtension as Ecs } from '@kbn/securitysolution-ecs';
+import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { createHistoryEntry } from '../../../../common/utils/global_query_string/helpers';
 import { useKibana } from '../../../../common/lib/kibana';
 import { TimelineId } from '../../../../../common/types/timeline';
@@ -32,6 +33,8 @@ import { getField } from '../../../../helpers';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { useStartTransaction } from '../../../../common/lib/apm/use_start_transaction';
 import { ALERTS_ACTIONS } from '../../../../common/lib/apm/user_actions';
+import { defaultUdtHeaders } from '../../../../timelines/components/timeline/unified_components/default_headers';
+import { defaultHeaders } from '../../../../timelines/components/timeline/body/column_headers/default_headers';
 
 interface UseInvestigateInTimelineActionProps {
   ecsRowData?: Ecs | Ecs[] | null;
@@ -141,6 +144,9 @@ export const useInvestigateInTimeline = ({
     timelineType: TimelineType.default,
   });
 
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
   const updateTimeline = useUpdateTimeline();
 
   const createTimeline = useCallback(
@@ -154,6 +160,7 @@ export const useInvestigateInTimeline = ({
         notes: [],
         timeline: {
           ...timeline,
+          columns: unifiedComponentsInTimelineEnabled ? defaultUdtHeaders : defaultHeaders,
           indexNames: timeline.indexNames ?? [],
           show: true,
         },
@@ -161,7 +168,12 @@ export const useInvestigateInTimeline = ({
         ruleNote,
       });
     },
-    [updateTimeline, updateTimelineIsLoading, clearActiveTimeline]
+    [
+      updateTimeline,
+      updateTimelineIsLoading,
+      clearActiveTimeline,
+      unifiedComponentsInTimelineEnabled,
+    ]
   );
 
   const investigateInTimelineAlertClick = useCallback(async () => {
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_from_timeline.test.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_from_timeline.test.ts
index 3459c07d46823..669064e76bbc9 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_from_timeline.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_from_timeline.test.ts
@@ -17,6 +17,7 @@ import { useAppToastsMock } from '../../../../common/hooks/use_app_toasts.mock';
 import { mockTimeline } from '../../../../../server/lib/timeline/__mocks__/create_timelines';
 import type { TimelineModel } from '../../../..';
 
+jest.mock('../../../../common/hooks/use_experimental_features');
 jest.mock('../../../../common/utils/global_query_string/helpers');
 jest.mock('../../../../timelines/containers/api');
 jest.mock('../../../../common/hooks/use_app_toasts');
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_from_timeline.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_from_timeline.tsx
index 700f1332d773c..c5fbc1d35d127 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_from_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/use_rule_from_timeline.tsx
@@ -10,6 +10,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { i18n } from '@kbn/i18n';
 import type { EqlOptionsSelected } from '@kbn/timelines-plugin/common';
+import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { convertKueryToElasticSearchQuery } from '../../../../common/lib/kuery';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
@@ -47,6 +48,10 @@ export const useRuleFromTimeline = (setRuleQuery: SetRuleQuery): RuleFromTimelin
     SourcererScopeName.timeline
   );
 
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
+
   const isEql = useRef(false);
 
   // selectedTimeline = timeline to set rule from
@@ -195,10 +200,11 @@ export const useRuleFromTimeline = (setRuleQuery: SetRuleQuery): RuleFromTimelin
         queryTimelineById({
           timelineId,
           onOpenTimeline,
+          unifiedComponentsInTimelineEnabled,
         });
       }
     },
-    [onOpenTimeline, queryTimelineById, selectedTimeline]
+    [onOpenTimeline, queryTimelineById, selectedTimeline, unifiedComponentsInTimelineEnabled]
   );
 
   const [urlStateInitialized, setUrlStateInitialized] = useState(false);
diff --git a/x-pack/plugins/security_solution/public/overview/components/recent_timelines/index.tsx b/x-pack/plugins/security_solution/public/overview/components/recent_timelines/index.tsx
index 0ec865591aa37..4c92de5f9b552 100644
--- a/x-pack/plugins/security_solution/public/overview/components/recent_timelines/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/recent_timelines/index.tsx
@@ -8,6 +8,7 @@
 import { EuiHorizontalRule, EuiText } from '@elastic/eui';
 import React, { useCallback, useMemo, useEffect } from 'react';
 
+import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
 import { SortFieldTimeline, TimelineType } from '../../../../common/api/timeline';
 import { useGetAllTimeline } from '../../../timelines/containers/all';
 import { useQueryTimelineById } from '../../../timelines/components/open_timeline/helpers';
@@ -32,6 +33,10 @@ interface Props {
 const PAGE_SIZE = 3;
 
 const StatefulRecentTimelinesComponent: React.FC<Props> = ({ filterBy }) => {
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
+
   const { formatUrl } = useFormatUrl(SecurityPageName.timelines);
   const { navigateToApp } = useKibana().services.application;
 
@@ -42,9 +47,10 @@ const StatefulRecentTimelinesComponent: React.FC<Props> = ({ filterBy }) => {
       queryTimelineById({
         duplicate,
         timelineId,
+        unifiedComponentsInTimelineEnabled,
       });
     },
-    [queryTimelineById]
+    [queryTimelineById, unifiedComponentsInTimelineEnabled]
   );
 
   const goToTimelines = useCallback(
diff --git a/x-pack/plugins/security_solution/public/timelines/components/edit_data_provider/helpers.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/edit_data_provider/helpers.test.tsx
index 70cdeced764ca..8dec5280b669c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/edit_data_provider/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/edit_data_provider/helpers.test.tsx
@@ -118,6 +118,7 @@ describe('helpers', () => {
             },
           ],
         },
+        { label: 'process', options: [{ label: 'process.args' }] },
         { label: 'source', options: [{ label: 'source.ip' }, { label: 'source.port' }] },
         {
           label: 'user',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/modal/actions/new_timeline_button.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/modal/actions/new_timeline_button.test.tsx
index 41f6bd25b8793..097d2d256a2c7 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/modal/actions/new_timeline_button.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/modal/actions/new_timeline_button.test.tsx
@@ -25,6 +25,8 @@ jest.mock('react-redux', () => {
   };
 });
 
+jest.mock('../../../../common/hooks/use_experimental_features');
+
 const renderNewTimelineButton = () =>
   render(<NewTimelineButton timelineId={TimelineId.test} />, { wrapper: TestProviders });
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/new_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/new_timeline/index.test.tsx
index ae8025406da67..e1bc119235e2e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/new_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/new_timeline/index.test.tsx
@@ -27,6 +27,8 @@ jest.mock('react-redux', () => {
   };
 });
 
+jest.mock('../../../common/hooks/use_experimental_features');
+
 const renderNewTimelineButton = (type: TimelineType) =>
   render(<NewTimelineButton type={type} />, { wrapper: TestProviders });
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
index f360343c4083a..3732e818dffcc 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
@@ -7,6 +7,7 @@
 
 import { cloneDeep, getOr, omit } from 'lodash/fp';
 import { renderHook } from '@testing-library/react-hooks';
+import { waitFor } from '@testing-library/react';
 
 import { mockTimelineResults, mockGetOneTimelineResult } from '../../../common/mock';
 import { timelineDefaults } from '../../store/defaults';
@@ -29,6 +30,7 @@ import {
   mockTemplate as mockSelectedTemplate,
 } from './__mocks__';
 import { resolveTimeline } from '../../containers/api';
+import { defaultUdtHeaders } from '../timeline/unified_components/default_headers';
 
 jest.mock('react-redux', () => {
   const actual = jest.requireActual('react-redux');
@@ -494,6 +496,60 @@ describe('helpers', () => {
         title: 'Awesome Timeline',
       });
     });
+
+    test('should produce correct model if unifiedComponentsInTimelineEnabled is true', () => {
+      const timeline = {
+        savedObjectId: 'savedObject-1',
+        title: 'Awesome Timeline',
+        version: '1',
+        status: TimelineStatus.active,
+        timelineType: TimelineType.default,
+      };
+
+      const newTimeline = defaultTimelineToTimelineModel(
+        timeline,
+        false,
+        TimelineType.default,
+        true
+      );
+      expect(newTimeline).toEqual({
+        ...defaultTimeline,
+        dateRange: { end: '2020-07-08T08:20:18.966Z', start: '2020-07-07T08:20:18.966Z' },
+        status: TimelineStatus.active,
+        title: 'Awesome Timeline',
+        timelineType: TimelineType.default,
+        defaultColumns: defaultUdtHeaders,
+        columns: defaultUdtHeaders,
+      });
+    });
+
+    test('should produce correct model if unifiedComponentsInTimelineEnabled is true and custom set of columns is passed', () => {
+      const customColumns = defaultUdtHeaders.slice(0, 2);
+      const timeline = {
+        savedObjectId: 'savedObject-1',
+        title: 'Awesome Timeline',
+        version: '1',
+        status: TimelineStatus.active,
+        timelineType: TimelineType.default,
+        columns: customColumns,
+      };
+
+      const newTimeline = defaultTimelineToTimelineModel(
+        timeline,
+        false,
+        TimelineType.default,
+        true
+      );
+      expect(newTimeline).toEqual({
+        ...defaultTimeline,
+        dateRange: { end: '2020-07-08T08:20:18.966Z', start: '2020-07-07T08:20:18.966Z' },
+        status: TimelineStatus.active,
+        title: 'Awesome Timeline',
+        timelineType: TimelineType.default,
+        defaultColumns: defaultUdtHeaders,
+        columns: customColumns,
+      });
+    });
   });
 
   describe('queryTimelineById', () => {
@@ -717,6 +773,119 @@ describe('helpers', () => {
         });
       });
     });
+    describe('open a timeline when unifiedComponentsInTimelineEnabled is true', () => {
+      const untitledTimeline = { ...mockSelectedTimeline, title: '' };
+      const onOpenTimeline = jest.fn();
+      afterEach(() => {
+        jest.clearAllMocks();
+      });
+
+      it('should update timeline correctly when timeline is untitled', async () => {
+        const args: QueryTimelineById = {
+          duplicate: false,
+          graphEventId: '',
+          timelineId: undefined,
+          timelineType: TimelineType.default,
+          onOpenTimeline,
+          openTimeline: true,
+          unifiedComponentsInTimelineEnabled: true,
+        };
+        (resolveTimeline as jest.Mock).mockResolvedValue(untitledTimeline);
+        renderHook(async () => {
+          const queryTimelineById = useQueryTimelineById();
+          queryTimelineById(args);
+        });
+
+        expect(dispatchUpdateIsLoading).toHaveBeenCalledWith({
+          id: TimelineId.active,
+          isLoading: true,
+        });
+
+        expect(mockUpdateTimeline).toHaveBeenNthCalledWith(
+          1,
+          expect.objectContaining({
+            id: TimelineId.active,
+            timeline: expect.objectContaining({
+              columns: defaultUdtHeaders,
+            }),
+          })
+        );
+        expect(dispatchUpdateIsLoading).toHaveBeenCalledWith({
+          id: TimelineId.active,
+          isLoading: false,
+        });
+      });
+
+      it('should update timeline correctly when timeline is already saved and onOpenTimeline is not provided', async () => {
+        const args: QueryTimelineById = {
+          duplicate: false,
+          graphEventId: '',
+          timelineId: TimelineId.active,
+          timelineType: TimelineType.default,
+          onOpenTimeline: undefined,
+          openTimeline: true,
+          unifiedComponentsInTimelineEnabled: true,
+        };
+
+        (resolveTimeline as jest.Mock).mockResolvedValue(mockSelectedTimeline);
+        renderHook(async () => {
+          const queryTimelineById = useQueryTimelineById();
+          queryTimelineById(args);
+        });
+
+        expect(dispatchUpdateIsLoading).toHaveBeenCalledWith({
+          id: TimelineId.active,
+          isLoading: true,
+        });
+
+        await waitFor(() => {
+          expect(mockUpdateTimeline).toHaveBeenNthCalledWith(
+            1,
+            expect.objectContaining({
+              timeline: expect.objectContaining({
+                columns: mockSelectedTimeline.data.timeline.columns.map((col) => ({
+                  columnHeaderType: col.columnHeaderType,
+                  id: col.id,
+                  initialWidth: defaultUdtHeaders.find((defaultCol) => col.id === defaultCol.id)
+                    ?.initialWidth,
+                })),
+              }),
+            })
+          );
+        });
+      });
+
+      it('should update timeline correctly when timeline is already saved and onOpenTimeline IS provided', async () => {
+        const args: QueryTimelineById = {
+          duplicate: false,
+          graphEventId: '',
+          timelineId: TimelineId.active,
+          timelineType: TimelineType.default,
+          onOpenTimeline,
+          openTimeline: true,
+          unifiedComponentsInTimelineEnabled: true,
+        };
+
+        (resolveTimeline as jest.Mock).mockResolvedValue(mockSelectedTimeline);
+        renderHook(async () => {
+          const queryTimelineById = useQueryTimelineById();
+          queryTimelineById(args);
+        });
+
+        waitFor(() => {
+          expect(onOpenTimeline).toHaveBeenCalledWith(
+            expect.objectContaining({
+              columns: mockSelectedTimeline.data.timeline.columns.map((col) => ({
+                columnHeaderType: col.columnHeaderType,
+                id: col.id,
+                initialWidth: defaultUdtHeaders.find((defaultCol) => col.id === defaultCol.id)
+                  ?.initialWidth,
+              })),
+            })
+          );
+        });
+      });
+    });
   });
 
   describe('omitTypenameInTimeline', () => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
index 6a900a7ff89a6..835862c04ced8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
@@ -33,10 +33,6 @@ import {
   defaultColumnHeaderType,
   defaultHeaders,
 } from '../timeline/body/column_headers/default_headers';
-import {
-  DEFAULT_DATE_COLUMN_MIN_WIDTH,
-  DEFAULT_COLUMN_MIN_WIDTH,
-} from '../timeline/body/constants';
 
 import type { OpenTimelineResult, TimelineErrorCallback } from './types';
 import { IS_OPERATOR } from '../timeline/data_providers/data_provider';
@@ -47,6 +43,7 @@ import {
   DEFAULT_TO_MOMENT,
 } from '../../../common/utils/default_date_settings';
 import { resolveTimeline } from '../../containers/api';
+import { defaultUdtHeaders } from '../timeline/unified_components/default_headers';
 import { timelineActions } from '../../store';
 
 export const OPEN_TIMELINE_CLASS_NAME = 'open-timeline';
@@ -88,7 +85,7 @@ const parseString = (params: string) => {
   }
 };
 
-const setTimelineColumn = (col: ColumnHeaderResult) =>
+const setTimelineColumn = (col: ColumnHeaderResult, defaultHeadersValue: ColumnHeaderOptions[]) =>
   Object.entries(col).reduce<ColumnHeaderOptions>(
     (acc, [key, value]) => {
       if (key !== 'id' && value != null) {
@@ -99,8 +96,8 @@ const setTimelineColumn = (col: ColumnHeaderResult) =>
     {
       columnHeaderType: defaultColumnHeaderType,
       id: col.id != null ? col.id : 'unknown',
-      initialWidth:
-        col.id === '@timestamp' ? DEFAULT_DATE_COLUMN_MIN_WIDTH : DEFAULT_COLUMN_MIN_WIDTH,
+      initialWidth: defaultHeadersValue.find((defaultCol) => col.id === defaultCol.id)
+        ?.initialWidth,
     }
   );
 
@@ -235,13 +232,21 @@ export const getTimelineStatus = (
 export const defaultTimelineToTimelineModel = (
   timeline: TimelineResult,
   duplicate: boolean,
-  timelineType?: TimelineType
+  timelineType?: TimelineType,
+  unifiedComponentsInTimelineEnabled?: boolean
 ): TimelineModel => {
   const isTemplate = timeline.timelineType === TimelineType.template;
+  const defaultHeadersValue = unifiedComponentsInTimelineEnabled
+    ? defaultUdtHeaders
+    : defaultHeaders;
+
   const timelineEntries = {
     ...timeline,
-    columns: timeline.columns != null ? timeline.columns.map(setTimelineColumn) : defaultHeaders,
-    defaultColumns: defaultHeaders,
+    columns:
+      timeline.columns != null
+        ? timeline.columns.map((col) => setTimelineColumn(col, defaultHeadersValue))
+        : defaultHeadersValue,
+    defaultColumns: defaultHeadersValue,
     dateRange:
       timeline.status === TimelineStatus.immutable &&
       timeline.timelineType === TimelineType.template
@@ -282,12 +287,18 @@ export const defaultTimelineToTimelineModel = (
 export const formatTimelineResultToModel = (
   timelineToOpen: TimelineResult,
   duplicate: boolean = false,
-  timelineType?: TimelineType
+  timelineType?: TimelineType,
+  unifiedComponentsInTimelineEnabled?: boolean
 ): { notes: Note[] | null | undefined; timeline: TimelineModel } => {
   const { notes, ...timelineModel } = timelineToOpen;
   return {
     notes,
-    timeline: defaultTimelineToTimelineModel(timelineModel, duplicate, timelineType),
+    timeline: defaultTimelineToTimelineModel(
+      timelineModel,
+      duplicate,
+      timelineType,
+      unifiedComponentsInTimelineEnabled
+    ),
   };
 };
 
@@ -301,6 +312,11 @@ export interface QueryTimelineById {
   onOpenTimeline?: (timeline: TimelineModel) => void;
   openTimeline?: boolean;
   savedSearchId?: string;
+  /*
+   * Below feature flag will be removed once
+   * unified components have been fully migrated
+   * */
+  unifiedComponentsInTimelineEnabled?: boolean;
 }
 
 export const useQueryTimelineById = () => {
@@ -324,6 +340,7 @@ export const useQueryTimelineById = () => {
     onOpenTimeline,
     openTimeline = true,
     savedSearchId,
+    unifiedComponentsInTimelineEnabled = false,
   }: QueryTimelineById) => {
     updateIsLoading({ id: TimelineId.active, isLoading: true });
     if (timelineId == null) {
@@ -335,6 +352,7 @@ export const useQueryTimelineById = () => {
         to: DEFAULT_TO_MOMENT.toISOString(),
         timeline: {
           ...timelineDefaults,
+          columns: unifiedComponentsInTimelineEnabled ? defaultUdtHeaders : defaultHeaders,
           id: TimelineId.active,
           activeTab: activeTimelineTab,
           show: openTimeline,
@@ -355,7 +373,8 @@ export const useQueryTimelineById = () => {
           const { timeline, notes } = formatTimelineResultToModel(
             timelineToOpen,
             duplicate,
-            timelineType
+            timelineType,
+            unifiedComponentsInTimelineEnabled
           );
 
           if (onOpenTimeline != null) {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
index 2cf293ee0ec2f..4ccefedf07822 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
@@ -9,6 +9,7 @@ import React, { useEffect, useState, useCallback, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 import { encode } from '@kbn/rison';
 
+import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
 import {
   RULE_FROM_EQL_URL_PARAM,
   RULE_FROM_TIMELINE_URL_PARAM,
@@ -55,6 +56,7 @@ import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 import { useSourcererDataView } from '../../../common/containers/sourcerer';
 import { useStartTransaction } from '../../../common/lib/apm/use_start_transaction';
 import { TIMELINE_ACTIONS } from '../../../common/lib/apm/user_actions';
+import { defaultUdtHeaders } from '../timeline/unified_components/default_headers';
 
 interface OwnProps<TCache = object> {
   /** Displays open timeline in modal */
@@ -157,6 +159,9 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
     );
 
     const { dataViewId, selectedPatterns } = useSourcererDataView(SourcererScopeName.timeline);
+    const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+      'unifiedComponentsInTimelineEnabled'
+    );
 
     const {
       customTemplateTimelineCount,
@@ -245,7 +250,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
           dispatch(
             dispatchCreateNewTimeline({
               id: TimelineId.active,
-              columns: defaultHeaders,
+              columns: unifiedComponentsInTimelineEnabled ? defaultUdtHeaders : defaultHeaders,
               dataViewId,
               indexNames: selectedPatterns,
               show: false,
@@ -256,7 +261,15 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
         await deleteTimelinesByIds(timelineIds, searchIds);
         refetch();
       },
-      [startTransaction, timelineSavedObjectId, refetch, dispatch, dataViewId, selectedPatterns]
+      [
+        startTransaction,
+        timelineSavedObjectId,
+        refetch,
+        dispatch,
+        dataViewId,
+        selectedPatterns,
+        unifiedComponentsInTimelineEnabled,
+      ]
     );
 
     const onDeleteOneTimeline: OnDeleteOneTimeline = useCallback(
@@ -353,6 +366,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
           onOpenTimeline,
           timelineId,
           timelineType: timelineTypeToOpen,
+          unifiedComponentsInTimelineEnabled,
         });
       },
       // eslint-disable-next-line react-hooks/exhaustive-deps
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 ae2cd149ef69d..deb82934dc823 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
@@ -12,6 +12,7 @@ import { EuiFlyout } from '@elastic/eui';
 
 import type { EntityType } from '@kbn/timelines-plugin/common';
 import { dataTableActions, dataTableSelectors } from '@kbn/securitysolution-data-table';
+import styled from 'styled-components';
 import { getScopedActions, isInTableScope, isTimelineScope } from '../../../helpers';
 import { timelineSelectors } from '../../store';
 import { timelineDefaults } from '../../store/defaults';
@@ -35,6 +36,11 @@ interface DetailsPanelProps {
   isReadOnly?: boolean;
 }
 
+// hack to to get around the fact that this flyout causes issue with timeline modal z-index
+const StyleEuiFlyout = styled(EuiFlyout)`
+  z-index: 1002;
+`;
+
 /**
  * This panel is used in both the main timeline as well as the flyouts on the host, detection, cases, and network pages.
  * To prevent duplication the `isFlyoutView` prop is passed to determine the layout that should be used
@@ -87,7 +93,7 @@ export const DetailsPanel = React.memo(
       }
     }, [dispatch, scopeId]);
 
-    const activeTab = tabType ?? TimelineTabs.query;
+    const activeTab: TimelineTabs = tabType ?? TimelineTabs.query;
     const closePanel = useCallback(() => {
       if (handleOnPanelClosed) handleOnPanelClosed();
       else defaultOnPanelClose();
@@ -166,7 +172,7 @@ export const DetailsPanel = React.memo(
     }
 
     return isFlyoutView ? (
-      <EuiFlyout
+      <StyleEuiFlyout
         data-test-subj="timeline:details-panel:flyout"
         size={panelSize}
         onClose={closePanel}
@@ -174,7 +180,7 @@ export const DetailsPanel = React.memo(
         key={flyoutUniqueKey}
       >
         {visiblePanel}
-      </EuiFlyout>
+      </StyleEuiFlyout>
     ) : (
       visiblePanel
     );
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
index 12e78df1e49ec..14a17ec011923 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
@@ -648,6 +648,21 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
           },
         },
       },
+      "process": Object {
+        "fields": Object {
+          "process.args": Object {
+            "aggregatable": true,
+            "esTypes": Array [
+              "keyword",
+            ],
+            "format": "",
+            "name": "process.args",
+            "readFromDocValues": true,
+            "searchable": true,
+            "type": "string",
+          },
+        },
+      },
       "source": Object {
         "fields": Object {
           "source.ip": Object {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/helpers.test.ts
index 317400f3bae90..8a1aaf6295b9a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/helpers.test.ts
@@ -11,6 +11,7 @@ import type { BrowserFields } from '../../../../../../common/search_strategy';
 import type { ColumnHeaderOptions } from '../../../../../../common/types';
 import { DEFAULT_COLUMN_MIN_WIDTH, DEFAULT_DATE_COLUMN_MIN_WIDTH } from '../constants';
 import { defaultHeaders } from './default_headers';
+import { defaultUdtHeaders } from '../../unified_components/default_headers';
 import {
   getColumnWidthFromType,
   getColumnHeaders,
@@ -87,6 +88,17 @@ describe('helpers', () => {
         type: 'date',
       });
     });
+
+    test('should return the expected metadata in case of unified header', () => {
+      const inputHeaders = defaultUdtHeaders;
+      expect(getColumnHeader('@timestamp', inputHeaders)).toEqual({
+        columnHeaderType: 'not-filtered',
+        id: '@timestamp',
+        initialWidth: 215,
+        esTypes: ['date'],
+        type: 'date',
+      });
+    });
   });
 
   describe('getColumnHeaders', () => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/constants.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/constants.ts
index 23c79faf6d391..163721b2db659 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/constants.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/constants.ts
@@ -13,3 +13,5 @@ export const RESIZED_COLUMN_MIN_WITH = 70; // px
 
 /** The default minimum width of a column of type `date` */
 export const DEFAULT_DATE_COLUMN_MIN_WIDTH = 190; // px
+
+export const DEFAULT_UNIFIED_TABLE_DATE_COLUMN_MIN_WIDTH = 215; // px
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 944ee20034d0e..6f402316c1c96 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
@@ -70,6 +70,7 @@ const FormattedFieldValueComponent: React.FC<{
   eventId: string;
   isAggregatable?: boolean;
   isObjectArray?: boolean;
+  isUnifiedDataTable?: boolean;
   fieldFormat?: string;
   fieldFromBrowserField?: BrowserField;
   fieldName: string;
@@ -89,6 +90,7 @@ const FormattedFieldValueComponent: React.FC<{
   eventId,
   fieldFormat,
   isAggregatable = false,
+  isUnifiedDataTable,
   fieldName,
   fieldType = '',
   fieldFromBrowserField,
@@ -130,9 +132,12 @@ const FormattedFieldValueComponent: React.FC<{
         className={classNames}
         fieldName={fieldName}
         value={value}
-        tooltipProps={{ position: 'bottom', className: dataGridToolTipOffset }}
+        tooltipProps={
+          isUnifiedDataTable ? undefined : { position: 'bottom', className: dataGridToolTipOffset }
+        }
       />
     );
+    if (isUnifiedDataTable) return date;
     return isDraggable ? (
       <DefaultDraggable
         field={fieldName}
@@ -308,7 +313,7 @@ const FormattedFieldValueComponent: React.FC<{
       title,
       value,
     });
-  } else if (columnNamesNotDraggable.includes(fieldName) || !isDraggable) {
+  } else if (isUnifiedDataTable || columnNamesNotDraggable.includes(fieldName) || !isDraggable) {
     return truncate && !isEmpty(value) ? (
       <TruncatableText data-test-subj="truncatable-message">
         <EuiToolTip
@@ -333,6 +338,7 @@ const FormattedFieldValueComponent: React.FC<{
       <span data-test-subj={`formatted-field-${fieldName}`}>{value}</span>
     );
   } else {
+    // This should not be reached for the unified data table
     const contentValue = getOrEmptyTagFromValue(value);
     const content = truncate ? <TruncatableText>{contentValue}</TruncatableText> : contentValue;
     return (
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_udt.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_udt.test.tsx
new file mode 100644
index 0000000000000..d731b6e831f9d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_udt.test.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 { mockTimelineData } from '../../../../../common/mock';
+import { defaultUdtHeaders } from '../../unified_components/default_headers';
+import { getFormattedFields } from './formatted_field_udt';
+import type { DataTableRecord } from '@kbn/discover-utils/types';
+
+describe('formatted_fields_udt', () => {
+  describe('getFormattedFields', () => {
+    it('should return correct map for all the present headers', () => {
+      const result = getFormattedFields({
+        dataTableRows: mockTimelineData.map((row) => ({
+          ...row,
+          id: '',
+          raw: {} as DataTableRecord['raw'],
+          flattened: {} as DataTableRecord['flattened'],
+        })),
+        headers: defaultUdtHeaders,
+        scopeId: 'timeline',
+      });
+
+      const expected = {
+        '@timestamp': expect.any(Function),
+        message: expect.any(Function),
+        'event.category': expect.any(Function),
+        'event.action': expect.any(Function),
+        'host.name': expect.any(Function),
+        'source.ip': expect.any(Function),
+        'destination.ip': expect.any(Function),
+        'user.name': expect.any(Function),
+      };
+
+      expect(result).toMatchObject(expected);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_udt.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_udt.tsx
new file mode 100644
index 0000000000000..545a198593fe8
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field_udt.tsx
@@ -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 type { EuiDataGridCellValueElementProps } from '@elastic/eui';
+import React from 'react';
+
+import type { ColumnHeaderOptions, TimelineItem } from '@kbn/timelines-plugin/common';
+import type { DataTableRecord } from '@kbn/discover-utils/types';
+import { DefaultCellRenderer } from '../../cell_rendering/default_cell_renderer';
+
+export const getFormattedFields = ({
+  dataTableRows,
+  headers,
+  scopeId,
+}: {
+  dataTableRows: Array<DataTableRecord & TimelineItem>;
+  headers: ColumnHeaderOptions[];
+  scopeId: string;
+}) => {
+  return headers.reduce(
+    (
+      obj: Record<string, (props: EuiDataGridCellValueElementProps) => React.ReactNode>,
+      header: ColumnHeaderOptions
+    ) => {
+      obj[header.id] = function UnifiedFieldRender(props: EuiDataGridCellValueElementProps) {
+        return (
+          <DefaultCellRenderer
+            {...props}
+            isDraggable={false}
+            isTimeline={true}
+            isDetails={false}
+            isExpanded={false}
+            isExpandable={true}
+            data={dataTableRows[props.rowIndex].data}
+            eventId={dataTableRows[props.rowIndex]._id}
+            scopeId={scopeId}
+            linkValues={undefined}
+            header={header}
+          />
+        );
+      };
+      return obj;
+    },
+    {}
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.test.tsx
new file mode 100644
index 0000000000000..401fe8763ada5
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.test.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 { TimelineTabs } from '../../../../../common/types';
+import { DataLoadingState } from '@kbn/unified-data-table';
+import React from 'react';
+import { UnifiedTimeline } from '../unified_components';
+import { defaultUdtHeaders } from '../unified_components/default_headers';
+import type { UnifiedTimelineBodyProps } from './unified_timeline_body';
+import { UnifiedTimelineBody } from './unified_timeline_body';
+import { render, screen } from '@testing-library/react';
+import { defaultHeaders, mockTimelineData, TestProviders } from '../../../../common/mock';
+
+jest.mock('../unified_components', () => {
+  return {
+    UnifiedTimeline: jest.fn(),
+  };
+});
+
+const mockEventsData = structuredClone(mockTimelineData);
+
+const defaultProps: UnifiedTimelineBodyProps = {
+  activeTab: TimelineTabs.query,
+  columns: defaultUdtHeaders,
+  dataLoadingState: DataLoadingState.loading,
+  events: mockEventsData,
+  expandedDetail: {},
+  header: <div />,
+  isTextBasedQuery: false,
+  itemsPerPage: 25,
+  itemsPerPageOptions: [10, 25, 50],
+  onChangePage: jest.fn(),
+  onEventClosed: jest.fn(),
+  refetch: jest.fn(),
+  rowRenderers: [],
+  showExpandedDetails: false,
+  sort: [],
+  timelineId: 'timeline-1',
+  totalCount: 0,
+  updatedAt: 0,
+  pageInfo: {
+    activePage: 0,
+    querySize: 0,
+  },
+};
+
+const renderTestComponents = (props?: UnifiedTimelineBodyProps) => {
+  return render(<UnifiedTimelineBody {...defaultProps} {...props} />, {
+    wrapper: TestProviders,
+  });
+};
+
+const MockUnifiedTimelineComponent = jest.fn(() => <div />);
+
+describe('UnifiedTimelineBody', () => {
+  beforeEach(() => {
+    (UnifiedTimeline as unknown as jest.Mock).mockImplementation(MockUnifiedTimelineComponent);
+  });
+  it('should pass correct page rows', () => {
+    const { rerender } = renderTestComponents();
+
+    expect(screen.getByTestId('unifiedTimelineBody')).toBeVisible();
+    expect(MockUnifiedTimelineComponent).toHaveBeenCalledTimes(2);
+
+    expect(MockUnifiedTimelineComponent).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        events: mockEventsData.flat(),
+      }),
+      {}
+    );
+
+    const newEventsData = structuredClone([mockEventsData[0]]);
+
+    const newProps = {
+      ...defaultProps,
+      pageInfo: {
+        activePage: 1,
+        querySize: 0,
+      },
+      events: newEventsData,
+    };
+
+    MockUnifiedTimelineComponent.mockClear();
+    rerender(<UnifiedTimelineBody {...newProps} />);
+    expect(MockUnifiedTimelineComponent).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        events: [...mockEventsData, ...newEventsData].flat(),
+      }),
+      {}
+    );
+  });
+
+  it('should pass default columns when empty column list is supplied', () => {
+    const newProps = { ...defaultProps, columns: [] };
+    renderTestComponents(newProps);
+
+    expect(MockUnifiedTimelineComponent).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        columns: defaultUdtHeaders,
+      }),
+      {}
+    );
+  });
+  it('should pass custom columns when supplied', () => {
+    const newProps = { ...defaultProps, columns: defaultHeaders };
+    renderTestComponents(newProps);
+
+    expect(MockUnifiedTimelineComponent).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        columns: defaultHeaders,
+      }),
+      {}
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.tsx
new file mode 100644
index 0000000000000..1a131871dc4fe
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.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 type { ComponentProps, ReactElement } from 'react';
+import React, { useEffect, useState, useMemo } from 'react';
+import { RootDragDropProvider } from '@kbn/dom-drag-drop';
+import { isEmpty } from 'lodash';
+import { StyledTableFlexGroup, StyledTableFlexItem } from '../unified_components/styles';
+import { UnifiedTimeline } from '../unified_components';
+import { defaultUdtHeaders } from '../unified_components/default_headers';
+import type { PaginationInputPaginated, TimelineItem } from '../../../../../common/search_strategy';
+
+export interface UnifiedTimelineBodyProps extends ComponentProps<typeof UnifiedTimeline> {
+  header: ReactElement;
+  pageInfo: Pick<PaginationInputPaginated, 'activePage' | 'querySize'>;
+}
+
+export const UnifiedTimelineBody = (props: UnifiedTimelineBodyProps) => {
+  const {
+    header,
+    pageInfo,
+    columns,
+    rowRenderers,
+    timelineId,
+    itemsPerPage,
+    itemsPerPageOptions,
+    sort,
+    events,
+    refetch,
+    dataLoadingState,
+    totalCount,
+    onEventClosed,
+    expandedDetail,
+    showExpandedDetails,
+    onChangePage,
+    activeTab,
+    updatedAt,
+  } = props;
+
+  const [pageRows, setPageRows] = useState<TimelineItem[][]>([]);
+
+  const rows = useMemo(() => pageRows.flat(), [pageRows]);
+
+  useEffect(() => {
+    setPageRows((currentPageRows) => {
+      if (pageInfo.activePage !== 0 && currentPageRows[pageInfo.activePage]?.length) {
+        return currentPageRows;
+      }
+      const newPageRows = pageInfo.activePage === 0 ? [] : [...currentPageRows];
+      newPageRows[pageInfo.activePage] = events;
+      return newPageRows;
+    });
+  }, [events, pageInfo.activePage]);
+
+  const columnsHeader = useMemo(() => {
+    return isEmpty(columns) ? defaultUdtHeaders : columns;
+  }, [columns]);
+
+  return (
+    <StyledTableFlexGroup direction="column" gutterSize="s">
+      <StyledTableFlexItem grow={false}>{header}</StyledTableFlexItem>
+      <StyledTableFlexItem className="unifiedTimelineBody" data-test-subj="unifiedTimelineBody">
+        <RootDragDropProvider>
+          <UnifiedTimeline
+            columns={columnsHeader}
+            rowRenderers={rowRenderers}
+            timelineId={timelineId}
+            itemsPerPage={itemsPerPage}
+            itemsPerPageOptions={itemsPerPageOptions}
+            sort={sort}
+            events={rows}
+            refetch={refetch}
+            dataLoadingState={dataLoadingState}
+            totalCount={totalCount}
+            onEventClosed={onEventClosed}
+            expandedDetail={expandedDetail}
+            showExpandedDetails={showExpandedDetails}
+            onChangePage={onChangePage}
+            activeTab={activeTab}
+            updatedAt={updatedAt}
+            isTextBasedQuery={false}
+          />
+        </RootDragDropProvider>
+      </StyledTableFlexItem>
+    </StyledTableFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
index ee803cad8674a..6ca5f2bb5f7f1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/eql_tab_content/index.tsx
@@ -22,6 +22,7 @@ import { connect, useDispatch } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 import { InPortal } from 'react-reverse-portal';
 
+import { DataLoadingState } from '@kbn/unified-data-table';
 import type { ControlColumnProps } from '../../../../../common/types';
 import { InputsModelId } from '../../../../common/store/inputs/constants';
 import { timelineActions, timelineSelectors } from '../../../store';
@@ -192,7 +193,7 @@ export const EqlTabContentComponent: React.FC<Props> = ({
   };
 
   const [
-    isQueryLoading,
+    queryLoadingState,
     { events, inspect, totalCount, pageInfo, loadPage, refreshedAt, refetch },
   ] = useTimelineEvents({
     dataViewId,
@@ -210,6 +211,13 @@ export const EqlTabContentComponent: React.FC<Props> = ({
     timerangeKind,
   });
 
+  const isQueryLoading = useMemo(
+    () =>
+      queryLoadingState === DataLoadingState.loading ||
+      queryLoadingState === DataLoadingState.loadingMore,
+    [queryLoadingState]
+  );
+
   const handleOnPanelClosed = useCallback(() => {
     onEventClosed({ tabType: TimelineTabs.eql, id: timelineId });
   }, [onEventClosed, timelineId]);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx
index 019a4a1ce4132..a7ef4080c6d5e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/index.tsx
@@ -27,40 +27,10 @@ import type { OnChangePage } from '../events';
 import { EVENTS_COUNT_BUTTON_CLASS_NAME } from '../helpers';
 
 import * as i18n from './translations';
-import { useEventDetailsWidthContext } from '../../../../common/components/events_viewer/event_details_width_context';
 import { timelineActions, timelineSelectors } from '../../../store';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { useKibana } from '../../../../common/lib/kibana';
-
-export const isCompactFooter = (width: number): boolean => width < 600;
-
-interface FixedWidthLastUpdatedContainerProps {
-  updatedAt: number;
-}
-
-const FixedWidthLastUpdatedContainer = React.memo<FixedWidthLastUpdatedContainerProps>(
-  ({ updatedAt }) => {
-    const { timelines } = useKibana().services;
-    const width = useEventDetailsWidthContext();
-    const compact = useMemo(() => isCompactFooter(width), [width]);
-
-    return updatedAt > 0 ? (
-      <FixedWidthLastUpdated data-test-subj="fixed-width-last-updated" compact={compact}>
-        {timelines.getLastUpdated({ updatedAt, compact })}
-      </FixedWidthLastUpdated>
-    ) : null;
-  }
-);
-
-FixedWidthLastUpdatedContainer.displayName = 'FixedWidthLastUpdatedContainer';
-
-const FixedWidthLastUpdated = styled.div<{ compact?: boolean }>`
-  width: ${({ compact }) => (!compact ? 200 : 25)}px;
-  overflow: hidden;
-  text-align: end;
-`;
-
-FixedWidthLastUpdated.displayName = 'FixedWidthLastUpdated';
+import { FixedWidthLastUpdatedContainer } from './last_updated';
 
 interface HeightProp {
   height: number;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/last_updated.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/last_updated.test.tsx
new file mode 100644
index 0000000000000..fd26a06d0f3cb
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/last_updated.test.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 { render, screen } from '@testing-library/react';
+import { useEventDetailsWidthContext } from '../../../../common/components/events_viewer/event_details_width_context';
+import { FixedWidthLastUpdatedContainer } from './last_updated';
+import { useKibana } from '../../../../common/lib/kibana';
+import { createStartServicesMock } from '../../../../common/lib/kibana/kibana_react.mock';
+
+jest.mock('../../../../common/components/events_viewer/event_details_width_context');
+jest.mock('../../../../common/lib/kibana');
+
+const mockEventDetailsWidthContainer = jest.fn().mockImplementation(() => {
+  return 800;
+});
+
+const mockUseLastUpdatedTimelinesPlugin = jest.fn().mockImplementation(() => {
+  return `Updated 2 minutes ago`;
+});
+
+describe('FixWidthLastUpdateContainer', () => {
+  beforeEach(() => {
+    (useKibana as jest.Mock).mockImplementation(() => {
+      return {
+        services: {
+          ...createStartServicesMock(),
+          timelines: {
+            getLastUpdated: mockUseLastUpdatedTimelinesPlugin,
+          },
+        },
+      };
+    });
+
+    (useEventDetailsWidthContext as jest.Mock).mockImplementation(mockEventDetailsWidthContainer);
+  });
+
+  it('should return normal version when width is greater than 600', () => {
+    render(<FixedWidthLastUpdatedContainer updatedAt={Date.now()} />);
+    expect(screen.getByTestId('fixed-width-last-updated')).toHaveTextContent(
+      'Updated 2 minutes ago'
+    );
+    expect(screen.getByTestId('fixed-width-last-updated')).toHaveStyle({
+      width: '200px',
+    });
+  });
+  it('should return compact version when width is less than 600', () => {
+    mockEventDetailsWidthContainer.mockReturnValueOnce(400);
+    render(<FixedWidthLastUpdatedContainer updatedAt={Date.now()} />);
+    expect(screen.getByTestId('fixed-width-last-updated')).toHaveTextContent(
+      'Updated 2 minutes ago'
+    );
+    expect(screen.getByTestId('fixed-width-last-updated')).toHaveStyle({
+      width: '25px',
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/last_updated.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/last_updated.tsx
new file mode 100644
index 0000000000000..02359cb792378
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/footer/last_updated.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 React, { useMemo } from 'react';
+import styled from 'styled-components';
+import { useEventDetailsWidthContext } from '../../../../common/components/events_viewer/event_details_width_context';
+
+import { useKibana } from '../../../../common/lib/kibana';
+
+interface FixedWidthLastUpdatedContainerProps {
+  updatedAt: number;
+}
+
+export const isCompactFooter = (width: number): boolean => width < 600;
+
+export const FixedWidthLastUpdatedContainer = React.memo<FixedWidthLastUpdatedContainerProps>(
+  ({ updatedAt }) => {
+    const { timelines } = useKibana().services;
+    const width = useEventDetailsWidthContext();
+    const compact = useMemo(() => isCompactFooter(width), [width]);
+
+    return updatedAt > 0 ? (
+      <FixedWidthLastUpdated data-test-subj="fixed-width-last-updated" compact={compact}>
+        {timelines.getLastUpdated({ updatedAt, compact })}
+      </FixedWidthLastUpdated>
+    ) : null;
+  }
+);
+
+FixedWidthLastUpdatedContainer.displayName = 'FixedWidthLastUpdatedContainer';
+
+const FixedWidthLastUpdated = styled.span<{ compact?: boolean }>`
+  width: ${({ compact }) => (!compact ? 200 : 25)}px;
+  text-overflow: ellipsis;
+  text-align: end;
+  overflow: hidden;
+`;
+
+FixedWidthLastUpdated.displayName = 'FixedWidthLastUpdated';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
index 5faf91b9fd6ee..900789b24c6ed 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/index.tsx
@@ -12,6 +12,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components';
 
 import { isTab } from '@kbn/timelines-plugin/public';
+import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
 import { useUserPrivileges } from '../../../common/components/user_privileges';
 import { timelineActions, timelineSelectors } from '../../store';
 import { timelineDefaults } from '../../store/defaults';
@@ -32,6 +33,7 @@ import { EXIT_FULL_SCREEN_CLASS_NAME } from '../../../common/components/exit_ful
 import { useResolveConflict } from '../../../common/hooks/use_resolve_conflict';
 import { sourcererSelectors } from '../../../common/store';
 import { TimelineTour } from './tour';
+import { defaultUdtHeaders } from './unified_components/default_headers';
 
 const TimelineTemplateBadge = styled.div`
   background: ${({ theme }) => theme.eui.euiColorVis3_behindText};
@@ -72,6 +74,11 @@ const StatefulTimelineComponent: React.FC<Props> = ({
   openToggleRef,
 }) => {
   const dispatch = useDispatch();
+
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
+
   const containerElement = useRef<HTMLDivElement | null>(null);
   const getTimeline = useMemo(() => timelineSelectors.getTimelineByIdSelector(), []);
   const selectedPatternsSourcerer = useSelector((state: State) => {
@@ -122,7 +129,7 @@ const StatefulTimelineComponent: React.FC<Props> = ({
       dispatch(
         timelineActions.createTimeline({
           id: timelineId,
-          columns: defaultHeaders,
+          columns: unifiedComponentsInTimelineEnabled ? defaultUdtHeaders : defaultHeaders,
           dataViewId: selectedDataViewIdSourcerer,
           indexNames: selectedPatternsSourcerer,
           show: false,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
index 20eff77cfbaec..98f731d5f7f15 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/pinned_tab_content/index.tsx
@@ -14,6 +14,7 @@ import type { ConnectedProps } from 'react-redux';
 import { connect } from 'react-redux';
 import deepEqual from 'fast-deep-equal';
 
+import { DataLoadingState } from '@kbn/unified-data-table';
 import type { ControlColumnProps } from '../../../../../common/types';
 import { timelineActions, timelineSelectors } from '../../../store';
 import type { CellValueElementProps } from '../cell_rendering';
@@ -182,7 +183,7 @@ export const PinnedTabContentComponent: React.FC<Props> = ({
     [sort]
   );
 
-  const [isQueryLoading, { events, totalCount, pageInfo, loadPage, refreshedAt, refetch }] =
+  const [queryLoadingState, { events, totalCount, pageInfo, loadPage, refreshedAt, refetch }] =
     useTimelineEvents({
       endDate: '',
       id: `pinned-${timelineId}`,
@@ -198,6 +199,11 @@ export const PinnedTabContentComponent: React.FC<Props> = ({
       timerangeKind: undefined,
     });
 
+  const isQueryLoading = useMemo(
+    () => [DataLoadingState.loading, DataLoadingState.loadingMore].includes(queryLoadingState),
+    [queryLoadingState]
+  );
+
   const handleOnPanelClosed = useCallback(() => {
     onEventClosed({ tabType: TimelineTabs.pinned, id: timelineId });
   }, [timelineId, onEventClosed]);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
index 1fe1f2ebbfa7d..ff6fac5d733f0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.test.tsx
@@ -117,8 +117,7 @@ describe('Timeline', () => {
     };
   });
 
-  // FLAKY: https://github.com/elastic/kibana/issues/156797
-  describe.skip('rendering', () => {
+  describe('rendering', () => {
     let spyCombineQueries: jest.SpyInstance;
 
     beforeEach(() => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
index 40f8834264200..d8dd976848fd9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx
@@ -23,6 +23,11 @@ import deepEqual from 'fast-deep-equal';
 import { InPortal } from 'react-reverse-portal';
 
 import { getEsQueryConfig } from '@kbn/data-plugin/common';
+import { DataLoadingState } from '@kbn/unified-data-table';
+import type { BrowserFields, ColumnHeaderOptions } from '@kbn/timelines-plugin/common';
+import memoizeOne from 'memoize-one';
+import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
+import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import type { ControlColumnProps } from '../../../../../common/types';
 import { InputsModelId } from '../../../../common/store/inputs/constants';
 import { useInvalidFilterQuery } from '../../../../common/hooks/use_invalid_filter_query';
@@ -43,7 +48,7 @@ import type {
   RowRenderer,
   ToggleDetailPanel,
 } from '../../../../../common/types/timeline';
-import { TimelineTabs } from '../../../../../common/types/timeline';
+import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
 import { requiredFieldsForActions } from '../../../../detections/components/alerts_table/default_config';
 import { EventDetailsWidthProvider } from '../../../../common/components/events_viewer/event_details_width_context';
 import type { inputsModel, State } from '../../../../common/store';
@@ -59,6 +64,16 @@ import { ExitFullScreen } from '../../../../common/components/exit_full_screen';
 import { getDefaultControlColumn } from '../body/control_columns';
 import { useLicense } from '../../../../common/hooks/use_license';
 import { HeaderActions } from '../../../../common/components/header_actions/header_actions';
+import { defaultUdtHeaders } from '../unified_components/default_headers';
+import { UnifiedTimelineBody } from '../body/unified_timeline_body';
+import { getColumnHeaders } from '../body/column_headers/helpers';
+
+const memoizedGetColumnHeaders: (
+  headers: ColumnHeaderOptions[],
+  browserFields: BrowserFields,
+  isEventRenderedView: boolean
+) => ColumnHeaderOptions[] = memoizeOne(getColumnHeaders);
+
 const QueryTabHeaderContainer = styled.div`
   width: 100%;
 `;
@@ -173,6 +188,7 @@ export const QueryTabContentComponent: React.FC<Props> = ({
   status,
   sort,
   timerangeKind,
+  expandedDetail,
 }) => {
   const dispatch = useDispatch();
   const { portalNode: timelineEventsCountPortalNode } = useTimelineEventsCountPortal();
@@ -192,6 +208,18 @@ export const QueryTabContentComponent: React.FC<Props> = ({
   const isEnterprisePlus = useLicense().isEnterprise();
   const ACTION_BUTTON_COUNT = isEnterprisePlus ? 6 : 5;
 
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
+
+  const getManageTimeline = useMemo(() => timelineSelectors.getTimelineByIdSelector(), []);
+
+  const currentTimeline = useDeepEqualSelector((state) =>
+    getManageTimeline(state, timelineId ?? TimelineId.active)
+  );
+
+  const { sampleSize } = currentTimeline;
+
   const esQueryConfig = useMemo(() => getEsQueryConfig(uiSettings), [uiSettings]);
   const kqlQuery: {
     query: string;
@@ -237,9 +265,20 @@ export const QueryTabContentComponent: React.FC<Props> = ({
     [combinedQueries, end, loadingSourcerer, start]
   );
 
+  const defaultColumns = useMemo(
+    () => (unifiedComponentsInTimelineEnabled ? defaultUdtHeaders : defaultHeaders),
+    [unifiedComponentsInTimelineEnabled]
+  );
+
+  const localColumns = useMemo(
+    () => (isEmpty(columns) ? defaultColumns : columns),
+    [columns, defaultColumns]
+  );
+
+  const augumentedColumnHeaders = memoizedGetColumnHeaders(localColumns, browserFields, false);
+
   const getTimelineQueryFields = () => {
-    const columnsHeader = isEmpty(columns) ? defaultHeaders : columns;
-    const columnFields = columnsHeader.map((c) => c.id);
+    const columnFields = augumentedColumnHeaders.map((c) => c.id);
 
     return [...columnFields, ...requiredFieldsForActions];
   };
@@ -255,12 +294,13 @@ export const QueryTabContentComponent: React.FC<Props> = ({
     dispatch(
       timelineActions.initializeTimelineSettings({
         id: timelineId,
+        defaultColumns,
       })
     );
-  }, [dispatch, timelineId]);
+  }, [dispatch, timelineId, defaultColumns]);
 
   const [
-    isQueryLoading,
+    dataLoadingState,
     { events, inspect, totalCount, pageInfo, loadPage, refreshedAt, refetch },
   ] = useTimelineEvents({
     dataViewId,
@@ -270,7 +310,7 @@ export const QueryTabContentComponent: React.FC<Props> = ({
     id: timelineId,
     indexNames: selectedPatterns,
     language: kqlQuery.language,
-    limit: itemsPerPage,
+    limit: unifiedComponentsInTimelineEnabled ? sampleSize : itemsPerPage,
     runtimeMappings,
     skip: !canQueryTimeline,
     sort: timelineQuerySortField,
@@ -278,6 +318,11 @@ export const QueryTabContentComponent: React.FC<Props> = ({
     timerangeKind,
   });
 
+  const isQueryLoading = useMemo(
+    () => [DataLoadingState.loading, DataLoadingState.loadingMore].includes(dataLoadingState),
+    [dataLoadingState]
+  );
+
   const handleOnPanelClosed = useCallback(() => {
     onEventClosed({ tabType: TimelineTabs.query, id: timelineId });
   }, [onEventClosed, timelineId]);
@@ -305,11 +350,88 @@ export const QueryTabContentComponent: React.FC<Props> = ({
   // is not getting refreshed when using browser navigation.
   const showEventsCountBadge = !isBlankTimeline && totalCount >= 0;
 
+  const header = useMemo(
+    () => (
+      <StyledEuiFlyoutHeader data-test-subj={`${activeTab}-tab-flyout-header`} hasBorder={false}>
+        <InPortal node={timelineEventsCountPortalNode}>
+          {showEventsCountBadge ? <EventsCountBadge>{totalCount}</EventsCountBadge> : null}
+        </InPortal>
+        <EuiFlexGroup gutterSize="s" direction="column">
+          {!unifiedComponentsInTimelineEnabled &&
+            timelineFullScreen &&
+            setTimelineFullScreen != null && (
+              <EuiFlexItem>
+                <EuiFlexGroup alignItems="center" gutterSize="s">
+                  <ExitFullScreen
+                    fullScreen={timelineFullScreen}
+                    setFullScreen={setTimelineFullScreen}
+                  />
+                </EuiFlexGroup>
+              </EuiFlexItem>
+            )}
+          <EuiFlexItem data-test-subj="timeline-date-picker-container">
+            <QueryTabHeaderContainer data-test-subj="timelineHeader">
+              <QueryTabHeader
+                filterManager={timelineFilterManager}
+                show={show && activeTab === TimelineTabs.query}
+                showCallOutUnauthorizedMsg={showCallOutUnauthorizedMsg}
+                status={status}
+                timelineId={timelineId}
+              />
+            </QueryTabHeaderContainer>
+          </EuiFlexItem>
+          {/* TODO: This is a temporary solution to hide the KPIs until lens components play nicely with timelines */}
+          {/* https://github.com/elastic/kibana/issues/17156 */}
+          {/* <EuiFlexItem grow={false}> */}
+          {/*   <TimelineKpi timelineId={timelineId} /> */}
+          {/* </EuiFlexItem> */}
+        </EuiFlexGroup>
+      </StyledEuiFlyoutHeader>
+    ),
+    [
+      activeTab,
+      timelineFilterManager,
+      show,
+      showCallOutUnauthorizedMsg,
+      status,
+      timelineId,
+      setTimelineFullScreen,
+      timelineFullScreen,
+      unifiedComponentsInTimelineEnabled,
+      timelineEventsCountPortalNode,
+      showEventsCountBadge,
+      totalCount,
+    ]
+  );
+
+  if (unifiedComponentsInTimelineEnabled) {
+    return (
+      <UnifiedTimelineBody
+        header={header}
+        columns={augumentedColumnHeaders}
+        rowRenderers={rowRenderers}
+        timelineId={timelineId}
+        itemsPerPage={itemsPerPage}
+        itemsPerPageOptions={itemsPerPageOptions}
+        sort={sort}
+        events={events}
+        refetch={refetch}
+        dataLoadingState={dataLoadingState}
+        totalCount={isBlankTimeline ? 0 : totalCount}
+        onEventClosed={onEventClosed}
+        expandedDetail={expandedDetail}
+        showExpandedDetails={showExpandedDetails}
+        onChangePage={loadPage}
+        activeTab={activeTab}
+        updatedAt={refreshedAt}
+        isTextBasedQuery={false}
+        pageInfo={pageInfo}
+      />
+    );
+  }
+
   return (
     <>
-      <InPortal node={timelineEventsCountPortalNode}>
-        {showEventsCountBadge ? <EventsCountBadge>{totalCount}</EventsCountBadge> : null}
-      </InPortal>
       <TimelineRefetch
         id={`${timelineId}-${TimelineTabs.query}`}
         inputId={InputsModelId.timeline}
@@ -320,39 +442,7 @@ export const QueryTabContentComponent: React.FC<Props> = ({
       />
       <FullWidthFlexGroup gutterSize="none">
         <ScrollableFlexItem grow={2}>
-          <StyledEuiFlyoutHeader
-            data-test-subj={`${activeTab}-tab-flyout-header`}
-            hasBorder={false}
-          >
-            <EuiFlexGroup gutterSize="s" direction="column">
-              {timelineFullScreen && setTimelineFullScreen != null && (
-                <EuiFlexItem>
-                  <EuiFlexGroup alignItems="center" gutterSize="s">
-                    <ExitFullScreen
-                      fullScreen={timelineFullScreen}
-                      setFullScreen={setTimelineFullScreen}
-                    />
-                  </EuiFlexGroup>
-                </EuiFlexItem>
-              )}
-              <EuiFlexItem data-test-subj="timeline-date-picker-container">
-                <QueryTabHeaderContainer data-test-subj="timelineHeader">
-                  <QueryTabHeader
-                    filterManager={timelineFilterManager}
-                    show={show && activeTab === TimelineTabs.query}
-                    showCallOutUnauthorizedMsg={showCallOutUnauthorizedMsg}
-                    status={status}
-                    timelineId={timelineId}
-                  />
-                </QueryTabHeaderContainer>
-              </EuiFlexItem>
-              {/* TODO: This is a temporary solution to hide the KPIs until lens components play nicely with timelines */}
-              {/* https://github.com/elastic/kibana/issues/17156 */}
-              {/* <EuiFlexItem grow={false}> */}
-              {/*   <TimelineKpi timelineId={timelineId} /> */}
-              {/* </EuiFlexItem> */}
-            </EuiFlexGroup>
-          </StyledEuiFlyoutHeader>
+          {header}
           <EventDetailsWidthProvider>
             <StyledEuiFlyoutBody
               data-test-subj={`${TimelineTabs.query}-tab-flyout-body`}
@@ -441,6 +531,7 @@ const makeMapStateToProps = () => {
       status,
       timelineType,
     } = timeline;
+
     const kqlQueryTimeline = getKqlQueryTimeline(state, timelineId);
     const timelineFilter = kqlMode === 'filter' ? filters || [] : [];
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
new file mode 100644
index 0000000000000..05aae984f0357
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
@@ -0,0 +1,701 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ComponentProps } from 'react';
+import React, { useEffect } from 'react';
+import QueryTabContent from '.';
+import { defaultRowRenderers } from '../body/renderers';
+import { TimelineId } from '../../../../../common/types/timeline';
+import { useTimelineEvents } from '../../../containers';
+import { useTimelineEventsDetails } from '../../../containers/details';
+import { useSourcererDataView } from '../../../../common/containers/sourcerer';
+import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
+import {
+  createSecuritySolutionStorageMock,
+  mockTimelineData,
+  TestProviders,
+} from '../../../../common/mock';
+import { DefaultCellRenderer } from '../cell_rendering/default_cell_renderer';
+import { render, screen, waitFor, fireEvent, within, cleanup } from '@testing-library/react';
+import { createStartServicesMock } from '../../../../common/lib/kibana/kibana_react.mock';
+import type { StartServices } from '../../../../types';
+import { useKibana } from '../../../../common/lib/kibana';
+import { useDispatch } from 'react-redux';
+import { timelineActions } from '../../../store';
+import type { ExperimentalFeatures } from '../../../../../common';
+import { allowedExperimentalValues } from '../../../../../common';
+import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
+import { cloneDeep, flatten } from 'lodash';
+
+jest.mock('../../../containers', () => ({
+  useTimelineEvents: jest.fn(),
+}));
+
+jest.mock('../../../containers/details');
+
+jest.mock('../../fields_browser', () => ({
+  useFieldBrowserOptions: jest.fn(),
+}));
+
+jest.mock('../body/events', () => ({
+  Events: () => <></>,
+}));
+
+jest.mock('../../../../common/containers/sourcerer');
+jest.mock('../../../../common/containers/sourcerer/use_signal_helpers', () => ({
+  useSignalHelpers: () => ({ signalIndexNeedsInit: false }),
+}));
+
+jest.mock('../../../../common/lib/kuery');
+
+jest.mock('../../../../common/hooks/use_experimental_features');
+
+// These tests can take more than standard timeout of 5s
+// that is why we are setting it to 15s
+const SPECIAL_TEST_TIMEOUT = 15000;
+
+const useIsExperimentalFeatureEnabledMock = jest.fn((feature: keyof ExperimentalFeatures) => {
+  if (feature === 'unifiedComponentsInTimelineEnabled') {
+    return true;
+  }
+  return allowedExperimentalValues[feature];
+});
+
+jest.mock('../../../../common/lib/kibana');
+
+// unified-field-list is is reporiting multiple analytics events
+jest.mock(`@kbn/analytics-client`);
+
+const TestComponent = (props: Partial<ComponentProps<typeof QueryTabContent>>) => {
+  const testComponentDefaultProps: ComponentProps<typeof QueryTabContent> = {
+    timelineId: TimelineId.test,
+    renderCellValue: DefaultCellRenderer,
+    rowRenderers: defaultRowRenderers,
+  };
+
+  const dispatch = useDispatch();
+
+  // populating timeline so that it is not blank
+  useEffect(() => {
+    dispatch(
+      timelineActions.applyKqlFilterQuery({
+        id: TimelineId.test,
+        filterQuery: {
+          kuery: {
+            kind: 'kuery',
+            expression: '*',
+          },
+          serializedQuery: '*',
+        },
+      })
+    );
+  }, [dispatch]);
+
+  return <QueryTabContent {...testComponentDefaultProps} {...props} />;
+};
+
+const renderTestComponents = (props?: Partial<ComponentProps<typeof TestComponent>>) => {
+  return render(<TestComponent {...props} />, {
+    wrapper: TestProviders,
+  });
+};
+
+const changeItemsPerPageTo = (newItemsPerPage: number) => {
+  fireEvent.click(screen.getByTestId('tablePaginationPopoverButton'));
+  fireEvent.click(screen.getByTestId(`tablePagination-${newItemsPerPage}-rows`));
+  expect(screen.getByTestId('tablePaginationPopoverButton')).toHaveTextContent(
+    `Rows per page: ${newItemsPerPage}`
+  );
+};
+
+const loadPageMock = jest.fn();
+
+const useTimelineEventsMock = jest.fn(() => [
+  false,
+  {
+    events: cloneDeep(mockTimelineData),
+    pageInfo: {
+      activePage: 0,
+      totalPages: 10,
+    },
+    refreshedAt: Date.now(),
+    totalCount: 70,
+    loadPage: loadPageMock,
+  },
+]);
+
+const useSourcererDataViewMocked = jest.fn().mockReturnValue({
+  ...mockSourcererScope,
+});
+
+const { storage: storageMock } = createSecuritySolutionStorageMock();
+
+describe('query tab with unified timeline', () => {
+  const kibanaServiceMock: StartServices = {
+    ...createStartServicesMock(),
+    storage: storageMock,
+  };
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    storageMock.clear();
+    cleanup();
+    localStorage.clear();
+  });
+
+  beforeEach(() => {
+    // increase timeout for these tests as they are rendering a complete table with ~30 rows which can take time.
+    const ONE_SECOND = 1000;
+    jest.setTimeout(10 * ONE_SECOND);
+    HTMLElement.prototype.getBoundingClientRect = jest.fn(() => {
+      return {
+        width: 1000,
+        height: 1000,
+        x: 0,
+        y: 0,
+      } as DOMRect;
+    });
+
+    (useKibana as jest.Mock).mockImplementation(() => {
+      return {
+        services: kibanaServiceMock,
+      };
+    });
+
+    (useTimelineEvents as jest.Mock).mockImplementation(useTimelineEventsMock);
+
+    (useTimelineEventsDetails as jest.Mock).mockImplementation(() => [false, {}]);
+
+    (useSourcererDataView as jest.Mock).mockImplementation(useSourcererDataViewMocked);
+
+    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
+      useIsExperimentalFeatureEnabledMock
+    );
+  });
+
+  describe('render', () => {
+    it(
+      'should render unifiedDataTable in timeline',
+      async () => {
+        renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should render unified-field-list in timeline',
+      async () => {
+        renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('timeline-sidebar')).toBeVisible();
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+
+  describe('pagination', () => {
+    it(
+      'should paginate correctly',
+      async () => {
+        renderTestComponents();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('tablePaginationPopoverButton')).toHaveTextContent(
+            'Rows per page: 5'
+          );
+        });
+
+        expect(screen.getByTestId('pagination-button-0')).toHaveAttribute('aria-current', 'true');
+        expect(screen.getByTestId('pagination-button-6')).toBeVisible();
+
+        fireEvent.click(screen.getByTestId('pagination-button-6'));
+
+        await waitFor(() => {
+          expect(screen.getByTestId('pagination-button-6')).toHaveAttribute('aria-current', 'true');
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should load more records according to sample size correctly',
+      async () => {
+        renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('pagination-button-0')).toHaveAttribute('aria-current', 'true');
+          expect(screen.getByTestId('pagination-button-6')).toBeVisible();
+        });
+        // Go to last page
+        fireEvent.click(screen.getByTestId('pagination-button-6'));
+        await waitFor(() => {
+          expect(screen.getByTestId('dscGridSampleSizeFetchMoreLink')).toBeVisible();
+        });
+        fireEvent.click(screen.getByTestId('dscGridSampleSizeFetchMoreLink'));
+        expect(loadPageMock).toHaveBeenNthCalledWith(1, 1);
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+
+  describe('columns', () => {
+    it(
+      'should move column left/right correctly ',
+      async () => {
+        const { container } = renderTestComponents();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+        expect(container.querySelector('[data-gridcell-column-id="message"]')).toHaveAttribute(
+          'data-gridcell-column-index',
+          '12'
+        );
+
+        expect(container.querySelector('[data-gridcell-column-id="message"]')).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            '[data-gridcell-column-id="message"] .euiDataGridHeaderCell__icon'
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTitle('Move left')).toBeEnabled();
+        });
+
+        fireEvent.click(screen.getByTitle('Move left'));
+
+        await waitFor(() => {
+          expect(container.querySelector('[data-gridcell-column-id="message"]')).toHaveAttribute(
+            'data-gridcell-column-index',
+            '11'
+          );
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should remove column left/right ',
+      async () => {
+        const { container } = renderTestComponents();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+
+        expect(container.querySelector('[data-gridcell-column-id="message"]')).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            '[data-gridcell-column-id="message"] .euiDataGridHeaderCell__icon'
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTitle('Remove column')).toBeVisible();
+        });
+
+        fireEvent.click(screen.getByTitle('Remove column'));
+
+        await waitFor(() => {
+          expect(
+            container.querySelector('[data-gridcell-column-id="message"]')
+          ).not.toBeInTheDocument();
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should sort date column',
+      async () => {
+        const { container } = renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+
+        expect(
+          container.querySelector('[data-gridcell-column-id="@timestamp"]')
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            '[data-gridcell-column-id="@timestamp"] .euiDataGridHeaderCell__icon'
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTitle('Sort Old-New')).toBeVisible();
+        });
+        expect(screen.getByTitle('Sort New-Old')).toBeVisible();
+
+        useTimelineEventsMock.mockClear();
+
+        fireEvent.click(screen.getByTitle('Sort Old-New'));
+
+        await waitFor(() => {
+          expect(useTimelineEventsMock).toHaveBeenNthCalledWith(
+            1,
+            expect.objectContaining({
+              sort: [
+                {
+                  direction: 'asc',
+                  esTypes: [],
+                  field: '@timestamp',
+                  type: 'date',
+                },
+              ],
+            })
+          );
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should sort string column correctly',
+      async () => {
+        const { container } = renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+
+        expect(
+          container.querySelector('[data-gridcell-column-id="host.name"]')
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            '[data-gridcell-column-id="host.name"] .euiDataGridHeaderCell__icon'
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTestId('dataGridHeaderCellActionGroup-host.name')).toBeVisible();
+        });
+
+        expect(screen.getByTitle('Sort A-Z')).toBeVisible();
+        expect(screen.getByTitle('Sort Z-A')).toBeVisible();
+
+        useTimelineEventsMock.mockClear();
+
+        fireEvent.click(screen.getByTitle('Sort A-Z'));
+
+        await waitFor(() => {
+          expect(useTimelineEventsMock).toHaveBeenNthCalledWith(
+            1,
+            expect.objectContaining({
+              sort: [
+                {
+                  direction: 'desc',
+                  esTypes: [],
+                  field: '@timestamp',
+                  type: 'date',
+                },
+                {
+                  direction: 'asc',
+                  esTypes: [],
+                  field: 'host.name',
+                  type: 'string',
+                },
+              ],
+            })
+          );
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should sort number column',
+      async () => {
+        const field = {
+          name: 'event.severity',
+          type: 'number',
+        };
+
+        const { container } = renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            `[data-gridcell-column-id="${field.name}"] .euiDataGridHeaderCell__icon`
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTestId(`dataGridHeaderCellActionGroup-${field.name}`)).toBeVisible();
+        });
+
+        expect(screen.getByTitle('Sort Low-High')).toBeVisible();
+        expect(screen.getByTitle('Sort High-Low')).toBeVisible();
+
+        useTimelineEventsMock.mockClear();
+
+        fireEvent.click(screen.getByTitle('Sort Low-High'));
+
+        await waitFor(() => {
+          expect(useTimelineEventsMock).toHaveBeenNthCalledWith(
+            1,
+            expect.objectContaining({
+              sort: [
+                {
+                  direction: 'desc',
+                  esTypes: [],
+                  field: '@timestamp',
+                  type: 'date',
+                },
+                {
+                  direction: 'asc',
+                  esTypes: [],
+                  field: field.name,
+                  type: field.type,
+                },
+              ],
+            })
+          );
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+
+  describe('left controls', () => {
+    it(
+      'should clear all sorting',
+      async () => {
+        renderTestComponents();
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+        expect(screen.getByTestId('dataGridColumnSortingButton')).toBeVisible();
+        expect(
+          within(screen.getByTestId('dataGridColumnSortingButton')).getByRole('marquee')
+        ).toHaveTextContent('1');
+
+        fireEvent.click(screen.getByTestId('dataGridColumnSortingButton'));
+
+        // // timestamp sorting indicators
+        expect(
+          await screen.findByTestId('euiDataGridColumnSorting-sortColumn-@timestamp')
+        ).toBeVisible();
+
+        expect(screen.getByTestId('dataGridHeaderCellSortingIcon-@timestamp')).toBeVisible();
+
+        fireEvent.click(screen.getByTestId('dataGridColumnSortingClearButton'));
+
+        await waitFor(() => {
+          expect(screen.queryByTestId('dataGridHeaderCellSortingIcon-@timestamp')).toBeNull();
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should be able to sort by multiple columns',
+      async () => {
+        renderTestComponents();
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+        expect(screen.getByTestId('dataGridColumnSortingButton')).toBeVisible();
+        expect(
+          within(screen.getByTestId('dataGridColumnSortingButton')).getByRole('marquee')
+        ).toHaveTextContent('1');
+
+        fireEvent.click(screen.getByTestId('dataGridColumnSortingButton'));
+
+        // // timestamp sorting indicators
+        expect(
+          await screen.findByTestId('euiDataGridColumnSorting-sortColumn-@timestamp')
+        ).toBeVisible();
+
+        expect(screen.getByTestId('dataGridHeaderCellSortingIcon-@timestamp')).toBeVisible();
+
+        // add more columns to sorting
+        fireEvent.click(screen.getByText(/Pick fields to sort by/));
+
+        await waitFor(() => {
+          expect(
+            screen.getByTestId('dataGridColumnSortingPopoverColumnSelection-event.severity')
+          ).toBeVisible();
+        });
+
+        fireEvent.click(
+          screen.getByTestId('dataGridColumnSortingPopoverColumnSelection-event.severity')
+        );
+
+        // check new columns for sorting validity
+        await waitFor(() => {
+          expect(screen.getByTestId('dataGridHeaderCellSortingIcon-event.severity')).toBeVisible();
+        });
+        expect(
+          screen.getByTestId('euiDataGridColumnSorting-sortColumn-event.severity')
+        ).toBeVisible();
+
+        expect(screen.getByTestId('dataGridHeaderCellSortingIcon-@timestamp')).toBeVisible();
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+
+  describe('unified fields list', () => {
+    it(
+      'should add the column when clicked on X sign',
+      async () => {
+        const field = {
+          name: 'event.severity',
+        };
+
+        renderTestComponents();
+        expect(await screen.findByTestId('timeline-sidebar')).toBeVisible();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedSelectedFields-count')).toHaveTextContent(
+            '11'
+          );
+        });
+
+        // column exists in the table
+        expect(screen.getByTestId(`dataGridHeaderCell-${field.name}`)).toBeVisible();
+
+        fireEvent.click(screen.getAllByTestId(`fieldToggle-${field.name}`)[0]);
+
+        // column not longer exists in the table
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedSelectedFields-count')).toHaveTextContent(
+            '10'
+          );
+        });
+        expect(screen.queryAllByTestId(`dataGridHeaderCell-${field.name}`)).toHaveLength(0);
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should remove the column when clicked on ⊕ sign',
+      async () => {
+        const field = {
+          name: 'agent.id',
+        };
+
+        renderTestComponents();
+        expect(await screen.findByTestId('timeline-sidebar')).toBeVisible();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedSelectedFields-count')).toHaveTextContent(
+            '11'
+          );
+        });
+
+        expect(screen.queryAllByTestId(`dataGridHeaderCell-${field.name}`)).toHaveLength(0);
+
+        // column exists in the table
+        const availableFields = screen.getByTestId('fieldListGroupedAvailableFields');
+
+        fireEvent.click(within(availableFields).getByTestId(`fieldToggle-${field.name}`));
+
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedSelectedFields-count')).toHaveTextContent(
+            '12'
+          );
+        });
+        expect(screen.queryAllByTestId(`dataGridHeaderCell-${field.name}`)).toHaveLength(1);
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should should show callout when field search does not matches any field',
+      async () => {
+        renderTestComponents();
+        expect(await screen.findByTestId('timeline-sidebar')).toBeVisible();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedAvailableFields-count')).toHaveTextContent(
+            '36'
+          );
+        });
+
+        fireEvent.change(screen.getByTestId('fieldListFiltersFieldSearch'), {
+          target: { value: 'fake_field' },
+        });
+
+        await waitFor(() => {
+          expect(
+            screen.getByTestId('fieldListGroupedAvailableFieldsNoFieldsCallout-noFieldsMatch')
+          ).toBeVisible();
+        });
+
+        expect(screen.getByTestId('fieldListGroupedAvailableFields-count')).toHaveTextContent('0');
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should toggle side bar correctly',
+      async () => {
+        renderTestComponents();
+        expect(await screen.findByTestId('timeline-sidebar')).toBeVisible();
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedAvailableFields-count')).toHaveTextContent(
+            '36'
+          );
+        });
+
+        fireEvent.click(screen.getByTitle('Hide sidebar'));
+
+        await waitFor(() => {
+          expect(screen.queryAllByTestId('fieldListGroupedAvailableFields-count')).toHaveLength(0);
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should have all populated fields in Available fields section',
+      async () => {
+        const listOfPopulatedFields = new Set(
+          flatten(
+            mockTimelineData.map((dataItem) =>
+              dataItem.data.map((item) =>
+                item.value && item.value.length > 0 ? item.field : undefined
+              )
+            )
+          ).filter((item) => typeof item !== 'undefined')
+        );
+
+        renderTestComponents();
+
+        expect(await screen.findByTestId('timeline-sidebar')).toBeVisible();
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+        changeItemsPerPageTo(100);
+
+        const availableFields = screen.getByTestId('fieldListGroupedAvailableFields');
+
+        for (const field of listOfPopulatedFields) {
+          fireEvent.change(screen.getByTestId('fieldListFiltersFieldSearch'), {
+            target: { value: field },
+          });
+
+          expect(within(availableFields).getByTestId(`field-${field}`));
+        }
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
new file mode 100644
index 0000000000000..4beae12e85a95
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
@@ -0,0 +1,397 @@
+/*
+ * 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 { createMockStore, mockTimelineData, TestProviders } from '../../../../../common/mock';
+import React from 'react';
+import { TimelineDataTable } from '.';
+import { defaultUdtHeaders } from '../default_headers';
+import { TimelineId, TimelineTabs } from '../../../../../../common/types';
+import { DataLoadingState } from '@kbn/unified-data-table';
+import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { useSourcererDataView } from '../../../../../common/containers/sourcerer';
+import type { ComponentProps } from 'react';
+import { getColumnHeaders } from '../../body/column_headers/helpers';
+import { mockSourcererScope } from '../../../../../common/containers/sourcerer/mocks';
+import { timelineActions } from '../../../../store';
+import type { ExpandedDetailTimeline } from '../../../../../../common/types';
+
+jest.mock('../../../../../common/containers/sourcerer');
+
+const onFieldEditedMock = jest.fn();
+const refetchMock = jest.fn();
+const onEventClosedMock = jest.fn();
+const onChangePageMock = jest.fn();
+
+const initialEnrichedColumns = getColumnHeaders(
+  defaultUdtHeaders,
+  mockSourcererScope.browserFields
+);
+
+type TestComponentProps = Partial<ComponentProps<typeof TimelineDataTable>> & {
+  store?: ReturnType<typeof createMockStore>;
+};
+
+// These tests can take more than standard timeout of 5s
+// that is why we are setting it to 10s
+const SPECIAL_TEST_TIMEOUT = 10000;
+
+const TestComponent = (props: TestComponentProps) => {
+  const { store = createMockStore(), ...restProps } = props;
+  useSourcererDataView();
+  return (
+    <TestProviders store={store}>
+      <TimelineDataTable
+        columns={initialEnrichedColumns}
+        activeTab={TimelineTabs.query}
+        timelineId={TimelineId.test}
+        itemsPerPage={50}
+        itemsPerPageOptions={[10, 25, 50, 100]}
+        rowRenderers={[]}
+        sort={[['@timestamp', 'desc']]}
+        events={mockTimelineData}
+        onFieldEdited={onFieldEditedMock}
+        refetch={refetchMock}
+        dataLoadingState={DataLoadingState.loaded}
+        totalCount={mockTimelineData.length}
+        onEventClosed={onEventClosedMock}
+        showExpandedDetails={false}
+        expandedDetail={{}}
+        onChangePage={onChangePageMock}
+        updatedAt={Date.now()}
+        onSetColumns={jest.fn()}
+        onFilter={jest.fn()}
+        {...restProps}
+      />
+    </TestProviders>
+  );
+};
+
+const getTimelineFromStore = (
+  store: ReturnType<typeof createMockStore>,
+  timelineId: string = TimelineId.test
+) => {
+  return store.getState().timeline.timelineById[timelineId];
+};
+
+describe('unified data table', () => {
+  beforeEach(() => {
+    (useSourcererDataView as jest.Mock).mockReturnValue(mockSourcererScope);
+  });
+
+  it(
+    'should display unified data table',
+    async () => {
+      render(<TestComponent />);
+      expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+    },
+    SPECIAL_TEST_TIMEOUT
+  );
+
+  describe('custom cell rendering based on data Type', () => {
+    it(
+      'should render source.ip as link',
+      async () => {
+        const eventsWithSourceIp = mockTimelineData.filter(
+          (event) => event.ecs?.source?.ip?.length ?? -1 > 0
+        );
+
+        const { container } = render(<TestComponent events={eventsWithSourceIp} />);
+
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+        const sourceIpCell = container.querySelector(
+          '[data-gridcell-column-id="source.ip"][data-test-subj="dataGridRowCell"]'
+        ) as HTMLElement;
+
+        expect(sourceIpCell).toBeVisible();
+
+        expect(within(sourceIpCell).getByTestId('network-details')).toHaveClass('euiLink');
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+    it(
+      'should render destination.ip as link',
+      async () => {
+        const eventsWithDestIp = mockTimelineData.filter(
+          (event) => event.ecs?.destination?.ip?.length ?? -1 > 0
+        );
+
+        const { container } = render(<TestComponent events={eventsWithDestIp} />);
+
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+        const destIpCell = container.querySelector(
+          '[data-gridcell-column-id="destination.ip"][data-test-subj="dataGridRowCell"]'
+        ) as HTMLElement;
+
+        expect(destIpCell).toBeVisible();
+
+        expect(within(destIpCell).getByTestId('network-details')).toHaveClass('euiLink');
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+    it(
+      'should render host.name as link',
+      async () => {
+        const hostTestId = 'host-details-button';
+        const eventsWithHostName = mockTimelineData.filter(
+          (event) => event.ecs?.host?.name?.length ?? -1 > 0
+        );
+
+        const { container } = render(<TestComponent events={eventsWithHostName} />);
+
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+        const hostNameCell = container.querySelector(
+          '[data-gridcell-column-id="host.name"][data-test-subj="dataGridRowCell"]'
+        ) as HTMLElement;
+
+        expect(hostNameCell).toBeVisible();
+
+        expect(within(hostNameCell).getByTestId(hostTestId)).toHaveClass('euiLink');
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+    it(
+      'should render user.name as link',
+      async () => {
+        const userTestId = 'users-link-anchor';
+        const eventsWithUserName = mockTimelineData.filter(
+          (event) => event.ecs?.user?.name?.length ?? -1 > 0
+        );
+
+        const { container } = render(<TestComponent events={eventsWithUserName} />);
+
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+        const userNameCell = container.querySelector(
+          '[data-gridcell-column-id="user.name"][data-test-subj="dataGridRowCell"]'
+        ) as HTMLElement;
+
+        expect(userNameCell).toBeVisible();
+
+        expect(within(userNameCell).getByTestId(userTestId)).toHaveClass('euiLink');
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+
+  it(
+    'should refetch on sample size change',
+    async () => {
+      render(<TestComponent />);
+
+      expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+      const toolbarSettings = screen.getByTestId('dataGridDisplaySelectorButton');
+
+      fireEvent.click(toolbarSettings);
+
+      await waitFor(() => {
+        expect(screen.getAllByTestId('unifiedDataTableSampleSizeInput')[0]).toBeVisible();
+      });
+
+      fireEvent.change(screen.getAllByTestId('unifiedDataTableSampleSizeInput')[0], {
+        target: { value: '10' },
+      });
+
+      await waitFor(() => {
+        expect(refetchMock).toHaveBeenCalledTimes(1);
+      });
+    },
+    SPECIAL_TEST_TIMEOUT
+  );
+
+  it(
+    'should update row Height correctly',
+    async () => {
+      const rowHeight = {
+        initial: 2,
+        new: 1,
+      };
+      const customMockStore = createMockStore();
+
+      customMockStore.dispatch(
+        timelineActions.updateRowHeight({
+          id: TimelineId.test,
+          rowHeight: rowHeight.initial,
+        })
+      );
+
+      render(<TestComponent store={customMockStore} />);
+
+      expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+      const toolbarSettings = screen.getByTestId('dataGridDisplaySelectorButton');
+
+      fireEvent.click(toolbarSettings);
+
+      await waitFor(() => {
+        expect(
+          screen.getAllByTestId('unifiedDataTableRowHeightSettings_lineCountNumber')[0]
+        ).toBeVisible();
+      });
+      expect(
+        screen.getAllByTestId('unifiedDataTableRowHeightSettings_lineCountNumber')[0]
+      ).toHaveValue(String(rowHeight.initial));
+
+      fireEvent.change(
+        screen.getAllByTestId('unifiedDataTableRowHeightSettings_lineCountNumber')[0],
+        {
+          target: { value: String(rowHeight.new) },
+        }
+      );
+
+      await waitFor(() => {
+        expect(getTimelineFromStore(customMockStore)?.rowHeight).toEqual(rowHeight.new);
+      });
+    },
+    SPECIAL_TEST_TIMEOUT
+  );
+
+  describe('details flyout', () => {
+    it(
+      'should show defails flyout when clicked on expand event',
+      async () => {
+        render(<TestComponent showExpandedDetails={true} />);
+
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+
+        fireEvent.click(screen.getAllByTestId('docTableExpandToggleColumn')[0]);
+
+        await waitFor(() => {
+          expect(screen.getByTestId('timeline:details-panel:flyout')).toBeVisible();
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should show details flyout when expandedDetails state is set',
+      async () => {
+        const customMockStore = createMockStore();
+        const mockExpandedDetail: ExpandedDetailTimeline = {
+          query: {
+            params: {
+              eventId: 'some_id',
+              indexName: 'security-*',
+            },
+            panelView: 'eventDetail',
+          },
+        };
+        customMockStore.dispatch(
+          timelineActions.toggleDetailPanel({
+            id: TimelineId.test,
+            tabType: TimelineTabs.query,
+            ...mockExpandedDetail.query,
+          })
+        );
+
+        render(
+          <TestComponent
+            store={customMockStore}
+            showExpandedDetails={true}
+            expandedDetail={mockExpandedDetail}
+          />
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTestId('timeline:details-panel:flyout')).toBeVisible();
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+    it(
+      'should close details flyout when close icon is clicked',
+      async () => {
+        const customMockStore = createMockStore();
+        const mockExpandedDetail: ExpandedDetailTimeline = {
+          query: {
+            params: {
+              eventId: 'some_id',
+              indexName: 'security-*',
+            },
+            panelView: 'eventDetail',
+          },
+        };
+
+        customMockStore.dispatch(
+          timelineActions.toggleDetailPanel({
+            id: TimelineId.test,
+            tabType: TimelineTabs.query,
+            ...mockExpandedDetail.query,
+          })
+        );
+
+        render(
+          <TestComponent
+            store={customMockStore}
+            showExpandedDetails={true}
+            expandedDetail={mockExpandedDetail}
+          />
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTestId('euiFlyoutCloseButton')).toBeVisible();
+        });
+
+        fireEvent.click(screen.getByTestId('euiFlyoutCloseButton'));
+        expect(onEventClosedMock).toHaveBeenCalledTimes(1);
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+
+  describe('pagination', () => {
+    // change the number of items per page
+    it(
+      'should change the number of items per page',
+      async () => {
+        const customMockStore = createMockStore();
+        render(<TestComponent store={customMockStore} />);
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+        // make sure that items per page is as per the props passed above
+        expect(screen.getByTestId('tablePaginationPopoverButton')).toHaveTextContent(
+          `Rows per page: 50`
+        );
+        fireEvent.click(screen.getByTestId('tablePaginationPopoverButton'));
+        fireEvent.click(screen.getByTestId(`tablePagination-25-rows`));
+        await waitFor(() => {
+          expect(getTimelineFromStore(customMockStore)?.itemsPerPage).toEqual(25);
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should be able to load more records once user have seen all the records loaded according to sample size',
+      async () => {
+        const customMockStore = createMockStore();
+        customMockStore.dispatch(
+          timelineActions.updateSampleSize({
+            id: TimelineId.test,
+            sampleSize: 10,
+          })
+        );
+        render(
+          <TestComponent
+            store={customMockStore}
+            itemsPerPage={25}
+            events={structuredClone(mockTimelineData).slice(0, 10)}
+          />
+        );
+        expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+        expect(screen.getByTestId('dscGridSampleSizeFetchMoreLink')).toBeVisible();
+        fireEvent.click(screen.getByTestId('dscGridSampleSizeFetchMoreLink'));
+        await waitFor(() => {
+          expect(onChangePageMock).toHaveBeenNthCalledWith(1, 1);
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.tsx
new file mode 100644
index 0000000000000..acb083bf95cb0
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.tsx
@@ -0,0 +1,360 @@
+/*
+ * 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, useCallback, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
+import type { DataTableRecord } from '@kbn/discover-utils/types';
+import type {
+  UnifiedDataTableSettingsColumn,
+  UnifiedDataTableProps,
+} from '@kbn/unified-data-table';
+import { UnifiedDataTable, DataLoadingState } from '@kbn/unified-data-table';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import { EmptyComponent } from '../../../../../common/lib/cell_actions/helpers';
+import { withDataView } from '../../../../../common/components/with_data_view';
+import { StatefulEventContext } from '../../../../../common/components/events_viewer/stateful_event_context';
+import type { ExpandedDetailTimeline, ExpandedDetailType } from '../../../../../../common/types';
+import type { TimelineItem } from '../../../../../../common/search_strategy';
+import { useKibana } from '../../../../../common/lib/kibana';
+import type {
+  ColumnHeaderOptions,
+  OnChangePage,
+  RowRenderer,
+  ToggleDetailPanel,
+} from '../../../../../../common/types/timeline';
+import { TimelineId, TimelineTabs } from '../../../../../../common/types/timeline';
+import type { State, inputsModel } from '../../../../../common/store';
+import { SourcererScopeName } from '../../../../../common/store/sourcerer/model';
+import { useSourcererDataView } from '../../../../../common/containers/sourcerer';
+import { activeTimeline } from '../../../../containers/active_timeline_context';
+import { DetailsPanel } from '../../../side_panel';
+import { SecurityCellActionsTrigger } from '../../../../../actions/constants';
+import { getFormattedFields } from '../../body/renderers/formatted_field_udt';
+import { timelineBodySelector } from '../../body/selectors';
+import ToolbarAdditionalControls from './toolbar_additional_controls';
+import { StyledTimelineUnifiedDataTable, StyledEuiProgress } from '../styles';
+import { timelineDefaults } from '../../../../store/defaults';
+import { timelineActions } from '../../../../store';
+import { transformTimelineItemToUnifiedRows } from '../utils';
+
+export const SAMPLE_SIZE_SETTING = 500;
+const DataGridMemoized = React.memo(UnifiedDataTable);
+
+type CommonDataTableProps = {
+  columns: ColumnHeaderOptions[];
+  rowRenderers: RowRenderer[];
+  timelineId: string;
+  itemsPerPage: number;
+  itemsPerPageOptions: number[];
+  events: TimelineItem[];
+  refetch: inputsModel.Refetch;
+  onFieldEdited: () => void;
+  totalCount: number;
+  onEventClosed: (args: ToggleDetailPanel) => void;
+  expandedDetail: ExpandedDetailTimeline;
+  showExpandedDetails: boolean;
+  onChangePage: OnChangePage;
+  activeTab: TimelineTabs;
+  dataLoadingState: DataLoadingState;
+  updatedAt: number;
+  isTextBasedQuery?: boolean;
+} & Pick<UnifiedDataTableProps, 'onSort' | 'onSetColumns' | 'sort' | 'onFilter'>;
+
+interface DataTableProps extends CommonDataTableProps {
+  dataView: DataView;
+}
+
+export const TimelineDataTableComponent: React.FC<DataTableProps> = memo(
+  function TimelineDataTableMemo({
+    columns,
+    dataView,
+    activeTab,
+    timelineId,
+    itemsPerPage,
+    itemsPerPageOptions,
+    rowRenderers,
+    sort,
+    events,
+    onFieldEdited,
+    refetch,
+    dataLoadingState,
+    totalCount,
+    onEventClosed,
+    showExpandedDetails,
+    expandedDetail,
+    onChangePage,
+    updatedAt,
+    isTextBasedQuery = false,
+    onSetColumns,
+    onSort,
+    onFilter,
+  }) {
+    const dispatch = useDispatch();
+
+    // Store context in state rather than creating object in provider value={} to prevent re-renders caused by a new object being created
+    const [activeStatefulEventContext] = useState({
+      timelineID: timelineId,
+      enableHostDetailsFlyout: true,
+      enableIpDetailsFlyout: true,
+      tabType: activeTab,
+    });
+
+    const {
+      services: {
+        uiSettings,
+        fieldFormats,
+        storage,
+        dataViewFieldEditor,
+        notifications: { toasts: toastsService },
+        theme,
+        data: dataPluginContract,
+      },
+    } = useKibana();
+
+    const [expandedDoc, setExpandedDoc] = useState<DataTableRecord & TimelineItem>();
+    const [fetchedPage, setFechedPage] = useState<number>(0);
+
+    const { browserFields, runtimeMappings } = useSourcererDataView(SourcererScopeName.timeline);
+
+    const showTimeCol = useMemo(() => !!dataView && !!dataView.timeFieldName, [dataView]);
+
+    const tableSettings = useMemo(() => {
+      const columnSettings = columns.reduce((acc, item) => {
+        if (item.initialWidth) {
+          acc[item.id] = { width: item.initialWidth };
+        }
+        return acc;
+      }, {} as Record<string, UnifiedDataTableSettingsColumn>);
+
+      return {
+        columns: columnSettings,
+      };
+    }, [columns]);
+
+    const defaultColumnIds = useMemo(() => columns.map((c) => c.id), [columns]);
+
+    const { timeline: { rowHeight, sampleSize } = timelineDefaults } = useSelector((state: State) =>
+      timelineBodySelector(state, timelineId)
+    );
+
+    const tableRows = useMemo(
+      () => transformTimelineItemToUnifiedRows({ events, dataView }),
+      [events, dataView]
+    );
+
+    const handleOnEventDetailPanelOpened = useCallback(
+      (eventData: DataTableRecord & TimelineItem) => {
+        const updatedExpandedDetail: ExpandedDetailType = {
+          panelView: 'eventDetail',
+          params: {
+            eventId: eventData.id,
+            indexName: eventData._index ?? '', // TODO: fix type error
+            refetch,
+          },
+        };
+
+        dispatch(
+          timelineActions.toggleDetailPanel({
+            ...updatedExpandedDetail,
+            tabType: TimelineTabs.query,
+            id: timelineId,
+          })
+        );
+
+        activeTimeline.toggleExpandedDetail({ ...updatedExpandedDetail });
+      },
+      [dispatch, refetch, timelineId]
+    );
+
+    const handleOnPanelClosed = useCallback(() => {
+      if (
+        expandedDetail[TimelineTabs.query]?.panelView &&
+        timelineId === TimelineId.active &&
+        showExpandedDetails
+      ) {
+        activeTimeline.toggleExpandedDetail({});
+      }
+      setExpandedDoc(undefined);
+      onEventClosed({ tabType: TimelineTabs.query, id: timelineId });
+    }, [onEventClosed, timelineId, expandedDetail, showExpandedDetails]);
+
+    const onSetExpandedDoc = useCallback(
+      (newDoc?: DataTableRecord) => {
+        if (newDoc) {
+          const timelineDoc = tableRows.find((r) => r.id === newDoc.id);
+          setExpandedDoc(timelineDoc);
+          if (timelineDoc) {
+            handleOnEventDetailPanelOpened(timelineDoc);
+          }
+        } else {
+          handleOnPanelClosed();
+        }
+      },
+      [tableRows, handleOnEventDetailPanelOpened, handleOnPanelClosed]
+    );
+
+    const onColumnResize = useCallback(
+      ({ columnId, width }: { columnId: string; width: number }) => {
+        dispatch(
+          timelineActions.updateColumnWidth({
+            columnId,
+            id: timelineId,
+            width, // initialWidth?
+          })
+        );
+      },
+      [dispatch, timelineId]
+    );
+
+    const onResizeDataGrid = useCallback(
+      (colSettings) => {
+        onColumnResize({ columnId: colSettings.columnId, width: Math.round(colSettings.width) });
+      },
+      [onColumnResize]
+    );
+
+    const onChangeItemsPerPage = useCallback(
+      (itemsChangedPerPage) => {
+        dispatch(
+          timelineActions.updateItemsPerPage({ id: timelineId, itemsPerPage: itemsChangedPerPage })
+        );
+      },
+      [dispatch, timelineId]
+    );
+
+    const customColumnRenderers = useMemo(
+      () =>
+        getFormattedFields({
+          dataTableRows: tableRows,
+          scopeId: 'timeline',
+          headers: columns,
+        }),
+      [columns, tableRows]
+    );
+
+    const handleFetchMoreRecords = useCallback(() => {
+      onChangePage(fetchedPage + 1);
+      setFechedPage(fetchedPage + 1);
+    }, [fetchedPage, onChangePage]);
+
+    const additionalControls = useMemo(
+      () => <ToolbarAdditionalControls timelineId={timelineId} updatedAt={updatedAt} />,
+      [timelineId, updatedAt]
+    );
+
+    const cellActionsMetadata = useMemo(() => ({ scopeId: timelineId }), [timelineId]);
+
+    const onUpdateSampleSize = useCallback(
+      (newSampleSize: number) => {
+        if (newSampleSize !== sampleSize) {
+          dispatch(timelineActions.updateSampleSize({ id: timelineId, sampleSize: newSampleSize }));
+          refetch();
+        }
+      },
+      [dispatch, sampleSize, timelineId, refetch]
+    );
+
+    const onUpdateRowHeight = useCallback(
+      (newRowHeight: number) => {
+        if (newRowHeight !== rowHeight) {
+          dispatch(timelineActions.updateRowHeight({ id: timelineId, rowHeight: newRowHeight }));
+        }
+      },
+      [dispatch, rowHeight, timelineId]
+    );
+
+    const dataGridServices = useMemo(() => {
+      return {
+        theme,
+        fieldFormats,
+        storage,
+        toastNotifications: toastsService,
+        uiSettings,
+        dataViewFieldEditor,
+        data: dataPluginContract,
+      };
+    }, [
+      theme,
+      fieldFormats,
+      storage,
+      toastsService,
+      uiSettings,
+      dataViewFieldEditor,
+      dataPluginContract,
+    ]);
+
+    return (
+      <StatefulEventContext.Provider value={activeStatefulEventContext}>
+        <StyledTimelineUnifiedDataTable>
+          {(dataLoadingState === DataLoadingState.loading ||
+            dataLoadingState === DataLoadingState.loadingMore) && (
+            <StyledEuiProgress data-test-subj="discoverDataGridUpdating" size="xs" color="accent" />
+          )}
+          <DataGridMemoized
+            ariaLabelledBy="timelineDocumentsAriaLabel"
+            className={'udtTimeline'}
+            columns={defaultColumnIds}
+            expandedDoc={expandedDoc}
+            dataView={dataView}
+            showColumnTokens={true}
+            loadingState={dataLoadingState}
+            onFilter={onFilter}
+            onResize={onResizeDataGrid}
+            onSetColumns={onSetColumns}
+            onSort={!isTextBasedQuery ? onSort : undefined}
+            rows={tableRows}
+            sampleSizeState={sampleSize || 500}
+            onUpdateSampleSize={onUpdateSampleSize}
+            setExpandedDoc={onSetExpandedDoc}
+            settings={tableSettings}
+            showTimeCol={showTimeCol}
+            isSortEnabled={true}
+            sort={sort}
+            rowHeightState={rowHeight}
+            isPlainRecord={isTextBasedQuery}
+            rowsPerPageState={itemsPerPage}
+            onUpdateRowsPerPage={onChangeItemsPerPage}
+            onUpdateRowHeight={onUpdateRowHeight}
+            onFieldEdited={onFieldEdited}
+            cellActionsTriggerId={SecurityCellActionsTrigger.DEFAULT}
+            services={dataGridServices}
+            visibleCellActions={3}
+            externalCustomRenderers={customColumnRenderers}
+            renderDocumentView={EmptyComponent}
+            rowsPerPageOptions={itemsPerPageOptions}
+            showFullScreenButton={false}
+            useNewFieldsApi={true}
+            maxDocFieldsDisplayed={50}
+            consumer="timeline"
+            totalHits={totalCount}
+            onFetchMoreRecords={handleFetchMoreRecords}
+            configRowHeight={3}
+            showMultiFields={true}
+            cellActionsMetadata={cellActionsMetadata}
+            externalAdditionalControls={additionalControls}
+          />
+          {showExpandedDetails && (
+            <DetailsPanel
+              browserFields={browserFields}
+              handleOnPanelClosed={handleOnPanelClosed}
+              runtimeMappings={runtimeMappings}
+              tabType={activeTab}
+              scopeId={timelineId}
+              isFlyoutView
+            />
+          )}
+        </StyledTimelineUnifiedDataTable>
+      </StatefulEventContext.Provider>
+    );
+  }
+);
+
+export const TimelineDataTable = withDataView<DataTableProps>(TimelineDataTableComponent);
+
+// eslint-disable-next-line import/no-default-export
+export { TimelineDataTable as default };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/toolbar_additional_controls.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/toolbar_additional_controls.tsx
new file mode 100644
index 0000000000000..1c7fb20206095
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/toolbar_additional_controls.tsx
@@ -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 { EuiToolTip, EuiButtonIcon } from '@elastic/eui';
+import React, { useMemo, useCallback, useRef } from 'react';
+
+import { isActiveTimeline } from '../../../../../helpers';
+import { TimelineId } from '../../../../../../common/types/timeline';
+import {
+  useGlobalFullScreen,
+  useTimelineFullScreen,
+} from '../../../../../common/containers/use_full_screen';
+import { StatefulRowRenderersBrowser } from '../../../row_renderers_browser';
+import * as i18n from './translations';
+import { EXIT_FULL_SCREEN_CLASS_NAME } from '../../../../../common/components/exit_full_screen';
+import { FixedWidthLastUpdatedContainer } from '../../footer/last_updated';
+
+export const isFullScreen = ({
+  globalFullScreen,
+  isActiveTimelines,
+  timelineFullScreen,
+}: {
+  globalFullScreen: boolean;
+  isActiveTimelines: boolean;
+  timelineFullScreen: boolean;
+}) =>
+  (isActiveTimelines && timelineFullScreen) || (isActiveTimelines === false && globalFullScreen);
+
+interface Props {
+  timelineId: string;
+  updatedAt: number;
+}
+
+export const ToolbarAdditionalControlsComponent: React.FC<Props> = ({ timelineId, updatedAt }) => {
+  const { timelineFullScreen, setTimelineFullScreen } = useTimelineFullScreen();
+  const { globalFullScreen, setGlobalFullScreen } = useGlobalFullScreen();
+
+  const toolTipRef = useRef<EuiToolTip>(null);
+
+  const hideToolTip = () => toolTipRef.current?.hideToolTip();
+
+  const toggleFullScreen = useCallback(() => {
+    hideToolTip();
+    if (timelineId === TimelineId.active) {
+      setTimelineFullScreen(!timelineFullScreen);
+    } else {
+      setGlobalFullScreen(!globalFullScreen);
+    }
+  }, [
+    timelineId,
+    setTimelineFullScreen,
+    timelineFullScreen,
+    setGlobalFullScreen,
+    globalFullScreen,
+  ]);
+  const fullScreen = useMemo(
+    () =>
+      isFullScreen({
+        globalFullScreen,
+        isActiveTimelines: isActiveTimeline(timelineId),
+        timelineFullScreen,
+      }),
+    [globalFullScreen, timelineFullScreen, timelineId]
+  );
+
+  return (
+    <>
+      <StatefulRowRenderersBrowser data-test-subj="row-renderers-browser" timelineId={timelineId} />
+      <FixedWidthLastUpdatedContainer updatedAt={updatedAt} />
+      <span className="rightPosition">
+        <EuiToolTip
+          ref={toolTipRef}
+          content={fullScreen ? i18n.EXIT_FULL_SCREEN : i18n.FULL_SCREEN}
+        >
+          <EuiButtonIcon
+            aria-label={fullScreen ? i18n.EXIT_FULL_SCREEN : i18n.FULL_SCREEN}
+            className={`${fullScreen ? EXIT_FULL_SCREEN_CLASS_NAME : ''}`}
+            color={fullScreen ? 'text' : 'primary'}
+            data-test-subj={
+              // a full screen button gets created for timeline and for the host page
+              // this sets the data-test-subj for each case so that tests can differentiate between them
+              isActiveTimeline(timelineId) ? 'full-screen-active' : 'full-screen'
+            }
+            iconType={fullScreen ? 'fullScreenExit' : 'fullScreen'}
+            onClick={toggleFullScreen}
+            onMouseOut={hideToolTip}
+          />
+        </EuiToolTip>
+      </span>
+    </>
+  );
+};
+
+export const ToolbarAdditionalControls = React.memo(ToolbarAdditionalControlsComponent);
+// eslint-disable-next-line import/no-default-export
+export { ToolbarAdditionalControls as default };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/translations.ts
new file mode 100644
index 0000000000000..a0c5526d191b7
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/translations.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 { i18n } from '@kbn/i18n';
+
+export const DRAG_DROP_FIELD = i18n.translate(
+  'xpack.securitySolution.timeline.dataTable.dropZoneTableLabel',
+  {
+    defaultMessage: 'Drop zone to add field as a column to the table',
+  }
+);
+
+export const FULL_SCREEN = i18n.translate(
+  'xpack.securitySolution.timeline.dataTable.fullScreenButton',
+  {
+    defaultMessage: 'Enter fullscreen',
+  }
+);
+
+export const EXIT_FULL_SCREEN = i18n.translate(
+  'xpack.securitySolution.timeline.dataTable.exitFullScreenButton',
+  {
+    defaultMessage: 'Exit fullscreen (esc)',
+  }
+);
+
+export const EVENTS = i18n.translate('xpack.securitySolution.timeline.footer.events', {
+  defaultMessage: 'Events',
+});
+
+export const OF = i18n.translate('xpack.securitySolution.timeline.footer.of', {
+  defaultMessage: 'of',
+});
+
+export const ROWS = i18n.translate('xpack.securitySolution.timeline.footer.rows', {
+  defaultMessage: 'rows',
+});
+
+export const LOADING = i18n.translate('xpack.securitySolution.timeline.footer.loadingLabel', {
+  defaultMessage: 'Loading',
+});
+
+export const TOTAL_COUNT_OF_EVENTS = i18n.translate(
+  'xpack.securitySolution.timeline.dataTable.footer.totalCountOfEvents',
+  {
+    defaultMessage: 'events',
+  }
+);
+
+export const AUTO_REFRESH_ACTIVE = i18n.translate(
+  'xpack.securitySolution.timeline.dataTable.footer.autoRefreshActiveDescription',
+  {
+    defaultMessage: 'Auto-Refresh Active',
+  }
+);
+
+export const LOADING_EVENTS = i18n.translate(
+  'xpack.securitySolution.timeline.dataTable.footer.loadingEventsDataLabel',
+  {
+    defaultMessage: 'Loading Events',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/default_headers.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/default_headers.tsx
new file mode 100644
index 0000000000000..a0cf9d6355b9d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/default_headers.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 type { ColumnHeaderOptions, ColumnHeaderType } from '../../../../../common/types';
+import {
+  DEFAULT_COLUMN_MIN_WIDTH,
+  DEFAULT_UNIFIED_TABLE_DATE_COLUMN_MIN_WIDTH,
+} from '../body/constants';
+
+export const defaultColumnHeaderType: ColumnHeaderType = 'not-filtered';
+
+export const defaultUdtHeaders: ColumnHeaderOptions[] = [
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: '@timestamp',
+    initialWidth: DEFAULT_UNIFIED_TABLE_DATE_COLUMN_MIN_WIDTH,
+    esTypes: ['date'],
+    type: 'date',
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'message',
+    initialWidth: DEFAULT_COLUMN_MIN_WIDTH * 2,
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'event.category',
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'event.action',
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'host.name',
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'source.ip',
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'destination.ip',
+  },
+  {
+    columnHeaderType: defaultColumnHeaderType,
+    id: 'user.name',
+  },
+];
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/get_fields_list_creation_options.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/get_fields_list_creation_options.ts
new file mode 100644
index 0000000000000..bbcf9eb4f4a40
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/get_fields_list_creation_options.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 { i18n } from '@kbn/i18n';
+import { FieldsGroupNames } from '@kbn/unified-field-list';
+import type { UnifiedFieldListSidebarContainerProps } from '@kbn/unified-field-list';
+
+// This is passed to the unified components container to initialize the field list on the left side of the view
+export const getFieldsListCreationOptions: UnifiedFieldListSidebarContainerProps['getCreationOptions'] =
+  () => {
+    return {
+      originatingApp: 'security_solution',
+      localStorageKeyPrefix: 'securitySolution',
+      timeRangeUpdatesType: 'timefilter',
+      compressed: true,
+      showSidebarToggleButton: true,
+      disablePopularFields: false,
+      buttonAddFieldToWorkspaceProps: {
+        'aria-label': i18n.translate(
+          'xpack.securitySolution.fieldChooser.timelineField.addFieldTooltip',
+          {
+            defaultMessage: 'Add field as column',
+          }
+        ),
+      },
+      buttonRemoveFieldFromWorkspaceProps: {
+        'aria-label': i18n.translate(
+          'xpack.securitySolution.timeline.fieldChooser.timelineField.removeFieldTooltip',
+          {
+            defaultMessage: 'Remove field from table',
+          }
+        ),
+      },
+      onOverrideFieldGroupDetails: (groupName) => {
+        if (groupName === FieldsGroupNames.AvailableFields) {
+          return {
+            helpText: i18n.translate(
+              'xpack.securitySolution.timeline.fieldChooser.availableFieldsTooltip',
+              {
+                defaultMessage: 'Fields available for display in the table.',
+              }
+            ),
+          };
+        }
+      },
+      dataTestSubj: {
+        fieldListAddFieldButtonTestSubj: 'dataView-add-field_btn',
+        fieldListSidebarDataTestSubj: 'timeline-sidebar',
+        fieldListItemStatsDataTestSubj: 'dscFieldStats',
+        fieldListItemDndDataTestSubjPrefix: 'dscFieldListPanelField',
+        fieldListItemPopoverDataTestSubj: 'timelineFieldListPanelPopover',
+        fieldListItemPopoverHeaderDataTestSubjPrefix: 'timelineFieldListPanel',
+      },
+    };
+  };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/index.test.tsx
new file mode 100644
index 0000000000000..2ca35818df744
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/index.test.tsx
@@ -0,0 +1,688 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ComponentProps } from 'react';
+import React, { useEffect } from 'react';
+import type QueryTabContent from '.';
+import { UnifiedTimeline } from '.';
+import { TimelineId } from '../../../../../common/types/timeline';
+import { useTimelineEvents } from '../../../containers';
+import { useTimelineEventsDetails } from '../../../containers/details';
+import { useSourcererDataView } from '../../../../common/containers/sourcerer';
+import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
+import {
+  createSecuritySolutionStorageMock,
+  mockTimelineData,
+  TestProviders,
+} from '../../../../common/mock';
+import { createMockStore } from '../../../../common/mock/create_store';
+import { render, screen, fireEvent, cleanup, waitFor, within } from '@testing-library/react';
+import { createStartServicesMock } from '../../../../common/lib/kibana/kibana_react.mock';
+import type { StartServices } from '../../../../types';
+import { useKibana } from '../../../../common/lib/kibana';
+import { useDispatch } from 'react-redux';
+import { timelineActions } from '../../../store';
+import type { ExperimentalFeatures } from '../../../../../common';
+import { allowedExperimentalValues } from '../../../../../common';
+import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
+import { TimelineTabs } from '@kbn/securitysolution-data-table';
+import { DataLoadingState } from '@kbn/unified-data-table';
+import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_manager/filter_manager.mock';
+import { getColumnHeaders } from '../body/column_headers/helpers';
+import { defaultUdtHeaders } from './default_headers';
+import type { ColumnHeaderType } from '../../../../../common/types';
+
+jest.mock('../../../containers', () => ({
+  useTimelineEvents: jest.fn(),
+}));
+
+jest.mock('../../../containers/details');
+
+jest.mock('../../fields_browser', () => ({
+  useFieldBrowserOptions: jest.fn(),
+}));
+
+jest.mock('../body/events', () => ({
+  Events: () => <></>,
+}));
+
+jest.mock('../../../../common/containers/sourcerer');
+jest.mock('../../../../common/containers/sourcerer/use_signal_helpers', () => ({
+  useSignalHelpers: () => ({ signalIndexNeedsInit: false }),
+}));
+
+jest.mock('../../../../common/lib/kuery');
+
+jest.mock('../../../../common/hooks/use_experimental_features');
+
+const useIsExperimentalFeatureEnabledMock = jest.fn((feature: keyof ExperimentalFeatures) => {
+  if (feature === 'unifiedComponentsInTimelineEnabled') {
+    return true;
+  }
+  return allowedExperimentalValues[feature];
+});
+
+jest.mock('../../../../common/lib/kibana');
+
+// unified-field-list is is reporiting multiple analytics events
+jest.mock(`@kbn/analytics-client`);
+
+const columnsToDisplay = [
+  ...defaultUdtHeaders,
+  {
+    columnHeaderType: 'not-filtered' as ColumnHeaderType,
+    id: 'event.severity',
+  },
+];
+
+// These tests can take more than standard timeout of 5s
+// that is why we are setting it to 10s
+const SPECIAL_TEST_TIMEOUT = 10000;
+
+const localMockedTimelineData = structuredClone(mockTimelineData);
+
+const TestComponent = (props: Partial<ComponentProps<typeof UnifiedTimeline>>) => {
+  const testComponentDefaultProps: ComponentProps<typeof QueryTabContent> = {
+    columns: getColumnHeaders(columnsToDisplay, mockSourcererScope.browserFields),
+    activeTab: TimelineTabs.query,
+    rowRenderers: [],
+    timelineId: TimelineId.test,
+    itemsPerPage: 10,
+    itemsPerPageOptions: [],
+    sort: [
+      {
+        columnId: '@timestamp',
+        columnType: 'date',
+        esTypes: ['date'],
+        sortDirection: 'desc',
+      },
+    ],
+    events: localMockedTimelineData,
+    refetch: jest.fn(),
+    totalCount: localMockedTimelineData.length,
+    onEventClosed: jest.fn(),
+    expandedDetail: {},
+    showExpandedDetails: false,
+    onChangePage: jest.fn(),
+    dataLoadingState: DataLoadingState.loaded,
+    updatedAt: Date.now(),
+    isTextBasedQuery: false,
+  };
+
+  const dispatch = useDispatch();
+
+  // populating timeline so that it is not blank
+  useEffect(() => {
+    dispatch(
+      timelineActions.applyKqlFilterQuery({
+        id: TimelineId.test,
+        filterQuery: {
+          kuery: {
+            kind: 'kuery',
+            expression: '*',
+          },
+          serializedQuery: '*',
+        },
+      })
+    );
+  }, [dispatch]);
+
+  return <UnifiedTimeline {...testComponentDefaultProps} {...props} />;
+};
+
+const customStore = createMockStore();
+
+const TestProviderWrapperWithCustomStore: React.FC = ({ children }) => {
+  return <TestProviders store={customStore}>{children}</TestProviders>;
+};
+
+const renderTestComponents = (props?: Partial<ComponentProps<typeof TestComponent>>) => {
+  return render(<TestComponent {...props} />, {
+    wrapper: TestProviderWrapperWithCustomStore,
+  });
+};
+
+const getTimelineFromStore = (
+  store: ReturnType<typeof createMockStore>,
+  timelineId: string = TimelineId.test
+) => {
+  return store.getState().timeline.timelineById[timelineId];
+};
+
+const loadPageMock = jest.fn();
+
+const useTimelineEventsMock = jest.fn(() => [
+  false,
+  {
+    events: localMockedTimelineData,
+    pageInfo: {
+      activePage: 0,
+      totalPages: 10,
+    },
+    refreshedAt: Date.now(),
+    totalCount: 70,
+    loadPage: loadPageMock,
+  },
+]);
+
+const useSourcererDataViewMocked = jest.fn().mockReturnValue({
+  ...mockSourcererScope,
+});
+
+const { storage: storageMock } = createSecuritySolutionStorageMock();
+const mockTimelineFilterManager = createFilterManagerMock();
+
+describe('unified timeline', () => {
+  const kibanaServiceMock: StartServices = {
+    ...createStartServicesMock(),
+    storage: storageMock,
+    timelineFilterManager: mockTimelineFilterManager,
+  };
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    storageMock.clear();
+    cleanup();
+    localStorage.clear();
+  });
+
+  beforeEach(() => {
+    const ONE_SECOND = 1000;
+    jest.setTimeout(10 * ONE_SECOND);
+    HTMLElement.prototype.getBoundingClientRect = jest.fn(() => {
+      return {
+        width: 1000,
+        height: 1000,
+        x: 0,
+        y: 0,
+      } as DOMRect;
+    });
+
+    (useKibana as jest.Mock).mockImplementation(() => {
+      return {
+        services: kibanaServiceMock,
+      };
+    });
+
+    (useTimelineEvents as jest.Mock).mockImplementation(useTimelineEventsMock);
+
+    (useTimelineEventsDetails as jest.Mock).mockImplementation(() => [false, {}]);
+
+    (useSourcererDataView as jest.Mock).mockImplementation(useSourcererDataViewMocked);
+
+    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
+      useIsExperimentalFeatureEnabledMock
+    );
+  });
+
+  describe('columns', () => {
+    it(
+      'should move column left correctly ',
+      async () => {
+        const field = {
+          name: 'message',
+        };
+        const { container } = renderTestComponents();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toHaveAttribute('data-gridcell-column-index', '3');
+
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            `[data-gridcell-column-id="${field.name}"] .euiDataGridHeaderCell__icon`
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTitle('Move left')).toBeEnabled();
+        });
+
+        fireEvent.click(screen.getByTitle('Move left'));
+
+        await waitFor(() => {
+          const newColumns = getTimelineFromStore(customStore).columns;
+          expect(newColumns[0].id).toBe('message');
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should move column right correctly ',
+      async () => {
+        const field = {
+          name: 'message',
+        };
+        const { container } = renderTestComponents();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toHaveAttribute('data-gridcell-column-index', '3');
+
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            `[data-gridcell-column-id="${field.name}"] .euiDataGridHeaderCell__icon`
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTitle('Move right')).toBeEnabled();
+        });
+
+        fireEvent.click(screen.getByTitle('Move right'));
+
+        await waitFor(() => {
+          const newColumns = getTimelineFromStore(customStore).columns;
+          expect(newColumns[2].id).toBe('message');
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should remove column ',
+      async () => {
+        const field = {
+          name: 'message',
+        };
+        const { container } = renderTestComponents();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            `[data-gridcell-column-id="${field.name}"] .euiDataGridHeaderCell__icon`
+          ) as HTMLElement
+        );
+
+        // column is currently present in the state
+        const currentColumns = getTimelineFromStore(customStore).columns;
+        expect(currentColumns).toMatchObject(
+          expect.arrayContaining([
+            expect.objectContaining({
+              id: field.name,
+            }),
+          ])
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTitle('Remove column')).toBeVisible();
+        });
+
+        fireEvent.click(screen.getByTitle('Remove column'));
+
+        // column should now be removed
+        await waitFor(() => {
+          const newColumns = getTimelineFromStore(customStore).columns;
+          expect(newColumns).not.toMatchObject(
+            expect.arrayContaining([
+              expect.objectContaining({
+                id: field.name,
+              }),
+            ])
+          );
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should sort date column',
+      async () => {
+        const { container } = renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+
+        expect(
+          container.querySelector('[data-gridcell-column-id="@timestamp"]')
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            '[data-gridcell-column-id="@timestamp"] .euiDataGridHeaderCell__icon'
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTitle('Sort Old-New')).toBeVisible();
+        });
+        expect(screen.getByTitle('Sort New-Old')).toBeVisible();
+
+        useTimelineEventsMock.mockClear();
+
+        fireEvent.click(screen.getByTitle('Sort Old-New'));
+
+        await waitFor(() => {
+          const newSort = getTimelineFromStore(customStore).sort;
+          expect(newSort).toMatchObject([
+            {
+              columnId: '@timestamp',
+              columnType: 'date',
+              sortDirection: 'asc',
+            },
+          ]);
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should sort string column correctly',
+      async () => {
+        const { container } = renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+
+        expect(
+          container.querySelector('[data-gridcell-column-id="host.name"]')
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            '[data-gridcell-column-id="host.name"] .euiDataGridHeaderCell__icon'
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTestId('dataGridHeaderCellActionGroup-host.name')).toBeVisible();
+        });
+
+        expect(screen.getByTitle('Sort A-Z')).toBeVisible();
+        expect(screen.getByTitle('Sort Z-A')).toBeVisible();
+
+        useTimelineEventsMock.mockClear();
+
+        fireEvent.click(screen.getByTitle('Sort A-Z'));
+
+        await waitFor(() => {
+          const newSort = getTimelineFromStore(customStore).sort;
+          expect(newSort).toMatchObject([
+            {
+              columnId: '@timestamp',
+              columnType: 'date',
+              sortDirection: 'desc',
+            },
+            {
+              sortDirection: 'asc',
+              columnId: 'host.name',
+              columnType: 'string',
+            },
+          ]);
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should sort number column',
+      async () => {
+        const field = {
+          name: 'event.severity',
+          type: 'number',
+        };
+
+        const { container } = renderTestComponents();
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            `[data-gridcell-column-id="${field.name}"] .euiDataGridHeaderCell__icon`
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTestId(`dataGridHeaderCellActionGroup-${field.name}`)).toBeVisible();
+        });
+
+        expect(screen.getByTitle('Sort Low-High')).toBeVisible();
+        expect(screen.getByTitle('Sort High-Low')).toBeVisible();
+
+        useTimelineEventsMock.mockClear();
+
+        fireEvent.click(screen.getByTitle('Sort Low-High'));
+
+        await waitFor(() => {
+          const newSort = getTimelineFromStore(customStore).sort;
+          expect(newSort).toMatchObject([
+            {
+              columnId: '@timestamp',
+              columnType: 'date',
+              sortDirection: 'desc',
+            },
+            {
+              sortDirection: 'asc',
+              columnId: 'event.severity',
+              columnType: 'number',
+            },
+          ]);
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should be able to edit DataView Field',
+      async () => {
+        const field = {
+          name: 'message',
+        };
+        const { container } = renderTestComponents();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('discoverDocTable')).toBeVisible();
+        });
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toHaveAttribute('data-gridcell-column-index', '3');
+
+        expect(
+          container.querySelector(`[data-gridcell-column-id="${field.name}"]`)
+        ).toBeInTheDocument();
+
+        fireEvent.click(
+          container.querySelector(
+            `[data-gridcell-column-id="${field.name}"] .euiDataGridHeaderCell__icon`
+          ) as HTMLElement
+        );
+
+        await waitFor(() => {
+          expect(screen.getByTitle('Edit data view field')).toBeEnabled();
+        });
+
+        fireEvent.click(screen.getByTitle('Edit data view field'));
+
+        await waitFor(() => {
+          expect(kibanaServiceMock.dataViewFieldEditor.openEditor).toHaveBeenNthCalledWith(1, {
+            ctx: {
+              dataView: expect.objectContaining({
+                id: 'security-solution',
+              }),
+            },
+            fieldName: 'message',
+            onSave: expect.any(Function),
+          });
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+
+  describe('unified field list', () => {
+    it(
+      'should be able to add filters',
+      async () => {
+        const field = {
+          name: 'event.severity',
+        };
+
+        renderTestComponents();
+        expect(await screen.findByTestId('timeline-sidebar')).toBeVisible();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedAvailableFields-count')).toBeVisible();
+        });
+
+        expect(screen.queryAllByTestId(`dataGridHeaderCell-${field.name}`)).toHaveLength(1);
+
+        const availableFields = screen.getByTestId('fieldListGroupedAvailableFields');
+
+        fireEvent.click(within(availableFields).getByTestId(`field-${field.name}-showDetails`));
+
+        await waitFor(() => {
+          expect(screen.getByTestId(`timelineFieldListPanelAddExistFilter-${field.name}`));
+        });
+
+        fireEvent.click(screen.getByTestId(`timelineFieldListPanelAddExistFilter-${field.name}`));
+        await waitFor(() => {
+          expect(mockTimelineFilterManager.addFilters).toHaveBeenNthCalledWith(
+            1,
+            expect.arrayContaining([
+              expect.objectContaining({
+                query: {
+                  exists: {
+                    field: field.name,
+                  },
+                },
+                meta: expect.objectContaining({
+                  negate: false,
+                  disabled: false,
+                }),
+              }),
+            ])
+          );
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+    it(
+      'should add the column when clicked on + sign',
+      async () => {
+        const fieldToBeAdded = {
+          name: 'agent.id',
+        };
+
+        renderTestComponents();
+        expect(await screen.findByTestId('timeline-sidebar')).toBeVisible();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedSelectedFields-count')).toBeVisible();
+        });
+
+        expect(screen.getByTestId('fieldListGroupedSelectedFields-count')).toHaveTextContent('9');
+
+        expect(screen.queryAllByTestId(`dataGridHeaderCell-${fieldToBeAdded.name}`)).toHaveLength(
+          0
+        );
+
+        const availableFields = screen.getByTestId('fieldListGroupedAvailableFields');
+
+        // / new columns does not exists yet
+        const currentColumns = getTimelineFromStore(customStore).columns;
+        expect(currentColumns).not.toMatchObject(
+          expect.arrayContaining([
+            expect.objectContaining({
+              id: fieldToBeAdded.name,
+            }),
+          ])
+        );
+
+        fireEvent.click(within(availableFields).getByTestId(`fieldToggle-${fieldToBeAdded.name}`));
+
+        // new columns should exist now
+        await waitFor(() => {
+          const newColumns = getTimelineFromStore(customStore).columns;
+          expect(newColumns).toMatchObject(
+            expect.arrayContaining([
+              expect.objectContaining({
+                id: fieldToBeAdded.name,
+              }),
+            ])
+          );
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+
+    it(
+      'should remove the column when clicked on X sign',
+      async () => {
+        const fieldToBeRemoved = {
+          name: 'event.severity',
+        };
+
+        renderTestComponents();
+        expect(await screen.findByTestId('timeline-sidebar')).toBeVisible();
+
+        await waitFor(() => {
+          expect(screen.getByTestId('fieldListGroupedAvailableFields-count')).toBeVisible();
+        });
+
+        expect(screen.queryAllByTestId(`dataGridHeaderCell-${fieldToBeRemoved.name}`)).toHaveLength(
+          1
+        );
+
+        const availableFields = screen.getByTestId('fieldListGroupedAvailableFields');
+
+        // new columns does exists
+        const currentColumns = getTimelineFromStore(customStore).columns;
+        expect(currentColumns).toMatchObject(
+          expect.arrayContaining([
+            expect.objectContaining({
+              id: fieldToBeRemoved.name,
+            }),
+          ])
+        );
+
+        fireEvent.click(
+          within(availableFields).getByTestId(`fieldToggle-${fieldToBeRemoved.name}`)
+        );
+
+        // new columns should not exist now
+        await waitFor(() => {
+          const newColumns = getTimelineFromStore(customStore).columns;
+          expect(newColumns).not.toMatchObject(
+            expect.arrayContaining([
+              expect.objectContaining({
+                id: fieldToBeRemoved.name,
+              }),
+            ])
+          );
+        });
+      },
+      SPECIAL_TEST_TIMEOUT
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/index.tsx
new file mode 100644
index 0000000000000..1c4a923e7efcc
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/index.tsx
@@ -0,0 +1,411 @@
+/*
+ * 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, EuiHideFor } from '@elastic/eui';
+import React, { useMemo, useCallback, useState, useRef } from 'react';
+import { useDispatch } from 'react-redux';
+
+import { generateFilters } from '@kbn/data-plugin/public';
+import type { DataView, DataViewField } from '@kbn/data-plugin/common';
+import type { SortOrder } from '@kbn/saved-search-plugin/public';
+import type { DataLoadingState } from '@kbn/unified-data-table';
+import { useColumns } from '@kbn/unified-data-table';
+import { popularizeField } from '@kbn/unified-data-table/src/utils/popularize_field';
+import type { DropType } from '@kbn/dom-drag-drop';
+import styled from 'styled-components';
+import { Droppable, DropOverlayWrapper, useDragDropContext } from '@kbn/dom-drag-drop';
+import type {
+  UnifiedFieldListSidebarContainerApi,
+  UnifiedFieldListSidebarContainerProps,
+} from '@kbn/unified-field-list';
+import { UnifiedFieldListSidebarContainer } from '@kbn/unified-field-list';
+import type { EuiTheme } from '@kbn/react-kibana-context-styled';
+import type { CoreStart } from '@kbn/core-lifecycle-browser';
+import type { DocViewFilterFn } from '@kbn/unified-doc-viewer/types';
+import { withDataView } from '../../../../common/components/with_data_view';
+import { EventDetailsWidthProvider } from '../../../../common/components/events_viewer/event_details_width_context';
+import type { ExpandedDetailTimeline } from '../../../../../common/types';
+import type { TimelineItem } from '../../../../../common/search_strategy';
+import { useKibana } from '../../../../common/lib/kibana';
+import { defaultHeaders } from '../body/column_headers/default_headers';
+import type {
+  ColumnHeaderOptions,
+  OnChangePage,
+  RowRenderer,
+  SortColumnTimeline,
+  ToggleDetailPanel,
+  TimelineTabs,
+} from '../../../../../common/types/timeline';
+import type { inputsModel } from '../../../../common/store';
+import { getColumnHeader } from '../body/column_headers/helpers';
+import { StyledPageContentWrapper, StyledMainEuiPanel, StyledSplitFlexItem } from './styles';
+import { DRAG_DROP_FIELD } from './data_table/translations';
+import { TimelineResizableLayout } from './resizable_layout';
+import TimelineDataTable from './data_table';
+import { timelineActions } from '../../../store';
+import { getFieldsListCreationOptions } from './get_fields_list_creation_options';
+import { defaultUdtHeaders } from './default_headers';
+
+const TimelineBodyContainer = styled.div.attrs(({ className = '' }) => ({
+  className: `${className}`,
+}))`
+  width: 100%;
+  height: 100%;
+`;
+
+const DataGridMemoized = React.memo(TimelineDataTable);
+
+const DROP_PROPS = {
+  value: {
+    id: 'dscDropZoneTable',
+    humanData: {
+      label: DRAG_DROP_FIELD,
+    },
+  },
+  order: [1, 0, 0, 0],
+  types: ['field_add'] as DropType[],
+};
+
+const SidebarPanelFlexGroup = styled(EuiFlexGroup)`
+  height: 100%;
+
+  .unifiedFieldListSidebar {
+    padding-bottom: ${(props) => (props.theme as EuiTheme).eui.euiSizeS};
+    padding-left: 0px;
+    border-top: 1px solid ${(props) => (props.theme as EuiTheme).eui.euiColorLightShade};
+
+    .unifiedFieldListSidebar__group {
+      .euiFlexItem:last-child {
+        /* padding-right: ${(props) => (props.theme as EuiTheme).eui.euiSizeS}; */
+      }
+      .unifiedFieldListSidebar__list {
+        padding-left: 0px;
+      }
+
+      .unifiedFieldListSidebar__addBtn {
+        margin-right: ${(props) => (props.theme as EuiTheme).eui.euiSizeS};
+      }
+    }
+  }
+`;
+
+export const SAMPLE_SIZE_SETTING = 500;
+export const HIDE_FOR_SIZES = ['xs', 's'];
+
+interface Props {
+  columns: ColumnHeaderOptions[];
+  rowRenderers: RowRenderer[];
+  timelineId: string;
+  itemsPerPage: number;
+  itemsPerPageOptions: number[];
+  sort: SortColumnTimeline[];
+  events: TimelineItem[];
+  refetch: inputsModel.Refetch;
+  totalCount: number;
+  onEventClosed: (args: ToggleDetailPanel) => void;
+  expandedDetail: ExpandedDetailTimeline;
+  showExpandedDetails: boolean;
+  onChangePage: OnChangePage;
+  activeTab: TimelineTabs;
+  dataLoadingState: DataLoadingState;
+  updatedAt: number;
+  isTextBasedQuery?: boolean;
+  dataView: DataView;
+}
+
+const UnifiedTimelineComponent: React.FC<Props> = ({
+  columns,
+  activeTab,
+  timelineId,
+  itemsPerPage,
+  itemsPerPageOptions,
+  rowRenderers,
+  sort,
+  events,
+  refetch,
+  dataLoadingState,
+  totalCount,
+  onEventClosed,
+  showExpandedDetails,
+  expandedDetail,
+  onChangePage,
+  updatedAt,
+  isTextBasedQuery,
+  dataView,
+}) => {
+  const dispatch = useDispatch();
+  const unifiedFieldListContainerRef = useRef<UnifiedFieldListSidebarContainerApi>(null);
+
+  const {
+    services: {
+      uiSettings,
+      fieldFormats,
+      dataViews,
+      dataViewFieldEditor,
+      application: { capabilities },
+      data: dataPluginContract,
+      uiActions,
+      charts,
+      docLinks,
+      analytics,
+      timelineFilterManager,
+    },
+  } = useKibana();
+
+  const fieldListSidebarServices: UnifiedFieldListSidebarContainerProps['services'] = useMemo(
+    () => ({
+      fieldFormats,
+      dataViews,
+      dataViewFieldEditor,
+      data: dataPluginContract,
+      uiActions,
+      charts,
+      core: {
+        analytics,
+        uiSettings,
+        docLinks,
+      } as CoreStart,
+    }),
+    [
+      fieldFormats,
+      dataViews,
+      dataViewFieldEditor,
+      dataPluginContract,
+      uiActions,
+      charts,
+      uiSettings,
+      docLinks,
+      analytics,
+    ]
+  );
+
+  const [sidebarContainer, setSidebarContainer] = useState<HTMLDivElement | null>(null);
+  const [, setMainContainer] = useState<HTMLDivElement | null>(null);
+
+  const columnIds = useMemo(() => {
+    return columns.map((c) => c.id);
+  }, [columns]);
+
+  const sortingColumns = useMemo(() => {
+    return (
+      (sort?.map((sortingCol) => [
+        sortingCol.columnId,
+        sortingCol.sortDirection as 'asc' | 'desc',
+      ]) as SortOrder[]) || []
+    );
+  }, [sort]);
+
+  const onSort = useCallback(
+    (nextSort: string[][]) => {
+      dispatch(
+        timelineActions.updateSort({
+          id: timelineId,
+          sort: nextSort.map(([id, direction]) => {
+            const currentColumn = columns.find((column) => column.id === id);
+            const columnType = currentColumn ? currentColumn.type : 'keyword';
+            return {
+              columnId: id,
+              columnType,
+              sortDirection: direction,
+            } as SortColumnTimeline;
+          }),
+        })
+      );
+    },
+    [dispatch, timelineId, columns]
+  );
+
+  const setAppState = useCallback(
+    (newState: { columns: string[]; sort?: string[][] }) => {
+      if (newState.sort) {
+        onSort(newState.sort);
+      } else {
+        const columnsStates = newState.columns.map((columnId) =>
+          getColumnHeader(columnId, defaultUdtHeaders)
+        );
+        dispatch(timelineActions.updateColumns({ id: timelineId, columns: columnsStates }));
+      }
+    },
+    [dispatch, onSort, timelineId]
+  );
+
+  const { onAddColumn, onRemoveColumn, onSetColumns } = useColumns({
+    capabilities,
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    dataView: dataView!,
+    dataViews,
+    setAppState,
+    useNewFieldsApi: true,
+    columns: columnIds,
+    sort: sortingColumns,
+  });
+
+  const onAddFilter = useCallback(
+    (field: DataViewField | string, values: unknown, operation: '+' | '-') => {
+      if (dataView && timelineFilterManager) {
+        const fieldName = typeof field === 'string' ? field : field.name;
+        popularizeField(dataView, fieldName, dataViews, capabilities);
+        const newFilters = generateFilters(
+          timelineFilterManager,
+          field,
+          values,
+          operation,
+          dataView
+        );
+        return timelineFilterManager.addFilters(newFilters);
+      }
+    },
+    [timelineFilterManager, dataView, dataViews, capabilities]
+  );
+
+  const [{ dragging }] = useDragDropContext();
+  const draggingFieldName = dragging?.id;
+
+  const onToggleColumn = useCallback(
+    (columnId: string) => {
+      dispatch(
+        timelineActions.upsertColumn({
+          column: getColumnHeader(columnId, defaultHeaders),
+          id: timelineId,
+          index: 1,
+        })
+      );
+    },
+    [dispatch, timelineId]
+  );
+
+  const isDropAllowed = useMemo(() => {
+    if (!draggingFieldName || columnIds.includes(draggingFieldName)) {
+      return false;
+    }
+    return true;
+  }, [draggingFieldName, columnIds]);
+
+  const onDropFieldToTable = useCallback(() => {
+    if (draggingFieldName) {
+      onAddColumn(draggingFieldName);
+      onToggleColumn(draggingFieldName);
+    }
+  }, [draggingFieldName, onAddColumn, onToggleColumn]);
+
+  const onAddFieldToWorkspace = useCallback(
+    (field: DataViewField) => {
+      onAddColumn(field.name);
+      onToggleColumn(field.name);
+    },
+    [onAddColumn, onToggleColumn]
+  );
+
+  const onRemoveFieldFromWorkspace = useCallback(
+    (field: DataViewField) => {
+      if (columns.some(({ id }) => id === field.name)) {
+        dispatch(
+          timelineActions.removeColumn({
+            columnId: field.name,
+            id: timelineId,
+          })
+        );
+      }
+      onRemoveColumn(field.name);
+    },
+    [columns, dispatch, onRemoveColumn, timelineId]
+  );
+
+  const onFieldEdited = useCallback(() => {
+    refetch();
+  }, [refetch]);
+
+  const wrappedOnFieldEdited = useCallback(async () => {
+    onFieldEdited();
+  }, [onFieldEdited]);
+
+  return (
+    <TimelineBodyContainer className="timelineBodyContainer" ref={setSidebarContainer}>
+      <TimelineResizableLayout
+        container={sidebarContainer}
+        unifiedFieldListSidebarContainerApi={unifiedFieldListContainerRef.current}
+        sidebarPanel={
+          <SidebarPanelFlexGroup gutterSize="none">
+            <EuiFlexItem className="sidebarContainer">
+              {dataView ? (
+                <UnifiedFieldListSidebarContainer
+                  ref={unifiedFieldListContainerRef}
+                  showFieldList
+                  variant="responsive"
+                  getCreationOptions={getFieldsListCreationOptions}
+                  services={fieldListSidebarServices}
+                  dataView={dataView}
+                  fullWidth
+                  allFields={dataView.fields}
+                  workspaceSelectedFieldNames={columnIds}
+                  onAddFieldToWorkspace={onAddFieldToWorkspace}
+                  onRemoveFieldFromWorkspace={onRemoveFieldFromWorkspace}
+                  onAddFilter={onAddFilter}
+                  onFieldEdited={wrappedOnFieldEdited}
+                />
+              ) : null}
+            </EuiFlexItem>
+            <EuiHideFor sizes={HIDE_FOR_SIZES}>
+              <StyledSplitFlexItem grow={false} className="thinBorderSplit" />
+            </EuiHideFor>
+          </SidebarPanelFlexGroup>
+        }
+        mainPanel={
+          <StyledPageContentWrapper>
+            <StyledMainEuiPanel
+              role="main"
+              panelRef={setMainContainer}
+              paddingSize="none"
+              borderRadius="none"
+              hasShadow={false}
+              hasBorder={false}
+              color="transparent"
+            >
+              <Droppable
+                dropTypes={isDropAllowed ? DROP_PROPS.types : undefined}
+                value={DROP_PROPS.value}
+                order={DROP_PROPS.order}
+                onDrop={onDropFieldToTable}
+              >
+                <DropOverlayWrapper isVisible={isDropAllowed}>
+                  <EventDetailsWidthProvider>
+                    <DataGridMemoized
+                      columns={columns}
+                      rowRenderers={rowRenderers}
+                      timelineId={timelineId}
+                      itemsPerPage={itemsPerPage}
+                      itemsPerPageOptions={itemsPerPageOptions}
+                      sort={sortingColumns}
+                      onSort={onSort}
+                      onSetColumns={onSetColumns}
+                      events={events}
+                      refetch={refetch}
+                      onFieldEdited={onFieldEdited}
+                      dataLoadingState={dataLoadingState}
+                      totalCount={totalCount}
+                      onEventClosed={onEventClosed}
+                      expandedDetail={expandedDetail}
+                      showExpandedDetails={showExpandedDetails}
+                      onChangePage={onChangePage}
+                      activeTab={activeTab}
+                      updatedAt={updatedAt}
+                      isTextBasedQuery={isTextBasedQuery}
+                      onFilter={onAddFilter as DocViewFilterFn}
+                    />
+                  </EventDetailsWidthProvider>
+                </DropOverlayWrapper>
+              </Droppable>
+            </StyledMainEuiPanel>
+          </StyledPageContentWrapper>
+        }
+      />
+    </TimelineBodyContainer>
+  );
+};
+
+export const UnifiedTimeline = React.memo(withDataView<Props>(UnifiedTimelineComponent));
+// eslint-disable-next-line import/no-default-export
+export { UnifiedTimeline as default };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/resizable_layout.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/resizable_layout.test.tsx
new file mode 100644
index 0000000000000..106be16c82329
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/resizable_layout.test.tsx
@@ -0,0 +1,47 @@
+/*
+ * 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, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+import TimelineResizableLayout from './resizable_layout';
+
+const TestSideBarPanel = <div data-test-subj="sidebar__panel">{'Sidebar Panel'}</div>;
+
+const MainPanel = <div data-test-subj="main__panel">{'Main Panel'}</div>;
+
+const container = document.createElement('div');
+container.style.width = '1000px';
+container.style.height = '1000px';
+container.getBoundingClientRect = jest.fn(() => {
+  return {
+    width: 1000,
+    height: 1000,
+    x: 0,
+    y: 0,
+  } as DOMRect;
+});
+
+const TestComponent = () => {
+  return (
+    <TimelineResizableLayout
+      sidebarPanel={TestSideBarPanel}
+      mainPanel={MainPanel}
+      unifiedFieldListSidebarContainerApi={null}
+      container={container}
+    />
+  );
+};
+
+describe('ResizableLayout', () => {
+  it('should render without any issues', async () => {
+    render(<TestComponent />);
+
+    await waitFor(() => {
+      expect(screen.getByTestId('sidebar__panel')).toBeVisible();
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/resizable_layout.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/resizable_layout.tsx
new file mode 100644
index 0000000000000..2bcb14a7df805
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/resizable_layout.tsx
@@ -0,0 +1,88 @@
+/*
+ * 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, useIsWithinBreakpoints } from '@elastic/eui';
+import {
+  ResizableLayout,
+  ResizableLayoutDirection,
+  ResizableLayoutMode,
+} from '@kbn/resizable-layout';
+import type { UnifiedFieldListSidebarContainerApi } from '@kbn/unified-field-list';
+import type { ReactNode } from 'react';
+import React, { useState } from 'react';
+import { createHtmlPortalNode, InPortal, OutPortal } from 'react-reverse-portal';
+import useLocalStorage from 'react-use/lib/useLocalStorage';
+import useObservable from 'react-use/lib/useObservable';
+import { of } from 'rxjs';
+
+export const SIDEBAR_WIDTH_KEY = 'timeline:sidebarWidth';
+
+// TODO: This is almost a duplicate of the logic here: src/plugins/discover/public/application/main/components/layout/discover_resizable_layout.tsx
+// Should this layout be a shared package or just an accepted dupe since the <ResizeableLayout /> is already shared?
+
+export const TimelineResizableLayoutComponent = ({
+  container,
+  sidebarPanel,
+  mainPanel,
+  unifiedFieldListSidebarContainerApi,
+}: {
+  container: HTMLElement | null;
+  sidebarPanel: ReactNode;
+  mainPanel: ReactNode;
+  unifiedFieldListSidebarContainerApi: UnifiedFieldListSidebarContainerApi | null;
+}) => {
+  const [sidebarPanelNode] = useState(() =>
+    createHtmlPortalNode({ attributes: { class: 'eui-fullHeight sidebarPanel' } })
+  );
+  const [mainPanelNode] = useState(() =>
+    createHtmlPortalNode({ attributes: { class: 'eui-fullHeight mainPanel' } })
+  );
+
+  const { euiTheme } = useEuiTheme();
+  const minSidebarWidth = euiTheme.base * 13;
+  const defaultSidebarWidth = euiTheme.base * 19;
+  const minMainPanelWidth = euiTheme.base * 30;
+
+  const [sidebarWidth, setSidebarWidth] = useLocalStorage(SIDEBAR_WIDTH_KEY, defaultSidebarWidth);
+
+  const isMobile = useIsWithinBreakpoints(['xs', 's']);
+
+  const isSidebarCollapsed = useObservable(
+    unifiedFieldListSidebarContainerApi?.sidebarVisibility.isCollapsed$ ?? of(true),
+    true
+  );
+  const layoutMode =
+    isMobile || isSidebarCollapsed ? ResizableLayoutMode.Static : ResizableLayoutMode.Resizable;
+  const layoutDirection = isMobile
+    ? ResizableLayoutDirection.Vertical
+    : ResizableLayoutDirection.Horizontal;
+
+  return (
+    <>
+      <InPortal node={sidebarPanelNode}>{sidebarPanel}</InPortal>
+      <InPortal node={mainPanelNode}>{mainPanel}</InPortal>
+      <ResizableLayout
+        className="timelineUnifiedComponentsBody__contents"
+        mode={layoutMode}
+        direction={layoutDirection}
+        container={container}
+        fixedPanelSize={sidebarWidth ?? defaultSidebarWidth}
+        minFixedPanelSize={minSidebarWidth}
+        minFlexPanelSize={minMainPanelWidth}
+        fixedPanel={<OutPortal node={sidebarPanelNode} />}
+        flexPanel={<OutPortal node={mainPanelNode} />}
+        resizeButtonClassName="timelineSidebarResizeButton"
+        data-test-subj="timelineUnifiedComponentsLayout"
+        onFixedPanelSizeChange={setSidebarWidth}
+      />
+    </>
+  );
+};
+
+export const TimelineResizableLayout = React.memo(TimelineResizableLayoutComponent);
+// eslint-disable-next-line import/no-default-export
+export { TimelineResizableLayout as default };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx
new file mode 100644
index 0000000000000..279284bf004a4
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx
@@ -0,0 +1,148 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import styled from 'styled-components';
+import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiProgress } from '@elastic/eui';
+import { euiThemeVars } from '@kbn/ui-theme';
+
+export const StyledTableFlexGroup = styled(EuiFlexGroup).attrs(({ className = '' }) => ({
+  className: `${className}`,
+}))`
+  margin: 0;
+  width: 100%;
+  overflow: hidden;
+
+  .dscPageBody__contents {
+    overflow: hidden;
+    height: 100%;
+  }
+`;
+
+export const StyledTableFlexItem = styled(EuiFlexItem).attrs(({ className = '' }) => ({
+  className: `${className}`,
+}))`
+  ${({ theme }) => `margin: 0 ${theme.eui.euiSizeM};`}
+  overflow: hidden;
+`;
+
+export const StyledSplitFlexItem = styled(EuiFlexItem).attrs(({ className = '' }) => ({
+  className: `${className}`,
+}))`
+  border-right: ${euiThemeVars.euiBorderThin};
+`;
+
+export const StyledEuiProgress = styled(EuiProgress)`
+  z-index: 2;
+`;
+
+export const StyledPageContentWrapper = styled.div.attrs(({ className = '' }) => ({
+  className: `${className}`,
+}))`
+  height: 100%;
+  overflow: hidden;
+  position: relative;
+`;
+
+export const StyledMainEuiPanel = styled(EuiPanel).attrs(({ className = '' }) => ({
+  className: `udtPageContent__wrapper ${className}`,
+}))`
+  overflow: hidden; // Ensures horizontal scroll of table
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+`;
+
+export const StyledTimelineUnifiedDataTable = styled.div.attrs(({ className = '' }) => ({
+  className: `unifiedDataTable ${className}`,
+  role: 'rowgroup',
+}))`
+  .udtTimeline [data-gridcell-column-id|='select'] {
+    border-right: none;
+  }
+  .udtTimeline [data-gridcell-column-id|='openDetails'] .euiDataGridRowCell__contentByHeight {
+    margin-top: 3px;
+  }
+
+  .udtTimeline .euiDataGridRowCell--controlColumn {
+    overflow: visible;
+  }
+
+  .udtTimeline [data-gridcell-column-id|='select'] .euiDataGridRowCell__contentByHeight {
+    margin-top: 5px;
+  }
+
+  .udtTimeline
+    .euiDataGridRow:hover
+    .euiDataGridRowCell--lastColumn.euiDataGridRowCell--controlColumn {
+    ${({ theme }) => `background-color: ${theme.eui.colorLightShade};`};
+  }
+
+  .udtTimeline .euiDataGridRowCell--lastColumn.euiDataGridRowCell--controlColumn {
+    ${({ theme }) => `background-color: ${theme.eui.emptyShade};`};
+  }
+
+  .udtTimeline .siemEventsTable__trSupplement--summary {
+    border-radius: 8px;
+  }
+
+  .udtTimeline .euiDataGridRow:has(.buildingBlockType) {
+    background: repeating-linear-gradient(
+      127deg,
+      rgba(245, 167, 0, 0.2),
+      rgba(245, 167, 0, 0.2) 1px,
+      rgba(245, 167, 0, 0.05) 2px,
+      rgba(245, 167, 0, 0.05) 10px
+    );
+  }
+  .udtTimeline .euiDataGridRow:has(.eqlSequence) {
+    .euiDataGridRowCell--firstColumn {
+      ${({ theme }) => `border-left: 4px solid ${theme.eui.euiColorPrimary};`}
+    }
+    background: repeating-linear-gradient(
+      127deg,
+      rgba(0, 107, 180, 0.2),
+      rgba(0, 107, 180, 0.2) 1px,
+      rgba(0, 107, 180, 0.05) 2px,
+      rgba(0, 107, 180, 0.05) 10px
+    );
+  }
+  .udtTimeline .euiDataGridRow:has(.eqlNonSequence) {
+    .euiDataGridRowCell--firstColumn {
+      ${({ theme }) => `border-left: 4px solid ${theme.eui.euiColorAccent};`}
+    }
+    background: repeating-linear-gradient(
+      127deg,
+      rgba(221, 10, 115, 0.2),
+      rgba(221, 10, 115, 0.2) 1px,
+      rgba(221, 10, 115, 0.05) 2px,
+      rgba(221, 10, 115, 0.05) 10px
+    );
+  }
+  .udtTimeline .euiDataGridRow:has(.nonRawEvent) .euiDataGridRowCell--firstColumn {
+    ${({ theme }) => `border-left: 4px solid ${theme.eui.euiColorWarning};`}
+  }
+  .udtTimeline .euiDataGridRow:has(.rawEvent) .euiDataGridRowCell--firstColumn {
+    ${({ theme }) => `border-left: 4px solid ${theme.eui.euiColorLightShade};`}
+  }
+
+  .udtTimeline .rowCellWrapper {
+    display: flex;
+    width: fit-content;
+  }
+
+  .udtTimeline .rightPosition {
+    position: absolute;
+    right: 5px;
+    button {
+      ${({ theme }) => `color: ${theme.eui.euiColorDarkShade};`}
+    }
+  }
+
+  .udtTimeline .euiDataGrid__rightControls {
+    padding-right: 30px;
+  }
+`;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/utils.test.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/utils.test.ts
new file mode 100644
index 0000000000000..e0a7007c3a16d
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/utils.test.ts
@@ -0,0 +1,60 @@
+/*
+ * 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 { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+
+import { mockSourcererScope } from '../../../../common/containers/sourcerer/mocks';
+import { mockTimelineData } from '../../../../common/mock';
+import { transformTimelineItemToUnifiedRows } from './utils';
+
+const testTimelineData = mockTimelineData;
+
+describe('utils', () => {
+  describe('transformTimelineItemToUnifiedRows', () => {
+    it('should return correct result', () => {
+      const result = transformTimelineItemToUnifiedRows({
+        events: testTimelineData,
+        dataView: new DataView({
+          spec: mockSourcererScope.sourcererDataView,
+          fieldFormats: fieldFormatsMock,
+        }),
+      });
+
+      expect(result[0]).toEqual({
+        _id: testTimelineData[0]._id,
+        id: testTimelineData[0]._id,
+        data: testTimelineData[0].data,
+        ecs: testTimelineData[0].ecs,
+        raw: {
+          _id: testTimelineData[0]._id,
+          _index: String(testTimelineData[0]._index),
+          _source: testTimelineData[0].ecs,
+        },
+        flattened: {
+          _id: testTimelineData[0]._id,
+          timestamp: '2018-11-05T19:03:25.937Z',
+          'host.name': ['apache'],
+          'host.ip': ['192.168.0.1'],
+          'event.id': ['1'],
+          'event.action': ['Action'],
+          'event.category': ['Access'],
+          'event.module': ['nginx'],
+          'event.severity': [3],
+          'source.ip': ['192.168.0.1'],
+          'source.port': [80],
+          'destination.ip': ['192.168.0.3'],
+          'destination.port': [6343],
+          'user.id': ['1'],
+          'user.name': ['john.dee'],
+          'geo.region_name': ['xx'],
+          'geo.country_iso_code': ['xx'],
+        },
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/utils.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/utils.ts
new file mode 100644
index 0000000000000..20b769455d3ea
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/utils.ts
@@ -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 { flattenHit } from '@kbn/data-service';
+import type { DataView } from '@kbn/data-views-plugin/public';
+import type { DataTableRecord } from '@kbn/discover-utils/types';
+import type { TimelineItem } from '../../../../../common/search_strategy';
+
+interface TransformTimelineItemToUnifiedRows {
+  events: TimelineItem[];
+  dataView: DataView;
+}
+
+export function transformTimelineItemToUnifiedRows(
+  args: TransformTimelineItemToUnifiedRows
+): Array<DataTableRecord & TimelineItem> {
+  const { events, dataView } = args;
+  const unifiedDataTableRows = events.map(({ _id, _index, ecs, data }) => {
+    const _source = ecs as unknown as Record<string, unknown>;
+    const hit = { _id, _index: String(_index), _source };
+    /*
+     * Ideally for unified data table we only need raw and flattened keys
+     * but we use this transformed data within other parts of security solution
+     * so we create a combined data format for timeline item and DataTableRecord
+     *
+     * */
+    return {
+      _id,
+      id: _id,
+      data,
+      ecs,
+      raw: hit,
+      flattened: flattenHit(hit, dataView, {
+        includeIgnoredValues: true,
+      }),
+    };
+  });
+
+  return unifiedDataTableRows;
+}
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/active_timeline_context.ts b/x-pack/plugins/security_solution/public/timelines/containers/active_timeline_context.ts
index 350bedb40b196..383825da33038 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/active_timeline_context.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/active_timeline_context.ts
@@ -9,6 +9,8 @@ import type {
   TimelineEventsAllOptionsInput,
   TimelineEqlRequestOptionsInput,
 } from '@kbn/timelines-plugin/common';
+import type { ExpandedDetailTimeline, ExpandedDetailType } from '../../../common/types';
+import { TimelineTabs } from '../../../common/types/timeline';
 import type { TimelineArgs } from '.';
 
 /*
@@ -24,6 +26,7 @@ import type { TimelineArgs } from '.';
 
 class ActiveTimelineEvents {
   private _activePage: number = 0;
+  private _expandedDetail: ExpandedDetailTimeline = {};
   private _pageName: string = '';
   private _request: TimelineEventsAllOptionsInput | null = null;
   private _response: TimelineArgs | null = null;
@@ -38,6 +41,42 @@ class ActiveTimelineEvents {
     this._activePage = activePage;
   }
 
+  getExpandedDetail() {
+    return this._expandedDetail;
+  }
+
+  toggleExpandedDetail(expandedDetail: ExpandedDetailType) {
+    const queryTab = TimelineTabs.query;
+    const currentExpandedDetail = this._expandedDetail[queryTab];
+    let isSameExpandedDetail;
+
+    // Check if the stored details matches the incoming detail
+    if (currentExpandedDetail?.panelView === 'eventDetail') {
+      isSameExpandedDetail =
+        expandedDetail?.panelView === 'eventDetail' &&
+        expandedDetail?.params?.eventId === currentExpandedDetail?.params?.eventId;
+    } else if (currentExpandedDetail?.panelView === 'hostDetail') {
+      isSameExpandedDetail =
+        expandedDetail?.panelView === 'hostDetail' &&
+        expandedDetail?.params?.hostName === currentExpandedDetail?.params?.hostName;
+    } else if (currentExpandedDetail?.panelView === 'networkDetail') {
+      isSameExpandedDetail =
+        expandedDetail?.panelView === 'networkDetail' &&
+        expandedDetail?.params?.ip === currentExpandedDetail?.params?.ip;
+    }
+
+    // if so, unset it, otherwise set it
+    if (isSameExpandedDetail) {
+      this._expandedDetail = {};
+    } else {
+      this._expandedDetail = { [queryTab]: { ...expandedDetail } };
+    }
+  }
+
+  setExpandedDetail(expandedDetail: ExpandedDetailTimeline) {
+    this._expandedDetail = expandedDetail;
+  }
+
   getPageName() {
     return this._pageName;
   }
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/containers/index.test.tsx
index 13189f4ed77e6..e2ec3d2117725 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/index.test.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { DataLoadingState } from '@kbn/unified-data-table';
 import { renderHook, act } from '@testing-library/react-hooks';
 import type { TimelineArgs, UseTimelineEventsProps } from '.';
 import { initSortDefault, useTimelineEvents } from '.';
@@ -125,7 +126,7 @@ describe('useTimelineEvents', () => {
     await act(async () => {
       const { result, waitForNextUpdate } = renderHook<
         UseTimelineEventsProps,
-        [boolean, TimelineArgs]
+        [DataLoadingState, TimelineArgs]
       >((args) => useTimelineEvents(args), {
         initialProps: { ...props },
       });
@@ -133,7 +134,7 @@ describe('useTimelineEvents', () => {
       // useEffect on params request
       await waitForNextUpdate();
       expect(result.current).toEqual([
-        false,
+        DataLoadingState.loaded,
         {
           events: [],
           id: TimelineId.active,
@@ -152,7 +153,7 @@ describe('useTimelineEvents', () => {
     await act(async () => {
       const { result, waitForNextUpdate, rerender } = renderHook<
         UseTimelineEventsProps,
-        [boolean, TimelineArgs]
+        [DataLoadingState, TimelineArgs]
       >((args) => useTimelineEvents(args), {
         initialProps: { ...props },
       });
@@ -165,7 +166,7 @@ describe('useTimelineEvents', () => {
 
       expect(mockSearch).toHaveBeenCalledTimes(2);
       expect(result.current).toEqual([
-        false,
+        DataLoadingState.loaded,
         {
           events: mockEvents,
           id: TimelineId.active,
@@ -184,7 +185,7 @@ describe('useTimelineEvents', () => {
     await act(async () => {
       const { result, waitForNextUpdate, rerender } = renderHook<
         UseTimelineEventsProps,
-        [boolean, TimelineArgs]
+        [DataLoadingState, TimelineArgs]
       >((args) => useTimelineEvents(args), {
         initialProps: { ...props },
       });
@@ -208,7 +209,7 @@ describe('useTimelineEvents', () => {
       expect(mockSearch).toHaveBeenCalledTimes(2);
 
       expect(result.current).toEqual([
-        false,
+        DataLoadingState.loaded,
         {
           events: mockEvents,
           id: TimelineId.active,
@@ -227,7 +228,7 @@ describe('useTimelineEvents', () => {
     await act(async () => {
       const { result, waitForNextUpdate, rerender } = renderHook<
         UseTimelineEventsProps,
-        [boolean, TimelineArgs]
+        [DataLoadingState, TimelineArgs]
       >((args) => useTimelineEvents(args), {
         initialProps: {
           ...props,
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
index 19e8e7b92b870..80ffd7ea30836 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/containers/index.tsx
@@ -13,6 +13,7 @@ import { Subscription } from 'rxjs';
 
 import type { DataView } from '@kbn/data-plugin/common';
 import { isRunningResponse } from '@kbn/data-plugin/common';
+import { DataLoadingState } from '@kbn/unified-data-table';
 import type {
   TimelineEqlRequestOptionsInput,
   TimelineEventsAllOptionsInput,
@@ -147,14 +148,14 @@ export const useTimelineEventsHandler = ({
   sort = initSortDefault,
   skip = false,
   timerangeKind,
-}: UseTimelineEventsProps): [boolean, TimelineArgs, TimelineEventsSearchHandler] => {
+}: UseTimelineEventsProps): [DataLoadingState, TimelineArgs, TimelineEventsSearchHandler] => {
   const [{ pageName }] = useRouteSpy();
   const dispatch = useDispatch();
   const { data } = useKibana().services;
   const refetch = useRef<inputsModel.Refetch>(noop);
   const abortCtrl = useRef(new AbortController());
   const searchSubscription$ = useRef(new Subscription());
-  const [loading, setLoading] = useState(false);
+  const [loading, setLoading] = useState<DataLoadingState>(DataLoadingState.loaded);
   const [activePage, setActivePage] = useState(
     id === TimelineId.active ? activeTimeline.getActivePage() : 0
   );
@@ -219,7 +220,11 @@ export const useTimelineEventsHandler = ({
       const asyncSearch = async () => {
         prevTimelineRequest.current = request;
         abortCtrl.current = new AbortController();
-        setLoading(true);
+        if (activePage === 0) {
+          setLoading(DataLoadingState.loading);
+        } else {
+          setLoading(DataLoadingState.loadingMore);
+        }
         const { endTracking } = startTracking({ name: `${APP_UI_ID} timeline events search` });
         searchSubscription$.current = data.search
           .search<TimelineRequest<typeof language>, TimelineResponse<typeof language>>(request, {
@@ -233,7 +238,7 @@ export const useTimelineEventsHandler = ({
             next: (response) => {
               if (!isRunningResponse(response)) {
                 endTracking('success');
-                setLoading(false);
+                setLoading(DataLoadingState.loaded);
                 setTimelineResponse((prevResponse) => {
                   const newTimelineResponse = {
                     ...prevResponse,
@@ -262,7 +267,7 @@ export const useTimelineEventsHandler = ({
             },
             error: (msg) => {
               endTracking(abortCtrl.current.signal.aborted ? 'aborted' : 'error');
-              setLoading(false);
+              setLoading(DataLoadingState.loaded);
               data.search.showError(msg);
               searchSubscription$.current.unsubscribe();
             },
@@ -276,7 +281,7 @@ export const useTimelineEventsHandler = ({
       ) {
         activeTimeline.setPageName(pageName);
         abortCtrl.current.abort();
-        setLoading(false);
+        setLoading(DataLoadingState.loaded);
 
         if (request.language === 'eql') {
           prevTimelineRequest.current = activeTimeline.getEqlRequest();
@@ -312,7 +317,17 @@ export const useTimelineEventsHandler = ({
       await asyncSearch();
       refetch.current = asyncSearch;
     },
-    [pageName, skip, id, startTracking, data.search, dataViewId, refetchGrid, wrappedLoadPage]
+    [
+      pageName,
+      skip,
+      id,
+      activePage,
+      startTracking,
+      data.search,
+      dataViewId,
+      refetchGrid,
+      wrappedLoadPage,
+    ]
   );
 
   useEffect(() => {
@@ -450,8 +465,8 @@ export const useTimelineEvents = ({
   sort = initSortDefault,
   skip = false,
   timerangeKind,
-}: UseTimelineEventsProps): [boolean, TimelineArgs] => {
-  const [loading, timelineResponse, timelineSearchHandler] = useTimelineEventsHandler({
+}: UseTimelineEventsProps): [DataLoadingState, TimelineArgs] => {
+  const [dataLoadingState, timelineResponse, timelineSearchHandler] = useTimelineEventsHandler({
     dataViewId,
     endDate,
     eqlOptions,
@@ -473,5 +488,5 @@ export const useTimelineEvents = ({
     timelineSearchHandler();
   }, [timelineSearchHandler]);
 
-  return [loading, timelineResponse];
+  return [dataLoadingState, timelineResponse];
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/hooks/use_create_timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/hooks/use_create_timeline.test.tsx
index a40c16495ef6c..7a5f0a0adf154 100644
--- a/x-pack/plugins/security_solution/public/timelines/hooks/use_create_timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/hooks/use_create_timeline.test.tsx
@@ -33,6 +33,8 @@ jest.mock('../../common/containers/use_global_time', () => {
 });
 jest.mock('../../common/lib/kibana');
 
+jest.mock('../../common/hooks/use_experimental_features');
+
 describe('useCreateTimeline', () => {
   const resetDiscoverAppState = jest.fn().mockResolvedValue({});
   (useDiscoverInTimelineContext as jest.Mock).mockReturnValue({ resetDiscoverAppState });
diff --git a/x-pack/plugins/security_solution/public/timelines/hooks/use_create_timeline.tsx b/x-pack/plugins/security_solution/public/timelines/hooks/use_create_timeline.tsx
index 78f1e54f3b2cd..199549ef103ea 100644
--- a/x-pack/plugins/security_solution/public/timelines/hooks/use_create_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/hooks/use_create_timeline.tsx
@@ -20,6 +20,8 @@ import { SourcererScopeName } from '../../common/store/sourcerer/model';
 import { appActions } from '../../common/store/app';
 import type { TimeRange } from '../../common/store/inputs/model';
 import { useDiscoverInTimelineContext } from '../../common/components/discover_in_timeline/use_discover_in_timeline_context';
+import { useIsExperimentalFeatureEnabled } from '../../common/hooks/use_experimental_features';
+import { defaultUdtHeaders } from '../components/timeline/unified_components/default_headers';
 
 export interface UseCreateTimelineParams {
   /**
@@ -47,6 +49,9 @@ export const useCreateTimeline = ({
   onClick,
 }: UseCreateTimelineParams): ((options?: { timeRange?: TimeRange }) => Promise<void>) => {
   const dispatch = useDispatch();
+  const unifiedComponentsInTimelineEnabled = useIsExperimentalFeatureEnabled(
+    'unifiedComponentsInTimelineEnabled'
+  );
   const { id: dataViewId, patternList: selectedPatterns } = useSelector(
     sourcererSelectors.defaultDataView
   ) ?? { id: '', patternList: [] };
@@ -72,7 +77,7 @@ export const useCreateTimeline = ({
       );
       dispatch(
         timelineActions.createTimeline({
-          columns: defaultHeaders,
+          columns: unifiedComponentsInTimelineEnabled ? defaultUdtHeaders : defaultHeaders,
           dataViewId,
           id,
           indexNames: selectedPatterns,
@@ -113,6 +118,7 @@ export const useCreateTimeline = ({
       setTimelineFullScreen,
       timelineFullScreen,
       timelineType,
+      unifiedComponentsInTimelineEnabled,
     ]
   );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/store/actions.ts b/x-pack/plugins/security_solution/public/timelines/store/actions.ts
index 38279428b495a..16bcdd748bce2 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/actions.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/actions.ts
@@ -290,6 +290,22 @@ export const setDataProviderVisibility = actionCreator<{
 
 export const setChanged = actionCreator<{ id: string; changed: boolean }>('SET_CHANGED');
 
+export const updateColumnWidth = actionCreator<{
+  columnId: string;
+  id: string;
+  width: number;
+}>('UPDATE_COLUMN_WIDTH');
+
+export const updateRowHeight = actionCreator<{
+  id: string;
+  rowHeight: number;
+}>('UPDATE_ROW_HEIGHT');
+
+export const updateSampleSize = actionCreator<{
+  id: string;
+  sampleSize: number;
+}>('UPDATE_SAMPLE_SIZE');
+
 export const setConfirmingNoteId = actionCreator<{
   id: string;
   confirmingNoteId: string | null | undefined;
diff --git a/x-pack/plugins/security_solution/public/timelines/store/defaults.ts b/x-pack/plugins/security_solution/public/timelines/store/defaults.ts
index 30f673e3645cd..55155a30dbbbf 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/defaults.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/defaults.ts
@@ -16,7 +16,7 @@ import type { SubsetTimelineModel, TimelineModel } from './model';
 const { from: start, to: end } = normalizeTimeRange({ from: '', to: '' }, false);
 
 export const timelineDefaults: SubsetTimelineModel &
-  Pick<TimelineModel, 'eqlOptions' | 'resolveTimelineConfig'> = {
+  Pick<TimelineModel, 'eqlOptions' | 'resolveTimelineConfig' | 'sampleSize' | 'rowHeight'> = {
   activeTab: TimelineTabs.query,
   prevActiveTab: TimelineTabs.query,
   columns: defaultHeaders,
@@ -81,6 +81,8 @@ export const timelineDefaults: SubsetTimelineModel &
   savedSearchId: null,
   savedSearch: null,
   isDataProviderVisible: false,
+  sampleSize: 500,
+  rowHeight: 3,
 };
 
 export const getTimelineManageDefaults = (id: string) => ({
diff --git a/x-pack/plugins/security_solution/public/timelines/store/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/store/helpers.test.ts
index 827f94c6252e6..7ff9cb00a47e0 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/helpers.test.ts
@@ -40,11 +40,13 @@ import {
   updateTimelineTitleAndDescription,
   upsertTimelineColumn,
   updateTimelineGraphEventId,
+  updateTimelineColumnWidth,
 } from './helpers';
 import type { TimelineModel } from './model';
 import { timelineDefaults } from './defaults';
 import type { TimelineById } from './types';
 import { Direction } from '../../../common/search_strategy';
+import { defaultUdtHeaders } from '../components/timeline/unified_components/default_headers';
 
 jest.mock('../../common/utils/normalize_time_range');
 jest.mock('../../common/utils/default_date_settings', () => {
@@ -131,6 +133,7 @@ const basicTimeline: TimelineModel = {
   savedSearchId: null,
   savedSearch: null,
   isDataProviderVisible: true,
+  sampleSize: 500,
 };
 const timelineByIdMock: TimelineById = {
   foo: { ...basicTimeline },
@@ -1833,4 +1836,34 @@ describe('Timeline', () => {
       expect(update[TimelineId.active].prevActiveTab).toEqual(TimelineTabs.graph);
     });
   });
+
+  describe('#updateTimelineColumnWidth', () => {
+    let mockTimelineById: TimelineById;
+    beforeEach(() => {
+      mockTimelineById = structuredClone(timelineByIdMock);
+      mockTimelineById.foo.columns = structuredClone(defaultUdtHeaders);
+    });
+
+    it('should update column width correctly when correct column is supplied', () => {
+      const result = updateTimelineColumnWidth({
+        columnId: '@timestamp',
+        id: 'foo',
+        timelineById: mockTimelineById,
+        width: 500,
+      });
+
+      expect(result.foo.columns[0]).toHaveProperty('initialWidth', 500);
+    });
+
+    it('should be no-op when incorrect column is supplied', () => {
+      const result = updateTimelineColumnWidth({
+        columnId: 'invalid-column',
+        id: 'foo',
+        timelineById: mockTimelineById,
+        width: 500,
+      });
+
+      expect(result.foo.columns).toEqual(defaultUdtHeaders);
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/store/helpers.ts b/x-pack/plugins/security_solution/public/timelines/store/helpers.ts
index 3a7e4ed83cb9f..86a03e3b23874 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/helpers.ts
@@ -1531,3 +1531,30 @@ export const applyDeltaToTableColumnWidth = ({
     },
   };
 };
+
+export const updateTimelineColumnWidth = ({
+  columnId,
+  id,
+  timelineById,
+  width,
+}: {
+  columnId: string;
+  id: string;
+  timelineById: TimelineById;
+  width: number;
+}): TimelineById => {
+  const timeline = timelineById[id];
+
+  const columns = timeline.columns.map((x) => ({
+    ...x,
+    initialWidth: x.id === columnId ? width : x.initialWidth,
+  }));
+
+  return {
+    ...timelineById,
+    [id]: {
+      ...timeline,
+      columns,
+    },
+  };
+};
diff --git a/x-pack/plugins/security_solution/public/timelines/store/middlewares/timeline_save.test.ts b/x-pack/plugins/security_solution/public/timelines/store/middlewares/timeline_save.test.ts
index 3e57a7b9f28bd..dfb88d47d7c17 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/middlewares/timeline_save.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/middlewares/timeline_save.test.ts
@@ -338,6 +338,7 @@ describe('Timeline save middleware', () => {
         savedSearchId: null,
         savedSearch: null,
         isDataProviderVisible: true,
+        sampleSize: 500,
       };
 
       expect(
diff --git a/x-pack/plugins/security_solution/public/timelines/store/model.ts b/x-pack/plugins/security_solution/public/timelines/store/model.ts
index 33a9d9f545f7e..e87383be77a85 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/model.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/model.ts
@@ -139,6 +139,10 @@ export interface TimelineModel {
   isDataProviderVisible: boolean;
   /** used to mark the timeline as unsaved in the UI */
   changed?: boolean;
+  /* row height, used only by unified data table */
+  rowHeight?: number;
+  /* sample size, total record number stored in in memory EuiDataGrid */
+  sampleSize: number;
   /** the note id pending deletion */
   confirmingNoteId?: string | null;
 }
diff --git a/x-pack/plugins/security_solution/public/timelines/store/reducer.ts b/x-pack/plugins/security_solution/public/timelines/store/reducer.ts
index 54f72dbaa401f..2486c49b577db 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/reducer.ts
@@ -62,6 +62,9 @@ import {
   initializeSavedSearch,
   setDataProviderVisibility,
   setChanged,
+  updateRowHeight,
+  updateSampleSize,
+  updateColumnWidth,
   setConfirmingNoteId,
   deleteNoteFromEvent,
 } from './actions';
@@ -103,6 +106,7 @@ import {
   applyDeltaToTableColumnWidth,
   updateTimelinePerPageOptions,
   updateTimelineItemsPerPage,
+  updateTimelineColumnWidth,
 } from './helpers';
 
 import type { TimelineState } from './types';
@@ -566,6 +570,37 @@ export const timelineReducer = reducerWithInitialState(initialTimelineState)
       },
     },
   }))
+  .case(updateColumnWidth, (state, { id, columnId, width }) => ({
+    ...state,
+    timelineById: updateTimelineColumnWidth({
+      columnId,
+      id,
+      timelineById: state.timelineById,
+      width,
+    }),
+  }))
+
+  .case(updateSampleSize, (state, { id, sampleSize }) => ({
+    ...state,
+    timelineById: {
+      ...state.timelineById,
+      [id]: {
+        ...state.timelineById[id],
+        sampleSize,
+      },
+    },
+  }))
+
+  .case(updateRowHeight, (state, { id, rowHeight }) => ({
+    ...state,
+    timelineById: {
+      ...state.timelineById,
+      [id]: {
+        ...state.timelineById[id],
+        rowHeight,
+      },
+    },
+  }))
   .case(setConfirmingNoteId, (state, { id, confirmingNoteId }) => ({
     ...state,
     timelineById: {
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index 16b7308aa73d9..be4022d3f2839 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -56,6 +56,7 @@ import type { DiscoverStart } from '@kbn/discover-plugin/public';
 import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
 import type { DataViewEditorStart } from '@kbn/data-view-editor-plugin/public';
 import type { UpsellingService } from '@kbn/security-solution-upselling/service';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import type { SavedSearchPublicPluginStart } from '@kbn/saved-search-plugin/public';
 import type { ResolverPluginSetup } from './resolver/types';
 import type { Inspect } from '../common/search_strategy';
@@ -139,7 +140,9 @@ export interface StartPlugins {
   navigation: NavigationPublicPluginStart;
   expressions: ExpressionsStart;
   dataViewEditor: DataViewEditorStart;
+  charts: ChartsPluginStart;
   savedSearch: SavedSearchPublicPluginStart;
+  core: CoreStart;
 }
 
 export interface StartPluginsDependencies extends StartPlugins {
diff --git a/x-pack/plugins/security_solution/tsconfig.json b/x-pack/plugins/security_solution/tsconfig.json
index cce960b04dc43..cf7216e476a93 100644
--- a/x-pack/plugins/security_solution/tsconfig.json
+++ b/x-pack/plugins/security_solution/tsconfig.json
@@ -175,6 +175,12 @@
     "@kbn/react-kibana-mount",
     "@kbn/react-kibana-context-styled",
     "@kbn/unified-doc-viewer-plugin",
+    "@kbn/openapi-generator",
+    "@kbn/unified-data-table",
+    "@kbn/unified-doc-viewer",
+    "@kbn/dom-drag-drop",
+    "@kbn/unified-field-list",
+    "@kbn/resizable-layout",
     "@kbn/shared-ux-error-boundary",
     "@kbn/zod-helpers",
     "@kbn/core-http-common",
@@ -187,6 +193,7 @@
     "@kbn/core-test-helpers-kbn-server",
     "@kbn/core-ui-settings-server",
     "@kbn/core-http-request-handler-context-server",
-    "@kbn/core-http-server-mocks"
+    "@kbn/core-http-server-mocks",
+    "@kbn/data-service"
   ]
 }
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/unified_components/query_tab.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/unified_components/query_tab.cy.ts
new file mode 100644
index 0000000000000..058025b596956
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/unified_components/query_tab.cy.ts
@@ -0,0 +1,74 @@
+/*
+ * 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 {
+  closeTimelineFlyout,
+  openEventDetailsFlyout,
+  openHostDetailsFlyout,
+  openUserDetailsFlyout,
+} from '../../../../tasks/unified_timeline';
+import {
+  GET_UNIFIED_DATA_GRID_CELL_HEADER,
+  HOST_DETAILS_FLYOUT,
+  TIMELINE_DETAILS_FLYOUT,
+  USER_DETAILS_FLYOUT,
+} from '../../../../screens/unified_timeline';
+import { GET_DISCOVER_DATA_GRID_CELL_HEADER } from '../../../../screens/discover';
+import { addFieldToTable, removeFieldFromTable } from '../../../../tasks/discover';
+import { login } from '../../../../tasks/login';
+import { visitWithTimeRange } from '../../../../tasks/navigation';
+import { openTimelineUsingToggle } from '../../../../tasks/security_main';
+import { createNewTimeline, executeTimelineSearch } from '../../../../tasks/timeline';
+import { ALERTS_URL } from '../../../../urls/navigation';
+
+describe(
+  'Unsaved Timeline query tab',
+  {
+    tags: ['@ess', '@serverless', '@brokenInServerlessQA'],
+    env: {
+      ftrConfig: {
+        kbnServerArgs: [
+          `--xpack.securitySolution.enableExperimental=${JSON.stringify([
+            'unifiedComponentsInTimelineEnabled',
+          ])}`,
+        ],
+      },
+    },
+  },
+  () => {
+    beforeEach(() => {
+      login();
+      visitWithTimeRange(ALERTS_URL);
+      openTimelineUsingToggle();
+      createNewTimeline();
+      executeTimelineSearch('*');
+    });
+    it('should be able to add/remove columns correctly', () => {
+      cy.get(GET_UNIFIED_DATA_GRID_CELL_HEADER('agent.type')).should('not.exist');
+      addFieldToTable('agent.type');
+      cy.get(GET_DISCOVER_DATA_GRID_CELL_HEADER('agent.type')).should('be.visible');
+      removeFieldFromTable('agent.type');
+      cy.get(GET_DISCOVER_DATA_GRID_CELL_HEADER('agent.type')).should('not.exist');
+    });
+
+    context('flyout', () => {
+      it('should be able to open/close details details/host/user flyout', () => {
+        cy.log('Event Details Flyout');
+        openEventDetailsFlyout(0);
+        cy.get(TIMELINE_DETAILS_FLYOUT).should('be.visible');
+        closeTimelineFlyout();
+        cy.log('Host Details Flyout');
+        openHostDetailsFlyout(0);
+        cy.get(HOST_DETAILS_FLYOUT).should('be.visible');
+        closeTimelineFlyout();
+        cy.log('User Details Flyout');
+        openUserDetailsFlyout(0);
+        cy.get(USER_DETAILS_FLYOUT).should('be.visible');
+      });
+    });
+  }
+);
diff --git a/x-pack/test/security_solution_cypress/cypress/screens/unified_timeline.ts b/x-pack/test/security_solution_cypress/cypress/screens/unified_timeline.ts
new file mode 100644
index 0000000000000..36aeb7d616128
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/cypress/screens/unified_timeline.ts
@@ -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 { getDataTestSubjectSelector } from '../helpers/common';
+
+export const TIMELINE_DETAILS_FLYOUT_BTN = getDataTestSubjectSelector('docTableExpandToggleColumn');
+
+export const HOST_DETAILS_LINK = getDataTestSubjectSelector('host-details-button');
+
+export const USER_DETAILS_LINK = getDataTestSubjectSelector('users-link-anchor');
+
+export const TIMELINE_DETAILS_FLYOUT = getDataTestSubjectSelector('timeline:details-panel:flyout');
+
+export const HOST_DETAILS_FLYOUT = getDataTestSubjectSelector('host-panel-header');
+
+export const USER_DETAILS_FLYOUT = getDataTestSubjectSelector('user-panel-header');
+
+export const TIMELINE_DETAILS_FLYOUT_CLOSE_BTN = getDataTestSubjectSelector('euiFlyoutCloseButton');
+
+export const TIMELINE_UNIFIED_DATA_GRID = `${getDataTestSubjectSelector(
+  'timelineUnifiedComponentsLayoutResizablePanelFlex'
+)} ${getDataTestSubjectSelector('docTable')}`;
+
+export const CELL_FILTER_IN_BUTTON = getDataTestSubjectSelector(
+  'dataGridColumnCellAction-security-default-cellActions-filterIn'
+);
+
+export const CELL_FILTER_OUT_BUTTON = getDataTestSubjectSelector(
+  'dataGridColumnCellAction-security-default-cellActions-filterOut'
+);
+
+export const CELL_ADD_TO_TIMELINE_BUTTON = getDataTestSubjectSelector(
+  'dataGridColumnCellAction-security-default-cellActions-addToTimeline'
+);
+
+export const CELL_SHOW_TOP_FIELD_BUTTON = getDataTestSubjectSelector(
+  'dataGridColumnCellAction-security-default-cellActions-showTopN'
+);
+
+export const GET_UNIFIED_DATA_GRID_CELL_HEADER = (columnId: string) =>
+  getDataTestSubjectSelector(`dataGridHeaderCell-${columnId}`);
+
+export const GET_UNIFIED_DATA_GRID_CELL = (columnId: string, rowIndex: number) => {
+  return `${TIMELINE_UNIFIED_DATA_GRID} ${getDataTestSubjectSelector(
+    'dataGridRowCell'
+  )}[data-gridcell-column-id="${columnId}"][data-gridcell-row-index="${rowIndex}"] .unifiedDataTable__cellValue`;
+};
diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/discover.ts b/x-pack/test/security_solution_cypress/cypress/tasks/discover.ts
index 19e455cd4b648..e888f75149b2d 100644
--- a/x-pack/test/security_solution_cypress/cypress/tasks/discover.ts
+++ b/x-pack/test/security_solution_cypress/cypress/tasks/discover.ts
@@ -112,6 +112,10 @@ export const addFieldToTable = (fieldId: string) => {
   clearFieldSearch();
 };
 
+export const removeFieldFromTable = (fieldId: string) => {
+  cy.get(GET_DISCOVER_COLUMN_TOGGLE_BTN(fieldId)).first().click();
+};
+
 export const createAdHocDataView = (name: string, indexPattern: string, save: boolean = false) => {
   openDataViewSwitcher();
   cy.get(DISCOVER_DATA_VIEW_SWITCHER.CREATE_NEW).trigger('click');
diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/unified_timeline.ts b/x-pack/test/security_solution_cypress/cypress/tasks/unified_timeline.ts
new file mode 100644
index 0000000000000..d53ef784a8d24
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/cypress/tasks/unified_timeline.ts
@@ -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 {
+  GET_UNIFIED_DATA_GRID_CELL,
+  GET_UNIFIED_DATA_GRID_CELL_HEADER,
+  HOST_DETAILS_LINK,
+  TIMELINE_DETAILS_FLYOUT,
+  TIMELINE_DETAILS_FLYOUT_BTN,
+  TIMELINE_DETAILS_FLYOUT_CLOSE_BTN,
+  USER_DETAILS_LINK,
+} from '../screens/unified_timeline';
+
+export const openEventDetailsFlyout = (rowIndex: number) => {
+  cy.get(TIMELINE_DETAILS_FLYOUT_BTN).eq(rowIndex).click();
+};
+
+export const openHostDetailsFlyout = (rowIndex: number) => {
+  cy.get(HOST_DETAILS_LINK).eq(rowIndex).click();
+};
+
+export const openUserDetailsFlyout = (rowIndex: number) => {
+  cy.get(USER_DETAILS_LINK).eq(rowIndex).click();
+};
+
+export const getUnifiedTableHeaderColumn = (columnName: string) => {
+  return cy.get(GET_UNIFIED_DATA_GRID_CELL_HEADER(columnName));
+};
+
+export const getUnifiedTableHeaderColumnCell = (columnName: string, rowIndex: number) => {
+  return cy.get(GET_UNIFIED_DATA_GRID_CELL(columnName, rowIndex));
+};
+
+export const closeTimelineFlyout = () => {
+  cy.get(TIMELINE_DETAILS_FLYOUT_CLOSE_BTN).click();
+  cy.get(TIMELINE_DETAILS_FLYOUT).should('not.exist');
+};

From 6d55cc8e95e35c0d4f32ba7e3eb1c1615c80dc07 Mon Sep 17 00:00:00 2001
From: mohamedhamed-ahmed <mohamed.ahmed@elastic.co>
Date: Tue, 2 Apr 2024 14:39:51 +0200
Subject: [PATCH 20/63] [Dataset quality] Add Flyout Integration Actions
 (#179401)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes https://github.com/elastic/kibana/issues/178843

## 📝  Summary

This PR adds actions to the integration section in the dataset quality
flyout.
These actions navigate to different integration-related pages.
The Dashboards action is only visible if the integration does have
dashboard assets installed, otherwise its hidden.

## 🎥 Demo


https://github.com/elastic/kibana/assets/11225826/91c417e6-be7d-45eb-91dc-2f5b29e7aeb5

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 packages/deeplinks/analytics/constants.ts     |   4 +
 packages/deeplinks/analytics/index.ts         |   1 +
 packages/deeplinks/management/constants.ts    |   1 +
 .../src/get_router_link_props/index.ts        |   7 +-
 .../public/dashboard_app/dashboard_app.tsx    |   2 +-
 .../public/dashboard_app/locator/locator.ts   |   3 +-
 .../top_nav/share/show_share_modal.tsx        |   2 +-
 .../url/search_sessions_integration.ts        |   2 +-
 src/plugins/dashboard/tsconfig.json           |   1 +
 src/plugins/management/common/locator.test.ts |   3 +-
 src/plugins/management/common/locator.ts      |   3 +-
 src/plugins/management/tsconfig.json          |   1 +
 .../dataset_quality/common/api_types.ts       |  15 ++
 .../common/data_streams_stats/integration.ts  |   5 +-
 .../common/data_streams_stats/types.ts        |   6 +
 .../public/components/flyout/fields_list.tsx  |  11 +-
 .../flyout/integration_actions_menu.tsx       | 166 +++++++++++++++++
 .../components/flyout/integration_summary.tsx |   4 +
 .../public/controller/create_controller.ts    |   5 +-
 .../hooks/use_dataset_quality_flyout.tsx      |   7 +-
 .../hooks/use_flyout_integration_actions.tsx  |  78 ++++++++
 .../dataset_quality/public/plugin.tsx         |   6 +
 .../data_stream_details_client.ts             |  64 +++++++
 .../data_stream_details_service.ts            |  27 +++
 .../services/data_stream_details/index.ts     |  10 ++
 .../services/data_stream_details/types.ts     |  31 ++++
 .../data_streams_stats_client.ts              |  22 ---
 .../services/data_streams_stats/types.ts      |   3 -
 .../src/notifications.ts                      |   9 +
 .../src/state_machine.ts                      |  99 +++++++++--
 .../dataset_quality_controller/src/types.ts   |  10 ++
 .../routes/data_streams/get_integrations.ts   |  49 ++++-
 .../server/routes/data_streams/routes.ts      |  34 +++-
 .../dataset_quality/tsconfig.json             |   5 +-
 .../integration_dashboards.spec.ts            | 116 ++++++++++++
 .../dataset_quality/dataset_quality_flyout.ts | 167 ++++++++++++++++++
 .../page_objects/dataset_quality.ts           |  17 ++
 .../dataset_quality/dataset_quality_flyout.ts | 167 ++++++++++++++++++
 38 files changed, 1106 insertions(+), 57 deletions(-)
 create mode 100644 x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_actions_menu.tsx
 create mode 100644 x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_flyout_integration_actions.tsx
 create mode 100644 x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_client.ts
 create mode 100644 x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_service.ts
 create mode 100644 x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/index.ts
 create mode 100644 x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/types.ts
 create mode 100644 x-pack/test/dataset_quality_api_integration/tests/data_streams/integration_dashboards.spec.ts

diff --git a/packages/deeplinks/analytics/constants.ts b/packages/deeplinks/analytics/constants.ts
index 9793f7bb1864f..3eed43677281c 100644
--- a/packages/deeplinks/analytics/constants.ts
+++ b/packages/deeplinks/analytics/constants.ts
@@ -13,3 +13,7 @@ export const DASHBOARD_APP_ID = 'dashboards';
 export const VISUALIZE_APP_ID = 'visualize';
 
 export const DISCOVER_ESQL_LOCATOR = 'DISCOVER_ESQL_LOCATOR';
+
+export const DASHBOARD_APP_LOCATOR = 'DASHBOARD_APP_LOCATOR';
+
+export const DASHBOARD_SAVED_OBJECT_TYPE = 'dashboard';
diff --git a/packages/deeplinks/analytics/index.ts b/packages/deeplinks/analytics/index.ts
index aa01b0036a52d..ced2aeba50417 100644
--- a/packages/deeplinks/analytics/index.ts
+++ b/packages/deeplinks/analytics/index.ts
@@ -11,6 +11,7 @@ export {
   DISCOVER_APP_ID,
   VISUALIZE_APP_ID,
   DISCOVER_ESQL_LOCATOR,
+  DASHBOARD_APP_LOCATOR,
 } from './constants';
 
 export type { AppId, DeepLinkId } from './deep_links';
diff --git a/packages/deeplinks/management/constants.ts b/packages/deeplinks/management/constants.ts
index 1910641ac47c8..d094d97268574 100644
--- a/packages/deeplinks/management/constants.ts
+++ b/packages/deeplinks/management/constants.ts
@@ -11,3 +11,4 @@ export const INTEGRATIONS_APP_ID = 'integrations';
 export const FLEET_APP_ID = 'fleet';
 export const OSQUERY_APP_ID = 'osquery';
 export const MANAGEMENT_APP_ID = 'management';
+export const MANAGEMENT_APP_LOCATOR = 'MANAGEMENT_APP_LOCATOR';
diff --git a/packages/kbn-router-utils/src/get_router_link_props/index.ts b/packages/kbn-router-utils/src/get_router_link_props/index.ts
index f3def2e88650b..a0b7f53afc440 100644
--- a/packages/kbn-router-utils/src/get_router_link_props/index.ts
+++ b/packages/kbn-router-utils/src/get_router_link_props/index.ts
@@ -6,6 +6,11 @@
  * Side Public License, v 1.
  */
 
+export interface RouterLinkProps {
+  href: string | undefined;
+  onClick: (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => void;
+}
+
 interface GetRouterLinkPropsDeps {
   href?: string;
   onClick(): void;
@@ -28,7 +33,7 @@ const isLeftClickEvent = (event: React.MouseEvent<HTMLAnchorElement>) => event.b
  * @returns An object that contains an href and a guardedClick handler that will
  * manage behaviours such as leftClickEvent and event with modifiers (Ctrl, Shift, etc)
  */
-export const getRouterLinkProps = ({ href, onClick }: GetRouterLinkPropsDeps) => {
+export const getRouterLinkProps = ({ href, onClick }: GetRouterLinkPropsDeps): RouterLinkProps => {
   const guardedClickHandler = (event: React.MouseEvent<HTMLAnchorElement>) => {
     if (event.defaultPrevented) {
       return;
diff --git a/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx b/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
index 1ff789ab61201..320887bbf551c 100644
--- a/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
+++ b/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
@@ -15,6 +15,7 @@ import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
 import { createKbnUrlStateStorage, withNotifyOnErrors } from '@kbn/kibana-utils-plugin/public';
 
+import { DASHBOARD_APP_LOCATOR } from '@kbn/deeplinks-analytics';
 import {
   DashboardAppNoDataPage,
   isDashboardAppInNoDataState,
@@ -31,7 +32,6 @@ import {
 } from './url/search_sessions_integration';
 import { DashboardAPI, DashboardRenderer } from '..';
 import { type DashboardEmbedSettings } from './types';
-import { DASHBOARD_APP_LOCATOR } from './locator/locator';
 import { pluginServices } from '../services/plugin_services';
 import { AwaitingDashboardAPI } from '../dashboard_container';
 import { DashboardRedirect } from '../dashboard_container/types';
diff --git a/src/plugins/dashboard/public/dashboard_app/locator/locator.ts b/src/plugins/dashboard/public/dashboard_app/locator/locator.ts
index c902bc369e044..15eb56cd44714 100644
--- a/src/plugins/dashboard/public/dashboard_app/locator/locator.ts
+++ b/src/plugins/dashboard/public/dashboard_app/locator/locator.ts
@@ -14,6 +14,7 @@ import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
 import type { GlobalQueryStateFromUrl } from '@kbn/data-plugin/public';
 
+import { DASHBOARD_APP_LOCATOR } from '@kbn/deeplinks-analytics';
 import { DASHBOARD_APP_ID, SEARCH_SESSION_ID } from '../../dashboard_constants';
 import { DashboardLocatorParams } from '../..';
 
@@ -31,8 +32,6 @@ export const cleanEmptyKeys = (stateObj: Record<string, unknown>) => {
   return stateObj;
 };
 
-export const DASHBOARD_APP_LOCATOR = 'DASHBOARD_APP_LOCATOR';
-
 export type DashboardAppLocator = LocatorPublic<DashboardLocatorParams>;
 
 export interface DashboardAppLocatorDependencies {
diff --git a/src/plugins/dashboard/public/dashboard_app/top_nav/share/show_share_modal.tsx b/src/plugins/dashboard/public/dashboard_app/top_nav/share/show_share_modal.tsx
index b2d5cd9f4fe98..24a383244dc8c 100644
--- a/src/plugins/dashboard/public/dashboard_app/top_nav/share/show_share_modal.tsx
+++ b/src/plugins/dashboard/public/dashboard_app/top_nav/share/show_share_modal.tsx
@@ -19,11 +19,11 @@ import { getStateFromKbnUrl } from '@kbn/kibana-utils-plugin/public';
 import { setStateToKbnUrl, unhashUrl } from '@kbn/kibana-utils-plugin/public';
 import type { SerializableControlGroupInput } from '@kbn/controls-plugin/common';
 
+import { DASHBOARD_APP_LOCATOR } from '@kbn/deeplinks-analytics';
 import { dashboardUrlParams } from '../../dashboard_router';
 import { shareModalStrings } from '../../_dashboard_app_strings';
 import { pluginServices } from '../../../services/plugin_services';
 import { convertPanelMapToSavedPanels } from '../../../../common';
-import { DASHBOARD_APP_LOCATOR } from '../../locator/locator';
 import { DashboardLocatorParams } from '../../../dashboard_container';
 
 const showFilterBarId = 'showFilterBar';
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 91451b225658c..7a93c530767a2 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
@@ -18,11 +18,11 @@ import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/common';
 import type { Query } from '@kbn/es-query';
 import { SearchSessionInfoProvider } from '@kbn/data-plugin/public';
 
+import { DASHBOARD_APP_LOCATOR } from '@kbn/deeplinks-analytics';
 import { SEARCH_SESSION_ID } from '../../dashboard_constants';
 import { DashboardContainer, DashboardLocatorParams } from '../../dashboard_container';
 import { convertPanelMapToSavedPanels } from '../../../common';
 import { pluginServices } from '../../services/plugin_services';
-import { DASHBOARD_APP_LOCATOR } from '../locator/locator';
 
 export const removeSearchSessionIdFromURL = (kbnUrlStateStorage: IKbnUrlStateStorage) => {
   kbnUrlStateStorage.kbnUrlControls.updateAsync((nextUrl) => {
diff --git a/src/plugins/dashboard/tsconfig.json b/src/plugins/dashboard/tsconfig.json
index 7244e9ee9472f..b484a9f6c51c3 100644
--- a/src/plugins/dashboard/tsconfig.json
+++ b/src/plugins/dashboard/tsconfig.json
@@ -76,6 +76,7 @@
     "@kbn/shared-ux-utility",
     "@kbn/managed-content-badge",
     "@kbn/core-test-helpers-model-versions",
+    "@kbn/deeplinks-analytics",
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/src/plugins/management/common/locator.test.ts b/src/plugins/management/common/locator.test.ts
index 20773b9732782..c45632a9ad776 100644
--- a/src/plugins/management/common/locator.test.ts
+++ b/src/plugins/management/common/locator.test.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { MANAGEMENT_APP_LOCATOR } from '@kbn/deeplinks-management/constants';
 import { MANAGEMENT_APP_ID } from './contants';
-import { ManagementAppLocatorDefinition, MANAGEMENT_APP_LOCATOR } from './locator';
+import { ManagementAppLocatorDefinition } from './locator';
 
 test('locator has the right ID', () => {
   const locator = new ManagementAppLocatorDefinition();
diff --git a/src/plugins/management/common/locator.ts b/src/plugins/management/common/locator.ts
index 5169919846d9d..73b1d63f6610e 100644
--- a/src/plugins/management/common/locator.ts
+++ b/src/plugins/management/common/locator.ts
@@ -8,10 +8,9 @@
 
 import type { SerializableRecord } from '@kbn/utility-types';
 import { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/common';
+import { MANAGEMENT_APP_LOCATOR } from '@kbn/deeplinks-management/constants';
 import { MANAGEMENT_APP_ID } from './contants';
 
-export const MANAGEMENT_APP_LOCATOR = 'MANAGEMENT_APP_LOCATOR';
-
 export interface ManagementAppLocatorParams extends SerializableRecord {
   sectionId: string;
   appId?: string;
diff --git a/src/plugins/management/tsconfig.json b/src/plugins/management/tsconfig.json
index df0a876b4b3c4..116debbf72496 100644
--- a/src/plugins/management/tsconfig.json
+++ b/src/plugins/management/tsconfig.json
@@ -26,6 +26,7 @@
     "@kbn/config-schema",
     "@kbn/serverless",
     "@kbn/shared-ux-error-boundary",
+    "@kbn/deeplinks-management",
   ],
   "exclude": [
     "target/**/*"
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts b/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
index 9fba1352fa944..4c88ae2cadb10 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
@@ -21,6 +21,20 @@ export const dataStreamStatRt = rt.intersection([
 
 export type DataStreamStat = rt.TypeOf<typeof dataStreamStatRt>;
 
+export const dashboardRT = rt.type({
+  id: rt.string,
+  title: rt.string,
+});
+
+export const integrationDashboardsRT = rt.type({
+  dashboards: rt.array(dashboardRT),
+});
+
+export type IntegrationDashboards = rt.TypeOf<typeof integrationDashboardsRT>;
+export type Dashboard = rt.TypeOf<typeof dashboardRT>;
+
+export const getIntegrationDashboardsResponseRt = rt.exact(integrationDashboardsRT);
+
 export const integrationIconRt = rt.intersection([
   rt.type({
     path: rt.string,
@@ -42,6 +56,7 @@ export const integrationRt = rt.intersection([
     version: rt.string,
     icons: rt.array(integrationIconRt),
     datasets: rt.record(rt.string, rt.string),
+    dashboards: rt.array(dashboardRT),
   }),
 ]);
 
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/integration.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/integration.ts
index 68a394c4b41c5..97d0a5f001d69 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/integration.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/integration.ts
@@ -5,19 +5,21 @@
  * 2.0.
  */
 
-import { IntegrationType } from './types';
+import { DashboardType, IntegrationType } from './types';
 
 export class Integration {
   name: IntegrationType['name'];
   title: string;
   version: string;
   icons?: IntegrationType['icons'];
+  dashboards?: DashboardType[];
 
   private constructor(integration: Integration) {
     this.name = integration.name;
     this.title = integration.title || integration.name;
     this.version = integration.version || '1.0.0';
     this.icons = integration.icons;
+    this.dashboards = integration.dashboards || [];
   }
 
   public static create(integration: IntegrationType) {
@@ -25,6 +27,7 @@ export class Integration {
       ...integration,
       title: integration.title || integration.name,
       version: integration.version || '1.0.0',
+      dashboards: integration.dashboards || [],
     };
 
     return new Integration(integrationProps);
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
index b8f8c37e46851..a2fc5f42fed4a 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
@@ -41,5 +41,11 @@ export type GetDataStreamsEstimatedDataInBytesParams =
 export type GetDataStreamsEstimatedDataInBytesResponse =
   APIReturnType<`GET /internal/dataset_quality/data_streams/estimated_data`>;
 
+export type GetIntegrationDashboardsParams =
+  APIClientRequestParamsOf<`GET /internal/dataset_quality/integrations/{integration}/dashboards`>['params']['path'];
+export type GetIntegrationDashboardsResponse =
+  APIReturnType<`GET /internal/dataset_quality/integrations/{integration}/dashboards`>;
+export type DashboardType = GetIntegrationDashboardsResponse['dashboards'][0];
+
 export type { DataStreamStat } from './data_stream_stat';
 export type { DataStreamDetails } from '../api_types';
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/fields_list.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/fields_list.tsx
index 0824e85ddd363..a203d08365d2b 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/fields_list.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/fields_list.tsx
@@ -20,15 +20,20 @@ import {
 export function FieldsList({
   title,
   fields,
+  actionsMenu: ActionsMenu,
 }: {
   title: string;
   fields: Array<{ fieldTitle: string; fieldValue: ReactNode }>;
+  actionsMenu?: ReactNode;
 }) {
   return (
     <EuiPanel hasBorder grow={false}>
-      <EuiTitle size="s">
-        <span>{title}</span>
-      </EuiTitle>
+      <EuiFlexGroup justifyContent="spaceBetween">
+        <EuiTitle size="s">
+          <span>{title}</span>
+        </EuiTitle>
+        <EuiFlexItem grow={false}>{ActionsMenu}</EuiFlexItem>
+      </EuiFlexGroup>
       <EuiSpacer />
       <EuiFlexGroup direction="column" gutterSize="none">
         {fields.map(({ fieldTitle, fieldValue }, index) => (
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_actions_menu.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_actions_menu.tsx
new file mode 100644
index 0000000000000..7a3b2715f1782
--- /dev/null
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_actions_menu.tsx
@@ -0,0 +1,166 @@
+/*
+ * 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 {
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiContextMenu,
+  EuiContextMenuPanelDescriptor,
+  EuiContextMenuPanelItemDescriptor,
+  EuiPopover,
+} from '@elastic/eui';
+import { css } from '@emotion/react';
+import { RouterLinkProps } from '@kbn/router-utils/src/get_router_link_props';
+import { Integration } from '../../../common/data_streams_stats/integration';
+import { useDatasetQualityFlyout } from '../../hooks';
+import { useFlyoutIntegrationActions } from '../../hooks/use_flyout_integration_actions';
+const seeIntegrationText = i18n.translate('xpack.datasetQuality.flyoutSeeIntegrationActionText', {
+  defaultMessage: 'See integration',
+});
+
+const indexTemplateText = i18n.translate('xpack.datasetQuality.flyoutIndexTemplateActionText', {
+  defaultMessage: 'Index template',
+});
+
+const viewDashboardsText = i18n.translate('xpack.datasetQuality.flyoutViewDashboardsActionText', {
+  defaultMessage: 'View dashboards',
+});
+
+export function IntegrationActionsMenu({ integration }: { integration: Integration }) {
+  const { type, name } = useDatasetQualityFlyout().dataStreamStat!;
+  const { dashboards = [], version, name: integrationName } = integration;
+  const {
+    isOpen,
+    handleCloseMenu,
+    handleToggleMenu,
+    getIntegrationOverviewLinkProps,
+    getIndexManagementLinkProps,
+    getDashboardLinkProps,
+  } = useFlyoutIntegrationActions();
+
+  const actionButton = (
+    <EuiButtonIcon
+      iconType="boxesHorizontal"
+      onClick={handleToggleMenu}
+      data-test-subj="datasetQualityFlyoutIntegrationActionsButton"
+    />
+  );
+
+  const MenuActionItem = ({
+    dataTestSubject,
+    buttonText,
+    routerLinkProps,
+    iconType,
+  }: {
+    dataTestSubject: string;
+    buttonText: string;
+    routerLinkProps: RouterLinkProps;
+    iconType: string;
+  }) => (
+    <EuiButtonEmpty
+      {...routerLinkProps}
+      size="s"
+      css={css`
+        font-weight: normal;
+      `}
+      color="text"
+      iconType={iconType}
+      data-test-subj={dataTestSubject}
+    >
+      {buttonText}
+    </EuiButtonEmpty>
+  );
+
+  const panelItems = useMemo(() => {
+    const firstLevelItems: EuiContextMenuPanelItemDescriptor[] = [
+      {
+        renderItem: () => (
+          <MenuActionItem
+            buttonText={seeIntegrationText}
+            dataTestSubject="datasetQualityFlyoutIntegrationActionOverview"
+            routerLinkProps={getIntegrationOverviewLinkProps(integrationName, version)}
+            iconType="package"
+          />
+        ),
+      },
+      {
+        renderItem: () => (
+          <MenuActionItem
+            buttonText={indexTemplateText}
+            dataTestSubject="datasetQualityFlyoutIntegrationActionTemplate"
+            routerLinkProps={getIndexManagementLinkProps({
+              sectionId: 'data',
+              appId: `index_management/templates/${type}-${name}`,
+            })}
+            iconType="indexPatternApp"
+          />
+        ),
+      },
+      {
+        isSeparator: true,
+        key: 'sep',
+      },
+    ];
+
+    if (dashboards.length) {
+      firstLevelItems.push({
+        icon: 'dashboardApp',
+        panel: 1,
+        name: viewDashboardsText,
+        'data-test-subj': 'datasetQualityFlyoutIntegrationActionViewDashboards',
+      });
+    }
+
+    const panel: EuiContextMenuPanelDescriptor[] = [
+      {
+        id: 0,
+        items: firstLevelItems,
+      },
+      {
+        id: 1,
+        title: viewDashboardsText,
+        items: dashboards.map((dashboard) => {
+          return {
+            renderItem: () => (
+              <MenuActionItem
+                buttonText={dashboard.title}
+                dataTestSubject="datasetQualityFlyoutIntegrationActionDashboard"
+                routerLinkProps={getDashboardLinkProps(dashboard)}
+                iconType="dashboardApp"
+              />
+            ),
+          };
+        }),
+      },
+    ];
+
+    return panel;
+  }, [
+    dashboards,
+    getDashboardLinkProps,
+    getIndexManagementLinkProps,
+    getIntegrationOverviewLinkProps,
+    integrationName,
+    name,
+    type,
+    version,
+  ]);
+
+  return (
+    <EuiPopover
+      anchorPosition="downRight"
+      panelPaddingSize="none"
+      button={actionButton}
+      isOpen={isOpen}
+      closePopover={handleCloseMenu}
+    >
+      <EuiContextMenu size="s" panels={panelItems} initialPanelId={0} />
+    </EuiPopover>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_summary.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_summary.tsx
index 19b147bcea1fd..d77c68e4ac33b 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_summary.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_summary.tsx
@@ -16,12 +16,16 @@ import {
 import { Integration } from '../../../common/data_streams_stats/integration';
 import { IntegrationIcon } from '../common';
 import { FieldsList } from './fields_list';
+import { IntegrationActionsMenu } from './integration_actions_menu';
 
 export function IntegrationSummary({ integration }: { integration: Integration }) {
   const { name, version } = integration;
+
+  const integrationActionsMenu = <IntegrationActionsMenu integration={integration} />;
   return (
     <FieldsList
       title={flyoutIntegrationDetailsText}
+      actionsMenu={integrationActionsMenu}
       fields={[
         {
           fieldTitle: flyoutIntegrationNameText,
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/controller/create_controller.ts b/x-pack/plugins/observability_solution/dataset_quality/public/controller/create_controller.ts
index ab61302fe52f2..899ec4c672afa 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/controller/create_controller.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/controller/create_controller.ts
@@ -11,6 +11,7 @@ import equal from 'fast-deep-equal';
 import { distinctUntilChanged, from, map } from 'rxjs';
 import { interpret } from 'xstate';
 import { IDataStreamsStatsClient } from '../services/data_streams_stats';
+import { IDataStreamDetailsClient } from '../services/data_stream_details';
 import {
   createDatasetQualityControllerStateMachine,
   DEFAULT_CONTEXT,
@@ -23,10 +24,11 @@ type InitialState = DatasetQualityPublicStateUpdate;
 interface Dependencies {
   core: CoreStart;
   dataStreamStatsClient: IDataStreamsStatsClient;
+  dataStreamDetailsClient: IDataStreamDetailsClient;
 }
 
 export const createDatasetQualityControllerFactory =
-  ({ core, dataStreamStatsClient }: Dependencies) =>
+  ({ core, dataStreamStatsClient, dataStreamDetailsClient }: Dependencies) =>
   async ({
     initialState = DEFAULT_CONTEXT,
   }: {
@@ -38,6 +40,7 @@ export const createDatasetQualityControllerFactory =
       initialContext,
       toasts: core.notifications.toasts,
       dataStreamStatsClient,
+      dataStreamDetailsClient,
     });
 
     const service = interpret(machine, {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_flyout.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_flyout.tsx
index cbbd6b8d6bc46..0a60c3c2ed2b5 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_flyout.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_flyout.tsx
@@ -23,8 +23,11 @@ export const useDatasetQualityFlyout = () => {
   } = useSelector(service, (state) => state.context.flyout);
   const { timeRange } = useSelector(service, (state) => state.context.filters);
 
-  const dataStreamDetailsLoading = useSelector(service, (state) =>
-    state.matches('datasets.loaded.flyoutOpen.fetching')
+  const dataStreamDetailsLoading = useSelector(
+    service,
+    (state) =>
+      state.matches('datasets.loaded.flyoutOpen.fetching') ||
+      state.matches('flyout.initializing.dataStreamDetails.fetching')
   );
 
   return {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_flyout_integration_actions.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_flyout_integration_actions.tsx
new file mode 100644
index 0000000000000..29faaec2788ea
--- /dev/null
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_flyout_integration_actions.tsx
@@ -0,0 +1,78 @@
+/*
+ * 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 { getRouterLinkProps } from '@kbn/router-utils';
+import { useMemo, useCallback } from 'react';
+import useToggle from 'react-use/lib/useToggle';
+import { MANAGEMENT_APP_LOCATOR } from '@kbn/deeplinks-management/constants';
+import { DASHBOARD_APP_LOCATOR } from '@kbn/deeplinks-analytics';
+import { DashboardType } from '../../common/data_streams_stats';
+import { useKibanaContextForPlugin } from '../utils';
+
+export const useFlyoutIntegrationActions = () => {
+  const {
+    services: {
+      application: { navigateToUrl },
+      http: { basePath },
+      share,
+    },
+  } = useKibanaContextForPlugin();
+
+  const [isOpen, toggleIsOpen] = useToggle(false);
+
+  const dashboardLocator = useMemo(
+    () => share.url.locators.get(DASHBOARD_APP_LOCATOR),
+    [share.url.locators]
+  );
+  const indexManagementLocator = useMemo(
+    () => share.url.locators.get(MANAGEMENT_APP_LOCATOR),
+    [share.url.locators]
+  );
+
+  const handleCloseMenu = useCallback(() => {
+    toggleIsOpen();
+  }, [toggleIsOpen]);
+  const handleToggleMenu = useCallback(() => {
+    toggleIsOpen();
+  }, [toggleIsOpen]);
+
+  const getIntegrationOverviewLinkProps = useCallback(
+    (name: string, version: string) => {
+      const href = basePath.prepend(`/app/integrations/detail/${name}-${version}/overview`);
+      return getRouterLinkProps({
+        href,
+        onClick: () => navigateToUrl(href),
+      });
+    },
+    [basePath, navigateToUrl]
+  );
+  const getIndexManagementLinkProps = useCallback(
+    (params: { sectionId: string; appId: string }) =>
+      getRouterLinkProps({
+        href: indexManagementLocator?.getRedirectUrl(params),
+        onClick: () => indexManagementLocator?.navigate(params),
+      }),
+    [indexManagementLocator]
+  );
+  const getDashboardLinkProps = useCallback(
+    (dashboard: DashboardType) =>
+      getRouterLinkProps({
+        href: dashboardLocator?.getRedirectUrl({ dashboardId: dashboard?.id } || ''),
+        onClick: () => dashboardLocator?.navigate({ dashboardId: dashboard?.id } || ''),
+      }),
+    [dashboardLocator]
+  );
+
+  return {
+    isOpen,
+    handleCloseMenu,
+    handleToggleMenu,
+    getIntegrationOverviewLinkProps,
+    getIndexManagementLinkProps,
+    getDashboardLinkProps,
+  };
+};
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/plugin.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/plugin.tsx
index 88ab62eff4703..6ea2655450607 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/plugin.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/plugin.tsx
@@ -9,6 +9,7 @@ import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/cor
 import { createDatasetQuality } from './components/dataset_quality';
 import { createDatasetQualityControllerLazyFactory } from './controller/lazy_create_controller';
 import { DataStreamsStatsService } from './services/data_streams_stats';
+import { DataStreamDetailsService } from './services/data_stream_details';
 import {
   DatasetQualityPluginSetup,
   DatasetQualityPluginStart,
@@ -30,6 +31,10 @@ export class DatasetQualityPlugin
       http: core.http,
     }).client;
 
+    const dataStreamDetailsClient = new DataStreamDetailsService().start({
+      http: core.http,
+    }).client;
+
     const DatasetQuality = createDatasetQuality({
       core,
       plugins,
@@ -39,6 +44,7 @@ export class DatasetQualityPlugin
     const createDatasetQualityController = createDatasetQualityControllerLazyFactory({
       core,
       dataStreamStatsClient,
+      dataStreamDetailsClient,
     });
 
     return { DatasetQuality, createDatasetQualityController };
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_client.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_client.ts
new file mode 100644
index 0000000000000..1dd5b2d2220cd
--- /dev/null
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_client.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 { HttpStart } from '@kbn/core/public';
+import { decodeOrThrow } from '@kbn/io-ts-utils';
+import {
+  getDataStreamsDetailsResponseRt,
+  integrationDashboardsRT,
+} from '../../../common/api_types';
+import {
+  GetDataStreamsStatsError,
+  GetDataStreamDetailsParams,
+  GetDataStreamDetailsResponse,
+  GetIntegrationDashboardsParams,
+  GetIntegrationDashboardsResponse,
+} from '../../../common/data_streams_stats';
+import { DataStreamDetails } from '../../../common/data_streams_stats';
+import { IDataStreamDetailsClient } from './types';
+
+export class DataStreamDetailsClient implements IDataStreamDetailsClient {
+  constructor(private readonly http: HttpStart) {}
+
+  public async getDataStreamDetails({ dataStream }: GetDataStreamDetailsParams) {
+    const response = await this.http
+      .get<GetDataStreamDetailsResponse>(
+        `/internal/dataset_quality/data_streams/${dataStream}/details`
+      )
+      .catch((error) => {
+        throw new GetDataStreamsStatsError(`Failed to fetch data stream details": ${error}`);
+      });
+
+    const dataStreamDetails = decodeOrThrow(
+      getDataStreamsDetailsResponseRt,
+      (message: string) =>
+        new GetDataStreamsStatsError(`Failed to decode data stream details response: ${message}"`)
+    )(response);
+
+    return dataStreamDetails as DataStreamDetails;
+  }
+
+  public async getIntegrationDashboards({ integration }: GetIntegrationDashboardsParams) {
+    const response = await this.http
+      .get<GetIntegrationDashboardsResponse>(
+        `/internal/dataset_quality/integrations/${integration}/dashboards`
+      )
+      .catch((error) => {
+        throw new GetDataStreamsStatsError(`Failed to fetch integration dashboards": ${error}`);
+      });
+
+    const integrationDashboards = decodeOrThrow(
+      integrationDashboardsRT,
+      (message: string) =>
+        new GetDataStreamsStatsError(
+          `Failed to decode integration dashboards response: ${message}"`
+        )
+    )(response);
+
+    return integrationDashboards;
+  }
+}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_service.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_service.ts
new file mode 100644
index 0000000000000..21d9eb492cc2a
--- /dev/null
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_service.ts
@@ -0,0 +1,27 @@
+/*
+ * 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 { DataStreamDetailsClient } from './data_stream_details_client';
+import {
+  DataStreamDetailsServiceSetup,
+  DataStreamDetailsServiceStartDeps,
+  DataStreamDetailsServiceStart,
+} from './types';
+
+export class DataStreamDetailsService {
+  constructor() {}
+
+  public setup(): DataStreamDetailsServiceSetup {}
+
+  public start({ http }: DataStreamDetailsServiceStartDeps): DataStreamDetailsServiceStart {
+    const client = new DataStreamDetailsClient(http);
+
+    return {
+      client,
+    };
+  }
+}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/index.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/index.ts
new file mode 100644
index 0000000000000..7d142e5f2a3cf
--- /dev/null
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/index.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.
+ */
+
+export * from './data_stream_details_client';
+export * from './data_stream_details_service';
+export * from './types';
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/types.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/types.ts
new file mode 100644
index 0000000000000..068b36bab4fb1
--- /dev/null
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/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 { HttpStart } from '@kbn/core/public';
+import {
+  GetDataStreamDetailsParams,
+  DataStreamDetails,
+  GetIntegrationDashboardsParams,
+  GetIntegrationDashboardsResponse,
+} from '../../../common/data_streams_stats';
+
+export type DataStreamDetailsServiceSetup = void;
+
+export interface DataStreamDetailsServiceStart {
+  client: IDataStreamDetailsClient;
+}
+
+export interface DataStreamDetailsServiceStartDeps {
+  http: HttpStart;
+}
+
+export interface IDataStreamDetailsClient {
+  getDataStreamDetails(params: GetDataStreamDetailsParams): Promise<DataStreamDetails>;
+  getIntegrationDashboards(
+    params: GetIntegrationDashboardsParams
+  ): Promise<GetIntegrationDashboardsResponse>;
+}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
index 625eafce2a282..69e8b2364006e 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
@@ -12,7 +12,6 @@ import { Integration } from '../../../common/data_streams_stats/integration';
 import {
   getDataStreamsDegradedDocsStatsResponseRt,
   getDataStreamsStatsResponseRt,
-  getDataStreamsDetailsResponseRt,
   getDataStreamsEstimatedDataInBytesResponseRt,
 } from '../../../common/api_types';
 import { DEFAULT_DATASET_TYPE, NONE } from '../../../common/constants';
@@ -23,12 +22,9 @@ import {
   GetDataStreamsStatsError,
   GetDataStreamsStatsQuery,
   GetDataStreamsStatsResponse,
-  GetDataStreamDetailsParams,
-  GetDataStreamDetailsResponse,
   GetDataStreamsEstimatedDataInBytesParams,
   GetDataStreamsEstimatedDataInBytesResponse,
 } from '../../../common/data_streams_stats';
-import { DataStreamDetails } from '../../../common/data_streams_stats';
 import { DataStreamStat } from '../../../common/data_streams_stats/data_stream_stat';
 import { IDataStreamsStatsClient } from './types';
 
@@ -95,24 +91,6 @@ export class DataStreamsStatsClient implements IDataStreamsStatsClient {
     return degradedDocs;
   }
 
-  public async getDataStreamDetails({ dataStream }: GetDataStreamDetailsParams) {
-    const response = await this.http
-      .get<GetDataStreamDetailsResponse>(
-        `/internal/dataset_quality/data_streams/${dataStream}/details`
-      )
-      .catch((error) => {
-        throw new GetDataStreamsStatsError(`Failed to fetch data stream details": ${error}`);
-      });
-
-    const dataStreamDetails = decodeOrThrow(
-      getDataStreamsDetailsResponseRt,
-      (message: string) =>
-        new GetDataStreamsStatsError(`Failed to decode data stream details response: ${message}"`)
-    )(response);
-
-    return dataStreamDetails as DataStreamDetails;
-  }
-
   public async getDataStreamsEstimatedDataInBytes(
     params: GetDataStreamsEstimatedDataInBytesParams
   ) {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
index a2627ec4bf222..ed454233d36eb 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
@@ -11,8 +11,6 @@ import {
   DataStreamStatServiceResponse,
   GetDataStreamsDegradedDocsStatsQuery,
   GetDataStreamsStatsQuery,
-  GetDataStreamDetailsParams,
-  DataStreamDetails,
   GetDataStreamsEstimatedDataInBytesParams,
   GetDataStreamsEstimatedDataInBytesResponse,
 } from '../../../common/data_streams_stats';
@@ -32,7 +30,6 @@ export interface IDataStreamsStatsClient {
   getDataStreamsDegradedStats(
     params?: GetDataStreamsDegradedDocsStatsQuery
   ): Promise<DataStreamDegradedDocsStatServiceResponse>;
-  getDataStreamDetails(params: GetDataStreamDetailsParams): Promise<DataStreamDetails>;
   getDataStreamsEstimatedDataInBytes(
     params: GetDataStreamsEstimatedDataInBytesParams
   ): Promise<GetDataStreamsEstimatedDataInBytesResponse>;
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
index c3cb600951463..ca249e3fa6022 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
@@ -35,6 +35,15 @@ export const fetchDegradedStatsFailedNotifier = (toasts: IToasts, error: Error)
   });
 };
 
+export const fetchIntegrationDashboardsFailedNotifier = (toasts: IToasts, error: Error) => {
+  toasts.addDanger({
+    title: i18n.translate('xpack.datasetQuality.fetchIntegrationDashboardsFailed', {
+      defaultMessage: "We couldn't get your integration dashboards.",
+    }),
+    text: error.message,
+  });
+};
+
 export const noDatasetSelected = i18n.translate(
   'xpack.datasetQuality.fetchDatasetDetailsFailed.noDatasetSelected',
   {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
index 4fd6d19e2012a..cef0f8496e4ae 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
@@ -8,7 +8,9 @@
 import { IToasts } from '@kbn/core/public';
 import { getDateISORange } from '@kbn/timerange';
 import { assign, createMachine, DoneInvokeEvent, InterpreterFrom } from 'xstate';
+import { IDataStreamDetailsClient } from '../../../services/data_stream_details';
 import {
+  DashboardType,
   DataStreamDetails,
   DataStreamStatServiceResponse,
   GetDataStreamsStatsQuery,
@@ -23,6 +25,7 @@ import {
   fetchDatasetDetailsFailedNotifier,
   fetchDatasetStatsFailedNotifier,
   fetchDegradedStatsFailedNotifier,
+  fetchIntegrationDashboardsFailedNotifier,
   noDatasetSelected,
 } from './notifications';
 import {
@@ -35,7 +38,7 @@ import {
 export const createPureDatasetQualityControllerStateMachine = (
   initialContext: DatasetQualityControllerContext
 ) =>
-  /** @xstate-layout N4IgpgJg5mDOIC5QBECGAXVszoIoFdUAbAS3QE8BhAewDt0AnaoosBgOggyx1nYDMcAYwAWJWlADEEOmHbiAbtQDWctJmx5CpCjXpMWbTt019B6UeKgJF1IRhJ0A2gAYAuq7eJQAB2qwyR1pvEAAPRAAWADYARnYATgBmAHYo+OSADniYlwBWGIAaEHJEZIAmDPYI+JcImJissuSXDIiAXzai9R4tYjIqOkZmVg4uDV4BYTEJSTYmDh8iDH5qBgBbdm7NAj7dQYMR43H0MymrG1ole3Qgz08QvwCbuhDwhCjKiNqY3OTE9LKEWqZSKJQQ5Vy7GS0Xq8Si0KBETKHS6JhwOx0A30wyMYx6fCI1FQEEgkgAqgAFZAAQQAKgBRAD6tOpACEADJMygAJQAkgy+dT7kgQI9Ai8RW9ctl2IkYpkMnL4oqIolQYgcnkEmVclEorkXPEykb4SiQFt0dp+nohoZRmiTuxCcTSbSAPIAcQ9nMZvIActTKLTeQA1Jk0lkAZXptMjwt8-nFwUliDSyXYaUSZUNSWVLnK6oQGRa7DKctyBuVcpciSiZotvUxNoOuIdBKJJIgkndXp9ADEyez2YyI9To7TGQGALL0uPuB6J57J0BvbOVeFRMvy3IRHcufWFzWQo26-WG41lPX1h0Y637HGjMBQBguiDIOynCzTKQyWhyWyqJsN5Wns2J2pwT4vp275CJ+lgSBcVwOM47jxqKi5BK8pQZJCyQxNmubpBEyTpIeTRxBkZQ6k0NapHWnTmsBuxYrahwks+r4wXB36zAw8zsIsyyrBsDa3qBrG4pBnEfpMX7nLY1y3Kh84imKS5Ye8UTsDEqrlC4LiAlkMTxPEZE4aWGTGS0yQ2Yk+7XscYksS2HD8EQ5DUPg6CSNGnJBpO9IAOojnSY4xmhamYSm4JxFRHzKmUOTRCkpnFIg-yQrq0TxF8dQxGkDk9E5zYPgI7med5lDsm60aMn27IAJpumStIRRhEorqUsWXlklFJVEKWHjpspVoqOVGkaeGFdsIHOaVbkeV5snwT+sjyJcKhqExTb3uBC0Vct36IXYyG0HcKkJk8UWdUWrTsAa8KpJZ+U2alYKJNE2q5JRmR1FE+aJNNlrMSVe3lUt5grbx-GCegKzrEBjmzaDhz7RDZwIQpp3nV4qntcuYSIBkfwZtCMQpNmOT-IWiVaYlLj5RkA2Klk9kMaJyO7aj4PoE6HaklVNVMvVTUtW1V0dYTCDxN991ZNCgJGsTTSHiWlkVv8Ro-ArMRA42d5gdzi2886nbklSdJMv6ka8h6AASsbMryM6Mty1J+h69Li0mGn4SkVQ-GWmSxJThRpQg9SQuT8rQi08J5BkevFVzRho7zQiEtgXZuhS9J+nVjXNa1F3oRLBNvHUETsMW0o5Sktb6eTNO5GU2k1Dp+GbsHyQdAxtDUCS8AihzIMpwwC5lxpAC0xrV7qTQmck+QtAzhZT-q1d2VmBkA9U+FJ5zhutscQ+XT70XZlU3y-P85RAtkUSFrkiTHjUSRZtCGSWci7PbQbEn2hPodKwE9z43RolCD4Nl6hJV6oWTciRZTkxVNWXcP9URI1HkfQB+I+avlAepaK+R4jaRIvCP2ek3qIGyOmOytcMppBlgfLBACIIcWgh+Ah10pYNG0rpbMBkIhGRMkNfIsoG4KjGkvdBjFME7WwWwqCkAuLAIkFwyWFctQ1hlvhLIz8cIRDIokdc310gmWMjuAazD5GsPYkot8MlTaQHUeXSIX9Sy6h3NUOyu4GaP3DuTKIVctbQmaNkGsQjrH-xcmVY2LiNJllLD1BK-UUjExpnEYEA1mhNHlqqKJ4kYlp1UVAeJ0V-qQlqF8Q0vxizEVyDTPUCRdz1DwvUAaG4ClzTBsbPBnYyk3XqEIue1QGapA+pRGmmQMzeOVPlXUTNchdJRqnHm7AM7+GcXjSe0U7Lpi8fKB+0JEgv0PP7FuqpdQtEZkkH+HQgA */
+  /** @xstate-layout N4IgpgJg5mDOIC5QBECGAXVszoIoFdUAbAS3QE8BhAewDt0AnaoosBgOggyx1gGIAqgAVkAQQAqAUQD64gJIBZGQCVRAOQDikgNoAGALqJQAB2qwyJOkZAAPRAE4A7ABoQ5RACYAjLoAs7AFYPAA4PR2CAgN1HewBmXwBfBNc0TGw8QlIKGnomFjZObnT+ZUkAMVKAZQAJaTFxUT1DJBBTc3RLWms7BCdXdwQPXQD-R10wxwA2X2jfey8klKKcAmIyKjpGZlYOLjTeQREJGTk1KQ1VeQB5NUqm6zaLKxaevrdEL0dfR3Zg+xHdMFJhFdMDgosQKkeBk1tlNnkdoV9uh+MJ6jI1KIlJUhKJKJI7gYHmYnl0Xg4XO8EF5gr5YuxProfLEvJNYvZJqyIVD0qsshtctsCntoaijlJpLgBJJlABNe4tR4dZ6gHqTDz0rwBP6g0LTLUefofbX0jxOL5gnwBSbc5Yw-k5Lb5XZ22DsABmOAAxgALEi0KB8CB0MDsf0AN2oAGtQzyVpl1o6EcLXR7vX6AwgI9QvRhOk0FSYScqyarEAF7PZ2LE-h5JpMgqzHI5DVSvPYgdXZlEZvFAbbkXzE-ChS7kW7Pehff7A2wmBxjEQMO7qAwALbsOP24eC51I0VpqcZqBZ2iR3MlgtExXFzrdcuV6u1+uNybN1sDbzDBn-AKORt0t4sQDtCQ5wruiIisU7BENQqAQJAhzorIogAEIADIyJQyhyFIOGNNeRbtHe5IIH8ATsICHjalM9bhLEkxGoMTJVqCvi+ECXzBBE3wgbyCbgU6kGprB8GIeIVwaBomHSKceLyAAajI9SiJUkjiISzREaS95kc2DK+NMsQeHWQI9kxNJOAy-66ICsQsvYgF8fGsICkJKbjjBcEIRAfASVJMllAI6HoXUEiqep0iYtihatLeKq2IgQLBOwYzWtqXjePW1EWcETLsPYtkmeMMzNokySQnaYFucmuxgFADBiRAyA5mKyHyEo0iqJoOiEXFxEJT0LZMRqMTVr4QweHMZq6JW5VLIOAk1aOnD1Y1PktV6JTlFUtQqbFSokWWCDDVSGpmoErJBGEEQxI4znboJtWrQ1TWbRO6YzkGIZhme0axlVS1JitCGvRtrWHtOmbZhe+YGAd8WlolCAjBR0zan4JlhBWI0zF41aVsZ7H2QxXwPdVwN7qD62QO9kPHnwc6ruwi7LquG5bhTI5U2tb0Q5OUMnjDeZ0FeWn9TppGo+w6N5RNJn-vYI2xLNDLUdxc3BO2bLk0D3OIu6RDkNQ+DoHwamYZQ4hRZIADqYUNGp4gIwNSNDR+iDsv4oQsvEYS6MZWu665lMG0bJtm5Q6FXGp0hlOhspXAIzt9Ydg2IKdn50jLfg0ir8yTfYwcOvrBSG8bpu-RYawAF5fcGtChrAmDoADi0h6XHDlxHVcdLXM4u5Lx2OZqRUB3+oRml4Fk0vjPF0uyLbxFMxc7u5Xfh5X-rV6QdcBvulSMGAqBrsgOCoCQRAfUe9c-dmMaboDHcQWXm-oL3JD9-vIqHwwx+n+fS+19BannPCLWgYtiSu10r4dsT57Bmi+IZWabILKzR+FqXwQQA6shKvdCqnM9Yvw3hXd+28+67xnAfI+J8z6YCAfTL6TMFxLnQCudcj924l2IR6N+H8v5QGoX-WhgCr6MOhn9WGot4ap0RjAuBNYEFOHYpMFBsQ0F+F+FrQEJodGxHwQtUCRD168NIfwyh+9-St1eiWNAsAfQACM4IMAgMAhmDdQz3zbkY5+Jju5b1oDvEge9BFWN5rYrAjjnGuPEULSR4DIE3mgaRdiFEhj52CF8WaZkAgWXZPjEqLINT-G4oZVeT0Vr+LIYEihwSqFhJsZ0OxUTUAuLcUwhg84WasPYRzJ+3C-F8PIZ-CxoT6DhKaZEpxrSYkC2PKAnMCSZHizTm7RAqT2DpOyVkjsDZcltjNClGymSYg+EcF4eI5Tlp7iqV5JqfAo4xxkPHROydB4ll0ggpiS9KJOAQRqTkcwyYEP6WvZ6tzRI+SQscWStw5AaGqBpWQigVDqC0O8o6yNMqaJutaEEnIvCZTQaEVK3xbLtjpNEYYVzQ6vzMV6WC2BfJXCEJINQccE5JxTisuRpEGJVkUSrJkxkWRErOgEfGwITQ1n0eMWywEIS0GoAheALRCG+NqlAoeyMAC0WCmLAgKiaaaIwaQhHBCCrhYKQaui1R8lJSs2z1l0IEFscxPgvm1EXS1PiBnPSgrwWJdrMU9Hshg7i4RgQNn+BxfZn5AQpX+CrOsXx5grx9fxDVNrPKQsgMG9OvQGwFXGGm9GPhCUjUJQK9kYQOIzBKjSzuL0abNVavmtZgxfAjRMnPEtjhk0ciBI2nh1M+ZbSDUk7VPQzQUT+A5GsWo8qckpJ+Yy+NjKIIXpMeYNoM0uT9SDXm4Nx25ogO23SWt8YxC1uaoYhlYhxs8GG1KzqOw1g1L2YdgzSHnr5RZa0myb31k+HWJRX7wVDJqSMupAZf3HQlUxYIKtNkPtA6o2adJvWGMzQem5kGgkhKEf-OhF8r5weRpWJiabAgZWBAXeI+jwOVPw7UwjP8aEAPoWIuZM5yM9C8N8NBnxKLhAuYVTBWsDGVStRUvDZjhkCKIyIrjboPF8cQNul15zATNkiFg2kj7qQBw8DLQqgIdH9u8B4Jjcme4KdGb9axjUIn2OmW09TvRHUDEyoS9gE0YgjDylWyINmw7yag4phpznJmueie02Dk77XHQEyuj4LIXWORiOlpNsDd3Yf3da2zASCP1PGY0ugzS3MxLU4lkNGcANzCBN8QL-5OR5LrDRjsLY4jnMvaFulPdT0ecJRxAqYn1RVvmFqGeSHKJZQ5BNbWCr8uPWuWFnuDKzB5tqwWusJnMqk3ZDxBBqXBj1j8xyKYAQWS6Z8LupIQA */
   createMachine<
     DatasetQualityControllerContext,
     DatasetQualityControllerEvent,
@@ -132,18 +135,55 @@ export const createPureDatasetQualityControllerStateMachine = (
         flyout: {
           initial: 'closed',
           states: {
-            fetching: {
-              invoke: {
-                src: 'loadDataStreamDetails',
-                onDone: {
-                  target: 'loaded',
-                  actions: ['storeDatasetDetails'],
+            initializing: {
+              type: 'parallel',
+              states: {
+                dataStreamDetails: {
+                  initial: 'fetching',
+                  states: {
+                    fetching: {
+                      invoke: {
+                        src: 'loadDataStreamDetails',
+                        onDone: {
+                          target: 'done',
+                          actions: ['storeDatasetDetails'],
+                        },
+                        onError: {
+                          target: 'done',
+                          actions: ['fetchDatasetDetailsFailedNotifier'],
+                        },
+                      },
+                    },
+                    done: {
+                      type: 'final',
+                    },
+                  },
                 },
-                onError: {
-                  target: 'loaded',
-                  actions: ['fetchDatasetDetailsFailedNotifier'],
+                integrationDashboards: {
+                  initial: 'fetching',
+                  states: {
+                    fetching: {
+                      invoke: {
+                        src: 'loadIntegrationDashboards',
+                        onDone: {
+                          target: 'done',
+                          actions: ['storeIntegrationDashboards'],
+                        },
+                        onError: {
+                          target: 'done',
+                          actions: ['notifyFetchIntegrationDashboardsFailed'],
+                        },
+                      },
+                    },
+                    done: {
+                      type: 'final',
+                    },
+                  },
                 },
               },
+              onDone: {
+                target: '#DatasetQualityController.flyout.loaded',
+              },
             },
             loaded: {
               on: {
@@ -159,7 +199,7 @@ export const createPureDatasetQualityControllerStateMachine = (
             closed: {
               on: {
                 OPEN_FLYOUT: {
-                  target: '#DatasetQualityController.flyout.fetching',
+                  target: '#DatasetQualityController.flyout.initializing',
                   actions: ['storeFlyoutOptions'],
                 },
               },
@@ -167,7 +207,7 @@ export const createPureDatasetQualityControllerStateMachine = (
           },
           on: {
             SELECT_NEW_DATASET: {
-              target: '#DatasetQualityController.flyout.fetching',
+              target: '#DatasetQualityController.flyout.initializing',
               actions: ['storeFlyoutOptions'],
             },
             CLOSE_FLYOUT: {
@@ -292,6 +332,22 @@ export const createPureDatasetQualityControllerStateMachine = (
               }
             : {};
         }),
+        storeIntegrationDashboards: assign((context, event) => {
+          return 'data' in event && 'dashboards' in event.data
+            ? {
+                flyout: {
+                  ...context.flyout,
+                  dataset: {
+                    ...context.flyout.dataset,
+                    integration: {
+                      ...context.flyout.dataset?.integration,
+                      dashboards: event.data.dashboards as DashboardType[],
+                    },
+                  } as FlyoutDataset,
+                },
+              }
+            : {};
+        }),
         storeDatasets: assign((context, _event) => {
           return context.dataStreamStats && context.degradedDocStats
             ? {
@@ -312,12 +368,14 @@ export interface DatasetQualityControllerStateMachineDependencies {
   initialContext?: DatasetQualityControllerContext;
   toasts: IToasts;
   dataStreamStatsClient: IDataStreamsStatsClient;
+  dataStreamDetailsClient: IDataStreamDetailsClient;
 }
 
 export const createDatasetQualityControllerStateMachine = ({
   initialContext = DEFAULT_CONTEXT,
   toasts,
   dataStreamStatsClient,
+  dataStreamDetailsClient,
 }: DatasetQualityControllerStateMachineDependencies) =>
   createPureDatasetQualityControllerStateMachine(initialContext).withConfig({
     actions: {
@@ -327,6 +385,8 @@ export const createDatasetQualityControllerStateMachine = ({
         fetchDegradedStatsFailedNotifier(toasts, event.data),
       notifyFetchDatasetDetailsFailed: (_context, event: DoneInvokeEvent<Error>) =>
         fetchDatasetDetailsFailedNotifier(toasts, event.data),
+      notifyFetchIntegrationDashboardsFailed: (_context, event: DoneInvokeEvent<Error>) =>
+        fetchIntegrationDashboardsFailedNotifier(toasts, event.data),
     },
     services: {
       loadDataStreamStats: (context) =>
@@ -353,7 +413,7 @@ export const createDatasetQualityControllerStateMachine = ({
 
         const { type, name: dataset, namespace } = context.flyout.dataset;
 
-        return dataStreamStatsClient.getDataStreamDetails({
+        return dataStreamDetailsClient.getDataStreamDetails({
           dataStream: dataStreamPartsToIndexName({
             type: type as DataStreamType,
             dataset,
@@ -361,6 +421,19 @@ export const createDatasetQualityControllerStateMachine = ({
           }),
         });
       },
+      loadIntegrationDashboards: (context) => {
+        if (!context.flyout.dataset) {
+          fetchDatasetDetailsFailedNotifier(toasts, new Error(noDatasetSelected));
+
+          return Promise.resolve({});
+        }
+
+        const { integration } = context.flyout.dataset;
+
+        return integration
+          ? dataStreamDetailsClient.getIntegrationDashboards({ integration: integration.name })
+          : Promise.resolve({});
+      },
     },
   });
 
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
index 967458b54bf9b..64c54d088ce1b 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
@@ -11,6 +11,7 @@ import { Integration } from '../../../../common/data_streams_stats/integration';
 import { Direction, SortField } from '../../../hooks';
 import { DegradedDocsStat } from '../../../../common/data_streams_stats/malformed_docs_stat';
 import {
+  DashboardType,
   DataStreamDegradedDocsStatServiceResponse,
   DataStreamDetails,
   DataStreamStatServiceResponse,
@@ -115,6 +116,14 @@ export type DatasetQualityControllerTypeState =
   | {
       value: 'datasets.loaded';
       context: DefaultDatasetQualityStateContext;
+    }
+  | {
+      value: 'flyout.initializing.dataStreamDetails.fetching';
+      context: DefaultDatasetQualityStateContext;
+    }
+  | {
+      value: 'flyout.initializing.integrationDashboards.fetching';
+      context: DefaultDatasetQualityStateContext;
     };
 
 export type DatasetQualityControllerContext = DatasetQualityControllerTypeState['context'];
@@ -165,5 +174,6 @@ export type DatasetQualityControllerEvent =
       query: string;
     }
   | DoneInvokeEvent<DataStreamDegradedDocsStatServiceResponse>
+  | DoneInvokeEvent<DashboardType>
   | DoneInvokeEvent<DataStreamStatServiceResponse>
   | DoneInvokeEvent<Error>;
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_integrations.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_integrations.ts
index 44ffdc02a6731..f13e3661942c0 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_integrations.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_integrations.ts
@@ -5,9 +5,56 @@
  * 2.0.
  */
 
+import { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
+import { DASHBOARD_SAVED_OBJECT_TYPE } from '@kbn/deeplinks-analytics/constants';
 import { PackageClient } from '@kbn/fleet-plugin/server';
 import { PackageNotFoundError } from '@kbn/fleet-plugin/server/errors';
-import { DataStreamStat, Integration } from '../../../common/api_types';
+import { Dashboard, DataStreamStat, Integration } from '../../../common/api_types';
+
+export async function getIntegrationDashboards(
+  packageClient: PackageClient,
+  savedObjectsClient: SavedObjectsClientContract,
+  integration: string
+): Promise<Dashboard[]> {
+  // Retrieve integration savedObject
+  const integrationSavedObjects = await packageClient.getInstallation(integration);
+  if (!integrationSavedObjects) return [];
+
+  // Extract dashboard ids
+  const dashboardIds: string[] = [];
+  integrationSavedObjects.installed_kibana.forEach((intSavedObject) => {
+    if (intSavedObject.type === DASHBOARD_SAVED_OBJECT_TYPE) {
+      dashboardIds.push(intSavedObject.id);
+    }
+  });
+
+  // Fetch dashboards savedObject
+  // We are directly querying the SO here
+  // The dashboard service is not exposed from the server side at the moment
+  // https://github.com/elastic/kibana/issues/179759
+  const dashboardsSavedObjects = await savedObjectsClient.bulkGet<{
+    title?: string;
+  }>(
+    dashboardIds.map((id) => ({
+      id,
+      type: DASHBOARD_SAVED_OBJECT_TYPE,
+      fields: ['title'],
+    }))
+  );
+
+  // Ignore faulty dashboards
+  const allValidDashboardSavedObjects = dashboardsSavedObjects.saved_objects.filter(
+    (so) => !so.error
+  );
+
+  // Construct dashboard result
+  const packageDashboards = allValidDashboardSavedObjects.map((so) => ({
+    id: so.id,
+    title: so.attributes.title || so.id,
+  }));
+
+  return packageDashboards;
+}
 
 export async function getIntegrations(options: {
   packageClient: PackageClient;
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/routes.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/routes.ts
index dbca7e1d0b4bd..2bd5b3435acf2 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/routes.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/routes.ts
@@ -13,6 +13,7 @@ import {
   DataStreamStat,
   DegradedDocs,
   Integration,
+  IntegrationDashboards,
 } from '../../../common/api_types';
 import { rangeRt, typeRt } from '../../types/default_api_types';
 import { createDatasetQualityServerRoute } from '../create_datasets_quality_server_route';
@@ -20,7 +21,7 @@ import { getDataStreamDetails } from './get_data_stream_details';
 import { getDataStreams } from './get_data_streams';
 import { getDataStreamsStats } from './get_data_streams_stats';
 import { getDegradedDocsPaginated } from './get_degraded_docs';
-import { getIntegrations } from './get_integrations';
+import { getIntegrationDashboards, getIntegrations } from './get_integrations';
 import { getEstimatedDataInBytes } from './get_estimated_data_in_bytes';
 
 const statsRoute = createDatasetQualityServerRoute({
@@ -163,9 +164,40 @@ const estimatedDataInBytesRoute = createDatasetQualityServerRoute({
   },
 });
 
+const integrationDashboardsRoute = createDatasetQualityServerRoute({
+  endpoint: 'GET /internal/dataset_quality/integrations/{integration}/dashboards',
+  params: t.type({
+    path: t.type({
+      integration: t.string,
+    }),
+  }),
+  options: {
+    tags: [],
+  },
+  async handler(resources): Promise<IntegrationDashboards> {
+    const { context, params, plugins } = resources;
+    const { integration } = params.path;
+    const { savedObjects } = await context.core;
+
+    const fleetPluginStart = await plugins.fleet.start();
+    const packageClient = fleetPluginStart.packageService.asInternalUser;
+
+    const integrationDashboards = await getIntegrationDashboards(
+      packageClient,
+      savedObjects.client,
+      integration
+    );
+
+    return {
+      dashboards: integrationDashboards,
+    };
+  },
+});
+
 export const dataStreamsRouteRepository = {
   ...statsRoute,
   ...degradedDocsRoute,
   ...dataStreamDetailsRoute,
   ...estimatedDataInBytesRoute,
+  ...integrationDashboardsRoute,
 };
diff --git a/x-pack/plugins/observability_solution/dataset_quality/tsconfig.json b/x-pack/plugins/observability_solution/dataset_quality/tsconfig.json
index e59d2baacde27..37201afd73082 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/tsconfig.json
+++ b/x-pack/plugins/observability_solution/dataset_quality/tsconfig.json
@@ -36,7 +36,10 @@
     "@kbn/data-views-plugin",
     "@kbn/shared-ux-error-boundary",
     "@kbn/embeddable-plugin",
-    "@kbn/es-query"
+    "@kbn/es-query",
+    "@kbn/core-saved-objects-api-server",
+    "@kbn/deeplinks-management",
+    "@kbn/deeplinks-analytics"
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/test/dataset_quality_api_integration/tests/data_streams/integration_dashboards.spec.ts b/x-pack/test/dataset_quality_api_integration/tests/data_streams/integration_dashboards.spec.ts
new file mode 100644
index 0000000000000..e29b934223a31
--- /dev/null
+++ b/x-pack/test/dataset_quality_api_integration/tests/data_streams/integration_dashboards.spec.ts
@@ -0,0 +1,116 @@
+/*
+ * 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 { DatasetQualityApiClientKey } from '../../common/config';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+
+interface IntegrationPackage {
+  name: string;
+  version: string;
+}
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const registry = getService('registry');
+  const supertest = getService('supertest');
+  const datasetQualityApiClient = getService('datasetQualityApiClient');
+
+  const integrationPackages: IntegrationPackage[] = [
+    {
+      // with dashboards
+      name: 'postgresql',
+      version: '1.19.0',
+    },
+    {
+      // without dashboards
+      name: 'apm',
+      version: '8.4.2',
+    },
+  ];
+
+  async function installPackage({ name, version }: IntegrationPackage) {
+    return supertest
+      .post(`/api/fleet/epm/packages/${name}/${version}`)
+      .set('kbn-xsrf', 'xxxx')
+      .send({ force: true });
+  }
+
+  async function uninstallPackage({ name, version }: IntegrationPackage) {
+    return supertest.delete(`/api/fleet/epm/packages/${name}/${version}`).set('kbn-xsrf', 'xxxx');
+  }
+
+  async function callApiAs(integration: string) {
+    const user = 'datasetQualityLogsUser' as DatasetQualityApiClientKey;
+    return await datasetQualityApiClient[user]({
+      endpoint: 'GET /internal/dataset_quality/integrations/{integration}/dashboards',
+      params: {
+        path: {
+          integration,
+        },
+      },
+    });
+  }
+
+  registry.when('Integration dashboards', { config: 'basic' }, () => {
+    describe('gets the installed integration dashboards', () => {
+      before(async () => {
+        await Promise.all(
+          integrationPackages.map((pkg: IntegrationPackage) => installPackage(pkg))
+        );
+      });
+
+      it('returns a non-empty body', async () => {
+        const resp = await callApiAs(integrationPackages[0].name);
+        expect(resp.body).not.empty();
+      });
+
+      it('returns a list of dashboards in the correct format', async () => {
+        const expectedResult = {
+          dashboards: [
+            {
+              id: 'postgresql-158be870-87f4-11e7-ad9c-db80de0bf8d3',
+              title: '[Logs PostgreSQL] Overview',
+            },
+            {
+              id: 'postgresql-4288b790-b79f-11e9-a579-f5c0a5d81340',
+              title: '[Metrics PostgreSQL] Database Overview',
+            },
+            {
+              id: 'postgresql-e4c5f230-87f3-11e7-ad9c-db80de0bf8d3',
+              title: '[Logs PostgreSQL] Query Duration Overview',
+            },
+          ],
+        };
+        const resp = await callApiAs(integrationPackages[0].name);
+        expect(resp.body).to.eql(expectedResult);
+      });
+
+      it('returns an empty array for an integration without dashboards', async () => {
+        const expectedResult = {
+          dashboards: [],
+        };
+        const resp = await callApiAs(integrationPackages[1].name);
+        expect(resp.body).to.eql(expectedResult);
+      });
+
+      it('returns an empty array for an invalid integration', async () => {
+        const expectedResult = {
+          dashboards: [],
+        };
+        const resp = await callApiAs('invalid');
+        expect(resp.body).to.eql(expectedResult);
+      });
+
+      after(
+        async () =>
+          await Promise.all(
+            integrationPackages.map((pkg: IntegrationPackage) => uninstallPackage(pkg))
+          )
+      );
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/dataset_quality/dataset_quality_flyout.ts b/x-pack/test/functional/apps/dataset_quality/dataset_quality_flyout.ts
index b458574273e18..78060f5c29571 100644
--- a/x-pack/test/functional/apps/dataset_quality/dataset_quality_flyout.ts
+++ b/x-pack/test/functional/apps/dataset_quality/dataset_quality_flyout.ts
@@ -9,6 +9,12 @@ import expect from '@kbn/expect';
 import { DatasetQualityFtrProviderContext } from './config';
 import { datasetNames, getInitialTestLogs, getLogsForDataset } from './data';
 
+const integrationActions = {
+  overview: 'Overview',
+  template: 'Template',
+  viewDashboards: 'ViewDashboards',
+};
+
 export default function ({ getService, getPageObjects }: DatasetQualityFtrProviderContext) {
   const PageObjects = getPageObjects([
     'common',
@@ -18,6 +24,8 @@ export default function ({ getService, getPageObjects }: DatasetQualityFtrProvid
   ]);
   const testSubjects = getService('testSubjects');
   const synthtrace = getService('logSynthtraceEsClient');
+  const retry = getService('retry');
+  const browser = getService('browser');
   const to = '2024-01-01T12:00:00.000Z';
 
   describe('Dataset quality flyout', () => {
@@ -109,5 +117,164 @@ export default function ({ getService, getPageObjects }: DatasetQualityFtrProvid
         await PageObjects.observabilityLogsExplorer.getDataSourceSelectorButtonText();
       expect(datasetSelectorText).to.eql(testDatasetName);
     });
+
+    it('Integration actions menu is present with correct actions', async () => {
+      const apacheAccessDatasetName = 'apache.access';
+      const apacheAccessDatasetHumanName = 'Apache access logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.setupInitialIntegrations();
+
+      // Index 10 logs for `logs-apache.access` dataset
+      await synthtrace.index(
+        getLogsForDataset({ to, count: 10, dataset: apacheAccessDatasetName })
+      );
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(apacheAccessDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      const actions = await Promise.all(
+        Object.values(integrationActions).map((action) =>
+          PageObjects.datasetQuality.getIntegrationActionButtonByAction(action)
+        )
+      );
+
+      expect(actions.length).to.eql(3);
+    });
+
+    it('Integration dashboard action hidden for integrations without dashboards', async () => {
+      const bitbucketDatasetName = 'atlassian_bitbucket.audit';
+      const bitbucketDatasetHumanName = 'Bitbucket Audit Logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.installPackage({
+        name: 'atlassian_bitbucket',
+        version: '1.14.0',
+      });
+
+      // Index 10 logs for `atlassian_bitbucket.audit` dataset
+      await synthtrace.index(getLogsForDataset({ to, count: 10, dataset: bitbucketDatasetName }));
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(bitbucketDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      await testSubjects.missingOrFail(
+        PageObjects.datasetQuality.testSubjectSelectors.datasetQualityFlyoutIntegrationAction(
+          integrationActions.viewDashboards
+        )
+      );
+    });
+
+    it('Integration overview action should navigate to the integration overview page', async () => {
+      const bitbucketDatasetName = 'atlassian_bitbucket.audit';
+      const bitbucketDatasetHumanName = 'Bitbucket Audit Logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.installPackage({
+        name: 'atlassian_bitbucket',
+        version: '1.14.0',
+      });
+
+      // Index 10 logs for `atlassian_bitbucket.audit` dataset
+      await synthtrace.index(getLogsForDataset({ to, count: 10, dataset: bitbucketDatasetName }));
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(bitbucketDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      const action = await PageObjects.datasetQuality.getIntegrationActionButtonByAction(
+        integrationActions.overview
+      );
+
+      await action.click();
+
+      await retry.tryForTime(5000, async () => {
+        const currentUrl = await browser.getCurrentUrl();
+        const parsedUrl = new URL(currentUrl);
+
+        expect(parsedUrl.pathname).to.contain('/app/integrations/detail/atlassian_bitbucket');
+      });
+    });
+
+    it('Integration template action should navigate to the index template page', async () => {
+      const apacheAccessDatasetName = 'apache.access';
+      const apacheAccessDatasetHumanName = 'Apache access logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.setupInitialIntegrations();
+
+      // Index 10 logs for `logs-apache.access` dataset
+      await synthtrace.index(
+        getLogsForDataset({ to, count: 10, dataset: apacheAccessDatasetName })
+      );
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(apacheAccessDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      const action = await PageObjects.datasetQuality.getIntegrationActionButtonByAction(
+        integrationActions.template
+      );
+
+      await action.click();
+
+      await retry.tryForTime(5000, async () => {
+        const currentUrl = await browser.getCurrentUrl();
+        const parsedUrl = new URL(currentUrl);
+        expect(parsedUrl.pathname).to.contain(
+          `/app/management/data/index_management/templates/logs-${apacheAccessDatasetName}`
+        );
+      });
+    });
+
+    it('Integration dashboard action should navigate to the selected dashboard', async () => {
+      const apacheAccessDatasetName = 'apache.access';
+      const apacheAccessDatasetHumanName = 'Apache access logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.setupInitialIntegrations();
+
+      // Index 10 logs for `logs-apache.access` dataset
+      await synthtrace.index(
+        getLogsForDataset({ to, count: 10, dataset: apacheAccessDatasetName })
+      );
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(apacheAccessDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      const action = await PageObjects.datasetQuality.getIntegrationActionButtonByAction(
+        integrationActions.viewDashboards
+      );
+
+      await action.click();
+
+      const dashboardButtons = await PageObjects.datasetQuality.getIntegrationDashboardButtons();
+      const firstDashboardButton = await dashboardButtons[0];
+      const dashboardText = await firstDashboardButton.getVisibleText();
+
+      await firstDashboardButton.click();
+
+      const breadcrumbText = await testSubjects.getVisibleText('breadcrumb last');
+
+      expect(breadcrumbText).to.eql(dashboardText);
+    });
   });
 }
diff --git a/x-pack/test/functional/page_objects/dataset_quality.ts b/x-pack/test/functional/page_objects/dataset_quality.ts
index ba1f2dbe296fc..5663ffe077011 100644
--- a/x-pack/test/functional/page_objects/dataset_quality.ts
+++ b/x-pack/test/functional/page_objects/dataset_quality.ts
@@ -60,6 +60,9 @@ export function DatasetQualityPageObject({ getPageObjects, getService }: FtrProv
     datasetQualityFlyoutTitle: 'datasetQualityFlyoutTitle',
     datasetQualityHeaderButton: 'datasetQualityHeaderButton',
     datasetQualityFlyoutFieldValue: 'datasetQualityFlyoutFieldValue',
+    datasetQualityFlyoutIntegrationActionsButton: 'datasetQualityFlyoutIntegrationActionsButton',
+    datasetQualityFlyoutIntegrationAction: (action: string) =>
+      `datasetQualityFlyoutIntegrationAction${action}`,
     datasetQualityFilterBarFieldSearch: 'datasetQualityFilterBarFieldSearch',
     datasetQualityIntegrationsSelectable: 'datasetQualityIntegrationsSelectable',
     datasetQualityIntegrationsSelectableButton: 'datasetQualityIntegrationsSelectableButton',
@@ -237,6 +240,20 @@ export function DatasetQualityPageObject({ getPageObjects, getService }: FtrProv
       return testSubjects.find(testSubjectSelectors.datasetQualityHeaderButton);
     },
 
+    openIntegrationActionsMenu() {
+      return testSubjects.click(testSubjectSelectors.datasetQualityFlyoutIntegrationActionsButton);
+    },
+
+    getIntegrationActionButtonByAction(action: string) {
+      return testSubjects.find(testSubjectSelectors.datasetQualityFlyoutIntegrationAction(action));
+    },
+
+    getIntegrationDashboardButtons() {
+      return testSubjects.findAll(
+        testSubjectSelectors.datasetQualityFlyoutIntegrationAction('Dashboard')
+      );
+    },
+
     async doestTextExistInFlyout(text: string, elementSelector: string) {
       const flyoutContainer: WebElementWrapper = await testSubjects.find(
         testSubjectSelectors.datasetQualityFlyoutBody
diff --git a/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/dataset_quality_flyout.ts b/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/dataset_quality_flyout.ts
index 068e0b04088a1..75c423d618f86 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/dataset_quality_flyout.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/dataset_quality_flyout.ts
@@ -9,6 +9,12 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { datasetNames, getInitialTestLogs, getLogsForDataset } from './data';
 
+const integrationActions = {
+  overview: 'Overview',
+  template: 'Template',
+  viewDashboards: 'ViewDashboards',
+};
+
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects([
     'common',
@@ -20,6 +26,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   ]);
   const testSubjects = getService('testSubjects');
   const synthtrace = getService('svlLogsSynthtraceClient');
+  const retry = getService('retry');
+  const browser = getService('browser');
   const to = '2024-01-01T12:00:00.000Z';
 
   describe('Dataset quality flyout', () => {
@@ -113,5 +121,164 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.observabilityLogsExplorer.getDataSourceSelectorButtonText();
       expect(datasetSelectorText).to.eql(testDatasetName);
     });
+
+    it('Integration actions menu is present with correct actions', async () => {
+      const apacheAccessDatasetName = 'apache.access';
+      const apacheAccessDatasetHumanName = 'Apache access logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.setupInitialIntegrations();
+
+      // Index 10 logs for `logs-apache.access` dataset
+      await synthtrace.index(
+        getLogsForDataset({ to, count: 10, dataset: apacheAccessDatasetName })
+      );
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(apacheAccessDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      const actions = await Promise.all(
+        Object.values(integrationActions).map((action) =>
+          PageObjects.datasetQuality.getIntegrationActionButtonByAction(action)
+        )
+      );
+
+      expect(actions.length).to.eql(3);
+    });
+
+    it('Integration dashboard action hidden for integrations without dashboards', async () => {
+      const bitbucketDatasetName = 'atlassian_bitbucket.audit';
+      const bitbucketDatasetHumanName = 'Bitbucket Audit Logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.installPackage({
+        name: 'atlassian_bitbucket',
+        version: '1.14.0',
+      });
+
+      // Index 10 logs for `atlassian_bitbucket.audit` dataset
+      await synthtrace.index(getLogsForDataset({ to, count: 10, dataset: bitbucketDatasetName }));
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(bitbucketDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      await testSubjects.missingOrFail(
+        PageObjects.datasetQuality.testSubjectSelectors.datasetQualityFlyoutIntegrationAction(
+          integrationActions.viewDashboards
+        )
+      );
+    });
+
+    it('Integration overview action should navigate to the integration overview page', async () => {
+      const bitbucketDatasetName = 'atlassian_bitbucket.audit';
+      const bitbucketDatasetHumanName = 'Bitbucket Audit Logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.installPackage({
+        name: 'atlassian_bitbucket',
+        version: '1.14.0',
+      });
+
+      // Index 10 logs for `atlassian_bitbucket.audit` dataset
+      await synthtrace.index(getLogsForDataset({ to, count: 10, dataset: bitbucketDatasetName }));
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(bitbucketDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      const action = await PageObjects.datasetQuality.getIntegrationActionButtonByAction(
+        integrationActions.overview
+      );
+
+      await action.click();
+
+      await retry.tryForTime(5000, async () => {
+        const currentUrl = await browser.getCurrentUrl();
+        const parsedUrl = new URL(currentUrl);
+
+        expect(parsedUrl.pathname).to.contain('/app/integrations/detail/atlassian_bitbucket');
+      });
+    });
+
+    it('Integration template action should navigate to the index template page', async () => {
+      const apacheAccessDatasetName = 'apache.access';
+      const apacheAccessDatasetHumanName = 'Apache access logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.setupInitialIntegrations();
+
+      // Index 10 logs for `logs-apache.access` dataset
+      await synthtrace.index(
+        getLogsForDataset({ to, count: 10, dataset: apacheAccessDatasetName })
+      );
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(apacheAccessDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      const action = await PageObjects.datasetQuality.getIntegrationActionButtonByAction(
+        integrationActions.template
+      );
+
+      await action.click();
+
+      await retry.tryForTime(5000, async () => {
+        const currentUrl = await browser.getCurrentUrl();
+        const parsedUrl = new URL(currentUrl);
+        expect(parsedUrl.pathname).to.contain(
+          `/app/management/data/index_management/templates/logs-${apacheAccessDatasetName}`
+        );
+      });
+    });
+
+    it('Integration dashboard action should navigate to the selected dashboard', async () => {
+      const apacheAccessDatasetName = 'apache.access';
+      const apacheAccessDatasetHumanName = 'Apache access logs';
+
+      await PageObjects.observabilityLogsExplorer.navigateTo();
+
+      // Add initial integrations
+      await PageObjects.observabilityLogsExplorer.setupInitialIntegrations();
+
+      // Index 10 logs for `logs-apache.access` dataset
+      await synthtrace.index(
+        getLogsForDataset({ to, count: 10, dataset: apacheAccessDatasetName })
+      );
+
+      await PageObjects.datasetQuality.navigateTo();
+
+      await PageObjects.datasetQuality.openDatasetFlyout(apacheAccessDatasetHumanName);
+      await PageObjects.datasetQuality.openIntegrationActionsMenu();
+
+      const action = await PageObjects.datasetQuality.getIntegrationActionButtonByAction(
+        integrationActions.viewDashboards
+      );
+
+      await action.click();
+
+      const dashboardButtons = await PageObjects.datasetQuality.getIntegrationDashboardButtons();
+      const firstDashboardButton = await dashboardButtons[0];
+      const dashboardText = await firstDashboardButton.getVisibleText();
+
+      await firstDashboardButton.click();
+
+      const breadcrumbText = await testSubjects.getVisibleText('breadcrumb last');
+
+      expect(breadcrumbText).to.eql(dashboardText);
+    });
   });
 }

From 9e6376cc1f3aaff8f661f8698507e0314f20edfe Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Tue, 2 Apr 2024 15:51:20 +0300
Subject: [PATCH 21/63] fix: [Integrations > Add integration prompt][SCREEN
 READER]: Images are decorative and should be removed from the accessibility
 tree (#179805)

Closes: https://github.com/elastic/security-team/issues/8989

## Description

The Add integration prompt has a number of images that are decorative,
but have alt text added. This could be confusing to screen reader users
because the images do not provide additional context or information.
Let's update them to have `alt=""` attributes so the images are removed
from the accessibility tree. Screenshot attached below.

### Steps to recreate

1. Create a new Security Serverless project if none exist
2. When the project is ready, open it and go to Integrations, under the
Project Settings in the lower left navigation
3. Search for DynamoDB in the Integrations, and click on the card
4. From the DynamoDB detail view, click "Add Amazon DynamoDB"
5. When the "Ready to add your first integration?" view loads, open Dev
Tools and verify the images highlighted have alt text.

### What was done?
1. _role="presentation"_ was set to image container
2. removed extra `alt`'s attributes
---
 .../add_first_integration_splash.tsx          | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/add_first_integration_splash.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/add_first_integration_splash.tsx
index d09178f499717..7dbfae011d64f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/add_first_integration_splash.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/add_first_integration_splash.tsx
@@ -60,7 +60,7 @@ const CenteredEuiStepNumber = styled(EuiStepNumber)`
 // step numbers are not centered in smaller layouts without this
 const CenteredEuiImage = (props: EuiImageProps) => (
   <div style={{ margin: '0 auto' }}>
-    <EuiImage {...props} />
+    <EuiImage role="presentation" {...props} />
   </div>
 );
 
@@ -93,10 +93,7 @@ const AddIntegrationStepsIllustrations = () => {
           </EuiFlexItem>
           <EuiFlexItem>
             <div style={{ margin: '0 auto' }}>
-              <CenteredEuiImage
-                alt="Illustration of installing the Elastic Agent"
-                src={assetsBasePath + '1_install_agent.svg'}
-              />
+              <CenteredEuiImage alt="" src={assetsBasePath + '1_install_agent.svg'} />
             </div>
           </EuiFlexItem>
           <EuiFlexItem>
@@ -124,10 +121,7 @@ const AddIntegrationStepsIllustrations = () => {
       </EuiShowFor>
       <EuiHideFor sizes={['s', 'xs']}>
         <EuiFlexItem grow={false}>
-          <CenteredEuiImage
-            alt="Illustration of an arrow pointing from left to right"
-            src={assetsBasePath + 'arrow_right_curve_over.svg'}
-          />
+          <CenteredEuiImage alt="" src={assetsBasePath + 'arrow_right_curve_over.svg'} />
         </EuiFlexItem>
       </EuiHideFor>
       <EuiFlexItem grow={false}>
@@ -136,10 +130,7 @@ const AddIntegrationStepsIllustrations = () => {
             <CenteredEuiStepNumber status="incomplete" number={2} />
           </EuiFlexItem>
           <EuiFlexItem>
-            <CenteredEuiImage
-              alt="Illustration of adding an integration"
-              src={assetsBasePath + '2_add_integration.svg'}
-            />
+            <CenteredEuiImage alt="" src={assetsBasePath + '2_add_integration.svg'} />
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiText textAlign="center">
@@ -166,10 +157,7 @@ const AddIntegrationStepsIllustrations = () => {
       </EuiShowFor>
       <EuiHideFor sizes={['s', 'xs']}>
         <EuiFlexItem grow={false}>
-          <CenteredEuiImage
-            alt="Illustration of an arrow pointing from left to right"
-            src={assetsBasePath + 'arrow_right_curve_under.svg'}
-          />
+          <CenteredEuiImage alt="" src={assetsBasePath + 'arrow_right_curve_under.svg'} />
         </EuiFlexItem>
       </EuiHideFor>
       <EuiFlexItem grow={false}>
@@ -178,10 +166,7 @@ const AddIntegrationStepsIllustrations = () => {
             <CenteredEuiStepNumber status="incomplete" number={3} />
           </EuiFlexItem>
           <EuiFlexItem>
-            <CenteredEuiImage
-              alt="Illustration of a dashboard with data"
-              src={assetsBasePath + '3_confirm_data.svg'}
-            />
+            <CenteredEuiImage alt="" src={assetsBasePath + '3_confirm_data.svg'} />
           </EuiFlexItem>
           <EuiFlexItem>
             <EuiText textAlign="center">

From 7b94769f76b89b9c727f643150877248eb91ecc9 Mon Sep 17 00:00:00 2001
From: Coen Warmer <coen.warmer@gmail.com>
Date: Tue, 2 Apr 2024 15:28:22 +0200
Subject: [PATCH 22/63] [Observability AI Assistant] Update label in
 path-labeller.yml (#179824)

## Summary

This updates the github label which is added when there are changes in
AI Assistant for Observability owned code.
---
 .github/paths-labeller.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
index 4b6f27037ea5d..68a00be960c4b 100644
--- a/.github/paths-labeller.yml
+++ b/.github/paths-labeller.yml
@@ -22,7 +22,7 @@
     - 'x-pack/test/fleet_api_integration/**/*.*'
 - 'Team:obs-ux-management':
     - 'x-pack/plugins/observability_solution/observability/**/*.*'
-- 'Team:obs-knowledge':
+- 'Team:Obs AI Assistant':
     - 'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.*'
     - 'x-pack/plugins/observability_solution/observability_ai_assistant_*/**/*.*'
     - 'x-pack/test/observability_ai_assistant_api_integration/**/*.*'

From d44f73928ebbbcc5e1699ca40cb2d4c59ef42706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <soren.louv@elastic.co>
Date: Tue, 2 Apr 2024 15:41:26 +0200
Subject: [PATCH 23/63] [ObsAIAssistant] Persist settings in ES instead of
 local storage (#179380)

- Update AI Assistant settings to be stored in ES via "UI Settings"
instead of persisting in local storage.
- Add setting for logs indices
- Updated UI for settings to match UI for Kibana Advanced Settings
- Removed setting to update connector from the settings page


![image](https://github.com/elastic/kibana/assets/209966/5d88a86f-5bb6-418d-ae24-cff68f38c80a)

Link to "Manage connectors" directly from chat

![image](https://github.com/elastic/kibana/assets/209966/9c443f6a-6d6a-47d0-987f-d66315c70731)
---
 .../app/service_inventory/index.tsx           |   2 +-
 .../app/settings/general_settings/index.tsx   |   2 +-
 .../labs/labs_flyout.tsx                      |   2 +-
 .../source_configuration_settings.tsx         |   2 +-
 .../common/utils/advanced_settings.tsx        |  10 +
 .../public/hooks/use_chat.test.ts             |   3 +
 .../hooks/use_user_preferred_language.ts      |  62 +++--
 .../public/index.ts                           |   5 +
 .../server/index.ts                           |   5 +
 .../public/hooks/use_conversation.test.tsx    |  39 +--
 .../kibana.jsonc                              |  10 +-
 .../public/app.tsx                            |   2 +
 .../public/context/app_context.tsx            |   2 +
 .../public/helpers/test_helper.tsx            |   2 +
 .../public/plugin.ts                          |   4 +-
 .../routes/components/settings_page.test.tsx  |   6 +
 .../routes/components/settings_page.tsx       |   2 +-
 .../routes/components/settings_tab.test.tsx   |  71 -----
 .../public/routes/components/settings_tab.tsx | 245 ------------------
 .../settings_tab/get_field_definitions.ts     |  88 +++++++
 .../settings_tab/persisted_settings.tsx       | 100 +++++++
 .../settings_tab/settings_tab.test.tsx        | 120 +++++++++
 .../components/settings_tab/settings_tab.tsx  | 109 ++++++++
 .../tsconfig.json                             |   7 +-
 .../public/hooks/use_editable_settings.tsx    |   3 +-
 .../profiling/public/views/settings/index.tsx |   2 +-
 26 files changed, 519 insertions(+), 386 deletions(-)
 create mode 100644 x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/advanced_settings.tsx
 delete mode 100644 x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab.test.tsx
 delete mode 100644 x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab.tsx
 create mode 100644 x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/get_field_definitions.ts
 create mode 100644 x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/persisted_settings.tsx
 create mode 100644 x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.test.tsx
 create mode 100644 x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.tsx

diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx
index 6dc372c71fc13..ea6565c8cc566 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx
@@ -295,7 +295,7 @@ export function ServiceInventory() {
     });
   }, [mainStatisticsStatus, mainStatisticsData.items, setScreenContext]);
 
-  const { fields, isSaving, saveSingleSetting } = useEditableSettings('apm', [
+  const { fields, isSaving, saveSingleSetting } = useEditableSettings([
     apmEnableServiceInventoryTableSearchBar,
   ]);
 
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/settings/general_settings/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/general_settings/index.tsx
index 7fdccfb9e3346..dab7e7fcc5dab 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/settings/general_settings/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/settings/general_settings/index.tsx
@@ -82,7 +82,7 @@ export function GeneralSettings() {
     saveAll,
     isSaving,
     cleanUnsavedChanges,
-  } = useEditableSettings('apm', apmSettingsKeys);
+  } = useEditableSettings(apmSettingsKeys);
 
   async function handleSave() {
     try {
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/labs/labs_flyout.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/labs/labs_flyout.tsx
index 65164232ef564..5ffb120c9ce8a 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/labs/labs_flyout.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/labs/labs_flyout.tsx
@@ -61,7 +61,7 @@ export function LabsFlyout({ onClose }: Props) {
     saveAll,
     isSaving,
     cleanUnsavedChanges,
-  } = useEditableSettings('apm', labsItems);
+  } = useEditableSettings(labsItems);
 
   async function handleSave() {
     try {
diff --git a/x-pack/plugins/observability_solution/infra/public/pages/metrics/settings/source_configuration_settings.tsx b/x-pack/plugins/observability_solution/infra/public/pages/metrics/settings/source_configuration_settings.tsx
index 3da4ab36bce36..e3b9794300e85 100644
--- a/x-pack/plugins/observability_solution/infra/public/pages/metrics/settings/source_configuration_settings.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/pages/metrics/settings/source_configuration_settings.tsx
@@ -60,7 +60,7 @@ export const SourceConfigurationSettings = ({
     formStateChanges,
     getUnsavedChanges,
   } = useSourceConfigurationFormState(source?.configuration);
-  const infraUiSettings = useEditableSettings('infra_metrics', [
+  const infraUiSettings = useEditableSettings([
     enableInfrastructureHostsView,
     enableInfrastructureProfilingIntegration,
   ]);
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/advanced_settings.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/advanced_settings.tsx
new file mode 100644
index 0000000000000..27c1fc452c350
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/advanced_settings.tsx
@@ -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.
+ */
+
+// AI Assistant
+export const aiAssistantLogsIndexPattern = 'observability:aiAssistantLogsIndexPattern';
+export const aiAssistantResponseLanguage = 'observability:aiAssistantResponseLanguage';
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_chat.test.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_chat.test.ts
index d120bab32b1ca..838feb18330e7 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_chat.test.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_chat.test.ts
@@ -37,6 +37,9 @@ const addErrorMock = jest.fn();
 
 jest.spyOn(useKibanaModule, 'useKibana').mockReturnValue({
   services: {
+    uiSettings: {
+      get: jest.fn(),
+    },
     notifications: {
       toasts: {
         addError: addErrorMock,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_user_preferred_language.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_user_preferred_language.ts
index 74262cd0fc552..83b9acf9a4bb0 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_user_preferred_language.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_user_preferred_language.ts
@@ -7,19 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { useCallback } from 'react';
-import useLocalStorage from 'react-use/lib/useLocalStorage';
-
-const USE_KIBANA_LOCALE_SETTING = 'Use Kibana locale setting';
-const USE_BROWSER_LANGUAGE_SETTING = 'Use browser language setting';
-
-const SPECIAL_OPTIONS = [
-  {
-    label: USE_KIBANA_LOCALE_SETTING,
-  },
-  {
-    label: USE_BROWSER_LANGUAGE_SETTING,
-  },
-];
+import { aiAssistantResponseLanguage } from '../../common/utils/advanced_settings';
+import { useKibana } from './use_kibana';
 
 /* eslint-disable @typescript-eslint/naming-convention */
 // Data taken from https://github.com/L-P/native-language-list/blob/master/data/langs.json
@@ -163,39 +152,46 @@ const languages: { [key: string]: string } = {
   zu: 'isiZulu',
 };
 
-const LANGUAGE_OPTIONS = SPECIAL_OPTIONS.concat(
-  Object.values(languages).map((language) => ({
-    label: language,
-  }))
-);
+const KIBANA_LOCALE_SETTING = {
+  value: 'locale_setting',
+  label: 'Kibana locale setting',
+};
 
-export type UseUserPreferredLanguageResult = ReturnType<typeof useUserPreferredLanguage>;
+const BROWSER_LANGUAGE_SETTING = {
+  value: 'browser_setting',
+  label: 'Browser language setting',
+};
 
-export const SELECTED_LANGUAGE_LOCAL_STORAGE_KEY =
-  'xpack.observabilityAiAssistant.responseLanguage';
+export const DEFAULT_LANGUAGE_OPTION = KIBANA_LOCALE_SETTING;
+export const LANGUAGE_OPTIONS = [
+  KIBANA_LOCALE_SETTING,
+  BROWSER_LANGUAGE_SETTING,
+  ...Object.entries(languages).map(([value, label]) => ({ value, label })),
+];
+
+export type UseUserPreferredLanguageResult = ReturnType<typeof useUserPreferredLanguage>;
 
 export function useUserPreferredLanguage() {
-  const [selectedLanguage, setSelectedLanguage] = useLocalStorage(
-    SELECTED_LANGUAGE_LOCAL_STORAGE_KEY,
-    USE_KIBANA_LOCALE_SETTING
+  const {
+    services: { uiSettings },
+  } = useKibana();
+
+  const selectedLanguage = uiSettings.get<string>(
+    aiAssistantResponseLanguage,
+    DEFAULT_LANGUAGE_OPTION.value
   );
 
   const getPreferredLanguage = useCallback(() => {
-    if (selectedLanguage === USE_KIBANA_LOCALE_SETTING) {
+    if (selectedLanguage === KIBANA_LOCALE_SETTING.value) {
       return getLanguageFromKibanaSettings();
-    } else if (selectedLanguage === USE_BROWSER_LANGUAGE_SETTING) {
+    } else if (selectedLanguage === BROWSER_LANGUAGE_SETTING.value) {
       return getLanguageFromBrowserSetting();
     } else {
-      return selectedLanguage || 'English';
+      return languages[selectedLanguage] || 'English';
     }
   }, [selectedLanguage]);
 
-  return {
-    selectedLanguage,
-    setSelectedLanguage,
-    LANGUAGE_OPTIONS,
-    getPreferredLanguage,
-  };
+  return { selectedLanguage, getPreferredLanguage };
 }
 
 function getLanguageFromKibanaSettings() {
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/public/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/public/index.ts
index 80d01706700b8..ed6ace7b662cf 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/public/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/public/index.ts
@@ -73,6 +73,11 @@ export type {
 } from './api';
 
 export type { UseChatResult } from './hooks/use_chat';
+export { LANGUAGE_OPTIONS, DEFAULT_LANGUAGE_OPTION } from './hooks/use_user_preferred_language';
+export {
+  aiAssistantResponseLanguage,
+  aiAssistantLogsIndexPattern,
+} from '../common/utils/advanced_settings';
 
 export const plugin: PluginInitializer<
   ObservabilityAIAssistantPublicSetup,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/index.ts
index dd263d29d59bb..f33b3b55df8c4 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/index.ts
@@ -17,6 +17,11 @@ export type {
   ObservabilityAIAssistantServerSetup,
 } from './types';
 
+export {
+  aiAssistantResponseLanguage,
+  aiAssistantLogsIndexPattern,
+} from '../common/utils/advanced_settings';
+
 export const config: PluginConfigDescriptor<ObservabilityAIAssistantConfig> = {
   deprecations: ({ unusedFromRoot }) => [
     unusedFromRoot('xpack.observability.aiAssistant.enabled', {
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/hooks/use_conversation.test.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/hooks/use_conversation.test.tsx
index e190cc0c34782..ffada4c212b2f 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/hooks/use_conversation.test.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/hooks/use_conversation.test.tsx
@@ -27,11 +27,11 @@ import {
   type UseConversationProps,
   type UseConversationResult,
 } from './use_conversation';
-import * as useKibanaModule from './use_kibana';
 import { ChatState } from '@kbn/observability-ai-assistant-plugin/public';
 import { createMockChatService } from '../utils/create_mock_chat_service';
 import { createUseChat } from '@kbn/observability-ai-assistant-plugin/public/hooks/use_chat';
 import type { NotificationsStart } from '@kbn/core/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 
 let hookResult: RenderHookResult<UseConversationProps, UseConversationResult>;
 
@@ -61,23 +61,24 @@ const mockChatService = createMockChatService();
 
 const addErrorMock = jest.fn();
 
-jest.spyOn(useKibanaModule, 'useKibana').mockReturnValue({
-  services: {
-    plugins: {
-      start: {
-        observabilityAIAssistant: {
-          useChat: createUseChat({
-            notifications: {
-              toasts: {
-                addError: addErrorMock,
-              },
-            } as unknown as NotificationsStart,
-          }),
-        },
+const useKibanaMockServices = {
+  uiSettings: {
+    get: jest.fn(),
+  },
+  plugins: {
+    start: {
+      observabilityAIAssistant: {
+        useChat: createUseChat({
+          notifications: {
+            toasts: {
+              addError: addErrorMock,
+            },
+          } as unknown as NotificationsStart,
+        }),
       },
     },
   },
-} as any);
+};
 
 describe('useConversation', () => {
   let wrapper: WrapperComponent<UseConversationProps>;
@@ -85,9 +86,11 @@ describe('useConversation', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     wrapper = ({ children }) => (
-      <ObservabilityAIAssistantAppServiceProvider value={mockService}>
-        {children}
-      </ObservabilityAIAssistantAppServiceProvider>
+      <KibanaContextProvider services={useKibanaMockServices}>
+        <ObservabilityAIAssistantAppServiceProvider value={mockService}>
+          {children}
+        </ObservabilityAIAssistantAppServiceProvider>
+      </KibanaContextProvider>
     );
   });
 
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc b/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc
index 0d59b0202b4e5..7595eb93543b9 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc
@@ -7,14 +7,8 @@
     "server": false,
     "browser": true,
     "configPath": ["xpack", "observabilityAiAssistantManagement"],
-    "requiredPlugins": ["management"],
-    "optionalPlugins": [
-      "actions",
-      "home",
-      "observabilityAIAssistant",
-      "serverless",
-      "enterpriseSearch"
-    ],
+    "requiredPlugins": ["management", "observabilityAIAssistant", "observabilityShared"],
+    "optionalPlugins": ["actions", "home", "serverless", "enterpriseSearch"],
     "requiredBundles": ["kibanaReact"]
   }
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/app.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/app.tsx
index add303f3bc0ea..43be7afde4feb 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/app.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/app.tsx
@@ -51,6 +51,8 @@ export const mountManagementSection = async ({ core, mountParams }: MountParams)
               http: coreStart.http,
               notifications: coreStart.notifications,
               uiSettings: coreStart.uiSettings,
+              settings: coreStart.settings,
+              docLinks: coreStart.docLinks,
               setBreadcrumbs,
             }}
           >
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/context/app_context.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/context/app_context.tsx
index 5637bd4429c45..db39a8134999c 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/context/app_context.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/context/app_context.tsx
@@ -14,8 +14,10 @@ export interface ContextValue extends StartDependencies {
   application: CoreStart['application'];
   http: HttpSetup;
   notifications: CoreStart['notifications'];
+  docLinks: CoreStart['docLinks'];
   setBreadcrumbs: (crumbs: ChromeBreadcrumb[]) => void;
   uiSettings: CoreStart['uiSettings'];
+  settings: CoreStart['settings'];
 }
 
 export const AppContext = createContext<ContextValue>(null as any);
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/test_helper.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/test_helper.tsx
index ee36d365ae950..be285f70f2b57 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/test_helper.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/test_helper.tsx
@@ -59,6 +59,8 @@ export const render = (component: React.ReactNode, params?: { show: boolean }) =
           value={{
             http: coreStart.http,
             application: coreStart.application,
+            docLinks: coreStart.docLinks,
+            settings: coreStart.settings,
             notifications: coreStart.notifications,
             observabilityAIAssistant: observabilityAIAssistantPluginMock.createStartContract(),
             uiSettings: coreStart.uiSettings,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/plugin.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/plugin.ts
index 3f63235e82f24..53da619c7ad1c 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/plugin.ts
@@ -26,11 +26,11 @@ export interface AiAssistantManagementObservabilityPluginStart {}
 export interface SetupDependencies {
   management: ManagementSetup;
   home?: HomePublicPluginSetup;
-  observabilityAIAssistant?: ObservabilityAIAssistantPublicSetup;
+  observabilityAIAssistant: ObservabilityAIAssistantPublicSetup;
 }
 
 export interface StartDependencies {
-  observabilityAIAssistant?: ObservabilityAIAssistantPublicStart;
+  observabilityAIAssistant: ObservabilityAIAssistantPublicStart;
   serverless?: ServerlessPluginStart;
   enterpriseSearch?: EnterpriseSearchPublicStart;
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_page.test.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_page.test.tsx
index 14f88dcba9092..eb71723ffd9b5 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_page.test.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_page.test.tsx
@@ -20,6 +20,12 @@ const navigateToApp = jest.fn();
 describe('Settings Page', () => {
   beforeEach(() => {
     useAppContextMock.mockReturnValue({
+      uiSettings: {
+        get: jest.fn(),
+      },
+      docLinks: {
+        links: {},
+      },
       observabilityAIAssistant: {
         useGenAIConnectors: () => ({ connectors: [] }),
         useUserPreferredLanguage: () => ({
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_page.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_page.tsx
index 34e82942d7c0f..e0bb2cd45673b 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_page.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_page.tsx
@@ -9,7 +9,7 @@ import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiTab, EuiTabs, EuiTitle } from '@elastic/eui';
 import { useAppContext } from '../../hooks/use_app_context';
-import { SettingsTab } from './settings_tab';
+import { SettingsTab } from './settings_tab/settings_tab';
 import { KnowledgeBaseTab } from './knowledge_base_tab';
 import { useObservabilityAIAssistantManagementRouterParams } from '../../hooks/use_observability_management_params';
 import { useObservabilityAIAssistantManagementRouter } from '../../hooks/use_observability_management_router';
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab.test.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab.test.tsx
deleted file mode 100644
index 80ab608bd7dbd..0000000000000
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab.test.tsx
+++ /dev/null
@@ -1,71 +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 { fireEvent } from '@testing-library/react';
-import { render } from '../../helpers/test_helper';
-import { useAppContext } from '../../hooks/use_app_context';
-import { SettingsTab } from './settings_tab';
-
-jest.mock('../../hooks/use_app_context');
-
-const useAppContextMock = useAppContext as jest.Mock;
-
-const navigateToAppMock = jest.fn(() => Promise.resolve());
-const selectConnectorMock = jest.fn();
-
-describe('SettingsTab', () => {
-  beforeEach(() => {
-    useAppContextMock.mockReturnValue({
-      application: { navigateToApp: navigateToAppMock },
-      observabilityAIAssistant: {
-        useGenAIConnectors: () => ({
-          connectors: [
-            { name: 'openAi', id: 'openAi' },
-            { name: 'azureOpenAi', id: 'azureOpenAi' },
-            { name: 'bedrock', id: 'bedrock' },
-          ],
-          selectConnector: selectConnectorMock,
-        }),
-        useUserPreferredLanguage: () => ({
-          LANGUAGE_OPTIONS: [{ label: 'English' }],
-          selectedLanguage: 'English',
-          setSelectedLanguage: () => {},
-          getPreferredLanguage: () => 'English',
-        }),
-      },
-    });
-  });
-
-  it('should offer a way to configure Observability AI Assistant visibility in apps', () => {
-    const { getByTestId } = render(<SettingsTab />);
-
-    fireEvent.click(getByTestId('settingsTabGoToSpacesButton'));
-
-    expect(navigateToAppMock).toBeCalledWith('management', { path: '/kibana/spaces' });
-  });
-
-  it('should offer a way to configure Gen AI connectors', () => {
-    const { getByTestId } = render(<SettingsTab />);
-
-    fireEvent.click(getByTestId('settingsTabGoToConnectorsButton'));
-
-    expect(navigateToAppMock).toBeCalledWith('management', {
-      path: '/insightsAndAlerting/triggersActionsConnectors/connectors',
-    });
-  });
-
-  it('should allow selection of a configured Observability AI Assistant connector', () => {
-    const { getByTestId } = render(<SettingsTab />);
-
-    fireEvent.change(getByTestId('settingsTabGenAIConnectorSelect'), {
-      target: { value: 'bedrock' },
-    });
-
-    expect(selectConnectorMock).toBeCalledWith('bedrock');
-  });
-});
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab.tsx
deleted file mode 100644
index 5d6197e247714..0000000000000
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab.tsx
+++ /dev/null
@@ -1,245 +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 {
-  EuiButton,
-  EuiComboBox,
-  EuiDescribedFormGroup,
-  EuiForm,
-  EuiFormRow,
-  EuiPanel,
-  EuiSelect,
-  EuiSpacer,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { useAppContext } from '../../hooks/use_app_context';
-
-export function SettingsTab() {
-  const {
-    application: { navigateToApp },
-    observabilityAIAssistant,
-  } = useAppContext();
-
-  // If the AI Assistant is not available, don't render the settings tab
-  if (!observabilityAIAssistant) {
-    return null;
-  }
-
-  const {
-    connectors = [],
-    selectedConnector,
-    selectConnector,
-  } = observabilityAIAssistant.useGenAIConnectors();
-
-  const selectorOptions = connectors.map((connector) => ({
-    text: connector.name,
-    value: connector.id,
-  }));
-
-  const handleNavigateToConnectors = () => {
-    navigateToApp('management', {
-      path: '/insightsAndAlerting/triggersActionsConnectors/connectors',
-    });
-  };
-
-  const handleNavigateToSpacesConfiguration = () => {
-    navigateToApp('management', {
-      path: '/kibana/spaces',
-    });
-  };
-
-  const { selectedLanguage, setSelectedLanguage, LANGUAGE_OPTIONS } =
-    observabilityAIAssistant.useUserPreferredLanguage();
-
-  return (
-    <>
-      <EuiPanel hasBorder grow={false}>
-        <EuiForm component="form">
-          <EuiDescribedFormGroup
-            fullWidth
-            title={
-              <h3>
-                {i18n.translate(
-                  'xpack.observabilityAiAssistantManagement.settingsPage.showAIAssistantButtonLabel',
-                  {
-                    defaultMessage:
-                      'Show AI Assistant button and Contextual Insights in Observability apps',
-                  }
-                )}
-              </h3>
-            }
-            description={
-              <p>
-                {i18n.translate(
-                  'xpack.observabilityAiAssistantManagement.settingsPage.showAIAssistantDescriptionLabel',
-                  {
-                    defaultMessage:
-                      'Toggle the AI Assistant button and Contextual Insights on or off in Observability apps by checking or unchecking the AI Assistant feature in Spaces > <your space> > Features.',
-                  }
-                )}
-              </p>
-            }
-          >
-            <EuiFormRow fullWidth>
-              <div css={{ textAlign: 'right' }}>
-                <EuiButton
-                  data-test-subj="settingsTabGoToSpacesButton"
-                  onClick={handleNavigateToSpacesConfiguration}
-                >
-                  {i18n.translate(
-                    'xpack.observabilityAiAssistantManagement.settingsPage.goToFeatureControlsButtonLabel',
-                    { defaultMessage: 'Go to Spaces' }
-                  )}
-                </EuiButton>
-              </div>
-            </EuiFormRow>
-          </EuiDescribedFormGroup>
-        </EuiForm>
-      </EuiPanel>
-
-      <EuiSpacer size="l" />
-
-      <EuiPanel hasBorder grow={false}>
-        <EuiForm component="form">
-          <EuiDescribedFormGroup
-            fullWidth
-            title={
-              <h3>
-                {i18n.translate(
-                  'xpack.observabilityAiAssistantManagement.settingsPage.connectorSettingsLabel',
-                  {
-                    defaultMessage: 'Connector settings',
-                  }
-                )}
-              </h3>
-            }
-            description={i18n.translate(
-              'xpack.observabilityAiAssistantManagement.settingsPage.euiDescribedFormGroup.inOrderToUseLabel',
-              {
-                defaultMessage:
-                  'In order to use the Observability AI Assistant you must set up a Generative AI connector.',
-              }
-            )}
-          >
-            <EuiFormRow fullWidth>
-              <div css={{ textAlign: 'right' }}>
-                <EuiButton
-                  data-test-subj="settingsTabGoToConnectorsButton"
-                  onClick={handleNavigateToConnectors}
-                >
-                  {i18n.translate(
-                    'xpack.observabilityAiAssistantManagement.settingsPage.goToConnectorsButtonLabel',
-                    {
-                      defaultMessage: 'Manage connectors',
-                    }
-                  )}
-                </EuiButton>
-              </div>
-            </EuiFormRow>
-          </EuiDescribedFormGroup>
-
-          <EuiDescribedFormGroup
-            fullWidth
-            title={
-              <h3>
-                {i18n.translate(
-                  'xpack.observabilityAiAssistantManagement.settingsPage.h4.selectDefaultConnectorLabel',
-                  { defaultMessage: 'Default connector' }
-                )}
-              </h3>
-            }
-            description={i18n.translate(
-              'xpack.observabilityAiAssistantManagement.settingsPage.connectYourElasticAITextLabel',
-              {
-                defaultMessage:
-                  'Select the Generative AI connector you want to use as the default for the Observability AI Assistant.',
-              }
-            )}
-          >
-            <EuiFormRow
-              style={{ alignSelf: 'end', width: '80%' }}
-              fullWidth
-              label={i18n.translate(
-                'xpack.observabilityAiAssistantManagement.settingsPage.selectConnectorLabel',
-                {
-                  defaultMessage: 'Select connector',
-                }
-              )}
-            >
-              <EuiSelect
-                data-test-subj="settingsTabGenAIConnectorSelect"
-                id="generativeAIProvider"
-                options={selectorOptions}
-                value={selectedConnector}
-                onChange={(e) => {
-                  selectConnector(e.target.value);
-                }}
-                aria-label={i18n.translate(
-                  'xpack.observabilityAiAssistantManagement.settingsPage.euiSelect.generativeAIProviderLabel',
-                  { defaultMessage: 'Generative AI provider' }
-                )}
-              />
-            </EuiFormRow>
-          </EuiDescribedFormGroup>
-        </EuiForm>
-      </EuiPanel>
-
-      <EuiSpacer size="l" />
-
-      <EuiPanel hasBorder grow={false}>
-        <EuiForm component="form">
-          <EuiDescribedFormGroup
-            fullWidth
-            title={
-              <h3>
-                {i18n.translate(
-                  'xpack.observabilityAiAssistantManagement.settingsPage.userPreferencesLabel',
-                  {
-                    defaultMessage: 'User preferences',
-                  }
-                )}
-              </h3>
-            }
-            description={i18n.translate(
-              'xpack.observabilityAiAssistantManagement.settingsPage.selectYourLanguageLabel',
-              {
-                defaultMessage:
-                  'Select the language you wish the Assistant to use when generating responses.',
-              }
-            )}
-          >
-            <EuiFormRow
-              fullWidth
-              label={i18n.translate(
-                'xpack.observabilityAiAssistantManagement.settingsPage.selectLanguageLabel',
-                {
-                  defaultMessage: 'Response language',
-                }
-              )}
-            >
-              <EuiComboBox
-                data-test-subj="settingsTabUserPreferredLanguage"
-                singleSelection={{ asPlainText: true }}
-                isClearable={false}
-                options={LANGUAGE_OPTIONS}
-                selectedOptions={selectedLanguage ? [{ label: selectedLanguage }] : []}
-                onChange={(selected) => {
-                  setSelectedLanguage(selected[0]?.label ?? '');
-                }}
-                aria-label={i18n.translate(
-                  'xpack.observabilityAiAssistantManagement.settingsPage.userPreferences.responseLanguageLabel',
-                  { defaultMessage: 'Response language' }
-                )}
-              />
-            </EuiFormRow>
-          </EuiDescribedFormGroup>
-        </EuiForm>
-      </EuiPanel>
-    </>
-  );
-}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/get_field_definitions.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/get_field_definitions.ts
new file mode 100644
index 0000000000000..aad2cfe323d7a
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/get_field_definitions.ts
@@ -0,0 +1,88 @@
+/*
+ * 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 {
+  LANGUAGE_OPTIONS,
+  DEFAULT_LANGUAGE_OPTION,
+} from '@kbn/observability-ai-assistant-plugin/public';
+import {
+  aiAssistantLogsIndexPattern,
+  aiAssistantResponseLanguage,
+} from '@kbn/observability-ai-assistant-plugin/public';
+import { FieldDefinition } from '@kbn/management-settings-types';
+import { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
+
+export function getFieldDefinitions(
+  uiSettings: IUiSettingsClient
+): Record<string, FieldDefinition & { isSavingEnabled?: boolean }> {
+  return [
+    {
+      id: aiAssistantResponseLanguage,
+      defaultValueDisplay: DEFAULT_LANGUAGE_OPTION.label,
+      defaultValue: DEFAULT_LANGUAGE_OPTION.value,
+      displayName: i18n.translate(
+        'xpack.observabilityAiAssistantManagement.settingsPage.userPreferencesLabel',
+        {
+          defaultMessage: 'Response language',
+        }
+      ),
+      description: i18n.translate(
+        'xpack.observabilityAiAssistantManagement.settingsPage.selectYourLanguageLabel',
+        {
+          defaultMessage:
+            'Select the language you wish the Assistant to use when generating responses.',
+        }
+      ),
+      type: 'select',
+      options: {
+        values: LANGUAGE_OPTIONS.map(({ value }) => value),
+        labels: LANGUAGE_OPTIONS.reduce(
+          (acc, { value, label }) => ({ ...acc, [value]: label }),
+          {}
+        ),
+      },
+    },
+    {
+      id: aiAssistantLogsIndexPattern,
+      defaultValue: 'logs-*',
+      displayName: i18n.translate(
+        'xpack.observabilityAiAssistantManagement.settingsTab.h3.logIndexPatternLabel',
+        { defaultMessage: 'Logs index pattern' }
+      ),
+      type: 'string',
+      description: i18n.translate(
+        'xpack.observabilityAiAssistantManagement.settingsPage.logIndexPatternDescription',
+        {
+          defaultMessage:
+            'Index pattern used by the AI Assistant when querying for logs. Logs are categorised and used for root cause analysis',
+        }
+      ),
+    },
+  ].reduce((acc, field) => {
+    const savedValue = uiSettings.get<string>(field.id, field.defaultValue);
+
+    const fieldDef = {
+      // defaults
+      isCustom: false,
+      isDefaultValue: false,
+      isOverridden: false,
+      unsavedFieldId: field.id,
+      ariaAttributes: {
+        ariaLabel: field.displayName,
+      },
+      defaultValueDisplay: field.defaultValueDisplay ?? field.defaultValue,
+      ...field,
+      savedValue,
+    } as FieldDefinition;
+
+    return {
+      ...acc,
+      [field.id]: fieldDef,
+    };
+  }, {});
+}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/persisted_settings.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/persisted_settings.tsx
new file mode 100644
index 0000000000000..b662e6dc8b4ae
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/persisted_settings.tsx
@@ -0,0 +1,100 @@
+/*
+ * 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, useState } from 'react';
+import { omit, isEmpty } from 'lodash';
+import { EuiSpacer } from '@elastic/eui';
+import { withSuspense } from '@kbn/shared-ux-utility';
+import { FieldRowProvider } from '@kbn/management-settings-components-field-row';
+import { UnsavedFieldChange } from '@kbn/management-settings-types';
+import { BottomBarActions } from '@kbn/observability-shared-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { getFieldDefinitions } from './get_field_definitions';
+import { useAppContext } from '../../../hooks/use_app_context';
+
+const LazyFieldRow = React.lazy(async () => ({
+  default: (await import('@kbn/management-settings-components-field-row')).FieldRow,
+}));
+
+const FieldRow = withSuspense(LazyFieldRow);
+
+export function PersistedSettings() {
+  const { uiSettings, docLinks, notifications, settings } = useAppContext();
+  const [unsavedChanges, setUnsavedChanges] = useState<Record<string, UnsavedFieldChange>>({});
+  const [isSaving, setIsSaving] = useState(false);
+
+  async function onSave() {
+    if (!isEmpty(unsavedChanges)) {
+      try {
+        setIsSaving(true);
+        const promises = Object.entries(unsavedChanges).map(([key, { unsavedValue }]) => {
+          return settings.client.set(key, unsavedValue);
+        });
+        await Promise.all(promises);
+
+        window.location.reload();
+      } finally {
+        setIsSaving(false);
+      }
+    }
+  }
+
+  function onDiscardChanges() {
+    setUnsavedChanges({});
+  }
+
+  const fieldDefinitions = useMemo(() => getFieldDefinitions(uiSettings), [uiSettings]);
+
+  return (
+    <>
+      <EuiSpacer />
+
+      {Object.values(fieldDefinitions).map((field) => {
+        return (
+          <FieldRowProvider
+            key={field.id}
+            {...{
+              links: docLinks.links.management,
+              showDanger: (message: string) => notifications.toasts.addDanger(message),
+              validateChange: async (key: string, value: any) => {
+                return { successfulValidation: true };
+              },
+            }}
+          >
+            <FieldRow
+              field={field}
+              isSavingEnabled={field.isSavingEnabled ?? true}
+              unsavedChange={unsavedChanges[field.id]}
+              onFieldChange={(id, change) => {
+                if (!change) {
+                  setUnsavedChanges((changes) => omit(changes, id));
+                  return;
+                }
+
+                setUnsavedChanges((changes) => ({ ...changes, [id]: change }));
+              }}
+            />
+          </FieldRowProvider>
+        );
+      })}
+      {!isEmpty(unsavedChanges) && (
+        <BottomBarActions
+          isLoading={isSaving}
+          onDiscardChanges={onDiscardChanges}
+          onSave={onSave}
+          saveLabel={i18n.translate(
+            'xpack.observabilityAiAssistantManagement.persistedSettings.saveChangesLabel',
+            { defaultMessage: 'Save changes' }
+          )}
+          unsavedChangesCount={Object.keys(unsavedChanges).length}
+          appTestSubj="apm"
+          areChangesInvalid={false}
+        />
+      )}
+    </>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.test.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.test.tsx
new file mode 100644
index 0000000000000..bfe41163e6bc4
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.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 React from 'react';
+import { fireEvent, waitFor } from '@testing-library/react';
+import { render } from '../../../helpers/test_helper';
+import { useAppContext } from '../../../hooks/use_app_context';
+import { SettingsTab } from './settings_tab';
+import {
+  aiAssistantLogsIndexPattern,
+  aiAssistantResponseLanguage,
+} from '@kbn/observability-ai-assistant-plugin/server';
+
+jest.mock('../../../hooks/use_app_context');
+
+const useAppContextMock = useAppContext as jest.Mock;
+
+const navigateToAppMock = jest.fn(() => Promise.resolve());
+const settingsClientSet = jest.fn();
+
+describe('SettingsTab', () => {
+  beforeEach(() => {
+    useAppContextMock.mockReturnValue({
+      settings: {
+        client: {
+          set: settingsClientSet,
+        },
+      },
+      uiSettings: {
+        get: jest.fn(),
+      },
+      docLinks: {
+        links: {},
+      },
+      application: { navigateToApp: navigateToAppMock },
+      observabilityAIAssistant: {
+        useGenAIConnectors: () => ({
+          connectors: [
+            { name: 'openAi', id: 'openAi' },
+            { name: 'azureOpenAi', id: 'azureOpenAi' },
+            { name: 'bedrock', id: 'bedrock' },
+          ],
+        }),
+        useUserPreferredLanguage: () => ({
+          LANGUAGE_OPTIONS: [{ label: 'English' }],
+          selectedLanguage: 'English',
+          setSelectedLanguage: () => {},
+          getPreferredLanguage: () => 'English',
+        }),
+      },
+    });
+  });
+
+  it('should offer a way to configure Observability AI Assistant visibility in apps', () => {
+    const { getByTestId } = render(<SettingsTab />);
+
+    fireEvent.click(getByTestId('settingsTabGoToSpacesButton'));
+
+    expect(navigateToAppMock).toBeCalledWith('management', { path: '/kibana/spaces' });
+  });
+
+  it('should offer a way to configure Gen AI connectors', () => {
+    const { getByTestId } = render(<SettingsTab />);
+
+    fireEvent.click(getByTestId('settingsTabGoToConnectorsButton'));
+
+    expect(navigateToAppMock).toBeCalledWith('management', {
+      path: '/insightsAndAlerting/triggersActionsConnectors/connectors',
+    });
+  });
+
+  describe('allows updating the AI Assistant settings', () => {
+    const windowLocationReloadMock = jest.fn();
+    const windowLocationOriginal = window.location;
+
+    beforeEach(async () => {
+      Object.defineProperty(window, 'location', {
+        value: {
+          reload: windowLocationReloadMock,
+        },
+        writable: true,
+      });
+
+      const { getByTestId, container } = render(<SettingsTab />);
+
+      await waitFor(() => expect(container.querySelector('.euiLoadingSpinner')).toBeNull());
+
+      fireEvent.input(getByTestId(`management-settings-editField-${aiAssistantLogsIndexPattern}`), {
+        target: { value: 'observability-ai-assistant-*' },
+      });
+
+      fireEvent.change(
+        getByTestId(`management-settings-editField-${aiAssistantResponseLanguage}`),
+        {
+          target: { value: 'da' },
+        }
+      );
+
+      fireEvent.click(getByTestId('apmBottomBarActionsButton'));
+
+      await waitFor(() => expect(windowLocationReloadMock).toHaveBeenCalledTimes(1));
+    });
+
+    afterEach(() => {
+      window.location = windowLocationOriginal;
+    });
+
+    it('calls the settings client with correct args', async () => {
+      expect(settingsClientSet).toBeCalledWith(
+        aiAssistantLogsIndexPattern,
+        'observability-ai-assistant-*'
+      );
+      expect(settingsClientSet).toBeCalledWith(aiAssistantResponseLanguage, 'da');
+    });
+  });
+});
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.tsx
new file mode 100644
index 0000000000000..2745b5a82bb42
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.tsx
@@ -0,0 +1,109 @@
+/*
+ * 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 { EuiButton, EuiDescribedFormGroup, EuiFormRow, EuiPanel } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { useAppContext } from '../../../hooks/use_app_context';
+import { PersistedSettings } from './persisted_settings';
+
+export function SettingsTab() {
+  const {
+    application: { navigateToApp },
+  } = useAppContext();
+
+  const handleNavigateToConnectors = () => {
+    navigateToApp('management', {
+      path: '/insightsAndAlerting/triggersActionsConnectors/connectors',
+    });
+  };
+
+  const handleNavigateToSpacesConfiguration = () => {
+    navigateToApp('management', {
+      path: '/kibana/spaces',
+    });
+  };
+
+  return (
+    <EuiPanel hasBorder grow={false}>
+      <EuiDescribedFormGroup
+        fullWidth
+        title={
+          <h3>
+            {i18n.translate(
+              'xpack.observabilityAiAssistantManagement.settingsPage.showAIAssistantButtonLabel',
+              {
+                defaultMessage:
+                  'Show AI Assistant button and Contextual Insights in Observability apps',
+              }
+            )}
+          </h3>
+        }
+        description={
+          <p>
+            {i18n.translate(
+              'xpack.observabilityAiAssistantManagement.settingsPage.showAIAssistantDescriptionLabel',
+              {
+                defaultMessage:
+                  'Toggle the AI Assistant button and Contextual Insights on or off in Observability apps by checking or unchecking the AI Assistant feature in Spaces > <your space> > Features.',
+              }
+            )}
+          </p>
+        }
+      >
+        <EuiFormRow fullWidth>
+          <EuiButton
+            data-test-subj="settingsTabGoToSpacesButton"
+            onClick={handleNavigateToSpacesConfiguration}
+          >
+            {i18n.translate(
+              'xpack.observabilityAiAssistantManagement.settingsPage.goToFeatureControlsButtonLabel',
+              { defaultMessage: 'Go to Spaces' }
+            )}
+          </EuiButton>
+        </EuiFormRow>
+      </EuiDescribedFormGroup>
+
+      <EuiDescribedFormGroup
+        fullWidth
+        title={
+          <h3>
+            {i18n.translate(
+              'xpack.observabilityAiAssistantManagement.settingsPage.connectorSettingsLabel',
+              {
+                defaultMessage: 'Connector settings',
+              }
+            )}
+          </h3>
+        }
+        description={i18n.translate(
+          'xpack.observabilityAiAssistantManagement.settingsPage.euiDescribedFormGroup.inOrderToUseLabel',
+          {
+            defaultMessage:
+              'In order to use the Observability AI Assistant you must set up a Generative AI connector.',
+          }
+        )}
+      >
+        <EuiFormRow fullWidth>
+          <EuiButton
+            data-test-subj="settingsTabGoToConnectorsButton"
+            onClick={handleNavigateToConnectors}
+          >
+            {i18n.translate(
+              'xpack.observabilityAiAssistantManagement.settingsPage.goToConnectorsButtonLabel',
+              {
+                defaultMessage: 'Manage connectors',
+              }
+            )}
+          </EuiButton>
+        </EuiFormRow>
+      </EuiDescribedFormGroup>
+
+      <PersistedSettings />
+    </EuiPanel>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json b/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json
index 4e83f07086a89..b437a3f50d422 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json
@@ -16,7 +16,12 @@
     "@kbn/observability-ai-assistant-plugin",
     "@kbn/serverless",
     "@kbn/translations-plugin",
-    "@kbn/enterprise-search-plugin"
+    "@kbn/enterprise-search-plugin",
+    "@kbn/management-settings-types",
+    "@kbn/core-ui-settings-browser",
+    "@kbn/shared-ux-utility",
+    "@kbn/management-settings-components-field-row",
+    "@kbn/observability-shared-plugin"
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/plugins/observability_solution/observability_shared/public/hooks/use_editable_settings.tsx b/x-pack/plugins/observability_solution/observability_shared/public/hooks/use_editable_settings.tsx
index caf6658b7413a..c5bf376b8b26c 100644
--- a/x-pack/plugins/observability_solution/observability_shared/public/hooks/use_editable_settings.tsx
+++ b/x-pack/plugins/observability_solution/observability_shared/public/hooks/use_editable_settings.tsx
@@ -16,7 +16,6 @@ import type {
   UnsavedFieldChange,
 } from '@kbn/management-settings-types';
 import { normalizeSettings } from '@kbn/management-settings-utilities';
-import { ObservabilityApp } from '../../typings/common';
 
 function getSettingsFields({
   settingsKeys,
@@ -46,7 +45,7 @@ function getSettingsFields({
   return fields;
 }
 
-export function useEditableSettings(app: ObservabilityApp, settingsKeys: string[]) {
+export function useEditableSettings(settingsKeys: string[]) {
   const {
     services: { settings },
   } = useKibana();
diff --git a/x-pack/plugins/observability_solution/profiling/public/views/settings/index.tsx b/x-pack/plugins/observability_solution/profiling/public/views/settings/index.tsx
index 56f6ca99e91c3..a5656c4451aed 100644
--- a/x-pack/plugins/observability_solution/profiling/public/views/settings/index.tsx
+++ b/x-pack/plugins/observability_solution/profiling/public/views/settings/index.tsx
@@ -64,7 +64,7 @@ export function Settings() {
   } = useProfilingDependencies();
 
   const { fields, handleFieldChange, unsavedChanges, saveAll, isSaving, cleanUnsavedChanges } =
-    useEditableSettings('profiling', [...co2Settings, ...costSettings, ...miscSettings]);
+    useEditableSettings([...co2Settings, ...costSettings, ...miscSettings]);
 
   async function handleSave() {
     try {

From 8f11146f2977e36c66617cbd2914e4669718b3fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 2 Apr 2024 15:59:41 +0200
Subject: [PATCH 24/63] [Part of #176153] Rendering FTR core plugin (#179757)

---
 test/plugin_functional/test_suites/core_plugins/rendering.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
index 29552079a1083..ca06f8a6a731d 100644
--- a/test/plugin_functional/test_suites/core_plugins/rendering.ts
+++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -18,7 +18,7 @@ declare global {
      * We use this global variable to track page history changes to ensure that
      * navigation is done without causing a full page reload.
      */
-    __RENDERING_SESSION__: string[];
+    __RENDERING_SESSION__?: string[];
   }
 }
 
@@ -39,11 +39,10 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
     await appsMenu.clickLink(title);
     return browser.execute(() => {
       if (!('__RENDERING_SESSION__' in window)) {
-        // @ts-expect-error upgrade typescript v4.9.5
         window.__RENDERING_SESSION__ = [];
       }
 
-      window.__RENDERING_SESSION__.push(window.location.pathname);
+      window.__RENDERING_SESSION__!.push(window.location.pathname);
     });
   };
 

From 507f09d0b69a99f03f0c0cb19f10f1ea8584cd47 Mon Sep 17 00:00:00 2001
From: Hannah Mudge <Heenawter@users.noreply.github.com>
Date: Tue, 2 Apr 2024 08:10:53 -0600
Subject: [PATCH 25/63] [Dashboard] [Controls] Fix bug with drilldowns when
 source dashboard has no controls (#179485)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

## Summary

We were previously only calling `setSavedState` for the control group on
dashboard navigation **when the control group was defined in the loaded
dashboard** - however, if either the source or destination dashboard had
zero controls, this caused problems on navigation:
- If the source dashboard had at least one control and the destination
dashboard had zero, the destination dashboard's control group
`lastSavedInput` would **not** get set in `navigateToDashboard` since it
is undefined - i.e. the `lastSavedInput` on the destination dashboard's
control group would **still be equal to** the `lastSavedInput` of the
source dashboard's control group after navigation. Therefore, hitting
"reset" would replace the destination dashboard's empty control group
with the source's control group.
- If the source dashboard had zero controls and the destination
dashboard had at least one, the first step in navigation would work as
expected - the `lastSavedInput` of the destination dashboard would be
set appropriately. However, upon hitting the browser back button and
triggering `navigateToDashboard` a second time, the source dashboard's
control group's `lastSavedInput` would **not** get set properly (since
it is undefined) and would therefore still be equal to the
`lastSavedInput` of the destination dashboard. Therefore, hitting
"reset" would replace the source's empty control group with the
destination dashboard's controls.

This fixes the above scenarios by calling `setSavedState` on the control
group **even if** the last saved control group state is undefined.

### Race Condition Fix

In my testing for this, I discovered **another** bug caused by a race
condition where, on dashboard navigation, the subscription to the
control group's `initialize$` subject was firing with the **wrong**
input, so the `lastSavedFilters` would be calculated incorrectly. This
caused the dashboard to get stuck in an unsaved changes state, like so:



https://github.com/elastic/kibana/assets/8698078/14c553a9-21b3-40d0-96ac-0282e9e66911



I fixed this by removing this subscription (it was messy anyway 🙈) and
replaced this logic with individual calls to
`calculateFiltersFromSelections` - this should be easier to follow, and
we ensure that we are **always** doing this calculation with the
expected input. Since we aren't `awaiting` these calculations, it also
shouldn't slow down the control group's initialization (which was the
original reason for using a subscription).


### Checklist


- [x] This was checked for [cross-browser
compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
- [x] Flaky test runner -
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5583
<br/>

![image](https://github.com/elastic/kibana/assets/8698078/cd8ce150-6104-4395-b70c-7309185cc04d)


### 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)
---
 .../embeddable/control_group_container.tsx    | 43 ++++++-------------
 .../embeddable/dashboard_container.tsx        |  6 +--
 2 files changed, 16 insertions(+), 33 deletions(-)

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 4d1ecc6458ce0..26ddd1c3e0769 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
@@ -12,7 +12,7 @@ import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
 import { batch, Provider, TypedUseSelectorHook, useSelector } from 'react-redux';
 import { BehaviorSubject, merge, Subject, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, filter, first, skip } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, skip } from 'rxjs/operators';
 
 import { OverlayRef } from '@kbn/core/public';
 import { Container, EmbeddableFactory } from '@kbn/embeddable-plugin/public';
@@ -173,6 +173,13 @@ export class ControlGroupContainer extends Container<
       this.setupSubscriptions();
       const { filters, timeslice } = this.recalculateFilters();
       this.publishFilters({ filters, timeslice });
+
+      this.calculateFiltersFromSelections(initialComponentState?.lastSavedInput?.panels ?? {}).then(
+        (filterOutput) => {
+          this.dispatch.setLastSavedFilters(filterOutput);
+        }
+      );
+
       this.initialized$.next(true);
     });
 
@@ -206,29 +213,6 @@ export class ControlGroupContainer extends Container<
   };
 
   private setupSubscriptions = () => {
-    /**
-     * on initialization, in order for comparison to be performed, calculate the last saved filters based on the
-     * selections from the last saved input and save them to component state. This is done as a subscription so that
-     * it can be done async without actually slowing down the loading of the controls.
-     */
-    this.subscriptions.add(
-      this.initialized$
-        .pipe(
-          filter((isInitialized) => isInitialized),
-          first()
-        )
-        .subscribe(async () => {
-          const {
-            componentState: { lastSavedInput },
-            explicitInput: { panels },
-          } = this.getState();
-          const filterOutput = await this.calculateFiltersFromSelections(
-            lastSavedInput?.panels ?? panels
-          );
-          this.dispatch.setLastSavedFilters(filterOutput);
-        })
-    );
-
     /**
      * refresh control order cache and make all panels refreshInputFromParent whenever panel orders change
      */
@@ -289,11 +273,12 @@ export class ControlGroupContainer extends Container<
     );
   };
 
-  public setSavedState(lastSavedInput: PersistableControlGroupInput): void {
-    batch(() => {
-      this.dispatch.setLastSavedInput(lastSavedInput);
-      const { filters, timeslice } = this.getState().output;
-      this.dispatch.setLastSavedFilters({ filters, timeslice });
+  public setSavedState(lastSavedInput: PersistableControlGroupInput | undefined): void {
+    this.calculateFiltersFromSelections(lastSavedInput?.panels ?? {}).then((filterOutput) => {
+      batch(() => {
+        this.dispatch.setLastSavedInput(lastSavedInput);
+        this.dispatch.setLastSavedFilters(filterOutput);
+      });
     });
   }
 
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 90b4fb3094274..1a8e10f3999e0 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
@@ -600,10 +600,8 @@ export class DashboardContainer
         omit(loadDashboardReturn?.dashboardInput, 'controlGroupInput')
       );
       this.dispatch.setManaged(loadDashboardReturn?.managed);
-      if (this.controlGroup && loadDashboardReturn?.dashboardInput.controlGroupInput) {
-        this.controlGroup.dispatch.setLastSavedInput(
-          loadDashboardReturn?.dashboardInput.controlGroupInput
-        );
+      if (this.controlGroup) {
+        this.controlGroup.setSavedState(loadDashboardReturn.dashboardInput?.controlGroupInput);
       }
       this.dispatch.setAnimatePanelTransforms(false); // prevents panels from animating on navigate.
       this.dispatch.setLastSavedId(newSavedObjectId);

From 961df454f1ca5878da6c9eb8e2307b6c67bdd17c Mon Sep 17 00:00:00 2001
From: Alexi Doak <109488926+doakalexi@users.noreply.github.com>
Date: Tue, 2 Apr 2024 07:15:14 -0700
Subject: [PATCH 26/63] Onboard APM Anomaly rule type with FAAD (#179196)

towards: https://github.com/elastic/kibana/issues/169867

This PR onboards APM Anomaly rule type with FAAD.

I am having trouble getting this rule to create an alert. If there is
any easy way to verify pls let me know!
---
 .../register_anomaly_rule_type.test.ts        |  56 +-
 .../anomaly/register_anomaly_rule_type.ts     | 572 +++++++++---------
 2 files changed, 335 insertions(+), 293 deletions(-)

diff --git a/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts
index ec77562c1b07e..8867f7cd2db4c 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts
@@ -39,7 +39,7 @@ describe('Transaction duration anomaly alert', () => {
         services.scopedClusterClient.asCurrentUser.search
       ).not.toHaveBeenCalled();
 
-      expect(services.alertFactory.create).not.toHaveBeenCalled();
+      expect(services.alertsClient.report).not.toHaveBeenCalled();
     });
 
     it('ml jobs are not available', async () => {
@@ -69,7 +69,7 @@ describe('Transaction duration anomaly alert', () => {
         services.scopedClusterClient.asCurrentUser.search
       ).not.toHaveBeenCalled();
 
-      expect(services.alertFactory.create).not.toHaveBeenCalled();
+      expect(services.alertsClient.report).not.toHaveBeenCalled();
     });
 
     it('anomaly is less than threshold', async () => {
@@ -135,7 +135,7 @@ describe('Transaction duration anomaly alert', () => {
       expect(
         services.scopedClusterClient.asCurrentUser.search
       ).not.toHaveBeenCalled();
-      expect(services.alertFactory.create).not.toHaveBeenCalled();
+      expect(services.alertsClient.report).not.toHaveBeenCalled();
     });
   });
 
@@ -154,8 +154,9 @@ describe('Transaction duration anomaly alert', () => {
         ] as unknown as ApmMlJob[])
       );
 
-      const { services, dependencies, executor, scheduleActions } =
-        createRuleTypeMocks();
+      const { services, dependencies, executor } = createRuleTypeMocks();
+
+      services.alertsClient.report.mockReturnValue({ uuid: 'test-uuid' });
 
       const ml = {
         mlSystemProvider: () => ({
@@ -221,23 +222,38 @@ describe('Transaction duration anomaly alert', () => {
 
       await executor({ params });
 
-      expect(services.alertFactory.create).toHaveBeenCalledTimes(1);
+      expect(services.alertsClient.report).toHaveBeenCalledTimes(1);
 
-      expect(services.alertFactory.create).toHaveBeenCalledWith(
-        'apm.anomaly_foo_development_type-foo'
-      );
+      expect(services.alertsClient.report).toHaveBeenCalledWith({
+        actionGroup: 'threshold_met',
+        id: 'apm.anomaly_foo_development_type-foo',
+      });
 
-      expect(scheduleActions).toHaveBeenCalledWith('threshold_met', {
-        serviceName: 'foo',
-        transactionType: 'type-foo',
-        environment: 'development',
-        threshold: 'minor',
-        triggerValue: 'critical',
-        reason:
-          'critical latency anomaly with a score of 80, was detected in the last 5 mins for foo.',
-        viewInAppUrl:
-          'http://localhost:5601/eyr/app/apm/services/foo?transactionType=type-foo&environment=development',
-        alertDetailsUrl: 'mockedAlertsLocator > getLocation',
+      expect(services.alertsClient.setAlertData).toHaveBeenCalledWith({
+        context: {
+          alertDetailsUrl: 'mockedAlertsLocator > getLocation',
+          environment: 'development',
+          reason:
+            'critical latency anomaly with a score of 80, was detected in the last 5 mins for foo.',
+          serviceName: 'foo',
+          threshold: 'minor',
+          transactionType: 'type-foo',
+          triggerValue: 'critical',
+          viewInAppUrl:
+            'http://localhost:5601/eyr/app/apm/services/foo?transactionType=type-foo&environment=development',
+        },
+        id: 'apm.anomaly_foo_development_type-foo',
+        payload: {
+          'kibana.alert.evaluation.threshold': 25,
+          'kibana.alert.evaluation.value': 80,
+          'kibana.alert.reason':
+            'critical latency anomaly with a score of 80, was detected in the last 5 mins for foo.',
+          'kibana.alert.severity': 'critical',
+          'processor.event': 'transaction',
+          'service.environment': 'development',
+          'service.name': 'foo',
+          'transaction.type': 'type-foo',
+        },
       });
     });
   });
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts
index 3165a72fbe134..e8dd969cdb30b 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts
@@ -6,7 +6,16 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { GetViewInAppRelativeUrlFnOpts } from '@kbn/alerting-plugin/server';
+import {
+  GetViewInAppRelativeUrlFnOpts,
+  ActionGroupIdsOf,
+  AlertInstanceContext as AlertContext,
+  AlertInstanceState as AlertState,
+  RuleTypeState,
+  RuleExecutorOptions,
+  AlertsClientError,
+  IRuleTypeAlerts,
+} from '@kbn/alerting-plugin/server';
 import { KibanaRequest, DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
 import datemath from '@kbn/datemath';
 import type { ESSearchResponse } from '@kbn/es-types';
@@ -23,7 +32,7 @@ import {
   ALERT_SEVERITY,
   ApmRuleType,
 } from '@kbn/rule-data-utils';
-import { createLifecycleRuleTypeFactory } from '@kbn/rule-registry-plugin/server';
+import { ObservabilityApmAlert } from '@kbn/alerts-as-data-utils';
 import { addSpaceIdToPath } from '@kbn/spaces-plugin/common';
 import { asyncForEach } from '@kbn/std';
 import { compact } from 'lodash';
@@ -43,6 +52,7 @@ import {
   APM_SERVER_FEATURE_ID,
   formatAnomalyReason,
   RULE_TYPES_CONFIG,
+  THRESHOLD_MET_GROUP,
 } from '../../../../../common/rules/apm_rule_types';
 import { asMutableArray } from '../../../../../common/utils/as_mutable_array';
 import { getAlertUrlTransaction } from '../../../../../common/utils/formatters';
@@ -53,7 +63,10 @@ import {
   RegisterRuleDependencies,
 } from '../../register_apm_rule_types';
 import { getServiceGroupFieldsForAnomaly } from './get_service_group_fields_for_anomaly';
-import { anomalyParamsSchema } from '../../../../../common/rules/schema';
+import {
+  anomalyParamsSchema,
+  ApmRuleParamsType,
+} from '../../../../../common/rules/schema';
 import {
   getAnomalyDetectorIndex,
   getAnomalyDetectorType,
@@ -61,6 +74,13 @@ import {
 
 const ruleTypeConfig = RULE_TYPES_CONFIG[ApmRuleType.Anomaly];
 
+type AnomalyRuleTypeParams = ApmRuleParamsType[ApmRuleType.Anomaly];
+type AnomalyActionGroups = ActionGroupIdsOf<typeof THRESHOLD_MET_GROUP>;
+type AnomalyRuleTypeState = RuleTypeState;
+type AnomalyAlertState = AlertState;
+type AnomalyAlertContext = AlertContext;
+type AnomalyAlert = ObservabilityApmAlert;
+
 export function registerAnomalyRuleType({
   alerting,
   alertsLocator,
@@ -70,296 +90,302 @@ export function registerAnomalyRuleType({
   ml,
   ruleDataClient,
 }: RegisterRuleDependencies) {
-  const createLifecycleRuleType = createLifecycleRuleTypeFactory({
-    logger,
-    ruleDataClient,
-  });
+  if (!alerting) {
+    throw new Error(
+      'Cannot register anomaly rule type. The alerting plugin needs to be enabled.'
+    );
+  }
 
-  alerting.registerType(
-    createLifecycleRuleType({
-      id: ApmRuleType.Anomaly,
-      name: ruleTypeConfig.name,
-      actionGroups: ruleTypeConfig.actionGroups,
-      defaultActionGroupId: ruleTypeConfig.defaultActionGroupId,
-      validate: { params: anomalyParamsSchema },
-      schemas: {
-        params: {
-          type: 'config-schema',
-          schema: anomalyParamsSchema,
-        },
-      },
-      actionVariables: {
-        context: [
-          apmActionVariables.alertDetailsUrl,
-          apmActionVariables.environment,
-          apmActionVariables.reason,
-          apmActionVariables.serviceName,
-          apmActionVariables.threshold,
-          apmActionVariables.transactionType,
-          apmActionVariables.triggerValue,
-          apmActionVariables.viewInAppUrl,
-        ],
+  alerting.registerType({
+    id: ApmRuleType.Anomaly,
+    name: ruleTypeConfig.name,
+    actionGroups: ruleTypeConfig.actionGroups,
+    defaultActionGroupId: ruleTypeConfig.defaultActionGroupId,
+    validate: { params: anomalyParamsSchema },
+    schemas: {
+      params: {
+        type: 'config-schema',
+        schema: anomalyParamsSchema,
       },
-      category: DEFAULT_APP_CATEGORIES.observability.id,
-      producer: APM_SERVER_FEATURE_ID,
-      minimumLicenseRequired: 'basic',
-      isExportable: true,
-      executor: async ({
-        params,
-        services,
-        spaceId,
-        startedAt,
-        getTimeRange,
-      }) => {
-        if (!ml) {
-          return { state: {} };
-        }
+    },
+    actionVariables: {
+      context: [
+        apmActionVariables.alertDetailsUrl,
+        apmActionVariables.environment,
+        apmActionVariables.reason,
+        apmActionVariables.serviceName,
+        apmActionVariables.threshold,
+        apmActionVariables.transactionType,
+        apmActionVariables.triggerValue,
+        apmActionVariables.viewInAppUrl,
+      ],
+    },
+    category: DEFAULT_APP_CATEGORIES.observability.id,
+    producer: APM_SERVER_FEATURE_ID,
+    minimumLicenseRequired: 'basic',
+    isExportable: true,
+    executor: async (
+      options: RuleExecutorOptions<
+        AnomalyRuleTypeParams,
+        AnomalyRuleTypeState,
+        AnomalyAlertState,
+        AnomalyAlertContext,
+        AnomalyActionGroups,
+        AnomalyAlert
+      >
+    ) => {
+      if (!ml) {
+        return { state: {} };
+      }
 
-        const {
-          getAlertUuid,
-          getAlertStartedDate,
-          savedObjectsClient,
-          scopedClusterClient,
-        } = services;
+      const { params, services, spaceId, startedAt, getTimeRange } = options;
+      const { alertsClient, savedObjectsClient, scopedClusterClient } =
+        services;
+      if (!alertsClient) {
+        throw new AlertsClientError();
+      }
 
-        const apmIndices = await getApmIndices(savedObjectsClient);
+      const apmIndices = await getApmIndices(savedObjectsClient);
 
-        const ruleParams = params;
-        const request = {} as KibanaRequest;
-        const { mlAnomalySearch } = ml.mlSystemProvider(
-          request,
-          savedObjectsClient
-        );
-        const anomalyDetectors = ml.anomalyDetectorsProvider(
-          request,
-          savedObjectsClient
-        );
+      const ruleParams = params;
+      const request = {} as KibanaRequest;
+      const { mlAnomalySearch } = ml.mlSystemProvider(
+        request,
+        savedObjectsClient
+      );
+      const anomalyDetectors = ml.anomalyDetectorsProvider(
+        request,
+        savedObjectsClient
+      );
 
-        const mlJobs = await getMLJobs(
-          anomalyDetectors,
-          ruleParams.environment
-        );
+      const mlJobs = await getMLJobs(anomalyDetectors, ruleParams.environment);
+
+      const selectedOption = ANOMALY_ALERT_SEVERITY_TYPES.find(
+        (option) => option.type === ruleParams.anomalySeverityType
+      );
 
-        const selectedOption = ANOMALY_ALERT_SEVERITY_TYPES.find(
-          (option) => option.type === ruleParams.anomalySeverityType
+      if (!selectedOption) {
+        throw new Error(
+          `Anomaly alert severity type ${ruleParams.anomalySeverityType} is not supported.`
         );
+      }
 
-        if (!selectedOption) {
-          throw new Error(
-            `Anomaly alert severity type ${ruleParams.anomalySeverityType} is not supported.`
-          );
-        }
-
-        const threshold = selectedOption.threshold;
-
-        if (mlJobs.length === 0) {
-          return { state: {} };
-        }
-
-        // Lookback window must be at least 30m to support rules created before this change where default was 15m
-        const minimumWindow = '30m';
-        const requestedWindow = `${ruleParams.windowSize}${ruleParams.windowUnit}`;
-
-        const window =
-          datemath.parse(`now-${minimumWindow}`)!.valueOf() <
-          datemath.parse(`now-${requestedWindow}`)!.valueOf()
-            ? minimumWindow
-            : requestedWindow;
-
-        const { dateStart } = getTimeRange(window);
-
-        const jobIds = mlJobs.map((job) => job.jobId);
-        const anomalySearchParams = {
-          body: {
-            track_total_hits: false,
-            size: 0,
-            query: {
-              bool: {
-                filter: [
-                  { term: { result_type: 'record' } },
-                  { terms: { job_id: jobIds } },
-                  { term: { is_interim: false } },
-                  {
-                    range: {
-                      timestamp: {
-                        gte: dateStart,
-                      },
+      const threshold = selectedOption.threshold;
+
+      if (mlJobs.length === 0) {
+        return { state: {} };
+      }
+
+      // Lookback window must be at least 30m to support rules created before this change where default was 15m
+      const minimumWindow = '30m';
+      const requestedWindow = `${ruleParams.windowSize}${ruleParams.windowUnit}`;
+
+      const window =
+        datemath.parse(`now-${minimumWindow}`)!.valueOf() <
+        datemath.parse(`now-${requestedWindow}`)!.valueOf()
+          ? minimumWindow
+          : requestedWindow;
+
+      const { dateStart } = getTimeRange(window);
+
+      const jobIds = mlJobs.map((job) => job.jobId);
+      const anomalySearchParams = {
+        body: {
+          track_total_hits: false,
+          size: 0,
+          query: {
+            bool: {
+              filter: [
+                { term: { result_type: 'record' } },
+                { terms: { job_id: jobIds } },
+                { term: { is_interim: false } },
+                {
+                  range: {
+                    timestamp: {
+                      gte: dateStart,
                     },
                   },
-                  ...termQuery(
-                    'partition_field_value',
-                    ruleParams.serviceName,
-                    { queryEmptyString: false }
-                  ),
-                  ...termQuery('by_field_value', ruleParams.transactionType, {
-                    queryEmptyString: false,
-                  }),
-                  ...termsQuery(
-                    'detector_index',
-                    ...(ruleParams.anomalyDetectorTypes?.map((type) =>
-                      getAnomalyDetectorIndex(type)
-                    ) ?? [])
-                  ),
-                ] as QueryDslQueryContainer[],
-              },
-            },
-            aggs: {
-              anomaly_groups: {
-                multi_terms: {
-                  terms: [
-                    { field: 'partition_field_value' },
-                    { field: 'by_field_value' },
-                    { field: 'job_id' },
-                    { field: 'detector_index' },
-                  ],
-                  size: 1000,
-                  order: { 'latest_score.record_score': 'desc' as const },
                 },
-                aggs: {
-                  latest_score: {
-                    top_metrics: {
-                      metrics: asMutableArray([
-                        { field: 'record_score' },
-                        { field: 'partition_field_value' },
-                        { field: 'by_field_value' },
-                        { field: 'job_id' },
-                        { field: 'timestamp' },
-                        { field: 'bucket_span' },
-                        { field: 'detector_index' },
-                      ] as const),
-                      sort: {
-                        timestamp: 'desc' as const,
-                      },
+                ...termQuery('partition_field_value', ruleParams.serviceName, {
+                  queryEmptyString: false,
+                }),
+                ...termQuery('by_field_value', ruleParams.transactionType, {
+                  queryEmptyString: false,
+                }),
+                ...termsQuery(
+                  'detector_index',
+                  ...(ruleParams.anomalyDetectorTypes?.map((type) =>
+                    getAnomalyDetectorIndex(type)
+                  ) ?? [])
+                ),
+              ] as QueryDslQueryContainer[],
+            },
+          },
+          aggs: {
+            anomaly_groups: {
+              multi_terms: {
+                terms: [
+                  { field: 'partition_field_value' },
+                  { field: 'by_field_value' },
+                  { field: 'job_id' },
+                  { field: 'detector_index' },
+                ],
+                size: 1000,
+                order: { 'latest_score.record_score': 'desc' as const },
+              },
+              aggs: {
+                latest_score: {
+                  top_metrics: {
+                    metrics: asMutableArray([
+                      { field: 'record_score' },
+                      { field: 'partition_field_value' },
+                      { field: 'by_field_value' },
+                      { field: 'job_id' },
+                      { field: 'timestamp' },
+                      { field: 'bucket_span' },
+                      { field: 'detector_index' },
+                    ] as const),
+                    sort: {
+                      timestamp: 'desc' as const,
                     },
                   },
                 },
               },
             },
           },
+        },
+      };
+
+      const response: ESSearchResponse<unknown, typeof anomalySearchParams> =
+        (await mlAnomalySearch(anomalySearchParams, [])) as any;
+
+      const anomalies =
+        response.aggregations?.anomaly_groups.buckets
+          .map((bucket) => {
+            const latest = bucket.latest_score.top[0].metrics;
+
+            const job = mlJobs.find((j) => j.jobId === latest.job_id);
+
+            if (!job) {
+              logger.warn(
+                `Could not find matching job for job id ${latest.job_id}`
+              );
+              return undefined;
+            }
+
+            return {
+              serviceName: latest.partition_field_value as string,
+              transactionType: latest.by_field_value as string,
+              environment: job.environment,
+              score: latest.record_score as number,
+              detectorType: getAnomalyDetectorType(
+                latest.detector_index as number
+              ),
+              timestamp: Date.parse(latest.timestamp as string),
+              bucketSpan: latest.bucket_span as number,
+              bucketKey: bucket.key,
+            };
+          })
+          .filter((anomaly) =>
+            anomaly ? anomaly.score >= threshold : false
+          ) ?? [];
+
+      await asyncForEach(compact(anomalies), async (anomaly) => {
+        const {
+          serviceName,
+          environment,
+          transactionType,
+          score,
+          detectorType,
+          timestamp,
+          bucketSpan,
+          bucketKey,
+        } = anomaly;
+
+        const eventSourceFields = await getServiceGroupFieldsForAnomaly({
+          apmIndices,
+          scopedClusterClient,
+          savedObjectsClient,
+          serviceName,
+          environment,
+          transactionType,
+          timestamp,
+          bucketSpan,
+        });
+
+        const severityLevel = getSeverity(score);
+        const reasonMessage = formatAnomalyReason({
+          anomalyScore: score,
+          serviceName,
+          severityLevel,
+          windowSize: params.windowSize,
+          windowUnit: params.windowUnit,
+          detectorType,
+        });
+
+        const alertId = bucketKey.join('_');
+
+        const { uuid, start } = alertsClient.report({
+          id: alertId,
+          actionGroup: ruleTypeConfig.defaultActionGroupId,
+        });
+        const indexedStartedAt = start ?? startedAt.toISOString();
+
+        const relativeViewInAppUrl = getAlertUrlTransaction(
+          serviceName,
+          getEnvironmentEsField(environment)?.[SERVICE_ENVIRONMENT],
+          transactionType
+        );
+        const viewInAppUrl = addSpaceIdToPath(
+          basePath.publicBaseUrl,
+          spaceId,
+          relativeViewInAppUrl
+        );
+        const alertDetailsUrl = await getAlertUrl(
+          uuid,
+          spaceId,
+          indexedStartedAt,
+          alertsLocator,
+          basePath.publicBaseUrl
+        );
+
+        const payload = {
+          [SERVICE_NAME]: serviceName,
+          ...getEnvironmentEsField(environment),
+          [TRANSACTION_TYPE]: transactionType,
+          [PROCESSOR_EVENT]: ProcessorEvent.transaction,
+          [ALERT_SEVERITY]: severityLevel,
+          [ALERT_EVALUATION_VALUE]: score,
+          [ALERT_EVALUATION_THRESHOLD]: threshold,
+          [ALERT_REASON]: reasonMessage,
+          ...eventSourceFields,
         };
 
-        const response: ESSearchResponse<unknown, typeof anomalySearchParams> =
-          (await mlAnomalySearch(anomalySearchParams, [])) as any;
-
-        const anomalies =
-          response.aggregations?.anomaly_groups.buckets
-            .map((bucket) => {
-              const latest = bucket.latest_score.top[0].metrics;
-
-              const job = mlJobs.find((j) => j.jobId === latest.job_id);
-
-              if (!job) {
-                logger.warn(
-                  `Could not find matching job for job id ${latest.job_id}`
-                );
-                return undefined;
-              }
-
-              return {
-                serviceName: latest.partition_field_value as string,
-                transactionType: latest.by_field_value as string,
-                environment: job.environment,
-                score: latest.record_score as number,
-                detectorType: getAnomalyDetectorType(
-                  latest.detector_index as number
-                ),
-                timestamp: Date.parse(latest.timestamp as string),
-                bucketSpan: latest.bucket_span as number,
-                bucketKey: bucket.key,
-              };
-            })
-            .filter((anomaly) =>
-              anomaly ? anomaly.score >= threshold : false
-            ) ?? [];
-
-        await asyncForEach(compact(anomalies), async (anomaly) => {
-          const {
-            serviceName,
-            environment,
-            transactionType,
-            score,
-            detectorType,
-            timestamp,
-            bucketSpan,
-            bucketKey,
-          } = anomaly;
-
-          const eventSourceFields = await getServiceGroupFieldsForAnomaly({
-            apmIndices,
-            scopedClusterClient,
-            savedObjectsClient,
-            serviceName,
-            environment,
-            transactionType,
-            timestamp,
-            bucketSpan,
-          });
-
-          const severityLevel = getSeverity(score);
-          const reasonMessage = formatAnomalyReason({
-            anomalyScore: score,
-            serviceName,
-            severityLevel,
-            windowSize: params.windowSize,
-            windowUnit: params.windowUnit,
-            detectorType,
-          });
-
-          const alertId = bucketKey.join('_');
-
-          const alert = services.alertWithLifecycle({
-            id: alertId,
-            fields: {
-              [SERVICE_NAME]: serviceName,
-              ...getEnvironmentEsField(environment),
-              [TRANSACTION_TYPE]: transactionType,
-              [PROCESSOR_EVENT]: ProcessorEvent.transaction,
-              [ALERT_SEVERITY]: severityLevel,
-              [ALERT_EVALUATION_VALUE]: score,
-              [ALERT_EVALUATION_THRESHOLD]: threshold,
-              [ALERT_REASON]: reasonMessage,
-              ...eventSourceFields,
-            },
-          });
-
-          const relativeViewInAppUrl = getAlertUrlTransaction(
-            serviceName,
-            getEnvironmentEsField(environment)?.[SERVICE_ENVIRONMENT],
-            transactionType
-          );
-          const viewInAppUrl = addSpaceIdToPath(
-            basePath.publicBaseUrl,
-            spaceId,
-            relativeViewInAppUrl
-          );
-          const indexedStartedAt =
-            getAlertStartedDate(alertId) ?? startedAt.toISOString();
-          const alertUuid = getAlertUuid(alertId);
-          const alertDetailsUrl = await getAlertUrl(
-            alertUuid,
-            spaceId,
-            indexedStartedAt,
-            alertsLocator,
-            basePath.publicBaseUrl
-          );
-
-          alert.scheduleActions(ruleTypeConfig.defaultActionGroupId, {
-            alertDetailsUrl,
-            environment: getEnvironmentLabel(environment),
-            reason: reasonMessage,
-            serviceName,
-            threshold: selectedOption?.label,
-            transactionType,
-            triggerValue: severityLevel,
-            viewInAppUrl,
-          });
+        const context = {
+          alertDetailsUrl,
+          environment: getEnvironmentLabel(environment),
+          reason: reasonMessage,
+          serviceName,
+          threshold: selectedOption?.label,
+          transactionType,
+          triggerValue: severityLevel,
+          viewInAppUrl,
+        };
+
+        alertsClient.setAlertData({
+          id: alertId,
+          payload,
+          context,
         });
+      });
 
-        return { state: {} };
-      },
-      alerts: ApmRuleTypeAlertDefinition,
-      getViewInAppRelativeUrl: ({ rule }: GetViewInAppRelativeUrlFnOpts<{}>) =>
-        observabilityPaths.ruleDetails(rule.id),
-    })
-  );
+      return { state: {} };
+    },
+    alerts: {
+      ...ApmRuleTypeAlertDefinition,
+      shouldWrite: true,
+    } as IRuleTypeAlerts<AnomalyAlert>,
+    getViewInAppRelativeUrl: ({ rule }: GetViewInAppRelativeUrlFnOpts<{}>) =>
+      observabilityPaths.ruleDetails(rule.id),
+  });
 }

From 6ecbe53736919419b87635cfc603e7cbaeb1a3f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gerg=C5=91=20=C3=81brah=C3=A1m?= <gergo.abraham@elastic.co>
Date: Tue, 2 Apr 2024 17:00:33 +0200
Subject: [PATCH 27/63] [EDR Workflows] Add possibility to disable malware
 filescan on write (#179176)

## Summary

- adds new field to Package Policy: `on_write_scan` for `malware`
protections for every OS
- adds new switch to Malware card to enable/disable this feature, but
this is hidden behind FF called `malwareOnWriteScanOptionAvailable`
- adds hint in order to indicate to the user, that disabling on-write
scan is only effective on Agent versions 8.13 and older
- adds new migration to backfill this property with default `true`
values, as it has been always enabled on previous agents. note: after
migration, policies are not re-deployed, so Endpoint must assume that
on-write scan is enabled when property is missing

<img width="400" alt="image"
src="https://github.com/elastic/kibana/assets/39014407/0616f48b-4eed-4acb-bff4-ef358250ab88">

<img width="400" alt="image"
src="https://github.com/elastic/kibana/assets/39014407/659fa72e-3245-4d2f-97e9-46563b8c0427">

<img width="400" alt="image"
src="https://github.com/elastic/kibana/assets/39014407/f32463ab-a30c-4537-8abd-675db408542f">

<img width="400" alt="image"
src="https://github.com/elastic/kibana/assets/39014407/277a35f6-489c-4b02-8311-6f2a45ec51b6">

<img width="400" alt="image"
src="https://github.com/elastic/kibana/assets/39014407/9df007ac-2889-4d84-8d4b-e10fc9b63acd">

<img width="400" alt="image"
src="https://github.com/elastic/kibana/assets/39014407/3857850f-6f34-4d58-b13d-5652776f8e0f">


### 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)
- [ ]
[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
- [x] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [x] 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))
- [x] This renders correctly on smaller devices using a responsive
layout. (You can test this [in your
browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 .../check_registered_types.test.ts            |   2 +-
 .../fleet/server/saved_objects/index.ts       |   9 ++
 .../migrations/security_solution/index.ts     |   1 +
 .../security_solution/to_v8_14_0.test.ts      | 137 ++++++++++++++++
 .../security_solution/to_v8_14_0.ts           |  37 +++++
 x-pack/plugins/fleet/tsconfig.json            |   1 +
 .../common/endpoint/models/policy_config.ts   |   3 +
 .../models/policy_config_helpers.test.ts      |   6 +-
 .../endpoint/models/policy_config_helpers.ts  |   6 +-
 .../common/endpoint/types/index.ts            |  10 +-
 .../common/experimental_features.ts           |   5 +
 .../policy/store/policy_details/index.test.ts |  10 +-
 .../cards/malware_protections_card.test.tsx   | 121 +++++++++-----
 .../cards/malware_protections_card.tsx        | 152 ++++++++++++++----
 .../policy/view/policy_settings_form/mocks.ts |  21 ++-
 .../policy_settings_layout.test.tsx           |  16 +-
 16 files changed, 429 insertions(+), 108 deletions(-)
 create mode 100644 x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_14_0.test.ts
 create mode 100644 x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_14_0.ts

diff --git a/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts b/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
index fbc0d5b2ef269..097a85aea54df 100644
--- a/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
+++ b/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
@@ -109,7 +109,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "ingest-agent-policies": "7633e578f60c074f8267bc50ec4763845e431437",
         "ingest-download-sources": "279a68147e62e4d8858c09ad1cf03bd5551ce58d",
         "ingest-outputs": "daafff49255ab700e07491376fe89f04fc998b91",
-        "ingest-package-policies": "f4c2767e852b700a8b82678925b86bac08958b43",
+        "ingest-package-policies": "8a99e165aab00c6c365540427a3abeb7bea03f31",
         "ingest_manager_settings": "91445219e7115ff0c45d1dabd5d614a80b421797",
         "inventory-view": "b8683c8e352a286b4aca1ab21003115a4800af83",
         "kql-telemetry": "93c1d16c1a0dfca9c8842062cf5ef8f62ae401ad",
diff --git a/x-pack/plugins/fleet/server/saved_objects/index.ts b/x-pack/plugins/fleet/server/saved_objects/index.ts
index 0e44db492b2c1..80665f381e871 100644
--- a/x-pack/plugins/fleet/server/saved_objects/index.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/index.ts
@@ -73,6 +73,7 @@ import {
 } from './migrations/to_v8_6_0';
 import {
   migratePackagePolicyToV8100,
+  migratePackagePolicyToV8140,
   migratePackagePolicyToV870,
 } from './migrations/security_solution';
 import { migratePackagePolicyToV880 } from './migrations/to_v8_8_0';
@@ -473,6 +474,14 @@ export const getSavedObjectTypes = (): { [key: string]: SavedObjectsType } => ({
           },
         ],
       },
+      '6': {
+        changes: [
+          {
+            type: 'data_backfill',
+            backfillFn: migratePackagePolicyToV8140,
+          },
+        ],
+      },
     },
     migrations: {
       '7.10.0': migratePackagePolicyToV7100,
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/index.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/index.ts
index 8248c181405e5..cd37ed56b5b58 100644
--- a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/index.ts
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/index.ts
@@ -19,3 +19,4 @@ export { migratePackagePolicyToV860 } from './to_v8_6_0';
 export { migratePackagePolicyToV870 } from './to_v8_7_0';
 export { migratePackagePolicyToV880 } from './to_v8_8_0';
 export { migratePackagePolicyToV8100 } from './to_v8_10_0';
+export { migratePackagePolicyToV8140 } from './to_v8_14_0';
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_14_0.test.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_14_0.test.ts
new file mode 100644
index 0000000000000..e724c039179dc
--- /dev/null
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_14_0.test.ts
@@ -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 {
+  createModelVersionTestMigrator,
+  type ModelVersionTestMigrator,
+} from '@kbn/core-test-helpers-model-versions';
+
+import { cloneDeep } from 'lodash';
+
+import type { SavedObject } from '@kbn/core-saved-objects-server';
+
+import type { PackagePolicy } from '../../../../common';
+import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../common';
+import { getSavedObjectTypes } from '../..';
+
+const policyDoc: SavedObject<PackagePolicy> = {
+  id: 'mock-saved-object-id',
+  attributes: {
+    name: 'Some Policy Name',
+    package: {
+      name: 'endpoint',
+      title: '',
+      version: '',
+    },
+    id: 'endpoint',
+    policy_id: '',
+    enabled: true,
+    namespace: '',
+    revision: 0,
+    updated_at: '',
+    updated_by: '',
+    created_at: '',
+    created_by: '',
+    inputs: [
+      {
+        type: 'endpoint',
+        enabled: true,
+        streams: [],
+        config: {
+          policy: {
+            value: {
+              windows: {
+                malware: {
+                  mode: 'detect',
+                  blocklist: true,
+                },
+              },
+              mac: {
+                malware: {
+                  mode: 'detect',
+                  blocklist: true,
+                },
+              },
+              linux: {
+                malware: {
+                  mode: 'detect',
+                  blocklist: true,
+                },
+              },
+            },
+          },
+        },
+      },
+    ],
+  },
+  type: PACKAGE_POLICY_SAVED_OBJECT_TYPE,
+  references: [],
+};
+
+describe('8.14.0 Endpoint Package Policy migration', () => {
+  let migrator: ModelVersionTestMigrator;
+
+  beforeEach(() => {
+    migrator = createModelVersionTestMigrator({
+      type: getSavedObjectTypes()[PACKAGE_POLICY_SAVED_OBJECT_TYPE],
+    });
+  });
+
+  it('should backfill `on_write_scan` field to malware protections on Kibana update', () => {
+    const originalPolicyConfigSO = cloneDeep(policyDoc);
+
+    const migratedPolicyConfigSO = migrator.migrate<PackagePolicy, PackagePolicy>({
+      document: originalPolicyConfigSO,
+      fromVersion: 5,
+      toVersion: 6,
+    });
+
+    const migratedPolicyConfig = migratedPolicyConfigSO.attributes.inputs[0].config?.policy.value;
+    expect(migratedPolicyConfig.windows.malware.on_write_scan).toBe(true);
+    expect(migratedPolicyConfig.mac.malware.on_write_scan).toBe(true);
+    expect(migratedPolicyConfig.linux.malware.on_write_scan).toBe(true);
+  });
+
+  it('should not backfill `on_write_scan` field if already present due to user edit before migration is performed on serverless', () => {
+    const originalPolicyConfigSO = cloneDeep(policyDoc);
+    const originalPolicyConfig = originalPolicyConfigSO.attributes.inputs[0].config?.policy.value;
+    originalPolicyConfig.windows.malware.on_write_scan = false;
+    originalPolicyConfig.mac.malware.on_write_scan = true;
+    originalPolicyConfig.linux.malware.on_write_scan = false;
+
+    const migratedPolicyConfigSO = migrator.migrate<PackagePolicy, PackagePolicy>({
+      document: originalPolicyConfigSO,
+      fromVersion: 5,
+      toVersion: 6,
+    });
+
+    const migratedPolicyConfig = migratedPolicyConfigSO.attributes.inputs[0].config?.policy.value;
+    expect(migratedPolicyConfig.windows.malware.on_write_scan).toBe(false);
+    expect(migratedPolicyConfig.mac.malware.on_write_scan).toBe(true);
+    expect(migratedPolicyConfig.linux.malware.on_write_scan).toBe(false);
+  });
+
+  // no reason for removing `on_write_scan` for a lower version Kibana - the field will just sit silently in the package config
+  it('should not strip `on_write_scan` in regards of forward compatibility', () => {
+    const originalPolicyConfigSO = cloneDeep(policyDoc);
+    const originalPolicyConfig = originalPolicyConfigSO.attributes.inputs[0].config?.policy.value;
+    originalPolicyConfig.windows.malware.on_write_scan = false;
+    originalPolicyConfig.mac.malware.on_write_scan = true;
+    originalPolicyConfig.linux.malware.on_write_scan = false;
+
+    const migratedPolicyConfigSO = migrator.migrate<PackagePolicy, PackagePolicy>({
+      document: originalPolicyConfigSO,
+      fromVersion: 6,
+      toVersion: 5,
+    });
+
+    const migratedPolicyConfig = migratedPolicyConfigSO.attributes.inputs[0].config?.policy.value;
+    expect(migratedPolicyConfig.windows.malware.on_write_scan).toBe(false);
+    expect(migratedPolicyConfig.mac.malware.on_write_scan).toBe(true);
+    expect(migratedPolicyConfig.linux.malware.on_write_scan).toBe(false);
+  });
+});
diff --git a/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_14_0.ts b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_14_0.ts
new file mode 100644
index 0000000000000..cc97dafe72180
--- /dev/null
+++ b/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution/to_v8_14_0.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 type { SavedObjectUnsanitizedDoc } from '@kbn/core/server';
+
+import type { SavedObjectModelDataBackfillFn } from '@kbn/core-saved-objects-server';
+
+import type { PackagePolicy } from '../../../../common';
+
+const ON_WRITE_SCAN_DEFAULT_VALUE = true;
+
+export const migratePackagePolicyToV8140: SavedObjectModelDataBackfillFn<
+  PackagePolicy,
+  PackagePolicy
+> = (packagePolicyDoc) => {
+  if (packagePolicyDoc.attributes.package?.name !== 'endpoint') {
+    return { attributes: packagePolicyDoc.attributes };
+  }
+
+  const updatedPackagePolicyDoc: SavedObjectUnsanitizedDoc<PackagePolicy> = packagePolicyDoc;
+
+  const input = updatedPackagePolicyDoc.attributes.inputs[0];
+
+  if (input && input.config) {
+    const policy = input.config.policy.value;
+
+    policy.windows.malware.on_write_scan ??= ON_WRITE_SCAN_DEFAULT_VALUE;
+    policy.mac.malware.on_write_scan ??= ON_WRITE_SCAN_DEFAULT_VALUE;
+    policy.linux.malware.on_write_scan ??= ON_WRITE_SCAN_DEFAULT_VALUE;
+  }
+
+  return { attributes: updatedPackagePolicyDoc.attributes };
+};
diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json
index 5b16316d9baaa..b99fb0cce0985 100644
--- a/x-pack/plugins/fleet/tsconfig.json
+++ b/x-pack/plugins/fleet/tsconfig.json
@@ -104,5 +104,6 @@
     "@kbn/config",
     "@kbn/core-http-server-mocks",
     "@kbn/code-editor",
+    "@kbn/core-test-helpers-model-versions",
   ]
 }
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 91585c9b16fa1..779a309e03d32 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
@@ -43,6 +43,7 @@ export const policyFactory = (
       malware: {
         mode: ProtectionModes.prevent,
         blocklist: true,
+        on_write_scan: true,
       },
       ransomware: {
         mode: ProtectionModes.prevent,
@@ -96,6 +97,7 @@ export const policyFactory = (
       malware: {
         mode: ProtectionModes.prevent,
         blocklist: true,
+        on_write_scan: true,
       },
       behavior_protection: {
         mode: ProtectionModes.prevent,
@@ -138,6 +140,7 @@ export const policyFactory = (
       malware: {
         mode: ProtectionModes.prevent,
         blocklist: true,
+        on_write_scan: true,
       },
       behavior_protection: {
         mode: ProtectionModes.prevent,
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 8e1c4e087c827..662c47f9c8999 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
@@ -212,7 +212,7 @@ export const eventsOnlyPolicy = (): PolicyConfig => ({
       registry: true,
       security: true,
     },
-    malware: { mode: ProtectionModes.off, blocklist: false },
+    malware: { mode: ProtectionModes.off, blocklist: false, on_write_scan: false },
     ransomware: { mode: ProtectionModes.off, supported: true },
     memory_protection: { mode: ProtectionModes.off, supported: true },
     behavior_protection: { mode: ProtectionModes.off, supported: true, reputation_service: false },
@@ -228,7 +228,7 @@ export const eventsOnlyPolicy = (): PolicyConfig => ({
   },
   mac: {
     events: { process: true, file: true, network: true },
-    malware: { mode: ProtectionModes.off, blocklist: false },
+    malware: { mode: ProtectionModes.off, blocklist: false, on_write_scan: false },
     behavior_protection: { mode: ProtectionModes.off, supported: true, reputation_service: false },
     memory_protection: { mode: ProtectionModes.off, supported: true },
     popup: {
@@ -249,7 +249,7 @@ export const eventsOnlyPolicy = (): PolicyConfig => ({
       session_data: false,
       tty_io: false,
     },
-    malware: { mode: ProtectionModes.off, blocklist: false },
+    malware: { mode: ProtectionModes.off, blocklist: false, on_write_scan: false },
     behavior_protection: { mode: ProtectionModes.off, supported: true, reputation_service: false },
     memory_protection: { mode: ProtectionModes.off, supported: true },
     popup: {
diff --git a/x-pack/plugins/security_solution/common/endpoint/models/policy_config_helpers.ts b/x-pack/plugins/security_solution/common/endpoint/models/policy_config_helpers.ts
index 472fcfdfd825a..c6ffc43928bd6 100644
--- a/x-pack/plugins/security_solution/common/endpoint/models/policy_config_helpers.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/models/policy_config_helpers.ts
@@ -103,7 +103,10 @@ const disableCommonProtections = (policy: PolicyConfig) => {
   }, policy);
 };
 
-const getDisabledCommonProtectionsForOS = (policy: PolicyConfig, os: PolicyOperatingSystem) => ({
+const getDisabledCommonProtectionsForOS = (
+  policy: PolicyConfig,
+  os: PolicyOperatingSystem
+): Partial<PolicyConfig['windows']> => ({
   behavior_protection: {
     ...policy[os].behavior_protection,
     mode: ProtectionModes.off,
@@ -115,6 +118,7 @@ const getDisabledCommonProtectionsForOS = (policy: PolicyConfig, os: PolicyOpera
   malware: {
     ...policy[os].malware,
     blocklist: false,
+    on_write_scan: false,
     mode: ProtectionModes.off,
   },
 });
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 f525c03ce17f7..68867e92d7294 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -973,7 +973,7 @@ export interface PolicyConfig {
       registry: boolean;
       security: boolean;
     };
-    malware: ProtectionFields & BlocklistFields;
+    malware: ProtectionFields & BlocklistFields & OnWriteScanFields;
     memory_protection: ProtectionFields & SupportedFields;
     behavior_protection: BehaviorProtectionFields & SupportedFields;
     ransomware: ProtectionFields & SupportedFields;
@@ -1014,7 +1014,7 @@ export interface PolicyConfig {
       process: boolean;
       network: boolean;
     };
-    malware: ProtectionFields & BlocklistFields;
+    malware: ProtectionFields & BlocklistFields & OnWriteScanFields;
     behavior_protection: BehaviorProtectionFields & SupportedFields;
     memory_protection: ProtectionFields & SupportedFields;
     popup: {
@@ -1044,7 +1044,7 @@ export interface PolicyConfig {
       session_data: boolean;
       tty_io: boolean;
     };
-    malware: ProtectionFields & BlocklistFields;
+    malware: ProtectionFields & BlocklistFields & OnWriteScanFields;
     behavior_protection: BehaviorProtectionFields & SupportedFields;
     memory_protection: ProtectionFields & SupportedFields;
     popup: {
@@ -1120,6 +1120,10 @@ export interface BlocklistFields {
   blocklist: boolean;
 }
 
+export interface OnWriteScanFields {
+  on_write_scan?: boolean;
+}
+
 /** Policy protection mode options */
 export enum ProtectionModes {
   detect = 'detect',
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
index a6eba0197b490..72ea5b723758c 100644
--- a/x-pack/plugins/security_solution/common/experimental_features.ts
+++ b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -228,6 +228,11 @@ export const allowedExperimentalValues = Object.freeze({
    * Expires: on Apr 23, 2024
    */
   perFieldPrebuiltRulesDiffingEnabled: true,
+
+  /**
+   * Makes Elastic Defend integration's Malware On-Write Scan option available to edit.
+   */
+  malwareOnWriteScanOptionAvailable: false,
 });
 
 type ExperimentalConfigKeys = Array<keyof ExperimentalFeatures>;
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 1c7a8e0b18a61..d93b2aa6a1e39 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
@@ -12,7 +12,7 @@ import type { PolicyDetailsAction } from '.';
 import { policyDetailsReducer, policyDetailsMiddlewareFactory } from '.';
 import { policyConfig } from './selectors';
 import { policyFactory } from '../../../../../../common/endpoint/models/policy_config';
-import type { PolicyData } from '../../../../../../common/endpoint/types';
+import type { PolicyConfig, PolicyData } from '../../../../../../common/endpoint/types';
 import type { MiddlewareActionSpyHelper } from '../../../../../common/store/test_utils';
 import { createSpyMiddleware } from '../../../../../common/store/test_utils';
 import type { AppContextTestRender } from '../../../../../common/mock/endpoint';
@@ -289,7 +289,7 @@ describe('policy details: ', () => {
                       registry: true,
                       security: true,
                     },
-                    malware: { mode: 'prevent', blocklist: true },
+                    malware: { mode: 'prevent', blocklist: true, on_write_scan: true },
                     memory_protection: { mode: 'off', supported: false },
                     behavior_protection: {
                       mode: 'off',
@@ -327,7 +327,7 @@ describe('policy details: ', () => {
                   },
                   mac: {
                     events: { process: true, file: true, network: true },
-                    malware: { mode: 'prevent', blocklist: true },
+                    malware: { mode: 'prevent', blocklist: true, on_write_scan: true },
                     behavior_protection: {
                       mode: 'off',
                       supported: false,
@@ -363,7 +363,7 @@ describe('policy details: ', () => {
                       tty_io: false,
                     },
                     logging: { file: 'info' },
-                    malware: { mode: 'prevent', blocklist: true },
+                    malware: { mode: 'prevent', blocklist: true, on_write_scan: true },
                     behavior_protection: {
                       mode: 'off',
                       supported: false,
@@ -388,7 +388,7 @@ describe('policy details: ', () => {
                       capture_env_vars: 'LD_PRELOAD,LD_LIBRARY_PATH',
                     },
                   },
-                },
+                } as PolicyConfig,
               },
             },
           },
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/cards/malware_protections_card.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/cards/malware_protections_card.test.tsx
index f300622231c05..516b5dc835644 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/cards/malware_protections_card.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/cards/malware_protections_card.test.tsx
@@ -17,6 +17,7 @@ import { FleetPackagePolicyGenerator } from '../../../../../../../../common/endp
 import React from 'react';
 import type { MalwareProtectionsProps } from './malware_protections_card';
 import { MalwareProtectionsCard } from './malware_protections_card';
+import type { PolicyConfig } from '../../../../../../../../common/endpoint/types';
 import { ProtectionModes } from '../../../../../../../../common/endpoint/types';
 import { cloneDeep, set } from 'lodash';
 import userEvent from '@testing-library/user-event';
@@ -27,11 +28,12 @@ describe('Policy Malware Protections Card', () => {
   const testSubj = getPolicySettingsFormTestSubjects('test').malware;
 
   let formProps: MalwareProtectionsProps;
-  let render: () => ReturnType<AppContextTestRender['render']>;
+  let render: (policyConfig?: PolicyConfig) => ReturnType<AppContextTestRender['render']>;
   let renderResult: ReturnType<typeof render>;
 
   beforeEach(() => {
     const mockedContext = createAppRootMockRenderer();
+    mockedContext.setExperimentalFlag({ malwareOnWriteScanOptionAvailable: true });
 
     formProps = {
       policy: new FleetPackagePolicyGenerator('seed').generateEndpointPackagePolicy().inputs[0]
@@ -41,7 +43,10 @@ describe('Policy Malware Protections Card', () => {
       'data-test-subj': testSubj.card,
     };
 
-    render = () => (renderResult = mockedContext.render(<MalwareProtectionsCard {...formProps} />));
+    render = (policyConfig = formProps.policy) =>
+      (renderResult = mockedContext.render(
+        <MalwareProtectionsCard {...formProps} policy={policyConfig} />
+      ));
   });
 
   it('should render the card with expected components', () => {
@@ -60,48 +65,72 @@ describe('Policy Malware Protections Card', () => {
     );
   });
 
-  it('should set Blocklist to disabled if malware is turned off', () => {
-    const expectedUpdatedPolicy = cloneDeep(formProps.policy);
-    setMalwareMode(expectedUpdatedPolicy, true);
-    render();
-    userEvent.click(renderResult.getByTestId(testSubj.enableDisableSwitch));
-
-    expect(formProps.onChange).toHaveBeenCalledWith({
-      isValid: true,
-      updatedPolicy: expectedUpdatedPolicy,
-    });
-  });
-
-  it('should allow blocklist to be disabled', () => {
-    const expectedUpdatedPolicy = cloneDeep(formProps.policy);
-    set(expectedUpdatedPolicy, 'windows.malware.blocklist', false);
-    set(expectedUpdatedPolicy, 'mac.malware.blocklist', false);
-    set(expectedUpdatedPolicy, 'linux.malware.blocklist', false);
-    render();
-    userEvent.click(renderResult.getByTestId(testSubj.blocklistEnableDisableSwitch));
-
-    expect(formProps.onChange).toHaveBeenCalledWith({
-      isValid: true,
-      updatedPolicy: expectedUpdatedPolicy,
-    });
-  });
-
-  it('should allow blocklist to be enabled', () => {
-    set(formProps.policy, 'windows.malware.blocklist', false);
-    set(formProps.policy, 'mac.malware.blocklist', false);
-    set(formProps.policy, 'linux.malware.blocklist', false);
-    const expectedUpdatedPolicy = cloneDeep(formProps.policy);
-    set(expectedUpdatedPolicy, 'windows.malware.blocklist', true);
-    set(expectedUpdatedPolicy, 'mac.malware.blocklist', true);
-    set(expectedUpdatedPolicy, 'linux.malware.blocklist', true);
-    render();
-    userEvent.click(renderResult.getByTestId(testSubj.blocklistEnableDisableSwitch));
-
-    expect(formProps.onChange).toHaveBeenCalledWith({
-      isValid: true,
-      updatedPolicy: expectedUpdatedPolicy,
-    });
-  });
+  describe.each`
+    name             | config             | default
+    ${'blocklist'}   | ${'blocklist'}     | ${true}
+    ${'onWriteScan'} | ${'on_write_scan'} | ${true}
+  `(
+    '$name subfeature',
+    (feature: { name: 'blocklist' | 'onWriteScan'; config: string; deafult: boolean }) => {
+      it(`should set ${feature.name} to disabled  if malware is turned off`, () => {
+        const expectedUpdatedPolicy = cloneDeep(formProps.policy);
+        setMalwareMode(expectedUpdatedPolicy, true);
+        render();
+        userEvent.click(renderResult.getByTestId(testSubj.enableDisableSwitch));
+
+        expect(formProps.onChange).toHaveBeenCalledWith({
+          isValid: true,
+          updatedPolicy: expectedUpdatedPolicy,
+        });
+      });
+
+      it(`should set ${feature.name} to enabled if malware is turned on`, () => {
+        const expectedUpdatedPolicy = cloneDeep(formProps.policy);
+        setMalwareMode(expectedUpdatedPolicy);
+        const initialPolicy = cloneDeep(formProps.policy);
+        setMalwareMode(initialPolicy, true);
+        render(initialPolicy);
+
+        userEvent.click(renderResult.getByTestId(testSubj.enableDisableSwitch));
+
+        expect(formProps.onChange).toHaveBeenCalledWith({
+          isValid: true,
+          updatedPolicy: expectedUpdatedPolicy,
+        });
+      });
+
+      it(`should allow ${feature.name} to be disabled`, () => {
+        const expectedUpdatedPolicy = cloneDeep(formProps.policy);
+        set(expectedUpdatedPolicy, `windows.malware.${feature.config}`, false);
+        set(expectedUpdatedPolicy, `mac.malware.${feature.config}`, false);
+        set(expectedUpdatedPolicy, `linux.malware.${feature.config}`, false);
+        render();
+        userEvent.click(renderResult.getByTestId(testSubj[`${feature.name}EnableDisableSwitch`]));
+
+        expect(formProps.onChange).toHaveBeenCalledWith({
+          isValid: true,
+          updatedPolicy: expectedUpdatedPolicy,
+        });
+      });
+
+      it(`should allow ${feature.name} to be enabled`, () => {
+        set(formProps.policy, `windows.malware.${feature.config}`, false);
+        set(formProps.policy, `mac.malware.${feature.config}`, false);
+        set(formProps.policy, `linux.malware.${feature.config}`, false);
+        const expectedUpdatedPolicy = cloneDeep(formProps.policy);
+        set(expectedUpdatedPolicy, `windows.malware.${feature.config}`, true);
+        set(expectedUpdatedPolicy, `mac.malware.${feature.config}`, true);
+        set(expectedUpdatedPolicy, `linux.malware.${feature.config}`, true);
+        render();
+        userEvent.click(renderResult.getByTestId(testSubj[`${feature.name}EnableDisableSwitch`]));
+
+        expect(formProps.onChange).toHaveBeenCalledWith({
+          isValid: true,
+          updatedPolicy: expectedUpdatedPolicy,
+        });
+      });
+    }
+  );
 
   describe('and displayed in View mode', () => {
     beforeEach(() => {
@@ -124,6 +153,8 @@ describe('Policy Malware Protections Card', () => {
             'Prevent' +
             'Blocklist enabled' +
             'Info' +
+            'Scan files upon modification' +
+            'Info' +
             'User notification' +
             'Agent version 7.11+' +
             'Notify user' +
@@ -168,6 +199,8 @@ describe('Policy Malware Protections Card', () => {
             'Prevent' +
             'Blocklist enabled' +
             'Info' +
+            'Scan files upon modification' +
+            'Info' +
             'User notification' +
             'Agent version 7.11+' +
             'Notify user'
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/cards/malware_protections_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/cards/malware_protections_card.tsx
index 0e5bec1d110c2..3b0f01e1b8d2d 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/cards/malware_protections_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/components/cards/malware_protections_card.tsx
@@ -7,10 +7,10 @@
 
 import React, { memo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiSpacer, EuiSwitch, EuiFlexGroup, EuiFlexItem, EuiIconTip } from '@elastic/eui';
 import { OperatingSystem } from '@kbn/securitysolution-utils';
 import { cloneDeep } from 'lodash';
+import { useIsExperimentalFeatureEnabled } from '../../../../../../../common/hooks/use_experimental_features';
 import { useGetProtectionsUnavailableComponent } from '../../hooks/use_get_protections_unavailable_component';
 import { NotifyUserOption } from '../notify_user_option';
 import { SettingCard } from '../setting_card';
@@ -26,29 +26,83 @@ import { ProtectionSettingCardSwitch } from '../protection_setting_card_switch';
 import { DetectPreventProtectionLevel } from '../detect_prevent_protection_level';
 import { useTestIdGenerator } from '../../../../../../hooks/use_test_id_generator';
 
-const BLOCKLIST_ENABLED_LABEL = i18n.translate(
-  'xpack.securitySolution.endpoint.policy.protections.blocklistEnabled',
-  {
+const BLOCKLIST_LABELS = {
+  enabled: i18n.translate('xpack.securitySolution.endpoint.policy.protections.blocklistEnabled', {
     defaultMessage: 'Blocklist enabled',
+  }),
+  disabled: i18n.translate('xpack.securitySolution.endpoint.policy.protections.blocklistDisabled', {
+    defaultMessage: 'Blocklist disabled',
+  }),
+  hint: i18n.translate('xpack.securitySolution.endpoint.policyDetailsConfig.blocklistTooltip', {
+    defaultMessage:
+      'Enables or disables the blocklist associated with this policy. The blocklist is a collection hashes, paths, or signers which extends the list of processes the endpoint considers malicious. See the blocklist tab for entry details.',
+  }),
+};
+
+const ON_WRITE_SCAN_LABELS = {
+  enabled: i18n.translate('xpack.securitySolution.endpoint.policy.protections.onWriteScanEnabled', {
+    defaultMessage: 'Scan files upon modification',
+  }),
+  disabled: i18n.translate(
+    'xpack.securitySolution.endpoint.policy.protections.onWriteScanDisabled',
+    {
+      defaultMessage: 'Files are not scanned upon modification',
+    }
+  ),
+  hint: i18n.translate('xpack.securitySolution.endpoint.policyDetailsConfig.onWriteScanTooltip', {
+    defaultMessage:
+      "Enables or disables scanning files when they're modified. Disabling this feature improves Endpoint performance.",
+  }),
+  versionCompatibilityHint: i18n.translate(
+    'xpack.securitySolution.endpoint.policy.protections.onWriteVersionCompatibilityHint',
+    {
+      defaultMessage: 'Always enabled on Agent versions 8.13 and older.',
+    }
+  ),
+};
+
+type AdjustSubfeatureOnProtectionSwitch = NonNullable<
+  ProtectionSettingCardSwitchProps['additionalOnSwitchChange']
+>;
+
+// NOTE: it mutates `policyConfigData` passed on input
+const adjustBlocklistSettingsOnProtectionSwitch: AdjustSubfeatureOnProtectionSwitch = ({
+  value,
+  policyConfigData,
+  protectionOsList,
+}) => {
+  for (const os of protectionOsList) {
+    policyConfigData[os].malware.blocklist = value;
   }
-);
 
-const BLOCKLIST_DISABLED_LABEL = i18n.translate(
-  'xpack.securitySolution.endpoint.policy.protections.blocklistDisabled',
-  {
-    defaultMessage: 'Blocklist disabled',
+  return policyConfigData;
+};
+
+const adjustOnWriteSettingsOnProtectionSwitch: AdjustSubfeatureOnProtectionSwitch = ({
+  value,
+  policyConfigData,
+  protectionOsList,
+}) => {
+  for (const os of protectionOsList) {
+    policyConfigData[os].malware.on_write_scan = value;
   }
-);
 
-// NOTE: it mutates `policyConfigData` passed on input
-const adjustBlocklistSettingsOnProtectionSwitch: ProtectionSettingCardSwitchProps['additionalOnSwitchChange'] =
-  ({ value, policyConfigData, protectionOsList }) => {
-    for (const os of protectionOsList) {
-      policyConfigData[os].malware.blocklist = value;
-    }
+  return policyConfigData;
+};
 
-    return policyConfigData;
-  };
+const adjustAllSubfeaturesOnProtectionSwitch: AdjustSubfeatureOnProtectionSwitch = ({
+  policyConfigData,
+  ...rest
+}) => {
+  const modifiedPolicy = adjustBlocklistSettingsOnProtectionSwitch({
+    policyConfigData,
+    ...rest,
+  });
+  return adjustOnWriteSettingsOnProtectionSwitch({
+    policyConfigData: modifiedPolicy,
+    ...rest,
+  });
+};
 
 const MALWARE_OS_VALUES: Immutable<MalwareProtectionOSes[]> = [
   PolicyOperatingSystem.windows,
@@ -64,6 +118,9 @@ export type MalwareProtectionsProps = PolicyFormComponentCommonProps;
  */
 export const MalwareProtectionsCard = React.memo<MalwareProtectionsProps>(
   ({ policy, onChange, mode = 'edit', 'data-test-subj': dataTestSubj }) => {
+    const isMalwareOnwriteScanOptionAvailable = useIsExperimentalFeatureEnabled(
+      'malwareOnWriteScanOptionAvailable'
+    );
     const getTestId = useTestIdGenerator(dataTestSubj);
     const isProtectionsAllowed = !useGetProtectionsUnavailableComponent();
     const protection = 'malware';
@@ -95,7 +152,7 @@ export const MalwareProtectionsCard = React.memo<MalwareProtectionsProps>(
             protection={protection}
             protectionLabel={protectionLabel}
             osList={MALWARE_OS_VALUES}
-            additionalOnSwitchChange={adjustBlocklistSettingsOnProtectionSwitch}
+            additionalOnSwitchChange={adjustAllSubfeaturesOnProtectionSwitch}
             policy={policy}
             onChange={onChange}
             mode={mode}
@@ -113,13 +170,31 @@ export const MalwareProtectionsCard = React.memo<MalwareProtectionsProps>(
         />
         <EuiSpacer size="m" />
 
-        <EnableDisableBlocklist
+        <SubfeatureSwitch
           policy={policy}
           onChange={onChange}
           mode={mode}
           data-test-subj={getTestId('blocklist')}
+          labels={BLOCKLIST_LABELS}
+          checked={policy.windows.malware.blocklist}
+          adjustSubfeatureOnProtectionSwitch={adjustBlocklistSettingsOnProtectionSwitch}
         />
 
+        {isMalwareOnwriteScanOptionAvailable && (
+          <>
+            <EuiSpacer size="m" />
+            <SubfeatureSwitch
+              policy={policy}
+              onChange={onChange}
+              mode={mode}
+              data-test-subj={getTestId('onWriteScan')}
+              labels={ON_WRITE_SCAN_LABELS}
+              checked={policy.windows.malware.on_write_scan ?? true}
+              adjustSubfeatureOnProtectionSwitch={adjustOnWriteSettingsOnProtectionSwitch}
+            />
+          </>
+        )}
+
         <NotifyUserOption
           policy={policy}
           onChange={onChange}
@@ -136,22 +211,34 @@ export const MalwareProtectionsCard = React.memo<MalwareProtectionsProps>(
 
 MalwareProtectionsCard.displayName = 'MalwareProtectionsCard';
 
-type EnableDisableBlocklistProps = PolicyFormComponentCommonProps;
+type SubfeatureSwitchProps = PolicyFormComponentCommonProps & {
+  labels: { enabled: string; disabled: string; versionCompatibilityHint?: string; hint: string };
+  adjustSubfeatureOnProtectionSwitch: AdjustSubfeatureOnProtectionSwitch;
+  checked: boolean;
+};
 
-const EnableDisableBlocklist = memo<EnableDisableBlocklistProps>(
-  ({ policy, onChange, mode, 'data-test-subj': dataTestSubj }) => {
+const SubfeatureSwitch = memo<SubfeatureSwitchProps>(
+  ({
+    policy,
+    onChange,
+    mode,
+    'data-test-subj': dataTestSubj,
+    labels,
+    adjustSubfeatureOnProtectionSwitch,
+    checked,
+  }) => {
     const getTestId = useTestIdGenerator(dataTestSubj);
-    const checked = policy.windows.malware.blocklist;
+
     const isDisabled = policy.windows.malware.mode === 'off';
     const isEditMode = mode === 'edit';
-    const label = checked ? BLOCKLIST_ENABLED_LABEL : BLOCKLIST_DISABLED_LABEL;
+    const label = checked ? labels.enabled : labels.disabled;
 
     const handleBlocklistSwitchChange = useCallback(
       (event) => {
         const value = event.target.checked;
         const newPayload = cloneDeep(policy);
 
-        adjustBlocklistSettingsOnProtectionSwitch({
+        adjustSubfeatureOnProtectionSwitch({
           value,
           policyConfigData: newPayload,
           protectionOsList: MALWARE_OS_VALUES,
@@ -159,7 +246,7 @@ const EnableDisableBlocklist = memo<EnableDisableBlocklistProps>(
 
         onChange({ isValid: true, updatedPolicy: newPayload });
       },
-      [onChange, policy]
+      [adjustSubfeatureOnProtectionSwitch, onChange, policy]
     );
 
     return (
@@ -174,7 +261,7 @@ const EnableDisableBlocklist = memo<EnableDisableBlocklistProps>(
               data-test-subj={getTestId('enableDisableSwitch')}
             />
           ) : (
-            <>{label}</>
+            label
           )}
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
@@ -182,10 +269,9 @@ const EnableDisableBlocklist = memo<EnableDisableBlocklistProps>(
             position="right"
             content={
               <>
-                <FormattedMessage
-                  id="xpack.securitySolution.endpoint.policyDetailsConfig.blocklistTooltip"
-                  defaultMessage="Enables or disables the blocklist associated with this policy. The blocklist is a collection hashes, paths, or signers which extends the list of processes the endpoint considers malicious. See the blocklist tab for entry details."
-                />
+                <p>{labels.hint}</p>
+                {labels.versionCompatibilityHint && <EuiSpacer />}
+                {labels.versionCompatibilityHint && <i>{labels.versionCompatibilityHint}</i>}
               </>
             }
           />
@@ -194,4 +280,4 @@ const EnableDisableBlocklist = memo<EnableDisableBlocklistProps>(
     );
   }
 );
-EnableDisableBlocklist.displayName = 'EnableDisableBlocklist';
+SubfeatureSwitch.displayName = 'SubfeatureSwitch';
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/mocks.ts
index ee2e77307cd1b..5e1bb397f3b88 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_form/mocks.ts
@@ -61,6 +61,7 @@ export const getPolicySettingsFormTestSubjects = (
       rulesCallout: malwareTestSubj('rulesCallout'),
       blocklistContainer: malwareTestSubj('blocklist'),
       blocklistEnableDisableSwitch: malwareTestSubj('blocklist-enableDisableSwitch'),
+      onWriteScanEnableDisableSwitch: malwareTestSubj('onWriteScan-enableDisableSwitch'),
     },
     ransomware: {
       card: ransomwareTestSubj(),
@@ -192,13 +193,13 @@ export const exactMatchText = (text: string): RegExp => {
  * @param policy
  * @param turnOff
  * @param includePopup
- * @param includeBlocklist
+ * @param includeSubfeatures
  */
 export const setMalwareMode = (
   policy: PolicyConfig,
   turnOff: boolean = false,
   includePopup: boolean = true,
-  includeBlocklist: boolean = true
+  includeSubfeatures: boolean = true
 ) => {
   const mode = turnOff ? ProtectionModes.off : ProtectionModes.prevent;
   const enableValue = mode !== ProtectionModes.off;
@@ -207,15 +208,19 @@ export const setMalwareMode = (
   set(policy, 'mac.malware.mode', mode);
   set(policy, 'linux.malware.mode', mode);
 
-  if (includeBlocklist) {
-    set(policy, 'windows.malware.blocklist', enableValue);
-    set(policy, 'mac.malware.blocklist', enableValue);
-    set(policy, 'linux.malware.blocklist', enableValue);
-  }
-
   if (includePopup) {
     set(policy, 'windows.popup.malware.enabled', enableValue);
     set(policy, 'mac.popup.malware.enabled', enableValue);
     set(policy, 'linux.popup.malware.enabled', enableValue);
   }
+
+  if (includeSubfeatures) {
+    set(policy, 'windows.malware.blocklist', enableValue);
+    set(policy, 'mac.malware.blocklist', enableValue);
+    set(policy, 'linux.malware.blocklist', enableValue);
+
+    set(policy, 'windows.malware.on_write_scan', enableValue);
+    set(policy, 'mac.malware.on_write_scan', enableValue);
+    set(policy, 'linux.malware.on_write_scan', enableValue);
+  }
 };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_layout/policy_settings_layout.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_layout/policy_settings_layout.test.tsx
index b7c4c13237a1f..bfc0ec3691363 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_layout/policy_settings_layout.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/policy_settings_layout/policy_settings_layout.test.tsx
@@ -16,7 +16,11 @@ import { getUserPrivilegesMockDefaultValue } from '../../../../../common/compone
 import { getEndpointPrivilegesInitialStateMock } from '../../../../../common/components/user_privileges/endpoint/mocks';
 import { allFleetHttpMocks } from '../../../../mocks';
 import userEvent from '@testing-library/user-event';
-import { expectIsViewOnly, getPolicySettingsFormTestSubjects } from '../policy_settings_form/mocks';
+import {
+  expectIsViewOnly,
+  getPolicySettingsFormTestSubjects,
+  setMalwareMode,
+} from '../policy_settings_form/mocks';
 import { cloneDeep, set } from 'lodash';
 import { ProtectionModes } from '../../../../../../common/endpoint/types';
 import { waitFor, cleanup } from '@testing-library/react';
@@ -89,15 +93,7 @@ describe('When rendering PolicySettingsLayout', () => {
 
       // Turn off malware
       userEvent.click(getByTestId(testSubj.malware.enableDisableSwitch));
-      set(policySettings, 'windows.malware.mode', ProtectionModes.off);
-      set(policySettings, 'mac.malware.mode', ProtectionModes.off);
-      set(policySettings, 'linux.malware.mode', ProtectionModes.off);
-      set(policySettings, 'windows.malware.blocklist', false);
-      set(policySettings, 'mac.malware.blocklist', false);
-      set(policySettings, 'linux.malware.blocklist', false);
-      set(policySettings, 'windows.popup.malware.enabled', false);
-      set(policySettings, 'mac.popup.malware.enabled', false);
-      set(policySettings, 'linux.popup.malware.enabled', false);
+      setMalwareMode(policySettings, true);
 
       // Turn off Behaviour Protection
       userEvent.click(getByTestId(testSubj.behaviour.enableDisableSwitch));

From 8b95195b6825c183a69cc971b3e01154544082b1 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Tue, 2 Apr 2024 17:19:13 +0200
Subject: [PATCH 28/63] [ZDT] add aliases when creating the index (#179792)

## Summary

Fix https://github.com/elastic/kibana/issues/179783

Create the aliases during initial index creation, instead of doing it in
a later stage. This avoids an additional roundtrip with ES during
project creation.

**Before:**
```
INIT -> CREATE_TARGET_INDEX -> UPDATE_ALIASES -> INDEX_STATE_UPDATE_DONE -> DONE
```

**After:**
```
INIT -> CREATE_TARGET_INDEX -> INDEX_STATE_UPDATE_DONE -> DONE
```
---
 .../stages/create_target_index.test.mocks.ts  | 17 -------
 .../model/stages/create_target_index.test.ts  | 46 ++-----------------
 .../zdt/model/stages/create_target_index.ts   | 14 ++----
 .../src/zdt/model/stages/init.test.mocks.ts   |  3 ++
 .../src/zdt/model/stages/init.test.ts         | 20 ++++++++
 .../src/zdt/model/stages/init.ts              |  5 ++
 .../src/zdt/next.test.ts                      | 29 ++++++++++++
 .../src/zdt/next.ts                           |  1 +
 .../src/zdt/state/types.ts                    |  1 +
 .../zdt/utils/get_creation_aliases.test.ts    | 21 +++++++++
 .../src/zdt/utils/get_creation_aliases.ts     | 24 ++++++++++
 .../src/zdt/utils/index.ts                    |  1 +
 .../migrations/zdt_1/create_index.test.ts     | 14 ++++--
 .../zdt_v2_compat/create_index.test.ts        | 14 ++++--
 14 files changed, 129 insertions(+), 81 deletions(-)
 delete mode 100644 packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.test.mocks.ts
 create mode 100644 packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/get_creation_aliases.test.ts
 create mode 100644 packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/get_creation_aliases.ts

diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.test.mocks.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.test.mocks.ts
deleted file mode 100644
index b85e06bde59bc..0000000000000
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.test.mocks.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 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 const getAliasActionsMock = jest.fn();
-
-jest.doMock('../../utils', () => {
-  const realModule = jest.requireActual('../../utils');
-  return {
-    ...realModule,
-    getAliasActions: getAliasActionsMock,
-  };
-});
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.test.ts
index bcb482a99f9a5..b78b0caac8506 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.test.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { getAliasActionsMock } from './create_target_index.test.mocks';
 import * as Either from 'fp-ts/lib/Either';
 import {
   createContextMock,
@@ -24,12 +23,12 @@ describe('Stage: createTargetIndex', () => {
     ...createPostInitState(),
     controlState: 'CREATE_TARGET_INDEX',
     indexMappings: { properties: { foo: { type: 'text' } }, _meta: {} },
+    creationAliases: [],
     ...parts,
   });
 
   beforeEach(() => {
     context = createContextMock();
-    getAliasActionsMock.mockReset().mockReturnValue([]);
   });
 
   describe('In case of left return', () => {
@@ -68,50 +67,11 @@ describe('Stage: createTargetIndex', () => {
   });
 
   describe('In case of right return', () => {
-    it('calls getAliasActions with the correct parameters', () => {
-      const state = createState();
-      const res: StateActionResponse<'CREATE_TARGET_INDEX'> =
-        Either.right('create_index_succeeded');
-
-      createTargetIndex(state, res, context);
-
-      expect(getAliasActionsMock).toHaveBeenCalledTimes(1);
-      expect(getAliasActionsMock).toHaveBeenCalledWith({
-        currentIndex: state.currentIndex,
-        existingAliases: [],
-        indexPrefix: context.indexPrefix,
-        kibanaVersion: context.kibanaVersion,
-      });
-    });
-
-    it('CREATE_TARGET_INDEX -> UPDATE_ALIASES when successful and alias actions are not empty', () => {
-      const state = createState();
-      const res: StateActionResponse<'CREATE_TARGET_INDEX'> =
-        Either.right('create_index_succeeded');
-
-      const aliasActions = [{ add: { index: '.kibana_1', alias: '.kibana' } }];
-      getAliasActionsMock.mockReturnValue(aliasActions);
-
-      const newState = createTargetIndex(state, res, context);
-
-      expect(newState).toEqual({
-        ...state,
-        controlState: 'UPDATE_ALIASES',
-        previousMappings: state.indexMappings,
-        currentIndexMeta: state.indexMappings._meta,
-        aliases: [],
-        aliasActions,
-        skipDocumentMigration: true,
-      });
-    });
-
-    it('CREATE_TARGET_INDEX -> INDEX_STATE_UPDATE_DONE when successful and alias actions are empty', () => {
-      const state = createState();
+    it('CREATE_TARGET_INDEX -> INDEX_STATE_UPDATE_DONE when successful', () => {
+      const state = createState({});
       const res: StateActionResponse<'CREATE_TARGET_INDEX'> =
         Either.right('create_index_succeeded');
 
-      getAliasActionsMock.mockReturnValue([]);
-
       const newState = createTargetIndex(state, res, context);
 
       expect(newState).toEqual({
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.ts
index 16f8dd6e5ede7..b7c5081343ed5 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/create_target_index.ts
@@ -12,12 +12,11 @@ import { delayRetryState } from '../../../model/retry_state';
 import { throwBadResponse } from '../../../model/helpers';
 import { CLUSTER_SHARD_LIMIT_EXCEEDED_REASON } from '../../../common/constants';
 import { isTypeof } from '../../actions';
-import { getAliasActions } from '../../utils';
 import type { ModelStage } from '../types';
 
 export const createTargetIndex: ModelStage<
   'CREATE_TARGET_INDEX',
-  'UPDATE_ALIASES' | 'INDEX_STATE_UPDATE_DONE' | 'FATAL'
+  'INDEX_STATE_UPDATE_DONE' | 'FATAL'
 > = (state, res, context) => {
   if (Either.isLeft(res)) {
     const left = res.left;
@@ -36,22 +35,15 @@ export const createTargetIndex: ModelStage<
     }
   }
 
-  const aliasActions = getAliasActions({
-    currentIndex: state.currentIndex,
-    existingAliases: [],
-    indexPrefix: context.indexPrefix,
-    kibanaVersion: context.kibanaVersion,
-  });
-
   const currentIndexMeta = cloneDeep(state.indexMappings._meta!);
 
   return {
     ...state,
-    controlState: aliasActions.length ? 'UPDATE_ALIASES' : 'INDEX_STATE_UPDATE_DONE',
+    controlState: 'INDEX_STATE_UPDATE_DONE',
     previousMappings: state.indexMappings,
     currentIndexMeta,
     aliases: [],
-    aliasActions,
+    aliasActions: [],
     skipDocumentMigration: true,
     previousAlgorithm: 'zdt',
   };
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.mocks.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.mocks.ts
index c6a03c7ee6860..14b446463a455 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.mocks.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.mocks.ts
@@ -13,6 +13,8 @@ export const generateAdditiveMappingDiffMock = jest.fn();
 export const getAliasActionsMock = jest.fn();
 export const checkIndexCurrentAlgorithmMock = jest.fn();
 
+export const getCreationAliasesMock = jest.fn();
+
 jest.doMock('../../utils', () => {
   const realModule = jest.requireActual('../../utils');
   return {
@@ -23,6 +25,7 @@ jest.doMock('../../utils', () => {
     generateAdditiveMappingDiff: generateAdditiveMappingDiffMock,
     getAliasActions: getAliasActionsMock,
     checkIndexCurrentAlgorithm: checkIndexCurrentAlgorithmMock,
+    getCreationAliases: getCreationAliasesMock,
   };
 });
 
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.ts
index bdaabfcc863cd..892ac57c7e79c 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.test.ts
@@ -14,6 +14,7 @@ import {
   getAliasActionsMock,
   checkIndexCurrentAlgorithmMock,
   getAliasesMock,
+  getCreationAliasesMock,
 } from './init.test.mocks';
 import * as Either from 'fp-ts/lib/Either';
 import { FetchIndexResponse } from '../../../actions';
@@ -57,6 +58,7 @@ describe('Stage: init', () => {
     checkIndexCurrentAlgorithmMock.mockReset().mockReturnValue('zdt');
     getAliasesMock.mockReset().mockReturnValue(Either.right({}));
     buildIndexMappingsMock.mockReset().mockReturnValue({});
+    getCreationAliasesMock.mockReset().mockReturnValue([]);
 
     context = createContextMock({ indexPrefix: '.kibana', types: ['foo', 'bar'] });
     context.typeRegistry.registerType({
@@ -310,6 +312,20 @@ describe('Stage: init', () => {
         });
       });
 
+      it('calls getCreationAliases with the correct parameters', () => {
+        const state = createState();
+        const fetchIndexResponse = createResponse();
+        const res: StateActionResponse<'INIT'> = Either.right(fetchIndexResponse);
+
+        init(state, res, context);
+
+        expect(getCreationAliasesMock).toHaveBeenCalledTimes(1);
+        expect(getCreationAliasesMock).toHaveBeenCalledWith({
+          indexPrefix: context.indexPrefix,
+          kibanaVersion: context.kibanaVersion,
+        });
+      });
+
       it('INIT -> CREATE_TARGET_INDEX', () => {
         const state = createState();
         const fetchIndexResponse = createResponse();
@@ -318,6 +334,9 @@ describe('Stage: init', () => {
         const mockMappings = { properties: { someMappings: 'string' } };
         buildIndexMappingsMock.mockReturnValue(mockMappings);
 
+        const creationAliases = ['.foo', '.bar'];
+        getCreationAliasesMock.mockReturnValue(creationAliases);
+
         const newState = init(state, res, context);
 
         expect(newState).toEqual(
@@ -325,6 +344,7 @@ describe('Stage: init', () => {
             controlState: 'CREATE_TARGET_INDEX',
             currentIndex: '.kibana_1',
             indexMappings: mockMappings,
+            creationAliases,
           })
         );
       });
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.ts
index 7524e7b2d9f09..7405515c88b56 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/init.ts
@@ -18,6 +18,7 @@ import {
   checkVersionCompatibility,
   buildIndexMappings,
   getAliasActions,
+  getCreationAliases,
   generateAdditiveMappingDiff,
   checkIndexCurrentAlgorithm,
   removePropertiesFromV2,
@@ -73,6 +74,10 @@ export const init: ModelStage<
       controlState: 'CREATE_TARGET_INDEX',
       currentIndex: `${context.indexPrefix}_1`,
       indexMappings: buildIndexMappings({ types }),
+      creationAliases: getCreationAliases({
+        indexPrefix: context.indexPrefix,
+        kibanaVersion: context.kibanaVersion,
+      }),
     };
   }
 
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/next.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/next.test.ts
index 91a37ee7e9919..d9de1c8ce5b6a 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/next.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/next.test.ts
@@ -16,6 +16,7 @@ import { nextActionMap, type ActionMap } from './next';
 import {
   createContextMock,
   type MockedMigratorContext,
+  createPostInitState,
   createPostDocInitState,
 } from './test_helpers';
 import type {
@@ -23,6 +24,7 @@ import type {
   UpdateMappingModelVersionState,
   UpdateDocumentModelVersionsState,
   UpdateIndexMappingsState,
+  CreateTargetIndexState,
 } from './state';
 
 describe('actions', () => {
@@ -73,6 +75,33 @@ describe('actions', () => {
     });
   });
 
+  describe('CREATE_TARGET_INDEX', () => {
+    it('calls createIndex with the correct parameters', () => {
+      const state: CreateTargetIndexState = {
+        ...createPostInitState(),
+        controlState: 'CREATE_TARGET_INDEX',
+        currentIndex: '.kibana_1',
+        indexMappings: {
+          properties: { foo: { type: 'keyword' } },
+        },
+        creationAliases: ['.kibana', '.kibana_foo'],
+      };
+
+      const action = actionMap.CREATE_TARGET_INDEX;
+
+      action(state);
+
+      expect(ActionMocks.createIndex).toHaveBeenCalledTimes(1);
+      expect(ActionMocks.createIndex).toHaveBeenCalledWith({
+        client: context.elasticsearchClient,
+        indexName: state.currentIndex,
+        aliases: state.creationAliases,
+        mappings: state.indexMappings,
+        esCapabilities: context.esCapabilities,
+      });
+    });
+  });
+
   describe('UPDATE_MAPPING_MODEL_VERSIONS', () => {
     it('calls setMetaMappingMigrationComplete with the correct parameters', () => {
       const state: UpdateMappingModelVersionState = {
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/next.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/next.ts
index 66df07ac37309..3073dd66e73f1 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/next.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/next.ts
@@ -65,6 +65,7 @@ export const nextActionMap = (context: MigratorContext) => {
       Actions.createIndex({
         client,
         indexName: state.currentIndex,
+        aliases: state.creationAliases,
         mappings: state.indexMappings,
         esCapabilities: context.esCapabilities,
       }),
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/state/types.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/state/types.ts
index 7a1768745982e..23748f3d5e14b 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/state/types.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/state/types.ts
@@ -98,6 +98,7 @@ export interface CreateTargetIndexState extends BaseState {
   readonly controlState: 'CREATE_TARGET_INDEX';
   readonly currentIndex: string;
   readonly indexMappings: IndexMapping;
+  readonly creationAliases: string[];
 }
 
 export interface UpdateIndexMappingsState extends PostInitState {
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/get_creation_aliases.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/get_creation_aliases.test.ts
new file mode 100644
index 0000000000000..3318ea332b9bb
--- /dev/null
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/get_creation_aliases.test.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 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 { getCreationAliases } from './get_creation_aliases';
+
+describe('getCreationAliases', () => {
+  it('returns the correct list of alias', () => {
+    const aliases = getCreationAliases({ indexPrefix: '.kibana', kibanaVersion: '8.13.0' });
+    expect(aliases).toEqual(['.kibana', '.kibana_8.13.0']);
+  });
+
+  it('returns the correct version alias', () => {
+    const aliases = getCreationAliases({ indexPrefix: '.kibana', kibanaVersion: '8.17.2' });
+    expect(aliases).toEqual(['.kibana', '.kibana_8.17.2']);
+  });
+});
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/get_creation_aliases.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/get_creation_aliases.ts
new file mode 100644
index 0000000000000..f2171c233aa6d
--- /dev/null
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/get_creation_aliases.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.
+ */
+
+interface GetAliasActionOpts {
+  indexPrefix: string;
+  kibanaVersion: string;
+}
+
+/**
+ * Build the list of alias actions to perform, depending on the current state of the cluster.
+ */
+export const getCreationAliases = ({
+  indexPrefix,
+  kibanaVersion,
+}: GetAliasActionOpts): string[] => {
+  const globalAlias = indexPrefix;
+  const versionAlias = `${indexPrefix}_${kibanaVersion}`;
+  return [globalAlias, versionAlias];
+};
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/index.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/index.ts
index b1e68c6947823..37d6b56dfc597 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/index.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/index.ts
@@ -24,3 +24,4 @@ export {
   checkIndexCurrentAlgorithm,
   type CheckCurrentAlgorithmResult,
 } from './check_index_algorithm';
+export { getCreationAliases } from './get_creation_aliases';
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
index 784bd6c6e2699..f0b049b8307db 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
@@ -83,10 +83,14 @@ describe('ZDT upgrades - running on a fresh cluster', () => {
 
     const records = await parseLogFile(logFilePath);
 
-    expect(records).toContainLogEntry('INIT -> CREATE_TARGET_INDEX');
-    expect(records).toContainLogEntry('CREATE_TARGET_INDEX -> UPDATE_ALIASES');
-    expect(records).toContainLogEntry('UPDATE_ALIASES -> INDEX_STATE_UPDATE_DONE');
-    expect(records).toContainLogEntry('INDEX_STATE_UPDATE_DONE -> DONE');
-    expect(records).toContainLogEntry('Migration completed');
+    expect(records).toContainLogEntries(
+      [
+        'INIT -> CREATE_TARGET_INDEX',
+        'CREATE_TARGET_INDEX -> INDEX_STATE_UPDATE_DONE',
+        'INDEX_STATE_UPDATE_DONE -> DONE',
+        'Migration completed',
+      ],
+      { ordered: true }
+    );
   });
 });
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
index 6c95b9696538e..6f1b8257ddb26 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
@@ -83,10 +83,14 @@ describe('ZDT with v2 compat - running on a fresh cluster', () => {
 
     const records = await parseLogFile(logFilePath);
 
-    expect(records).toContainLogEntry('INIT -> CREATE_TARGET_INDEX');
-    expect(records).toContainLogEntry('CREATE_TARGET_INDEX -> UPDATE_ALIASES');
-    expect(records).toContainLogEntry('UPDATE_ALIASES -> INDEX_STATE_UPDATE_DONE');
-    expect(records).toContainLogEntry('INDEX_STATE_UPDATE_DONE -> DONE');
-    expect(records).toContainLogEntry('Migration completed');
+    expect(records).toContainLogEntries(
+      [
+        'INIT -> CREATE_TARGET_INDEX',
+        'CREATE_TARGET_INDEX -> INDEX_STATE_UPDATE_DONE',
+        'INDEX_STATE_UPDATE_DONE -> DONE',
+        'Migration completed',
+      ],
+      { ordered: true }
+    );
   });
 });

From 34d416f2e6717f0dfc997ef59cd5e0ac0bf75961 Mon Sep 17 00:00:00 2001
From: Pete Harverson <pete@elastic.co>
Date: Tue, 2 Apr 2024 16:29:16 +0100
Subject: [PATCH 29/63] [ML] Unskip a11y tests and fix datavisualizer test
 (#179833)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Summary

Unskips the ML accessibility tests skipped in
https://github.com/elastic/kibana/issues/17259 following the change made
to `EuiIcon` in https://github.com/elastic/eui/pull/7606 in EUI v93.5.1.

Also fixes a missing aria-label on the tech preview badge on the data
visualizer selector page which would otherwise cause an accessibility
test failure.

🟢 50x flaky test runner:
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5600


### 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] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [x] 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))
---
 .../application/datavisualizer/datavisualizer_selector.tsx | 7 +++++++
 x-pack/test/accessibility/apps/group2/ml.ts                | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
index 416ec8347847a..048c8dbe2b5eb 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
@@ -22,6 +22,7 @@ import {
   EuiTextAlign,
 } from '@elastic/eui';
 
+import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useTimefilter } from '@kbn/ml-date-picker';
 import { isFullLicense } from '../license';
@@ -182,6 +183,12 @@ export const DatavisualizerSelector: FC = () => {
                         />
                       }
                       tooltipPosition={'right'}
+                      aria-label={i18n.translate(
+                        'xpack.ml.datavisualizer.selector.technicalPreviewBadge.ariaLabel',
+                        {
+                          defaultMessage: 'ES|QL is in technical preview.',
+                        }
+                      )}
                     />
                   </>
                 </EuiTextAlign>
diff --git a/x-pack/test/accessibility/apps/group2/ml.ts b/x-pack/test/accessibility/apps/group2/ml.ts
index add5811a3ab54..af9664b5e258a 100644
--- a/x-pack/test/accessibility/apps/group2/ml.ts
+++ b/x-pack/test/accessibility/apps/group2/ml.ts
@@ -48,8 +48,7 @@ export default function ({ getService }: FtrProviderContext) {
         });
       });
 
-      // FLAKY: https://github.com/elastic/kibana/issues/172598
-      describe.skip('with data loaded', function () {
+      describe('with data loaded', function () {
         const dfaOutlierResultsJobId = 'iph_outlier_a11y';
         const ecIndexName = 'ft_module_sample_ecommerce';
         const ihpIndexName = 'ft_ihp_outlier';

From ce97a152482b624c355522c36e33bb68676b4503 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@elastic.co>
Date: Tue, 2 Apr 2024 10:35:50 -0500
Subject: [PATCH 30/63] skip failing suite (#179831)

---
 .../query_tab_content/query_tab_unified_components.test.tsx    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
index 05aae984f0357..7521534badf85 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
@@ -134,7 +134,8 @@ const useSourcererDataViewMocked = jest.fn().mockReturnValue({
 
 const { storage: storageMock } = createSecuritySolutionStorageMock();
 
-describe('query tab with unified timeline', () => {
+// Failing: See https://github.com/elastic/kibana/issues/179831
+describe.skip('query tab with unified timeline', () => {
   const kibanaServiceMock: StartServices = {
     ...createStartServicesMock(),
     storage: storageMock,

From f5b0b0c88489144a273d129dd0e8816dc5072bbb Mon Sep 17 00:00:00 2001
From: Bena Kansara <69037875+benakansara@users.noreply.github.com>
Date: Tue, 2 Apr 2024 17:43:48 +0200
Subject: [PATCH 31/63] [Obs Alerting] Implement tabbed design for existing
 alert detail pages (#179529)

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

Implements new tabbed design for the following alert detail pages:
- Custom threshold alert details page
- Log threshold alert details page
- APM Latency threshold alert details page
- SLO Burn rate alert details page

### Custom threshold alert details page
<img width="1473" alt="Screenshot 2024-03-27 at 12 49 00"
src="https://github.com/elastic/kibana/assets/69037875/062224eb-faa9-4b3b-bf5d-41c3f5d2c587">

### Log threshold alert details page
<img width="1481" alt="Screenshot 2024-03-27 at 12 49 36"
src="https://github.com/elastic/kibana/assets/69037875/7e08a1d3-2b96-4bcd-8af8-ddd026c5bb7e">

### APM Latency threshold alert details page
<img width="1478" alt="Screenshot 2024-03-27 at 12 50 14"
src="https://github.com/elastic/kibana/assets/69037875/d96976e3-1a91-42c2-a33b-bf663a099efe">

### SLO Burn rate alert details page
<img width="1483" alt="Screenshot 2024-03-27 at 12 50 46"
src="https://github.com/elastic/kibana/assets/69037875/6c5433f9-92c1-4627-9f11-5db26033a993">

### Metadata tab
<img width="1473" alt="Screenshot 2024-03-27 at 12 51 19"
src="https://github.com/elastic/kibana/assets/69037875/c35c1004-cf85-475f-b450-760807bcf506">
---
 .../alert_details/alert_details.test.tsx      | 21 +++++
 .../pages/alert_details/alert_details.tsx     | 76 +++++++++++++++----
 .../components/alert_summary.tsx              | 29 ++++---
 3 files changed, 102 insertions(+), 24 deletions(-)

diff --git a/x-pack/plugins/observability_solution/observability/public/pages/alert_details/alert_details.test.tsx b/x-pack/plugins/observability_solution/observability/public/pages/alert_details/alert_details.test.tsx
index ffa4f08e2d144..dbc084ee739bc 100644
--- a/x-pack/plugins/observability_solution/observability/public/pages/alert_details/alert_details.test.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/pages/alert_details/alert_details.test.tsx
@@ -41,6 +41,7 @@ const ruleType: RuleTypeModel = {
   requiresAppContext: false,
   validate: validationMethod,
   ruleParamsExpression: () => <Fragment />,
+  alertDetailsAppSection: () => <Fragment />,
 };
 const ruleTypeRegistry = ruleTypeRegistryMock.create();
 
@@ -135,7 +136,27 @@ describe('Alert details', () => {
     expect(alertDetails.queryByTestId('alertDetails')).toBeTruthy();
     expect(alertDetails.queryByTestId('alertDetailsError')).toBeFalsy();
     expect(alertDetails.queryByTestId('alertDetailsPageTitle')).toBeTruthy();
+    expect(alertDetails.queryByTestId('alertDetailsTabbedContent')).toBeTruthy();
     expect(alertDetails.queryByTestId('alert-summary-container')).toBeTruthy();
+    expect(alertDetails.queryByTestId('overviewTab')).toBeTruthy();
+    expect(alertDetails.queryByTestId('metadataTab')).toBeTruthy();
+  });
+
+  it('should show Metadata tab', async () => {
+    useFetchAlertDetailMock.mockReturnValue([false, alertDetail]);
+
+    const alertDetails = renderComponent();
+
+    await waitFor(() => expect(alertDetails.queryByTestId('centerJustifiedSpinner')).toBeFalsy());
+
+    expect(alertDetails.queryByTestId('alertDetailsTabbedContent')?.textContent).toContain(
+      'Metadata'
+    );
+    alertDetails.getByText('Metadata').click();
+    expect(alertDetails.queryByTestId('metadataTabPanel')).toBeTruthy();
+    expect(alertDetails.queryByTestId('metadataTabPanel')?.textContent).toContain(
+      'kibana.alert.status'
+    );
   });
 
   it('should show error loading the alert details', async () => {
diff --git a/x-pack/plugins/observability_solution/observability/public/pages/alert_details/alert_details.tsx b/x-pack/plugins/observability_solution/observability/public/pages/alert_details/alert_details.tsx
index 6c15585dcf9f5..cfd9f277b305e 100644
--- a/x-pack/plugins/observability_solution/observability/public/pages/alert_details/alert_details.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/pages/alert_details/alert_details.tsx
@@ -8,7 +8,14 @@
 import React, { useEffect, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { useParams } from 'react-router-dom';
-import { EuiEmptyPrompt, EuiPanel, EuiSpacer } from '@elastic/eui';
+import {
+  EuiEmptyPrompt,
+  EuiPanel,
+  EuiSpacer,
+  EuiTabbedContent,
+  EuiTabbedContentTab,
+  useEuiTheme,
+} from '@elastic/eui';
 import {
   AlertStatus,
   ALERT_RULE_CATEGORY,
@@ -21,6 +28,8 @@ import { RuleTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
 import { useBreadcrumbs } from '@kbn/observability-shared-plugin/public';
 
 import dedent from 'dedent';
+import { AlertFieldsTable } from '@kbn/alerts-ui-shared';
+import { css } from '@emotion/react';
 import { useKibana } from '../../utils/kibana_react';
 import { useFetchRule } from '../../hooks/use_fetch_rule';
 import { usePluginContext } from '../../hooks/use_plugin_context';
@@ -74,6 +83,7 @@ export function AlertDetails() {
   });
   const [summaryFields, setSummaryFields] = useState<AlertSummaryField[]>();
   const [alertStatus, setAlertStatus] = useState<AlertStatus>();
+  const { euiTheme } = useEuiTheme();
 
   useEffect(() => {
     if (!alertDetail) {
@@ -168,6 +178,50 @@ export function AlertDetails() {
   const AlertDetailsAppSection = ruleTypeModel ? ruleTypeModel.alertDetailsAppSection : null;
   const timeZone = getTimeZone(uiSettings);
 
+  const OVERVIEW_TAB_ID = 'overview';
+  const METADATA_TAB_ID = 'metadata';
+
+  const overviewTab = (
+    <>
+      <EuiSpacer size="l" />
+      <AlertSummary alertSummaryFields={summaryFields} />
+      {AlertDetailsAppSection && rule && alertDetail?.formatted && (
+        <AlertDetailsAppSection
+          alert={alertDetail.formatted}
+          rule={rule}
+          timeZone={timeZone}
+          setAlertSummaryFields={setSummaryFields}
+          ruleLink={http.basePath.prepend(paths.observability.ruleDetails(rule.id))}
+        />
+      )}
+    </>
+  );
+
+  const metadataTab = alertDetail?.raw && (
+    <EuiPanel hasShadow={false} data-test-subj="metadataTabPanel">
+      <AlertFieldsTable alert={alertDetail.raw} />
+    </EuiPanel>
+  );
+
+  const tabs: EuiTabbedContentTab[] = [
+    {
+      id: OVERVIEW_TAB_ID,
+      name: i18n.translate('xpack.observability.alertDetails.tab.overviewLabel', {
+        defaultMessage: 'Overview',
+      }),
+      'data-test-subj': 'overviewTab',
+      content: overviewTab,
+    },
+    {
+      id: METADATA_TAB_ID,
+      name: i18n.translate('xpack.observability.alertDetails.tab.metadataLabel', {
+        defaultMessage: 'Metadata',
+      }),
+      'data-test-subj': 'metadataTab',
+      content: metadataTab,
+    },
+  ];
+
   return (
     <ObservabilityPageTemplate
       pageHeader={{
@@ -191,22 +245,18 @@ export function AlertDetails() {
             />
           </CasesContext>,
         ],
-        bottomBorder: true,
+        bottomBorder: false,
+      }}
+      pageSectionProps={{
+        paddingSize: 'none',
+        css: css`
+          padding: 0 ${euiTheme.size.l} ${euiTheme.size.l} ${euiTheme.size.l};
+        `,
       }}
       data-test-subj="alertDetails"
     >
       <HeaderMenu />
-      <AlertSummary alertSummaryFields={summaryFields} />
-      <EuiSpacer size="l" />
-      {AlertDetailsAppSection && rule && alertDetail?.formatted && (
-        <AlertDetailsAppSection
-          alert={alertDetail.formatted}
-          rule={rule}
-          timeZone={timeZone}
-          setAlertSummaryFields={setSummaryFields}
-          ruleLink={http.basePath.prepend(paths.observability.ruleDetails(rule.id))}
-        />
-      )}
+      <EuiTabbedContent data-test-subj="alertDetailsTabbedContent" tabs={tabs} />
     </ObservabilityPageTemplate>
   );
 }
diff --git a/x-pack/plugins/observability_solution/observability/public/pages/alert_details/components/alert_summary.tsx b/x-pack/plugins/observability_solution/observability/public/pages/alert_details/components/alert_summary.tsx
index ee750a86e5b4a..20d0fb36f9f8a 100644
--- a/x-pack/plugins/observability_solution/observability/public/pages/alert_details/components/alert_summary.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/pages/alert_details/components/alert_summary.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { ReactNode } from 'react';
-import { EuiFlexItem, EuiFlexGroup, EuiText } from '@elastic/eui';
+import { EuiFlexItem, EuiFlexGroup, EuiText, EuiSpacer } from '@elastic/eui';
 
 export interface AlertSummaryField {
   label: ReactNode | string;
@@ -18,15 +18,22 @@ interface AlertSummaryProps {
 
 export function AlertSummary({ alertSummaryFields }: AlertSummaryProps) {
   return (
-    <EuiFlexGroup data-test-subj="alert-summary-container" gutterSize="xl">
-      {alertSummaryFields?.map((field, idx) => {
-        return (
-          <EuiFlexItem key={idx} grow={false}>
-            <EuiText color="subdued">{field.label}</EuiText>
-            <EuiText>{field.value}</EuiText>
-          </EuiFlexItem>
-        );
-      })}
-    </EuiFlexGroup>
+    <div data-test-subj="alert-summary-container">
+      {alertSummaryFields && alertSummaryFields.length > 0 && (
+        <>
+          <EuiFlexGroup gutterSize="xl">
+            {alertSummaryFields.map((field, idx) => {
+              return (
+                <EuiFlexItem key={idx} grow={false}>
+                  <EuiText color="subdued">{field.label}</EuiText>
+                  <EuiText>{field.value}</EuiText>
+                </EuiFlexItem>
+              );
+            })}
+          </EuiFlexGroup>
+          <EuiSpacer size="l" />
+        </>
+      )}
+    </div>
   );
 }

From 14942947063ae3439e1632e114197f2c63ea1569 Mon Sep 17 00:00:00 2001
From: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
Date: Tue, 2 Apr 2024 17:49:10 +0200
Subject: [PATCH 32/63] [Lens] Not display the timeRange error for ES|QL charts
 (#179804)

## Summary

fixes a problem that happens sometimes in the Obs ai assistant when
generating an ES|QL chart,

![image
(28)](https://github.com/elastic/kibana/assets/17003240/1120da32-685f-4d6c-a709-a738f39f3e73)

The ES|QL charts do not follow this logic. We don't have date histograms
here, we are just mapping columns to dimensions. It is fine to not give
a timeRange even if the adhoc dataview is timebased.
---
 x-pack/plugins/lens/public/embeddable/embeddable.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
index 00d5c79b6484a..502a84b7253dd 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
@@ -1489,7 +1489,9 @@ export class Embeddable
     const input = this.getInput();
 
     // if at least one indexPattern is time based, then the Lens embeddable requires the timeRange prop
+    // this is necessary for the dataview embeddable but not the ES|QL one
     if (
+      !Boolean(this.isTextBasedLanguage()) &&
       input.timeRange == null &&
       indexPatterns.some((indexPattern) => indexPattern.isTimeBased())
     ) {

From 5b7100b7c8b491e8537efd192f49d8df6c00b0e3 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 2 Apr 2024 17:35:26 +0100
Subject: [PATCH 33/63] skip flaky suite (#179843)

---
 .../timeline/unified_components/data_table/index.test.tsx      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
index 4beae12e85a95..ba909390aa3fb 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
@@ -91,7 +91,8 @@ describe('unified data table', () => {
     SPECIAL_TEST_TIMEOUT
   );
 
-  describe('custom cell rendering based on data Type', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/179843
+  describe.skip('custom cell rendering based on data Type', () => {
     it(
       'should render source.ip as link',
       async () => {

From 062a3f7629b51fe15ac1793ff936e8056aee7e95 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 2 Apr 2024 17:36:52 +0100
Subject: [PATCH 34/63] skip flaky suite (#179845)

---
 .../query_tab_content/query_tab_unified_components.test.tsx    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
index 7521534badf85..c87c8dfdddfe4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/query_tab_unified_components.test.tsx
@@ -476,7 +476,8 @@ describe.skip('query tab with unified timeline', () => {
     );
   });
 
-  describe('left controls', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/179845
+  describe.skip('left controls', () => {
     it(
       'should clear all sorting',
       async () => {

From 4f8d1ff5f2d54a8e367dd01090407ce21134c873 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 2 Apr 2024 17:37:55 +0100
Subject: [PATCH 35/63] skip flaky suite (#175791)

---
 .../test/security_solution_endpoint_api_int/apis/metadata.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
index 0e118cf88e4b9..db290065bfe24 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
@@ -403,7 +403,8 @@ export default function ({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('get metadata transforms', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/175791
+    describe.skip('get metadata transforms', () => {
       const testRegex = /(endpoint|logs-endpoint)\.metadata_(united|current)-default-*/;
       let currentTransformName = metadataTransformPrefix;
       let unitedTransformName = METADATA_UNITED_TRANSFORM;

From d81e03e0bbb90140775576719988ef86e0a7392a Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 2 Apr 2024 17:54:36 +0100
Subject: [PATCH 36/63] chore(NA): update versions after v8.13.2 bump (#179857)

This PR is a simple update of our versions file after the recent bumps.

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 versions.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.json b/versions.json
index 9dc74f92ba87a..1f8467c72b636 100644
--- a/versions.json
+++ b/versions.json
@@ -8,7 +8,7 @@
       "currentMinor": true
     },
     {
-      "version": "8.13.1",
+      "version": "8.13.2",
       "branch": "8.13",
       "currentMajor": true,
       "previousMinor": true

From 97e554cd3b6dda8c4effd3261c7b1f7cea5788f0 Mon Sep 17 00:00:00 2001
From: Drew Tate <drew.tate@elastic.co>
Date: Tue, 2 Apr 2024 19:15:57 +0200
Subject: [PATCH 37/63] [ES|QL] client-side validation: make `and` and `or`
 accept `null` (#179707)

## Summary

Part of https://github.com/elastic/kibana/issues/177699

`AND` and `OR` were not accepting `NULL` as an argument when they should
have.

The most basic test case is

`ROW var = TRUE or NULL`.

### 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: Stratoula Kalafateli <efstratia.kalafateli@elastic.co>
---
 packages/kbn-esql-ast/src/ast_walker.ts       |  2 +-
 .../src/definitions/builtin.ts                | 21 ++++++++
 .../esql_validation_meta_tests.json           | 50 +++++++++++++++++++
 .../src/validation/validation.test.ts         | 15 ++++++
 4 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/packages/kbn-esql-ast/src/ast_walker.ts b/packages/kbn-esql-ast/src/ast_walker.ts
index 05393d7b07c16..740986ec3edd6 100644
--- a/packages/kbn-esql-ast/src/ast_walker.ts
+++ b/packages/kbn-esql-ast/src/ast_walker.ts
@@ -294,7 +294,7 @@ function getBooleanValue(ctx: BooleanLiteralContext | BooleanValueContext) {
 
 function getConstant(ctx: ConstantContext | undefined): ESQLAstItem | undefined {
   if (ctx instanceof NullLiteralContext) {
-    return createLiteral('string', ctx.NULL());
+    return createLiteral('null', ctx.NULL());
   }
   if (ctx instanceof QualifiedIntegerLiteralContext) {
     // despite the generic name, this is a date unit constant:
diff --git a/packages/kbn-esql-validation-autocomplete/src/definitions/builtin.ts b/packages/kbn-esql-validation-autocomplete/src/definitions/builtin.ts
index 668a2cd20407b..23da9e1684cf4 100644
--- a/packages/kbn-esql-validation-autocomplete/src/definitions/builtin.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/definitions/builtin.ts
@@ -337,6 +337,27 @@ export const builtinFunctions: FunctionDefinition[] = [
         ],
         returnType: 'boolean',
       },
+      {
+        params: [
+          { name: 'left', type: 'null' },
+          { name: 'right', type: 'boolean' },
+        ],
+        returnType: 'boolean',
+      },
+      {
+        params: [
+          { name: 'left', type: 'boolean' },
+          { name: 'right', type: 'null' },
+        ],
+        returnType: 'boolean',
+      },
+      {
+        params: [
+          { name: 'left', type: 'null' },
+          { name: 'right', type: 'null' },
+        ],
+        returnType: 'boolean',
+      },
     ],
   })),
   {
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
index 0db7e695f8a62..d6919bb97551f 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
@@ -652,6 +652,46 @@
       ],
       "warning": []
     },
+    {
+      "query": "row bool_var = true and false",
+      "error": [],
+      "warning": []
+    },
+    {
+      "query": "row bool_var = true and null",
+      "error": [],
+      "warning": []
+    },
+    {
+      "query": "row bool_var = null and false",
+      "error": [],
+      "warning": []
+    },
+    {
+      "query": "row bool_var = null and null",
+      "error": [],
+      "warning": []
+    },
+    {
+      "query": "row bool_var = true or false",
+      "error": [],
+      "warning": []
+    },
+    {
+      "query": "row bool_var = true or null",
+      "error": [],
+      "warning": []
+    },
+    {
+      "query": "row bool_var = null or false",
+      "error": [],
+      "warning": []
+    },
+    {
+      "query": "row bool_var = null or null",
+      "error": [],
+      "warning": []
+    },
     {
       "query": "row var = abs(5)",
       "error": [],
@@ -5118,6 +5158,11 @@
       "error": [],
       "warning": []
     },
+    {
+      "query": "from a_index | where stringField == \"a\" or null",
+      "error": [],
+      "warning": []
+    },
     {
       "query": "from a_index | where avg(numberField)",
       "error": [
@@ -10587,6 +10632,11 @@
       "error": [],
       "warning": []
     },
+    {
+      "query": "from a_index | stats count(stringField == \"a\" or null)",
+      "error": [],
+      "warning": []
+    },
     {
       "query": "from a_index | stats count(`numberField`) | keep `count(``numberField``)` ",
       "error": [],
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts b/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
index 1d934731b9725..498d5f264a8f6 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
@@ -508,6 +508,15 @@ describe('validation logic', () => {
         'Argument of [not_in] must be [number[]], found value [(1, 2, 3, "a")] type [(number, number, number, string)]',
       ]);
 
+      // test that "and" and "or" accept null... not sure if this is the best place or not...
+      for (const op of ['and', 'or']) {
+        for (const firstParam of ['true', 'null']) {
+          for (const secondParam of ['false', 'null']) {
+            testErrorsAndWarnings(`row bool_var = ${firstParam} ${op} ${secondParam}`, []);
+          }
+        }
+      }
+
       function tweakSignatureForRowCommand(signature: string) {
         /**
          * row has no access to any field, so replace it with literal
@@ -1098,6 +1107,9 @@ describe('validation logic', () => {
         testErrorsAndWarnings(`from a_index | where ${camelCase(field)}Field Is nOt NuLL`, []);
       }
 
+      // this is a scenario that was failing because "or" didn't accept "null"
+      testErrorsAndWarnings('from a_index | where stringField == "a" or null', []);
+
       for (const {
         name,
         alias,
@@ -1742,6 +1754,9 @@ describe('validation logic', () => {
       ]);
       testErrorsAndWarnings('from a_index | stats count(`numberField`)', []);
 
+      // this is a scenario that was failing because "or" didn't accept "null"
+      testErrorsAndWarnings('from a_index | stats count(stringField == "a" or null)', []);
+
       for (const subCommand of ['keep', 'drop', 'eval']) {
         testErrorsAndWarnings(
           `from a_index | stats count(\`numberField\`) | ${subCommand} \`count(\`\`numberField\`\`)\` `,

From ec67941a4e7252cbb886a9f720bcaecc5ee5c540 Mon Sep 17 00:00:00 2001
From: Brad White <Ikuni17@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:16:28 -0600
Subject: [PATCH 38/63] [kbn/es] Add support for data path (#179678)

## Summary

When running serverless FTR locally, the data store is the same as for
local development. This data pollution can cause unintended results in
tests. This PR forces FTR to run in a clean data store every time in
`.es/stateless-cluster-ftr/*` and retains development data at
`.es/stateless/*`.
---
 .../kbn-es/src/cli_commands/serverless.ts     | 17 +++++++++---
 packages/kbn-es/src/utils/docker.test.ts      | 24 +++++++++++++++--
 packages/kbn-es/src/utils/docker.ts           | 27 ++++++++++++++-----
 packages/kbn-test/src/es/test_es_cluster.ts   |  3 ++-
 4 files changed, 58 insertions(+), 13 deletions(-)

diff --git a/packages/kbn-es/src/cli_commands/serverless.ts b/packages/kbn-es/src/cli_commands/serverless.ts
index f74eeb033e9a9..6b0fe4acd5be7 100644
--- a/packages/kbn-es/src/cli_commands/serverless.ts
+++ b/packages/kbn-es/src/cli_commands/serverless.ts
@@ -38,7 +38,8 @@ export const serverless: Command = {
       --tag               Image tag of ES serverless to run from ${ES_SERVERLESS_REPO_ELASTICSEARCH}
       --image             Full path of ES serverless image to run, has precedence over tag. [default: ${ES_SERVERLESS_DEFAULT_IMAGE}]
       --background        Start ES serverless without attaching to the first node's logs
-      --basePath          Path to the directory where the ES cluster will store data
+      --basePath          Full path where the ES cluster will store data [default: <REPO>/.es]
+      --dataPath          Directory in basePath where the ES cluster will store data [default: stateless]
       --clean             Remove existing file system object store before running
       --kill              Kill running ES serverless nodes if detected on startup
       --host              Publish ES docker container on additional host IP
@@ -87,12 +88,22 @@ export const serverless: Command = {
         esArgs: 'E',
         files: 'F',
         projectType: 'project-type',
+        dataPath: 'data-path',
       },
 
-      string: ['projectType', 'tag', 'image', 'basePath', 'resources', 'host', 'kibanaUrl'],
+      string: [
+        'projectType',
+        'tag',
+        'image',
+        'basePath',
+        'resources',
+        'host',
+        'kibanaUrl',
+        'dataPath',
+      ],
       boolean: ['clean', 'ssl', 'kill', 'background', 'skipTeardown', 'waitForReady'],
 
-      default: { ...defaults, kibanaUrl: 'https://localhost:5601/' },
+      default: { ...defaults, kibanaUrl: 'https://localhost:5601/', dataPath: 'stateless' },
     }) as unknown as ServerlessOptions;
 
     if (!options.projectType) {
diff --git a/packages/kbn-es/src/utils/docker.test.ts b/packages/kbn-es/src/utils/docker.test.ts
index 33b02d7df0d8e..ec706a64a96ac 100644
--- a/packages/kbn-es/src/utils/docker.test.ts
+++ b/packages/kbn-es/src/utils/docker.test.ts
@@ -103,12 +103,13 @@ const serverlessResources = SERVERLESS_RESOURCES_PATHS.reduce<string[]>((acc, pa
 }, []);
 
 const volumeCmdTest = async (volumeCmd: string[]) => {
-  expect(volumeCmd).toHaveLength(20);
+  expect(volumeCmd).toHaveLength(22);
   expect(volumeCmd).toEqual(
     expect.arrayContaining([
       ...getESp12Volume(),
       ...serverlessResources,
       `${baseEsPath}:/objectstore:z`,
+      `stateless.object_store.bucket=${serverlessDir}`,
       `${SERVERLESS_SECRETS_PATH}:${SERVERLESS_CONFIG_PATH}secrets/secrets.json:z`,
       `${SERVERLESS_JWKS_PATH}:${SERVERLESS_CONFIG_PATH}secrets/jwks.json:z`,
     ])
@@ -564,7 +565,7 @@ describe('setupServerlessVolumes()', () => {
     const pathsNotIncludedInCmd = requiredPaths.filter(
       (path) => !volumeCmd.some((cmd) => cmd.includes(path))
     );
-    expect(volumeCmd).toHaveLength(22);
+    expect(volumeCmd).toHaveLength(24);
     expect(pathsNotIncludedInCmd).toEqual([]);
   });
 
@@ -598,6 +599,25 @@ describe('setupServerlessVolumes()', () => {
         'Valid resources: operator_users.yml | role_mapping.yml | service_tokens | users | users_roles | roles.yml'
     );
   });
+
+  test('should override data path when passed', async () => {
+    const dataPath = 'stateless-cluster-ftr';
+
+    mockFs({
+      [baseEsPath]: {},
+    });
+
+    const volumeCmd = await setupServerlessVolumes(log, {
+      projectType,
+      basePath: baseEsPath,
+      dataPath,
+    });
+
+    expect(volumeCmd).toEqual(
+      expect.arrayContaining([`stateless.object_store.bucket=${dataPath}`])
+    );
+    await expect(Fsp.access(`${baseEsPath}/${dataPath}`)).resolves.not.toThrow();
+  });
 });
 
 describe('runServerlessEsNode()', () => {
diff --git a/packages/kbn-es/src/utils/docker.ts b/packages/kbn-es/src/utils/docker.ts
index c263ac686fc84..b0795a70f7d72 100644
--- a/packages/kbn-es/src/utils/docker.ts
+++ b/packages/kbn-es/src/utils/docker.ts
@@ -77,8 +77,10 @@ export interface ServerlessOptions extends EsClusterExecOptions, BaseOptions {
   projectType: ServerlessProjectType;
   /** Clean (or delete) all data created by the ES cluster after it is stopped */
   clean?: boolean;
-  /** Path to the directory where the ES cluster will store data */
+  /** Full path where the ES cluster will store data */
   basePath: string;
+  /** Directory in basePath where the ES cluster will store data */
+  dataPath?: string;
   /** If this process exits, leave the ES cluster running in the background */
   skipTeardown?: boolean;
   /** Start the ES cluster in the background instead of remaining attached: useful for running tests */
@@ -167,9 +169,6 @@ const SHARED_SERVERLESS_PARAMS = [
 
   '--env',
   'stateless.object_store.type=fs',
-
-  '--env',
-  'stateless.object_store.bucket=stateless',
 ];
 
 // only allow certain ES args to be overwrote by options
@@ -546,8 +545,17 @@ export function getDockerFileMountPath(hostPath: string) {
  * Setup local volumes for Serverless ES
  */
 export async function setupServerlessVolumes(log: ToolingLog, options: ServerlessOptions) {
-  const { basePath, clean, ssl, kibanaUrl, files, resources, projectType } = options;
-  const objectStorePath = resolve(basePath, 'stateless');
+  const {
+    basePath,
+    clean,
+    ssl,
+    kibanaUrl,
+    files,
+    resources,
+    projectType,
+    dataPath = 'stateless',
+  } = options;
+  const objectStorePath = resolve(basePath, dataPath);
 
   log.info(chalk.bold(`Checking for local serverless ES object store at ${objectStorePath}`));
   log.indent(4);
@@ -579,7 +587,12 @@ export async function setupServerlessVolumes(log: ToolingLog, options: Serverles
 
   log.indent(-4);
 
-  const volumeCmds = ['--volume', `${basePath}:/objectstore:z`];
+  const volumeCmds = [
+    '--volume',
+    `${basePath}:/objectstore:z`,
+    '--env',
+    `stateless.object_store.bucket=${dataPath}`,
+  ];
 
   if (files) {
     const _files = typeof files === 'string' ? [files] : files;
diff --git a/packages/kbn-test/src/es/test_es_cluster.ts b/packages/kbn-test/src/es/test_es_cluster.ts
index 3c39a2e2a1cc2..0f94a76d87f71 100644
--- a/packages/kbn-test/src/es/test_es_cluster.ts
+++ b/packages/kbn-test/src/es/test_es_cluster.ts
@@ -73,7 +73,7 @@ export interface CreateTestEsClusterOptions {
   esFrom?: string;
   esServerlessOptions?: Pick<
     ServerlessOptions,
-    'image' | 'tag' | 'resources' | 'host' | 'kibanaUrl' | 'projectType'
+    'image' | 'tag' | 'resources' | 'host' | 'kibanaUrl' | 'projectType' | 'dataPath'
   >;
   esJavaOpts?: string;
   /**
@@ -250,6 +250,7 @@ export function createTestEsCluster<
         await firstNode.runServerless({
           basePath,
           esArgs: customEsArgs,
+          dataPath: `stateless-${clusterName}`,
           ...esServerlessOptions,
           port,
           clean: true,

From fa8363abb9c8fb45e81e93f587c83d5788405d96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Efe=20G=C3=BCrkan=20YALAMAN?=
 <efeguerkan.yalaman@elastic.co>
Date: Tue, 2 Apr 2024 19:20:51 +0200
Subject: [PATCH 39/63] Fix license modal not showing every message (#179614)

## Summary

License endpoints can bring messages in string Arrays. This commit
changes modal logic to add every message instead of only the first
message.

<img width="755" alt="Screenshot 2024-03-28 at 14 18 27"
src="https://github.com/elastic/kibana/assets/1410658/182d1f2a-2f40-43cc-b290-1096d0c9fdd7">
<img width="432" alt="Screenshot 2024-03-28 at 14 20 21"
src="https://github.com/elastic/kibana/assets/1410658/b44b5743-5585-4ad0-9829-d6625cb61101">


### 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
- [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
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [x] Any UI touched in this PR is usable by keyboard only (learn more
about [keyboard accessibility](https://webaim.org/techniques/keyboard/))
- [x] 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))
- [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: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../public/application/store/actions/start_basic.js      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugins/license_management/public/application/store/actions/start_basic.js b/x-pack/plugins/license_management/public/application/store/actions/start_basic.js
index 562dcf48584a4..b83fa864b4f9e 100644
--- a/x-pack/plugins/license_management/public/application/store/actions/start_basic.js
+++ b/x-pack/plugins/license_management/public/application/store/actions/start_basic.js
@@ -37,9 +37,12 @@ export const startBasicLicense =
       //messages coming back in arrays
       const messages = Object.values(acknowledge)
         .slice(1)
-        .map((item) => {
-          return item[0];
-        });
+        .reduce((acc, item) => {
+          item.forEach((message) => {
+            acc.push(message);
+          });
+          return acc;
+        }, []);
       const first = i18n.translate(
         'xpack.licenseMgmt.replacingCurrentLicenseWithBasicLicenseWarningMessage',
         {

From d33559457d0140dbed40f2706cbfb9d9f1e75217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Efe=20G=C3=BCrkan=20YALAMAN?=
 <efeguerkan.yalaman@elastic.co>
Date: Tue, 2 Apr 2024 19:21:02 +0200
Subject: [PATCH 40/63] [Search] Sanitize Create and Attach button index name
 (#179637)

## Summary

Index name and connector name have different constrains, to make the
button work, we sanitize the connector name. This was found as a bug
during 8.13 QA.

<img width="579" alt="Screenshot 2024-03-28 at 17 18 35"
src="https://github.com/elastic/kibana/assets/1410658/5ef3719f-73e2-4f5f-b168-8f5e71c3c643">
<img width="632" alt="Screenshot 2024-03-28 at 17 18 37"
src="https://github.com/elastic/kibana/assets/1410658/8f037455-717b-480c-a90d-e524d35a4f76">
<img width="569" alt="Screenshot 2024-03-28 at 17 18 53"
src="https://github.com/elastic/kibana/assets/1410658/fd5240f2-5def-4339-8de0-2eebc2c815da">





### 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
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [x] 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))
- [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: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../connector_detail/attach_index_box.tsx     | 23 ++++++++++++-------
 .../connector_name_and_description_logic.ts   |  6 ++---
 .../connector_detail/connector_view_logic.ts  | 23 +++++++++++++++++--
 3 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/attach_index_box.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/attach_index_box.tsx
index 9e52ded0dcee5..5acc069144df1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/attach_index_box.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/attach_index_box.tsx
@@ -33,6 +33,8 @@ import { Status } from '../../../../../common/types/api';
 
 import { FetchAvailableIndicesAPILogic } from '../../api/index/fetch_available_indices_api_logic';
 
+import { formatApiName } from '../../utils/format_api_name';
+
 import { AttachIndexLogic } from './attach_index_logic';
 
 const CREATE_NEW_INDEX_GROUP_LABEL = i18n.translate(
@@ -77,6 +79,7 @@ export const AttachIndexBox: React.FC<AttachIndexBoxProps> = ({ connector }) =>
     isFullMatch: boolean;
     searchValue: string;
   }>();
+  const [sanitizedName, setSanitizedName] = useState<string>(formatApiName(connector.name));
 
   const { makeRequest } = useActions(FetchAvailableIndicesAPILogic);
   const { data, status } = useValues(FetchAvailableIndicesAPILogic);
@@ -128,8 +131,8 @@ export const AttachIndexBox: React.FC<AttachIndexBoxProps> = ({ connector }) =>
   useEffect(() => {
     setConnector(connector);
     makeRequest({});
-    if (!connector.index_name && connector.name) {
-      checkIndexExists({ indexName: connector.name });
+    if (!connector.index_name && connector.name && sanitizedName) {
+      checkIndexExists({ indexName: sanitizedName });
     }
   }, [connector.id]);
 
@@ -140,6 +143,10 @@ export const AttachIndexBox: React.FC<AttachIndexBoxProps> = ({ connector }) =>
     }
   }, [query]);
 
+  useEffect(() => {
+    setSanitizedName(formatApiName(connector.name));
+  }, [connector.name]);
+
   const { hash } = useLocation();
   useEffect(() => {
     if (hash) {
@@ -283,25 +290,25 @@ export const AttachIndexBox: React.FC<AttachIndexBoxProps> = ({ connector }) =>
                 color="primary"
                 fill
                 onClick={() => {
-                  createIndex({ indexName: connector.name, language: null });
-                  setSelectedIndex({ label: connector.name });
+                  createIndex({ indexName: sanitizedName, language: null });
+                  setSelectedIndex({ label: sanitizedName });
                 }}
                 isLoading={isSaveLoading || isExistLoading}
-                disabled={indexExists[connector.name]}
+                disabled={indexExists[sanitizedName]}
               >
                 {i18n.translate(
                   'xpack.enterpriseSearch.attachIndexBox.createSameIndexButtonLabel',
                   {
                     defaultMessage: 'Create and attach an index named {indexName}',
-                    values: { indexName: connector.name },
+                    values: { indexName: sanitizedName },
                   }
                 )}
               </EuiButton>
-              {indexExists[connector.name] ? (
+              {indexExists[sanitizedName] ? (
                 <EuiText size="xs">
                   {i18n.translate('xpack.enterpriseSearch.attachIndexBox.indexNameExistsError', {
                     defaultMessage: 'Index with name {indexName} already exists',
-                    values: { indexName: connector.name },
+                    values: { indexName: sanitizedName },
                   })}
                 </EuiText>
               ) : (
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_name_and_description_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_name_and_description_logic.ts
index adf6bfb166a0c..da097b6c2905b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_name_and_description_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_name_and_description_logic.ts
@@ -20,9 +20,9 @@ import {
 
 type NameAndDescription = Partial<Pick<Connector, 'name' | 'description'>>;
 
-type ConnectorNameAndDescriptionActions = Pick<
+export type ConnectorNameAndDescriptionActions = Pick<
   Actions<PutConnectorNameAndDescriptionArgs, PutConnectorNameAndDescriptionResponse>,
-  'makeRequest'
+  'makeRequest' | 'apiSuccess' | 'apiError'
 > & {
   saveNameAndDescription(nameAndDescription: NameAndDescription): NameAndDescription;
   setConnector(connector: Connector): Connector;
@@ -44,7 +44,7 @@ export const ConnectorNameAndDescriptionLogic = kea<
     setConnector: (connector) => connector,
   },
   connect: {
-    actions: [ConnectorNameAndDescriptionApiLogic, ['makeRequest']],
+    actions: [ConnectorNameAndDescriptionApiLogic, ['makeRequest', 'apiSuccess', 'apiError']],
     values: [ConnectorNameAndDescriptionApiLogic, ['status']],
   },
   listeners: ({ actions, values }) => ({
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_view_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_view_logic.ts
index a1eef12c28e86..f7d6f30ee7d54 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_view_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/connector_detail/connector_view_logic.ts
@@ -30,17 +30,24 @@ import {
 import { FetchIndexActions, FetchIndexApiLogic } from '../../api/index/fetch_index_api_logic';
 import { ElasticsearchViewIndex } from '../../types';
 
+import {
+  ConnectorNameAndDescriptionLogic,
+  ConnectorNameAndDescriptionActions,
+} from './connector_name_and_description_logic';
+
 export interface ConnectorViewActions {
   fetchConnector: CachedFetchConnectorByIdApiLogicActions['makeRequest'];
   fetchConnectorApiError: CachedFetchConnectorByIdApiLogicActions['apiError'];
   fetchConnectorApiReset: CachedFetchConnectorByIdApiLogicActions['apiReset'];
   fetchConnectorApiSuccess: CachedFetchConnectorByIdApiLogicActions['apiSuccess'];
-  startConnectorPoll: CachedFetchConnectorByIdApiLogicActions['startPolling'];
-  stopConnectorPoll: CachedFetchConnectorByIdApiLogicActions['stopPolling'];
   fetchIndex: FetchIndexActions['makeRequest'];
   fetchIndexApiError: FetchIndexActions['apiError'];
   fetchIndexApiReset: FetchIndexActions['apiReset'];
   fetchIndexApiSuccess: FetchIndexActions['apiSuccess'];
+  nameAndDescriptionApiError: ConnectorNameAndDescriptionActions['apiError'];
+  nameAndDescriptionApiSuccess: ConnectorNameAndDescriptionActions['apiSuccess'];
+  startConnectorPoll: CachedFetchConnectorByIdApiLogicActions['startPolling'];
+  stopConnectorPoll: CachedFetchConnectorByIdApiLogicActions['stopPolling'];
   updateConnectorConfiguration: PostConnectorConfigurationActions['makeRequest'];
   updateConnectorConfigurationSuccess: PostConnectorConfigurationActions['apiSuccess'];
 }
@@ -101,6 +108,8 @@ export const ConnectorViewLogic = kea<MakeLogicType<ConnectorViewValues, Connect
         'makeRequest as updateConnectorConfiguration',
         'apiSuccess as updateConnectorConfigurationSuccess',
       ],
+      ConnectorNameAndDescriptionLogic,
+      ['apiSuccess as nameAndDescriptionApiSuccess', 'apiError as nameAndDescriptionApiError'],
     ],
     values: [
       CachedFetchConnectorByIdApiLogic,
@@ -118,6 +127,16 @@ export const ConnectorViewLogic = kea<MakeLogicType<ConnectorViewValues, Connect
     },
   }),
   listeners: ({ actions, values }) => ({
+    nameAndDescriptionApiError: () => {
+      if (values.connectorId) {
+        actions.fetchConnector({ connectorId: values.connectorId });
+      }
+    },
+    nameAndDescriptionApiSuccess: () => {
+      if (values.connectorId) {
+        actions.fetchConnector({ connectorId: values.connectorId });
+      }
+    },
     updateConnectorConfigurationSuccess: () => {
       if (values.connectorId) {
         actions.fetchConnector({ connectorId: values.connectorId });

From 2d363d2833f4377686d05e50b2df716d612c608d Mon Sep 17 00:00:00 2001
From: Jon <jon@elastic.co>
Date: Tue, 2 Apr 2024 12:39:34 -0500
Subject: [PATCH 41/63] [actions/triage] Omit dev dependency installation
 (#179664)

---
 .github/workflows/fix-version-gaps.yml  | 2 +-
 .github/workflows/label-failed-test.yml | 2 +-
 .github/workflows/skip-failed-test.yml  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/fix-version-gaps.yml b/.github/workflows/fix-version-gaps.yml
index bdeffcf380384..77a56a268f20d 100644
--- a/.github/workflows/fix-version-gaps.yml
+++ b/.github/workflows/fix-version-gaps.yml
@@ -33,7 +33,7 @@ jobs:
           path: ./actions
 
       - name: Install Actions
-        run: npm install --production --prefix ./actions
+        run: npm ci --omit=dev --prefix ./actions
 
       - name: Run Fix Gaps
         uses: ./actions/fix-version-gaps
diff --git a/.github/workflows/label-failed-test.yml b/.github/workflows/label-failed-test.yml
index 79ad5673f38af..ec5114803639e 100644
--- a/.github/workflows/label-failed-test.yml
+++ b/.github/workflows/label-failed-test.yml
@@ -25,5 +25,5 @@ jobs:
           GITHUB_TOKEN: ${{secrets.KIBANAMACHINE_TOKEN}}
           SLACK_TOKEN: ${{secrets.SLACK_TOKEN_FAILED_TEST_NOTIFIER}}
         run: |
-          npm install
+          npm ci --omit=dev
           node failed-test-label ${{github.event.issue.number}} || true
diff --git a/.github/workflows/skip-failed-test.yml b/.github/workflows/skip-failed-test.yml
index 5950ed7e74c54..4c6d7c94b808d 100644
--- a/.github/workflows/skip-failed-test.yml
+++ b/.github/workflows/skip-failed-test.yml
@@ -20,7 +20,7 @@ jobs:
           path: ./actions
 
       - name: Install Actions
-        run: npm install --production --prefix ./actions
+        run: npm ci --omit=dev --prefix ./actions
 
       - name: User Permission Check
         uses: ./actions/permission-check
@@ -43,5 +43,5 @@ jobs:
           GITHUB_TOKEN: ${{secrets.KIBANAMACHINE_TOKEN}}
           SLACK_TOKEN: ${{secrets.SLACK_TOKEN_FAILED_TEST_NOTIFIER}}
         run: |
-          npm install
+          npm ci --omit=dev
           node failed-test-auto ${{github.event.issue.number}}

From 5469e88705a193c6ee178315e8b7c2679ec055ae Mon Sep 17 00:00:00 2001
From: Tomasz Ciecierski <tomasz.ciecierski@elastic.co>
Date: Tue, 2 Apr 2024 20:03:13 +0200
Subject: [PATCH 42/63] [EDR Workflows] Fix automated process action field name
 behavior (#178727)

---
 .../endpoint/field_name.tsx                   | 27 +++++++++++--------
 .../e2e/automated_response_actions/form.cy.ts |  7 ++++-
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/endpoint/field_name.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/endpoint/field_name.tsx
index c713c23cfe65d..6f862f22b7894 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/endpoint/field_name.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_response_actions/endpoint/field_name.tsx
@@ -33,6 +33,13 @@ const ECSSchemaOptions = ECSSchema.map((ecs) => ({
 const SINGLE_SELECTION = Object.freeze({ asPlainText: true });
 
 const FIELD_LABEL: string = 'Custom field name';
+const REQUIRED_ERROR = i18n.translate(
+  'xpack.securitySolution.responseActions.endpoint.validations.fieldNameIsRequiredErrorMessage',
+  {
+    defaultMessage: '{field} selection is required when the process.pid toggle is disabled.',
+    values: { field: FIELD_LABEL },
+  }
+);
 const FieldNameFieldComponent = ({
   path,
   disabled,
@@ -50,6 +57,11 @@ const FieldNameFieldComponent = ({
     if (currentFieldNameField && !isRequired) {
       currentFieldNameField?.clearErrors();
     }
+
+    // if the field is required and the value is empty, set an error, but don't do that before first validation (thus isValidated check)
+    if (currentFieldNameField?.isValidated && !currentFieldNameField?.value && isRequired) {
+      currentFieldNameField?.setErrors([{ message: REQUIRED_ERROR }]);
+    }
   }, [currentFieldNameField, isRequired]);
 
   const renderEntityIdNote = useMemo(() => {
@@ -82,14 +94,7 @@ const FieldNameFieldComponent = ({
               return {
                 code: 'ERR_FIELD_MISSING',
                 path,
-                message: i18n.translate(
-                  'xpack.securitySolution.responseActions.endpoint.validations.fieldNameIsRequiredErrorMessage',
-                  {
-                    defaultMessage:
-                      '{field} selection is required when the process.pid toggle is disabled.',
-                    values: { field: FIELD_LABEL },
-                  }
-                ),
+                message: REQUIRED_ERROR,
               };
             }
           },
@@ -131,10 +136,10 @@ const FieldNameFieldComponent = ({
                 selectedOptions={value && valueInList ? [{ value, label: value }] : undefined}
                 onChange={(newValue) => {
                   if (newValue.length === 0) {
-                    // Don't allow clearing the type. One must always be selected
-                    return;
+                    setValue('');
+                  } else {
+                    setValue(newValue[0].label);
                   }
-                  setValue(newValue[0].label);
                 }}
                 data-test-subj="config-custom-field-name"
               />
diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/automated_response_actions/form.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/automated_response_actions/form.cy.ts
index 770be07a61257..cd521f1cad32e 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/e2e/automated_response_actions/form.cy.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/automated_response_actions/form.cy.ts
@@ -122,8 +122,13 @@ describe(
             'Custom field name selection is required when the process.pid toggle is disabled.'
           );
         });
-
+        // field name can be cleared out
         cy.getByTestSubj(`response-actions-list-item-1`).within(() => {
+          cy.getByTestSubj('config-custom-field-name').should('have.text', '');
+          cy.getByTestSubj('config-custom-field-name').type('process.entity_id{downArrow}{enter}');
+          cy.getByTestSubj('config-custom-field-name').should('contain', 'process.entity_id');
+          cy.getByTestSubj('comboBoxClearButton').click();
+          cy.getByTestSubj('config-custom-field-name').should('not.contain', 'process.entity_id');
           cy.getByTestSubj('config-custom-field-name').type('process.entity_id{downArrow}{enter}');
         });
 

From ad99ea8d3dd024f06728c45750f346706beaf9d6 Mon Sep 17 00:00:00 2001
From: Alexi Doak <109488926+doakalexi@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:03:48 -0700
Subject: [PATCH 43/63] [ResponseOps] Set action type thrown errors as
 Framework errors (#179700)

Related to https://github.com/elastic/kibana/issues/174035

## Summary

This PR changes errors reported from the action type executors from USER
to FRAMEWORK.

### To verify

- Throw an error in any an action executor
- Expect to see framework error metrics in :
`/api/task_manager/metrics?reset=false`
---
 .../server/lib/action_executor.test.ts        |  7 +++++--
 .../actions/server/lib/action_executor.ts     |  2 +-
 .../tests/actions/connector_types/bedrock.ts  |  4 ++--
 .../actions/connector_types/cases_webhook.ts  | 12 +++++------
 .../actions/connector_types/d3security.ts     |  2 +-
 .../tests/actions/connector_types/openai.ts   |  4 ++--
 .../tests/actions/connector_types/opsgenie.ts | 18 ++++++++---------
 .../tests/actions/connector_types/tines.ts    | 20 +++++++++----------
 .../actions/sub_action_framework/index.ts     | 10 +++++-----
 .../spaces_only/tests/actions/execute.ts      |  4 ++--
 10 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
index 703a431393048..9b7773f1795d5 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -1182,11 +1182,14 @@ describe('Action Executor', () => {
       );
       connectorTypeRegistry.get.mockReturnValueOnce(connectorType);
 
+      let executorResult;
       if (executeUnsecure) {
-        await actionExecutor.executeUnsecured(executeUnsecuredParams);
+        executorResult = await actionExecutor.executeUnsecured(executeUnsecuredParams);
       } else {
-        await actionExecutor.execute(executeParams);
+        executorResult = await actionExecutor.execute(executeParams);
       }
+
+      expect(executorResult?.errorSource).toBe(TaskErrorSource.FRAMEWORK);
       expect(loggerMock.warn).toBeCalledWith(
         'action execution failure: test:1: 1: an error occurred while running the action: this action execution is intended to fail; retry: true'
       );
diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
index 6ab2df73fec37..58298ab7138f1 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -516,7 +516,7 @@ export class ActionExecutor {
               serviceMessage: err.message,
               error: err,
               retry: true,
-              errorSource: TaskErrorSource.USER,
+              errorSource: TaskErrorSource.FRAMEWORK,
             };
           }
         }
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/bedrock.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/bedrock.ts
index e0f737d3c6e53..98df544929ca7 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/bedrock.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/bedrock.ts
@@ -291,7 +291,7 @@ export default function bedrockTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message: `Sub action "invalidAction" is not registered. Connector id: ${bedrockActionId}. Connector name: Amazon Bedrock. Connector type: .bedrock`,
           });
         });
@@ -637,7 +637,7 @@ export default function bedrockTest({ getService }: FtrProviderContext) {
             connector_id: bedrockActionId,
             message: 'an error occurred while running the action',
             retry: true,
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Status code: 422. Message: API Error: Unprocessable Entity - Malformed input request: extraneous key [ooooo] is not permitted, please reformat your input and try again.',
           });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/cases_webhook.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/cases_webhook.ts
index 89e62be241412..35401f0c426a2 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/cases_webhook.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/cases_webhook.ts
@@ -471,7 +471,7 @@ export default function casesWebhookTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   '[Action][Webhook - Case Management]: Unable to create case. Error: JSON Error: Create case JSON body must be valid JSON.  ',
               });
@@ -502,7 +502,7 @@ export default function casesWebhookTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   '[Action][Webhook - Case Management]: Unable to update case with id 12345. Error: JSON Error: Update case JSON body must be valid JSON.  ',
               });
@@ -570,7 +570,7 @@ export default function casesWebhookTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   '[Action][Webhook - Case Management]: Unable to create comment at case with id 123. Error: JSON Error: Create comment JSON body must be valid JSON.  ',
               });
@@ -638,7 +638,7 @@ export default function casesWebhookTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   '[Action][Webhook - Case Management]: Unable to create case. Error: Invalid Create case URL: Error: Invalid protocol.  ',
               });
@@ -669,7 +669,7 @@ export default function casesWebhookTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   '[Action][Webhook - Case Management]: Unable to update case with id 12345. Error: Invalid Update case URL: Error: Invalid URL.  ',
               });
@@ -737,7 +737,7 @@ export default function casesWebhookTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   '[Action][Webhook - Case Management]: Unable to create comment at case with id 123. Error: Invalid Create comment URL: Error: Invalid URL.  ',
               });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/d3security.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/d3security.ts
index 3b99ea477f137..7e1f0636b3a96 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/d3security.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/d3security.ts
@@ -198,7 +198,7 @@ export default function d3SecurityTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message: `Sub action "invalidAction" is not registered. Connector id: ${d3SecurityActionId}. Connector name: D3 Security. Connector type: .d3security`,
           });
         });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/openai.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/openai.ts
index 4d23e887085e0..a971f18b7130d 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/openai.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/openai.ts
@@ -267,7 +267,7 @@ export default function genAiTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message: `Sub action "invalidAction" is not registered. Connector id: ${genAiActionId}. Connector name: OpenAI. Connector type: .gen-ai`,
           });
         });
@@ -487,7 +487,7 @@ export default function genAiTest({ getService }: FtrProviderContext) {
               connector_id: genAiActionId,
               message: 'an error occurred while running the action',
               retry: true,
-              errorSource: TaskErrorSource.USER,
+              errorSource: TaskErrorSource.FRAMEWORK,
               service_message:
                 'Status code: 422. Message: API Error: Unprocessable Entity - The model `bad model` does not exist',
             });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/opsgenie.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/opsgenie.ts
index 792e5dd021b3b..35d6d66f935fd 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/opsgenie.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/opsgenie.ts
@@ -191,7 +191,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message: `Sub action "invalidAction" is not registered. Connector id: ${opsgenieActionId}. Connector name: Opsgenie. Connector type: .opsgenie`,
           });
         });
@@ -210,7 +210,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Request validation failed (Error: [message]: expected value of type [string] but got [undefined])',
           });
@@ -230,7 +230,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Request validation failed (Error: [alias]: expected value of type [string] but got [undefined])',
           });
@@ -263,7 +263,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   'Request validation failed (Error: [responders.0]: types that failed validation:\n- [responders.0.0.type]: types that failed validation:\n - [responders.0.type.0]: expected value to equal [team]\n - [responders.0.type.1]: expected value to equal [user]\n - [responders.0.type.2]: expected value to equal [escalation]\n - [responders.0.type.3]: expected value to equal [schedule]\n- [responders.0.1.id]: expected value of type [string] but got [undefined]\n- [responders.0.2.username]: expected value of type [string] but got [undefined])',
               });
@@ -293,7 +293,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   'Request validation failed (Error: [responders.0]: types that failed validation:\n- [responders.0.0.name]: expected value of type [string] but got [undefined]\n- [responders.0.1.id]: expected value of type [string] but got [undefined]\n- [responders.0.2.username]: expected value of type [string] but got [undefined])',
               });
@@ -396,7 +396,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   'Request validation failed (Error: [visibleTo.0]: types that failed validation:\n- [visibleTo.0.0.type]: expected value to equal [team]\n- [visibleTo.0.1.id]: expected value of type [string] but got [undefined]\n- [visibleTo.0.2.id]: expected value of type [string] but got [undefined]\n- [visibleTo.0.3.username]: expected value of type [string] but got [undefined])',
               });
@@ -461,7 +461,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
                 status: 'error',
                 retry: true,
                 message: 'an error occurred while running the action',
-                errorSource: TaskErrorSource.USER,
+                errorSource: TaskErrorSource.FRAMEWORK,
                 service_message:
                   'Request validation failed (Error: [details.bananas]: expected value of type [string] but got [number])',
               });
@@ -697,7 +697,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
               message: 'an error occurred while running the action',
               retry: true,
               connector_id: opsgenieActionId,
-              errorSource: TaskErrorSource.USER,
+              errorSource: TaskErrorSource.FRAMEWORK,
               service_message:
                 'Status code: 422. Message: Request failed with status code 422: {"message":"failed"}',
             });
@@ -721,7 +721,7 @@ export default function opsgenieTest({ getService }: FtrProviderContext) {
               message: 'an error occurred while running the action',
               retry: true,
               connector_id: opsgenieActionId,
-              errorSource: TaskErrorSource.USER,
+              errorSource: TaskErrorSource.FRAMEWORK,
               service_message:
                 'Status code: 422. Message: Request failed with status code 422: {"message":"failed"}',
             });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/tines.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/tines.ts
index e6e3f8511c422..fb86cc94776dc 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/tines.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/connector_types/tines.ts
@@ -210,7 +210,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message: `Sub action "invalidAction" is not registered. Connector id: ${tinesActionId}. Connector name: Tines. Connector type: .tines`,
           });
         });
@@ -229,7 +229,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Request validation failed (Error: [storyId]: expected value of type [number] but got [undefined])',
           });
@@ -249,7 +249,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Invalid subActionsParams: [webhook] or [webhookUrl] expected but got none',
           });
@@ -273,7 +273,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Request validation failed (Error: [webhook.storyId]: expected value of type [number] but got [undefined])',
           });
@@ -297,7 +297,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Request validation failed (Error: [webhook.name]: expected value of type [string] but got [undefined])',
           });
@@ -321,7 +321,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Request validation failed (Error: [webhook.path]: expected value of type [string] but got [undefined])',
           });
@@ -345,7 +345,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
             status: 'error',
             retry: true,
             message: 'an error occurred while running the action',
-            errorSource: TaskErrorSource.USER,
+            errorSource: TaskErrorSource.FRAMEWORK,
             service_message:
               'Request validation failed (Error: [webhook.secret]: expected value of type [string] but got [undefined])',
           });
@@ -503,7 +503,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
               message: 'an error occurred while running the action',
               retry: true,
               connector_id: tinesActionId,
-              errorSource: TaskErrorSource.USER,
+              errorSource: TaskErrorSource.FRAMEWORK,
               service_message: 'Status code: 422. Message: API Error: Unprocessable Entity',
             });
           });
@@ -525,7 +525,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
               message: 'an error occurred while running the action',
               retry: true,
               connector_id: tinesActionId,
-              errorSource: TaskErrorSource.USER,
+              errorSource: TaskErrorSource.FRAMEWORK,
               service_message: 'Status code: 422. Message: API Error: Unprocessable Entity',
             });
           });
@@ -545,7 +545,7 @@ export default function tinesTest({ getService }: FtrProviderContext) {
               message: 'an error occurred while running the action',
               retry: true,
               connector_id: tinesActionId,
-              errorSource: TaskErrorSource.USER,
+              errorSource: TaskErrorSource.FRAMEWORK,
               service_message: 'Status code: 422. Message: API Error: Unprocessable Entity',
             });
           });
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/sub_action_framework/index.ts b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/sub_action_framework/index.ts
index e8470a2313209..0a363e001535b 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/sub_action_framework/index.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/sub_action_framework/index.ts
@@ -170,7 +170,7 @@ export default function createActionTests({ getService }: FtrProviderContext) {
           message: 'an error occurred while running the action',
           retry: true,
           connector_id: res.body.id,
-          errorSource: TaskErrorSource.USER,
+          errorSource: TaskErrorSource.FRAMEWORK,
           service_message:
             'Request validation failed (Error: [id]: expected value of type [string] but got [undefined])',
         });
@@ -251,7 +251,7 @@ export default function createActionTests({ getService }: FtrProviderContext) {
           message: 'an error occurred while running the action',
           retry: true,
           connector_id: res.body.id,
-          errorSource: TaskErrorSource.USER,
+          errorSource: TaskErrorSource.FRAMEWORK,
           service_message: `Sub action \"notRegistered\" is not registered. Connector id: ${res.body.id}. Connector name: Test: Sub action connector. Connector type: test.sub-action-connector`,
         });
       });
@@ -272,7 +272,7 @@ export default function createActionTests({ getService }: FtrProviderContext) {
           message: 'an error occurred while running the action',
           retry: true,
           connector_id: res.body.id,
-          errorSource: TaskErrorSource.USER,
+          errorSource: TaskErrorSource.FRAMEWORK,
           service_message: `Method \"notAFunction\" does not exists in service. Sub action: \"notAFunction\". Connector id: ${res.body.id}. Connector name: Test: Sub action connector. Connector type: test.sub-action-connector`,
         });
       });
@@ -293,7 +293,7 @@ export default function createActionTests({ getService }: FtrProviderContext) {
           message: 'an error occurred while running the action',
           retry: true,
           connector_id: res.body.id,
-          errorSource: TaskErrorSource.USER,
+          errorSource: TaskErrorSource.FRAMEWORK,
           service_message: `Method \"notExist\" does not exists in service. Sub action: \"notExist\". Connector id: ${res.body.id}. Connector name: Test: Sub action connector. Connector type: test.sub-action-connector`,
         });
       });
@@ -317,7 +317,7 @@ export default function createActionTests({ getService }: FtrProviderContext) {
           message: 'an error occurred while running the action',
           retry: true,
           connector_id: res.body.id,
-          errorSource: TaskErrorSource.USER,
+          errorSource: TaskErrorSource.FRAMEWORK,
           service_message: 'You should register at least one subAction for your connector type',
         });
       });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
index f9b3d1c4120b6..45d469eb1132d 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/execute.ts
@@ -133,7 +133,7 @@ export default function ({ getService }: FtrProviderContext) {
         message: 'an error occurred while running the action',
         service_message: `expected failure for ${ES_TEST_INDEX_NAME} ${reference}`,
         retry: true,
-        errorSource: TaskErrorSource.USER,
+        errorSource: TaskErrorSource.FRAMEWORK,
       });
 
       await validateEventLog({
@@ -329,7 +329,7 @@ export default function ({ getService }: FtrProviderContext) {
           message: 'an error occurred while running the action',
           serviceMessage: `expected failure for ${ES_TEST_INDEX_NAME} ${reference}`,
           retry: true,
-          errorSource: TaskErrorSource.USER,
+          errorSource: TaskErrorSource.FRAMEWORK,
         });
       });
     });

From e43dd0e93be5a851c7007b086363161a50926545 Mon Sep 17 00:00:00 2001
From: Alexi Doak <109488926+doakalexi@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:38:34 -0700
Subject: [PATCH 44/63] [Response Ops][Alerting] Add managed: true to meta for
 alerting API keys (#179770)

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

## Summary

This PR adds `managed:true` to the meta field when creating API keys a
rule.


### To verify

- Create a rule
- Go to the [API key
page](http://localhost:5601/app/management/security/api_keys/) and
verify that the managed tag is visible in the ui
- Use dev tools and refresh the page to inspect the api_key request,
verify that `metadata: { managed: true }`
---
 .../alerting/server/rules_client_factory.test.ts       | 10 +++++++++-
 x-pack/plugins/alerting/server/rules_client_factory.ts |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/alerting/server/rules_client_factory.test.ts b/x-pack/plugins/alerting/server/rules_client_factory.test.ts
index b02321c5da1d1..adb6e0c88d30f 100644
--- a/x-pack/plugins/alerting/server/rules_client_factory.test.ts
+++ b/x-pack/plugins/alerting/server/rules_client_factory.test.ts
@@ -249,11 +249,19 @@ test('createAPIKey() returns an API key when security is enabled', async () => {
     id: 'abc',
     name: '',
   });
-  const createAPIKeyResult = await constructorCall.createAPIKey();
+  const createAPIKeyResult = await constructorCall.createAPIKey('test');
   expect(createAPIKeyResult).toEqual({
     apiKeysEnabled: true,
     result: { api_key: '123', id: 'abc', name: '' },
   });
+  expect(securityPluginStart.authc.apiKeys.grantAsInternalUser).toHaveBeenCalledWith(
+    expect.any(Object),
+    {
+      metadata: { managed: true },
+      name: 'test',
+      role_descriptors: {},
+    }
+  );
 });
 
 test('createAPIKey() throws when security plugin createAPIKey throws an error', async () => {
diff --git a/x-pack/plugins/alerting/server/rules_client_factory.ts b/x-pack/plugins/alerting/server/rules_client_factory.ts
index d5402355930fa..ad3035791bde6 100644
--- a/x-pack/plugins/alerting/server/rules_client_factory.ts
+++ b/x-pack/plugins/alerting/server/rules_client_factory.ts
@@ -151,7 +151,7 @@ export class RulesClientFactory {
         // privileges
         const createAPIKeyResult = await securityPluginStart.authc.apiKeys.grantAsInternalUser(
           request,
-          { name, role_descriptors: {} }
+          { name, role_descriptors: {}, metadata: { managed: true } }
         );
         if (!createAPIKeyResult) {
           return { apiKeysEnabled: false };

From 1c1e20afdb883fc279c5a06d4b71f8e577f8dad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Tue, 2 Apr 2024 20:41:33 +0200
Subject: [PATCH 45/63] Use `rxjs` instead of `rxjs/operators` (#179553)

---
 .eslintrc.js                                       |  5 +++++
 .../public/run_expressions.tsx                     |  2 +-
 .../partial_results_example/public/app/app.tsx     |  2 +-
 .../public/functions/count_event.ts                |  2 +-
 .../public/functions/get_events.ts                 |  2 +-
 .../search_examples/public/search_sessions/app.tsx |  2 +-
 examples/search_examples/server/my_strategy.ts     |  2 +-
 .../src/analytics_client/analytics_client.ts       |  2 +-
 .../src/track_clicks.test.ts                       |  3 +--
 .../integration_tests/application_service.test.tsx |  3 +--
 .../src/application_service.test.ts                |  2 +-
 .../src/application_service.tsx                    |  2 +-
 .../src/bundle_routes/utils.ts                     |  2 +-
 .../src/chrome_service.test.tsx                    |  2 +-
 .../src/chrome_service.tsx                         |  2 +-
 .../src/nav_controls/nav_controls_service.test.ts  |  2 +-
 .../src/nav_controls/nav_controls_service.ts       |  2 +-
 .../src/nav_links/nav_links_service.test.ts        |  2 +-
 .../src/nav_links/nav_links_service.ts             |  2 +-
 .../src/recently_accessed/persisted_log.ts         |  2 +-
 .../recently_accessed_service.test.ts              |  2 +-
 .../src/custom_branding_service.ts                 |  2 +-
 .../src/elasticsearch_service.test.ts              |  2 +-
 .../src/elasticsearch_service.ts                   |  2 +-
 .../src/is_valid_connection.ts                     |  2 +-
 .../src/retry_call_cluster.ts                      |  2 +-
 .../src/status.test.ts                             |  2 +-
 .../src/status.ts                                  |  2 +-
 .../src/version_check/ensure_es_version.test.ts    |  2 +-
 .../src/version_check/ensure_es_version.ts         |  2 +-
 .../src/execution_context_service.ts               |  2 +-
 .../core-http-browser-internal/src/fetch.test.ts   |  2 +-
 .../src/loading_count_service.test.ts              |  2 +-
 .../src/loading_count_service.ts                   | 10 +---------
 .../src/request.ts                                 |  2 +-
 .../core-http-server-internal/src/http_server.ts   |  2 +-
 .../core-http-server-internal/src/http_service.ts  |  2 +-
 .../src/moment/moment_service.ts                   |  2 +-
 .../src/metrics_service.test.ts                    |  2 +-
 .../src/banners/banners_service.test.ts            |  2 +-
 .../src/banners/banners_service.tsx                |  2 +-
 .../src/banners/user_banner_service.tsx            |  2 +-
 .../src/discovery/plugins_discovery.test.ts        |  2 +-
 .../src/discovery/plugins_discovery.ts             |  2 +-
 .../src/discovery/scan_plugin_search_paths.test.ts |  2 +-
 .../src/discovery/scan_plugin_search_paths.ts      |  2 +-
 .../src/legacy_config.test.ts                      |  2 +-
 .../src/legacy_config.ts                           |  2 +-
 .../src/plugin_context.test.ts                     |  2 +-
 .../src/plugin_context.ts                          |  2 +-
 .../src/plugins_service.test.ts                    |  2 +-
 .../src/plugins_service.ts                         |  2 +-
 .../src/rendering_service.tsx                      |  2 +-
 .../src/rendering_service.tsx                      |  2 +-
 .../src/root/index.test.ts                         |  2 +-
 .../core-root-server-internal/src/root/index.ts    |  9 +--------
 .../src/kibana_migrator.test.ts                    |  2 +-
 .../src/saved_objects_service.test.ts              |  2 +-
 .../src/saved_objects_service.ts                   |  2 +-
 .../src/status.test.ts                             |  2 +-
 .../src/status.ts                                  |  2 +-
 .../src/log_core_services_status.ts                |  2 +-
 .../src/log_overall_status.ts                      |  2 +-
 .../src/log_plugins_status.ts                      |  2 +-
 .../src/plugins_status.test.ts                     |  2 +-
 .../src/plugins_status.ts                          | 10 +---------
 .../src/status_service.test.ts                     |  2 +-
 .../src/status_service.ts                          |  2 +-
 .../src/ui_settings_api.test.ts                    |  2 +-
 .../src/ui_settings_client.test.ts                 |  2 +-
 .../src/ui_settings_client_common.ts               |  2 +-
 .../src/ui_settings_global_client.test.ts          |  2 +-
 .../src/core_usage_data_service.ts                 |  2 +-
 .../kbn-cli-dev-mode/src/base_path_proxy_server.ts |  2 +-
 packages/kbn-cli-dev-mode/src/cli_dev_mode.ts      |  2 +-
 packages/kbn-cli-dev-mode/src/dev_server.ts        | 12 +-----------
 packages/kbn-cli-dev-mode/src/optimizer.test.ts    |  2 +-
 packages/kbn-cli-dev-mode/src/optimizer.ts         |  4 ++--
 packages/kbn-config/src/config_service.test.ts     |  2 +-
 packages/kbn-config/src/config_service.ts          |  2 +-
 packages/kbn-config/src/raw/raw_config_service.ts  |  2 +-
 packages/kbn-dev-proc-runner/src/proc.ts           |  2 +-
 packages/kbn-dev-utils/src/extract.ts              |  2 +-
 .../services/remote/create_stdout_stream.ts        |  2 +-
 .../services/remote/poll_for_log_entry.ts          |  2 +-
 .../services/remote/webdriver.ts                   |  2 +-
 .../src/common/event_stream_helpers.test.ts        |  2 +-
 .../kbn-optimizer/src/log_optimizer_progress.ts    |  2 +-
 packages/kbn-optimizer/src/log_optimizer_state.ts  |  2 +-
 .../kbn-optimizer/src/optimizer/bundle_cache.ts    |  2 +-
 .../src/optimizer/handle_optimizer_completion.ts   |  2 +-
 .../kbn-optimizer/src/optimizer/observe_worker.ts  |  2 +-
 .../kbn-optimizer/src/optimizer/run_workers.ts     |  2 +-
 .../src/optimizer/watch_bundles_for_changes.ts     |  2 +-
 packages/kbn-optimizer/src/optimizer/watcher.ts    |  2 +-
 .../kbn-optimizer/src/report_optimizer_timings.ts  |  2 +-
 packages/kbn-optimizer/src/run_optimizer.ts        |  2 +-
 packages/kbn-optimizer/src/worker/run_compilers.ts |  2 +-
 packages/kbn-optimizer/src/worker/run_worker.ts    |  2 +-
 .../export_types/pdf/printable_pdf.ts              |  2 +-
 packages/kbn-std/src/iteration/map.test.ts         |  2 +-
 packages/kbn-std/src/iteration/map.ts              |  2 +-
 packages/kbn-std/src/iteration/observable.test.ts  |  2 +-
 packages/kbn-std/src/iteration/observable.ts       |  2 +-
 packages/kbn-std/src/semaphore.ts                  |  2 +-
 .../lib/docker_servers/container_logs.ts           |  2 +-
 .../lib/docker_servers/docker_servers_service.ts   |  2 +-
 .../lib/lifecycle_phase.test.ts                    |  2 +-
 .../src/fetch_fields_from_esql.ts                  |  2 +-
 packages/kbn-tooling-log/src/tooling_log.test.ts   |  2 +-
 packages/kbn-ui-shared-deps-npm/webpack.config.js  |  1 -
 packages/kbn-ui-shared-deps-src/src/definitions.js |  1 -
 packages/kbn-ui-shared-deps-src/src/entry.js       |  1 -
 .../interfaces/last_saved_state.ts                 |  2 +-
 .../publishing_subject/publishing_batcher.ts       |  3 +--
 .../reload_logging_config.test.ts                  |  2 +-
 .../metrics/server_collector.test.ts               |  2 +-
 src/dev/build/lib/scan.ts                          |  2 +-
 src/dev/build/tasks/assert_file_time.ts            |  2 +-
 src/dev/code_coverage/ingest_coverage/process.js   |  3 +--
 .../ingest_coverage/team_assignment/index.js       |  2 +-
 .../team_assignment/parse_owners.js                |  3 +--
 src/dev/eslint/run_eslint_with_types.ts            |  2 +-
 src/dev/prs/helpers.ts                             |  2 +-
 src/dev/prs/run_update_prs_cli.ts                  |  2 +-
 .../bfetch/public/streaming/fetch_streaming.ts     |  2 +-
 src/plugins/bfetch/public/streaming/split.ts       |  2 +-
 .../server/streaming/create_compressed_stream.ts   |  2 +-
 .../services/active_cursor/use_active_cursor.ts    |  2 +-
 .../charts/public/services/theme/theme.test.tsx    |  2 +-
 .../public/content_client/content_client.test.ts   |  2 +-
 .../embeddable/control_group_container.tsx         |  2 +-
 .../embeddable/options_list_embeddable.tsx         |  2 +-
 .../embeddable/range_slider_embeddable.tsx         |  2 +-
 .../time_slider/components/time_slider_prepend.tsx |  2 +-
 .../embeddable/time_slider_embeddable.tsx          |  2 +-
 .../dashboard_app/url/sync_dashboard_url_state.ts  |  2 +-
 .../dashboard_control_group_integration.ts         |  2 +-
 .../embeddable/create/create_dashboard.ts          |  2 +-
 .../create/data_views/sync_dashboard_data_views.ts |  2 +-
 .../start_dashboard_search_session_integration.ts  |  2 +-
 .../sync_dashboard_unified_search_state.ts         |  2 +-
 .../embeddable/dashboard_container.tsx             |  2 +-
 .../state/diffing/dashboard_diffing_integration.ts |  2 +-
 src/plugins/dashboard/public/plugin.tsx            |  2 +-
 .../expressions/esaggs/request_handler.test.ts     |  2 +-
 .../search/expressions/esaggs/request_handler.ts   |  2 +-
 src/plugins/data/common/search/expressions/esql.ts |  2 +-
 .../data/common/search/expressions/essql.ts        |  2 +-
 src/plugins/data/common/search/poll_search.ts      |  2 +-
 .../search/search_source/search_source.test.ts     |  2 +-
 .../common/search/search_source/search_source.ts   | 11 +----------
 .../public/query/persisted_log/persisted_log.ts    |  2 +-
 src/plugins/data/public/query/query_service.ts     |  2 +-
 .../query/query_string/query_string_manager.ts     |  2 +-
 .../query/state_sync/connect_to_query_state.ts     |  2 +-
 .../state_sync/create_query_state_observable.ts    |  2 +-
 .../query/timefilter/lib/auto_refresh_loop.ts      |  2 +-
 .../public/query/timefilter/lib/page_visibility.ts |  2 +-
 .../search/collectors/create_usage_collector.ts    |  2 +-
 .../data/public/search/expressions/esaggs.ts       |  2 +-
 .../search_interceptor/search_interceptor.ts       |  2 +-
 .../search_response_cache.test.ts                  |  2 +-
 .../public/search/session/search_session_state.ts  |  2 +-
 .../data/public/search/session/session_helpers.ts  |  2 +-
 .../connected_search_session_indicator.test.tsx    |  2 +-
 .../connected_search_session_indicator.tsx         |  2 +-
 .../public/search/session/session_service.test.ts  |  2 +-
 .../data/public/search/session/session_service.ts  |  2 +-
 .../public/search/session/sessions_mgmt/lib/api.ts |  2 +-
 .../data/server/search/expressions/esaggs.ts       |  2 +-
 src/plugins/data/server/search/routes/bsearch.ts   |  2 +-
 src/plugins/data/server/search/routes/search.ts    |  2 +-
 src/plugins/data/server/search/search_service.ts   |  2 +-
 .../strategies/eql_search/eql_search_strategy.ts   |  2 +-
 .../strategies/es_search/es_search_strategy.ts     |  2 +-
 .../strategies/ese_search/ese_search_strategy.ts   |  2 +-
 .../esql_async_search_strategy.ts                  |  2 +-
 .../strategies/sql_search/sql_search_strategy.ts   |  2 +-
 .../data_view_field_editor/public/state_utils.ts   |  2 +-
 src/plugins/data_views/common/data_views/utils.ts  |  2 +-
 .../main/hooks/use_saved_search_messages.test.ts   |  2 +-
 .../main/services/discover_search_session.ts       |  2 +-
 .../application/main/utils/fetch_all.test.ts       |  2 +-
 .../application/main/utils/fetch_documents.ts      |  2 +-
 .../application/main/utils/fetch_text_based.ts     |  2 +-
 .../application/main/utils/get_fetch_observable.ts |  2 +-
 .../public/utils/initialize_kbn_url_tracking.ts    |  2 +-
 .../embeddable/public/lib/containers/container.ts  |  2 +-
 .../public/lib/embeddables/embeddable.test.tsx     |  2 +-
 .../public/lib/embeddables/embeddable.tsx          |  2 +-
 .../lib/filterable_embeddable/should_fetch.tsx     |  2 +-
 .../react_embeddable_unsaved_changes.ts            |  2 +-
 .../embeddable/public/tests/container.test.ts      |  2 +-
 .../embeddable/public/tests/explicit_input.test.ts |  2 +-
 .../hook_form_lib/components/use_field.test.tsx    |  2 +-
 .../expressions/common/execution/execution.test.ts |  2 +-
 .../expressions/common/execution/execution.ts      |  2 +-
 .../common/execution/execution_contract.test.ts    |  2 +-
 .../common/execution/execution_contract.ts         |  2 +-
 .../expression_functions/specs/map_column.ts       |  2 +-
 src/plugins/expressions/public/loader.test.ts      |  2 +-
 src/plugins/expressions/public/loader.ts           |  2 +-
 .../react_expression_renderer.test.tsx             |  2 +-
 .../use_expression_renderer.ts                     |  2 +-
 src/plugins/expressions/public/render.test.ts      |  2 +-
 src/plugins/expressions/public/render.ts           |  2 +-
 .../public/image_editor/configure_image.tsx        |  2 +-
 .../server/elasticsearch_service.ts                |  7 +++++--
 .../interactive_setup/server/routes/configure.ts   |  2 +-
 .../interactive_setup/server/routes/enroll.ts      |  2 +-
 .../interactive_setup/server/routes/status.ts      |  2 +-
 src/plugins/kibana_overview/public/plugin.ts       |  2 +-
 .../collectors/event_loop_delays/track_delays.ts   |  2 +-
 .../event_loop_delays/track_threshold.ts           |  2 +-
 ...stinct_until_changed_with_initial_value.test.ts |  2 +-
 .../distinct_until_changed_with_initial_value.ts   |  2 +-
 .../state_containers/create_state_container.ts     |  2 +-
 .../docs/state_sync/no_state_containers.md         |  2 +-
 .../public/history/history_observable.ts           |  2 +-
 .../kibana_utils/public/state_sync/state_sync.ts   |  2 +-
 .../create_kbn_url_state_storage.test.ts           |  2 +-
 .../create_kbn_url_state_storage.ts                |  2 +-
 .../links/public/editor/open_editor_flyout.tsx     |  2 +-
 src/plugins/newsfeed/public/lib/api.test.ts        |  2 +-
 src/plugins/newsfeed/public/lib/api.ts             |  2 +-
 src/plugins/newsfeed/public/lib/driver.test.ts     |  2 +-
 src/plugins/newsfeed/public/lib/storage.test.ts    |  2 +-
 src/plugins/newsfeed/public/plugin.test.ts         |  2 +-
 src/plugins/newsfeed/public/plugin.tsx             |  2 +-
 .../telemetry/public/services/telemetry_sender.ts  |  2 +-
 .../state/drilldown_manager_state.ts               |  2 +-
 .../drilldown_manager/state/drilldown_state.ts     |  2 +-
 .../public/container/utils/use_state_selector.ts   |  2 +-
 .../collectors/create_usage_collector.ts           |  2 +-
 .../query_string_input/query_bar_top_row.tsx       |  2 +-
 .../public/services/application_usage.ts           |  2 +-
 .../server/usage_counters/usage_counter.test.ts    |  2 +-
 .../usage_counters/usage_counters_service.test.ts  |  2 +-
 .../usage_counters/usage_counters_service.ts       |  2 +-
 .../public/application/components/vis_editor.tsx   |  2 +-
 .../components/vis_editor_visualization.js         |  2 +-
 .../strategies/abstract_search_strategy.ts         |  2 +-
 src/plugins/vis_types/timeseries/server/plugin.ts  |  2 +-
 .../vis_types/vega/public/data_model/search_api.ts |  2 +-
 .../vega/public/vega_inspector/vega_adapter.ts     |  2 +-
 .../public/actions/edit_in_lens_action.tsx         |  2 +-
 .../embeddable/visualize_embeddable_factory.tsx    |  2 +-
 src/plugins/visualizations/public/plugin.ts        |  2 +-
 .../utils/use/use_visualize_app_state.tsx          |  2 +-
 .../plugins/analytics_plugin_a/public/plugin.ts    |  2 +-
 .../plugins/analytics_plugin_a/server/plugin.ts    |  2 +-
 .../public/app/components/main.tsx                 |  2 +-
 .../plugins/kbn_tp_run_pipeline/server/plugin.ts   |  2 +-
 .../reporting_example/public/containers/main.tsx   |  2 +-
 .../src/use_cancellable_search.ts                  |  2 +-
 .../ml/date_picker/src/hooks/use_timefilter.ts     |  2 +-
 x-pack/packages/ml/url_state/src/url_state.tsx     |  2 +-
 .../change_point_detection_root.tsx                |  2 +-
 .../components/log_categorization/show_flyout.tsx  |  2 +-
 .../embeddable_chart_component_wrapper.tsx         |  2 +-
 .../aiops/public/hooks/use_cancellable_search.ts   |  2 +-
 .../canvas_plugin_src/functions/common/case.ts     |  2 +-
 .../functions/common/filterrows.ts                 |  2 +-
 .../canvas_plugin_src/functions/common/ply.ts      |  2 +-
 .../canvas/public/services/kibana/expressions.ts   |  2 +-
 .../markdown_editor/plugins/lens/plugin.tsx        |  2 +-
 .../plugins/lens/use_lens_draft_comment.ts         |  2 +-
 .../data_drift/document_count_with_brush.tsx       |  2 +-
 .../index_data_visualizer/hooks/use_field_stats.ts |  2 +-
 .../hooks/use_overall_stats.ts                     |  2 +-
 .../requests/get_boolean_field_stats.ts            |  2 +-
 .../requests/get_date_field_stats.ts               |  2 +-
 .../search_strategy/requests/get_field_examples.ts |  2 +-
 .../requests/get_numeric_field_stats.ts            |  2 +-
 .../requests/get_string_field_stats.ts             |  2 +-
 .../event_log/server/es/cluster_client_adapter.ts  |  2 +-
 x-pack/plugins/fleet/public/search_provider.ts     |  2 +-
 .../helpers/docker_registry_helper.ts              |  2 +-
 x-pack/plugins/fleet/server/plugin.ts              |  2 +-
 .../public/services/fetch_server_results.ts        |  2 +-
 .../public/services/search_service.ts              |  2 +-
 x-pack/plugins/global_search/server/routes/find.ts |  2 +-
 .../server/services/search_service.ts              |  2 +-
 .../public/components/search_bar.test.tsx          |  2 +-
 .../public/providers/application.ts                |  2 +-
 .../providers/saved_objects/provider.test.ts       |  2 +-
 .../server/providers/saved_objects/provider.ts     |  2 +-
 x-pack/plugins/graph/server/lib/license_state.ts   |  2 +-
 .../text_based/fetch_data_from_aggregate_query.ts  |  2 +-
 .../plugins/lens/public/embeddable/embeddable.tsx  |  2 +-
 .../subscribe_to_external_context.ts               |  2 +-
 .../licensing/common/license_update.test.ts        |  2 +-
 x-pack/plugins/licensing/common/license_update.ts  |  2 +-
 x-pack/plugins/licensing/public/plugin.test.ts     |  2 +-
 x-pack/plugins/licensing/server/plugin_status.ts   |  2 +-
 .../plugins/logstash/public/application/index.tsx  |  2 +-
 x-pack/plugins/logstash/public/plugin.ts           |  2 +-
 .../classes/sources/esql_source/esql_source.tsx    |  2 +-
 .../connected_components/timeslider/timeslider.tsx |  4 ++--
 .../maps/public/embeddable/map_component.tsx       |  2 +-
 .../maps/public/embeddable/map_embeddable.tsx      |  2 +-
 .../public/embeddable/map_embeddable_factory.ts    |  2 +-
 .../public/routes/map_page/map_app/map_app.tsx     |  2 +-
 .../map_app/wait_until_time_layers_load.ts         |  2 +-
 .../public/routes/map_page/url_state/app_sync.ts   |  2 +-
 x-pack/plugins/ml/common/license/ml_license.ts     |  2 +-
 .../application/capabilities/check_capabilities.ts |  2 +-
 .../chart_tooltip/chart_tooltip_service.ts         |  2 +-
 .../contexts/ml/ml_notifications_context.tsx       |  2 +-
 .../data_frame_analytics/common/analytics.ts       |  2 +-
 .../application/explorer/actions/job_selection.ts  |  2 +-
 .../explorer/actions/load_explorer_data.ts         |  2 +-
 .../anomaly_detection_alerts_state_service.ts      |  2 +-
 .../explorer/anomaly_charts_state_service.ts       |  2 +-
 .../explorer/anomaly_explorer_common_state.ts      |  2 +-
 .../explorer/anomaly_timeline_state_service.ts     |  2 +-
 .../explorer/explorer_dashboard_service.ts         |  2 +-
 .../job_creator/util/model_memory_estimator.ts     |  2 +-
 .../new_job/common/job_validator/job_validator.ts  |  2 +-
 .../new_job/common/job_validator/validators.ts     |  2 +-
 .../category_stopped_partitions.tsx                |  2 +-
 .../test_models/models/inference_base.ts           |  2 +-
 .../question_answering_inference.ts                |  2 +-
 .../text_classification/fill_mask_inference.ts     |  2 +-
 .../zero_shot_classification_inference.ts          |  2 +-
 .../text_expansion/text_expansion_inference.ts     |  2 +-
 .../ml/public/application/routing/use_refresh.ts   |  2 +-
 .../application/services/annotations_service.tsx   |  2 +-
 .../services/anomaly_detector_service.ts           |  2 +-
 .../services/anomaly_explorer_charts_service.ts    |  2 +-
 .../application/services/forecast_service.ts       |  2 +-
 .../services/results_service/result_service_rx.ts  |  2 +-
 .../timeseriesexplorer/timeseriesexplorer.js       | 12 ++++++++++--
 .../timeseriesexplorer_embeddable_chart.js         | 12 ++++++++++--
 .../time_series_search_service.ts                  |  2 +-
 .../util/time_series_explorer_service.ts           |  2 +-
 .../use_anomaly_charts_input_resolver.ts           |  2 +-
 .../anomaly_swimlane/swimlane_input_resolver.ts    |  2 +-
 .../embeddables/common/get_jobs_observable.ts      |  2 +-
 .../embeddables/common/resolve_job_selection.tsx   |  2 +-
 .../common/use_embeddable_execution_context.ts     |  2 +-
 .../job_creation/common/create_flyout.tsx          |  2 +-
 .../use_single_metric_viewer_input_resolver.ts     |  2 +-
 x-pack/plugins/ml/public/plugin.ts                 |  2 +-
 .../observability_solution/apm/public/plugin.ts    |  2 +-
 .../common/dependency_mocks/index_patterns.ts      |  2 +-
 .../asset_details/hooks/use_loading_state.test.ts  | 10 +---------
 .../asset_details/hooks/use_loading_state.ts       |  7 +++++--
 .../asset_details/hooks/use_request_observable.ts  |  2 +-
 .../hooks/use_kibana_index_patterns.mock.tsx       |  2 +-
 .../src/search_bar_state_service.ts                |  2 +-
 .../metrics/hosts/hooks/use_unified_search.ts      |  6 +++---
 .../observability_solution/infra/public/plugin.ts  |  2 +-
 .../data_search/flatten_data_search_response.ts    |  2 +-
 .../data_search/normalize_data_search_responses.ts |  2 +-
 .../utils/data_search/use_data_search_request.ts   |  2 +-
 .../use_latest_partial_data_search_response.ts     |  2 +-
 .../infra/public/utils/use_observable.ts           |  2 +-
 .../infra/public/utils/wrap_state_container.ts     |  2 +-
 .../log_stream/log_stream.story_decorators.tsx     |  2 +-
 .../logs/log_stream/use_fetch_log_entries_after.ts |  2 +-
 .../log_stream/use_fetch_log_entries_around.ts     |  2 +-
 .../log_stream/use_fetch_log_entries_before.ts     |  2 +-
 .../data_search/flatten_data_search_response.ts    |  2 +-
 .../data_search/normalize_data_search_responses.ts |  2 +-
 .../utils/data_search/use_data_search_request.ts   |  2 +-
 .../use_latest_partial_data_search_response.ts     |  2 +-
 .../logs_shared/public/utils/use_observable.ts     |  2 +-
 .../log_entries/log_entries_search_strategy.ts     |  2 +-
 .../log_entries/log_entry_search_strategy.ts       |  2 +-
 .../observability/public/plugin.ts                 |  2 +-
 .../synthetics/public/plugin.ts                    |  2 +-
 .../synthetics_service/service_api_client.ts       |  2 +-
 .../observability_solution/ux/public/plugin.ts     |  2 +-
 .../osquery/server/routes/live_query/utils.ts      |  2 +-
 .../plugins/reporting/public/lib/stream_handler.ts |  2 +-
 x-pack/plugins/reporting/server/core.ts            |  2 +-
 .../reporting/server/lib/tasks/execute_report.ts   |  2 +-
 .../server/search_strategy/search_strategy.ts      |  2 +-
 .../public/management/actions/assign.ts            |  2 +-
 .../public/management/bulk_actions/bulk_assign.ts  |  2 +-
 .../public/services/tags/tags_cache.ts             |  2 +-
 .../public/ui_api/parse_search_query.ts            |  2 +-
 .../browsers/chromium/driver_factory/index.test.ts |  2 +-
 .../browsers/chromium/driver_factory/index.ts      | 11 +----------
 .../server/browsers/safe_child_process.ts          |  2 +-
 x-pack/plugins/screenshotting/server/plugin.ts     |  2 +-
 .../server/screenshots/observable.test.ts          |  2 +-
 .../server/screenshots/observable.ts               |  2 +-
 .../server/screenshots/screenshots.ts              | 12 +-----------
 .../security/common/licensing/license_service.ts   |  2 +-
 .../security/public/analytics/analytics_service.ts |  3 +--
 .../public/nav_control/nav_control_service.tsx     |  3 +--
 .../security_checkup/security_checkup_service.tsx  |  3 +--
 .../security/public/session/session_timeout.ts     |  3 +--
 .../plugins/security/server/audit/audit_service.ts |  2 +-
 .../server/elasticsearch/elasticsearch_service.ts  | 11 +++++++++--
 x-pack/plugins/security/server/plugin.ts           |  2 +-
 .../common/containers/cti/event_enrichment/api.ts  |  2 +-
 .../containers/use_search_strategy/index.tsx       |  2 +-
 .../overview_cti_links/use_ti_data_sources.ts      |  2 +-
 .../server/search_strategy/endpoint/index.ts       |  3 +--
 .../search_strategy/security_solution/index.ts     |  2 +-
 .../components/legacy_url_conflict_internal.tsx    |  2 +-
 .../public/legacy_urls/redirect_legacy_url.ts      |  2 +-
 .../spaces/public/spaces_manager/spaces_manager.ts |  3 +--
 .../server/default_space/default_space_service.ts  | 14 ++++++++++++--
 .../server/ephemeral_task_lifecycle.ts             |  2 +-
 .../server/lib/bulk_operation_buffer.ts            |  2 +-
 .../server/lib/create_managed_configuration.ts     |  2 +-
 .../plugins/task_manager/server/lib/fill_pool.ts   |  2 +-
 .../server/metrics/create_aggregator.test.ts       |  2 +-
 .../server/metrics/metrics_stream.test.ts          |  2 +-
 .../task_manager/server/metrics/metrics_stream.ts  |  2 +-
 .../background_task_utilization_statistics.test.ts |  2 +-
 .../monitoring/configuration_statistics.test.ts    |  2 +-
 .../server/monitoring/configuration_statistics.ts  |  2 +-
 .../monitoring/ephemeral_task_statistics.test.ts   |  2 +-
 .../server/monitoring/ephemeral_task_statistics.ts |  2 +-
 .../monitoring/monitoring_stats_stream.test.ts     |  2 +-
 .../server/monitoring/monitoring_stats_stream.ts   |  2 +-
 .../server/monitoring/task_run_statistics.test.ts  |  2 +-
 .../server/monitoring/task_run_statistics.ts       |  2 +-
 .../server/monitoring/workload_statistics.test.ts  |  2 +-
 .../server/monitoring/workload_statistics.ts       |  2 +-
 x-pack/plugins/task_manager/server/plugin.test.ts  |  2 +-
 x-pack/plugins/task_manager/server/plugin.ts       |  2 +-
 .../polling/delay_on_claim_conflicts.test.ts       |  2 +-
 .../server/polling/delay_on_claim_conflicts.ts     |  2 +-
 .../task_manager/server/polling_lifecycle.ts       |  2 +-
 .../task_manager/server/queries/task_claiming.ts   |  2 +-
 .../server/routes/background_task_utilization.ts   |  2 +-
 .../plugins/task_manager/server/routes/health.ts   |  4 ++--
 .../server/task_claimers/strategy_default.test.ts  |  2 +-
 .../server/task_claimers/strategy_default.ts       |  2 +-
 .../plugins/task_manager/server/task_scheduling.ts |  2 +-
 .../plugins/task_manager/server/task_store.test.ts |  2 +-
 .../threat_intelligence/server/search_strategy.ts  |  2 +-
 .../server/search_strategy/timeline/eql/index.ts   |  2 +-
 .../server/search_strategy/timeline/index.ts       |  2 +-
 .../public/alerting/transform_alerting_flyout.tsx  |  2 +-
 x-pack/plugins/watcher/public/plugin.ts            |  2 +-
 .../enterprise_search_server.ts                    |  2 +-
 .../plugins/global_search_test/public/plugin.ts    |  2 +-
 .../reporting_and_security/spaces.ts               |  2 +-
 .../plugins/test_endpoints/public/plugin.tsx       |  2 +-
 447 files changed, 498 insertions(+), 537 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index dca6267b02c09..5b86e0572e2da 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -253,6 +253,11 @@ const RESTRICTED_IMPORTS = [
     importNames: ['Route'],
     message: 'Please use @kbn/shared-ux-router instead',
   },
+  {
+    name: 'rxjs/operators',
+    message:
+      'Please, use rxjs instead: rxjs/operators is just a subset, unnecessarily duplicating the package import.',
+  },
 ];
 
 module.exports = {
diff --git a/examples/expressions_explorer/public/run_expressions.tsx b/examples/expressions_explorer/public/run_expressions.tsx
index f30069acbc3ca..bd5bf1ad721e5 100644
--- a/examples/expressions_explorer/public/run_expressions.tsx
+++ b/examples/expressions_explorer/public/run_expressions.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { useState, useEffect } from 'react';
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 import {
   EuiCodeBlock,
   EuiFlexItem,
diff --git a/examples/partial_results_example/public/app/app.tsx b/examples/partial_results_example/public/app/app.tsx
index 414c7b3da2e1b..333ce7f6c263e 100644
--- a/examples/partial_results_example/public/app/app.tsx
+++ b/examples/partial_results_example/public/app/app.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { useContext, useEffect, useState } from 'react';
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 import {
   EuiBasicTable,
   EuiCallOut,
diff --git a/examples/partial_results_example/public/functions/count_event.ts b/examples/partial_results_example/public/functions/count_event.ts
index d0d3b562d3fa4..8185e77f756e8 100644
--- a/examples/partial_results_example/public/functions/count_event.ts
+++ b/examples/partial_results_example/public/functions/count_event.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, fromEvent } from 'rxjs';
-import { scan, startWith } from 'rxjs/operators';
+import { scan, startWith } from 'rxjs';
 import type { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 export interface CountEventArguments {
diff --git a/examples/partial_results_example/public/functions/get_events.ts b/examples/partial_results_example/public/functions/get_events.ts
index 57ac2f51d2425..1630a755ad49c 100644
--- a/examples/partial_results_example/public/functions/get_events.ts
+++ b/examples/partial_results_example/public/functions/get_events.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, fromEvent, merge } from 'rxjs';
-import { distinct, map, pluck, scan, take } from 'rxjs/operators';
+import { distinct, map, pluck, scan, take } from 'rxjs';
 import type { Datatable, ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 
 const EVENTS: Array<keyof WindowEventMap> = [
diff --git a/examples/search_examples/public/search_sessions/app.tsx b/examples/search_examples/public/search_sessions/app.tsx
index 501d0b3940c2a..d6adcd2c26f3e 100644
--- a/examples/search_examples/public/search_sessions/app.tsx
+++ b/examples/search_examples/public/search_sessions/app.tsx
@@ -26,7 +26,7 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
-import { catchError, map, tap } from 'rxjs/operators';
+import { catchError, map, tap } from 'rxjs';
 import { lastValueFrom, of } from 'rxjs';
 
 import { CoreStart } from '@kbn/core/public';
diff --git a/examples/search_examples/server/my_strategy.ts b/examples/search_examples/server/my_strategy.ts
index 9eea71b7a6c80..1cd271103d5cc 100644
--- a/examples/search_examples/server/my_strategy.ts
+++ b/examples/search_examples/server/my_strategy.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { ISearchStrategy, PluginStart } from '@kbn/data-plugin/server';
 import { IMyStrategyRequest, IMyStrategyResponse } from '../common/types';
 
diff --git a/packages/analytics/client/src/analytics_client/analytics_client.ts b/packages/analytics/client/src/analytics_client/analytics_client.ts
index 1029a87f2b935..52521ecde95de 100644
--- a/packages/analytics/client/src/analytics_client/analytics_client.ts
+++ b/packages/analytics/client/src/analytics_client/analytics_client.ts
@@ -23,7 +23,7 @@ import {
   skipWhile,
   takeUntil,
   tap,
-} from 'rxjs/operators';
+} from 'rxjs';
 import type { LogMeta } from '@kbn/logging';
 import type { IShipper } from '../shippers';
 import type {
diff --git a/packages/core/analytics/core-analytics-browser-internal/src/track_clicks.test.ts b/packages/core/analytics/core-analytics-browser-internal/src/track_clicks.test.ts
index 427ffc70bc2e1..387a8bddf6cbb 100644
--- a/packages/core/analytics/core-analytics-browser-internal/src/track_clicks.test.ts
+++ b/packages/core/analytics/core-analytics-browser-internal/src/track_clicks.test.ts
@@ -6,10 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { firstValueFrom, ReplaySubject } from 'rxjs';
+import { firstValueFrom, ReplaySubject, take } from 'rxjs';
 import { analyticsClientMock } from './analytics_service.test.mocks';
 import { trackClicks } from './track_clicks';
-import { take } from 'rxjs/operators';
 
 describe('trackClicks', () => {
   const addEventListenerSpy = jest.spyOn(window, 'addEventListener');
diff --git a/packages/core/application/core-application-browser-internal/integration_tests/application_service.test.tsx b/packages/core/application/core-application-browser-internal/integration_tests/application_service.test.tsx
index d9617952b26ca..d04157efb6476 100644
--- a/packages/core/application/core-application-browser-internal/integration_tests/application_service.test.tsx
+++ b/packages/core/application/core-application-browser-internal/integration_tests/application_service.test.tsx
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { BehaviorSubject, type Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { BehaviorSubject, type Observable, take } from 'rxjs';
 import { act } from 'react-dom/test-utils';
 import { createMemoryHistory, MemoryHistory } from 'history';
 
diff --git a/packages/core/application/core-application-browser-internal/src/application_service.test.ts b/packages/core/application/core-application-browser-internal/src/application_service.test.ts
index 9cadadb5504f7..073ce6099830e 100644
--- a/packages/core/application/core-application-browser-internal/src/application_service.test.ts
+++ b/packages/core/application/core-application-browser-internal/src/application_service.test.ts
@@ -16,7 +16,7 @@ import {
 
 import { createElement } from 'react';
 import { BehaviorSubject, firstValueFrom, Subject } from 'rxjs';
-import { bufferCount, takeUntil } from 'rxjs/operators';
+import { bufferCount, takeUntil } from 'rxjs';
 import { mount, shallow } from 'enzyme';
 import { createBrowserHistory } from 'history';
 
diff --git a/packages/core/application/core-application-browser-internal/src/application_service.tsx b/packages/core/application/core-application-browser-internal/src/application_service.tsx
index 417b36daaf9f4..b30f4ce650730 100644
--- a/packages/core/application/core-application-browser-internal/src/application_service.tsx
+++ b/packages/core/application/core-application-browser-internal/src/application_service.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { BehaviorSubject, firstValueFrom, type Observable, Subject, type Subscription } from 'rxjs';
-import { map, shareReplay, takeUntil, distinctUntilChanged, filter, take } from 'rxjs/operators';
+import { map, shareReplay, takeUntil, distinctUntilChanged, filter, take } from 'rxjs';
 import { createBrowserHistory, History } from 'history';
 
 import type { PluginOpaqueId } from '@kbn/core-base-common';
diff --git a/packages/core/apps/core-apps-server-internal/src/bundle_routes/utils.ts b/packages/core/apps/core-apps-server-internal/src/bundle_routes/utils.ts
index a2adefcfa73c2..fe340f836d84e 100644
--- a/packages/core/apps/core-apps-server-internal/src/bundle_routes/utils.ts
+++ b/packages/core/apps/core-apps-server-internal/src/bundle_routes/utils.ts
@@ -9,7 +9,7 @@
 import { createReadStream, Stats } from 'fs';
 import { createHash } from 'crypto';
 import * as Rx from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs';
 
 export const generateFileHash = (fd: number): Promise<string> => {
   const hash = createHash('sha1');
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
index 4ca4c4ff775f5..08847884eeafe 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
@@ -10,7 +10,7 @@ import { registerAnalyticsContextProviderMock } from './chrome_service.test.mock
 import { shallow, mount } from 'enzyme';
 import React from 'react';
 import * as Rx from 'rxjs';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 import { injectedMetadataServiceMock } from '@kbn/core-injected-metadata-browser-mocks';
 import { docLinksServiceMock } from '@kbn/core-doc-links-browser-mocks';
 import { httpServiceMock } from '@kbn/core-http-browser-mocks';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
index 7f14b54a0863a..664230d749d0b 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
@@ -9,7 +9,7 @@
 import React, { useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { BehaviorSubject, combineLatest, merge, type Observable, of, ReplaySubject } from 'rxjs';
-import { mergeMap, map, takeUntil, filter } from 'rxjs/operators';
+import { mergeMap, map, takeUntil, filter } from 'rxjs';
 import { parse } from 'url';
 import { EuiLink } from '@elastic/eui';
 import useObservable from 'react-use/lib/useObservable';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.test.ts b/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.test.ts
index 2019658aaa3e0..907146601d93e 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.test.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { NavControlsService } from './nav_controls_service';
 
 describe('RecentlyAccessed#start()', () => {
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.ts b/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.ts
index 1dada1d132459..dbc861e780ad2 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/nav_controls/nav_controls_service.ts
@@ -8,7 +8,7 @@
 
 import { sortBy } from 'lodash';
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs';
 import type {
   ChromeNavControl,
   ChromeNavControls,
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.test.ts b/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.test.ts
index 7baab7605f353..38143ecae07d9 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.test.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject, lastValueFrom } from 'rxjs';
-import { take, map, takeLast } from 'rxjs/operators';
+import { take, map, takeLast } from 'rxjs';
 import { type App, AppStatus } from '@kbn/core-application-browser';
 import { NavLinksService } from './nav_links_service';
 
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.ts b/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.ts
index 04b3fa8e3e7ba..a87613ba6f721 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/nav_links/nav_links_service.ts
@@ -8,7 +8,7 @@
 
 import { sortBy } from 'lodash';
 import { BehaviorSubject, ReplaySubject } from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs';
 import type { IBasePath } from '@kbn/core-http-browser';
 import type { InternalHttpStart } from '@kbn/core-http-browser-internal';
 import type { PublicAppDeepLinkInfo, PublicAppInfo } from '@kbn/core-application-browser';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/persisted_log.ts b/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/persisted_log.ts
index 0102bcd402463..a518b232eaeb4 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/persisted_log.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/persisted_log.ts
@@ -8,7 +8,7 @@
 
 import { cloneDeep, isEqual, take } from 'lodash';
 import * as Rx from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 
 interface PersistedLogOptions<T = any> {
   maxLength: number | string;
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.test.ts b/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.test.ts
index 20784f0f2ea11..e394f81fab11d 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.test.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { takeUntil, bufferCount } from 'rxjs/operators';
+import { takeUntil, bufferCount } from 'rxjs';
 import { httpServiceMock } from '@kbn/core-http-browser-mocks';
 import { RecentlyAccessedService } from './recently_accessed_service';
 
diff --git a/packages/core/custom-branding/core-custom-branding-browser-internal/src/custom_branding_service.ts b/packages/core/custom-branding/core-custom-branding-browser-internal/src/custom_branding_service.ts
index aa5521333f583..1e3f2fe8e6061 100644
--- a/packages/core/custom-branding/core-custom-branding-browser-internal/src/custom_branding_service.ts
+++ b/packages/core/custom-branding/core-custom-branding-browser-internal/src/custom_branding_service.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject, BehaviorSubject } from 'rxjs';
-import { shareReplay, takeUntil, map } from 'rxjs/operators';
+import { shareReplay, takeUntil, map } from 'rxjs';
 import type {
   CustomBrandingStart,
   CustomBrandingSetup,
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/elasticsearch_service.test.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/elasticsearch_service.test.ts
index 9ee79a9062973..7a07e9df73932 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/elasticsearch_service.test.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/elasticsearch_service.test.ts
@@ -24,7 +24,7 @@ import {
 
 import type { NodesVersionCompatibility } from './version_check/ensure_es_version';
 import { BehaviorSubject, firstValueFrom, of } from 'rxjs';
-import { first, concatMap } from 'rxjs/operators';
+import { first, concatMap } from 'rxjs';
 import { REPO_ROOT } from '@kbn/repo-info';
 import { Env } from '@kbn/config';
 import { configServiceMock, getEnvOptions } from '@kbn/config-mocks';
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/elasticsearch_service.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/elasticsearch_service.ts
index 8a75bfb4f8234..06c22d1c24e0f 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/elasticsearch_service.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/elasticsearch_service.ts
@@ -7,7 +7,7 @@
  */
 
 import { firstValueFrom, Observable, Subject } from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs';
 
 import type { Logger } from '@kbn/logging';
 import type { CoreContext, CoreService } from '@kbn/core-base-server-internal';
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/is_valid_connection.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/is_valid_connection.ts
index b36f89cdc8317..62edf2fbc94ad 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/is_valid_connection.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/is_valid_connection.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import { errors } from '@elastic/elasticsearch';
 import { Observable, firstValueFrom } from 'rxjs';
 import { NodesVersionCompatibility } from './version_check/ensure_es_version';
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/retry_call_cluster.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/retry_call_cluster.ts
index af4809990db5f..b86ab83bfe1e8 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/retry_call_cluster.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/retry_call_cluster.ts
@@ -7,7 +7,7 @@
  */
 
 import { defer, throwError, iif, timer } from 'rxjs';
-import { concatMap, retryWhen } from 'rxjs/operators';
+import { concatMap, retryWhen } from 'rxjs';
 
 const retryResponseStatuses = [
   503, // ServiceUnavailable
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/status.test.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/status.test.ts
index 8889125bf1d4e..10a8a64ba070b 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/status.test.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/status.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { Subject, of } from 'rxjs';
 
 import { ServiceStatusLevels, ServiceStatusLevel, ServiceStatus } from '@kbn/core-status-common';
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/status.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/status.ts
index fbb11824d8e83..a2aa13887160d 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/status.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/status.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, merge, of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { ServiceStatus, ServiceStatusLevels } from '@kbn/core-status-common';
 import { ElasticsearchStatusMeta } from './types';
 import { NodesVersionCompatibility } from './version_check/ensure_es_version';
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/version_check/ensure_es_version.test.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/version_check/ensure_es_version.test.ts
index 5257be97f26e6..9f6b31cf2230c 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/version_check/ensure_es_version.test.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/version_check/ensure_es_version.test.ts
@@ -9,7 +9,7 @@
 import { mapNodesVersionCompatibility, pollEsNodesVersion, NodesInfo } from './ensure_es_version';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
-import { take, delay } from 'rxjs/operators';
+import { take, delay } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { of } from 'rxjs';
 
diff --git a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/version_check/ensure_es_version.ts b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/version_check/ensure_es_version.ts
index 6f557c02b2638..753a9bd079a4e 100644
--- a/packages/core/elasticsearch/core-elasticsearch-server-internal/src/version_check/ensure_es_version.ts
+++ b/packages/core/elasticsearch/core-elasticsearch-server-internal/src/version_check/ensure_es_version.ts
@@ -21,7 +21,7 @@ import {
   tap,
   startWith,
   shareReplay,
-} from 'rxjs/operators';
+} from 'rxjs';
 import type { Logger } from '@kbn/logging';
 import type { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
 import {
diff --git a/packages/core/execution-context/core-execution-context-browser-internal/src/execution_context_service.ts b/packages/core/execution-context/core-execution-context-browser-internal/src/execution_context_service.ts
index e09de53c78727..3b413aa1c5237 100644
--- a/packages/core/execution-context/core-execution-context-browser-internal/src/execution_context_service.ts
+++ b/packages/core/execution-context/core-execution-context-browser-internal/src/execution_context_service.ts
@@ -9,7 +9,7 @@
 import { compact, isEqual, isUndefined, omitBy } from 'lodash';
 import type { Observable } from 'rxjs';
 import { BehaviorSubject, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { CoreService } from '@kbn/core-base-browser-internal';
 import type { AnalyticsServiceSetup } from '@kbn/core-analytics-browser';
 import type { KibanaExecutionContext } from '@kbn/core-execution-context-common';
diff --git a/packages/core/http/core-http-browser-internal/src/fetch.test.ts b/packages/core/http/core-http-browser-internal/src/fetch.test.ts
index d4f37a6601b69..e8015a5030532 100644
--- a/packages/core/http/core-http-browser-internal/src/fetch.test.ts
+++ b/packages/core/http/core-http-browser-internal/src/fetch.test.ts
@@ -10,7 +10,7 @@
 import fetchMock from 'fetch-mock/es5/client';
 import { readFileSync } from 'fs';
 import { join } from 'path';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { executionContextServiceMock } from '@kbn/core-execution-context-browser-mocks';
 import type { HttpResponse, HttpFetchOptionsWithPath } from '@kbn/core-http-browser';
 
diff --git a/packages/core/http/core-http-browser-internal/src/loading_count_service.test.ts b/packages/core/http/core-http-browser-internal/src/loading_count_service.test.ts
index 041af203c8b37..287f6d30143ec 100644
--- a/packages/core/http/core-http-browser-internal/src/loading_count_service.test.ts
+++ b/packages/core/http/core-http-browser-internal/src/loading_count_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, throwError, of, Subject } from 'rxjs';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 
 import { fatalErrorsServiceMock } from '@kbn/core-fatal-errors-browser-mocks';
 import { LoadingCountService } from './loading_count_service';
diff --git a/packages/core/http/core-http-browser-internal/src/loading_count_service.ts b/packages/core/http/core-http-browser-internal/src/loading_count_service.ts
index 4df60e53f9c66..e44efb55a4031 100644
--- a/packages/core/http/core-http-browser-internal/src/loading_count_service.ts
+++ b/packages/core/http/core-http-browser-internal/src/loading_count_service.ts
@@ -7,15 +7,7 @@
  */
 
 import { BehaviorSubject, Observable, Subject } from 'rxjs';
-import {
-  distinctUntilChanged,
-  endWith,
-  map,
-  pairwise,
-  startWith,
-  takeUntil,
-  tap,
-} from 'rxjs/operators';
+import { distinctUntilChanged, endWith, map, pairwise, startWith, takeUntil, tap } from 'rxjs';
 import type { CoreService } from '@kbn/core-base-browser-internal';
 import type { FatalErrorsSetup } from '@kbn/core-fatal-errors-browser';
 
diff --git a/packages/core/http/core-http-router-server-internal/src/request.ts b/packages/core/http/core-http-router-server-internal/src/request.ts
index 3c60b32219eaa..450294fb09c0f 100644
--- a/packages/core/http/core-http-router-server-internal/src/request.ts
+++ b/packages/core/http/core-http-router-server-internal/src/request.ts
@@ -11,7 +11,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { inspect } from 'util';
 import type { Request, RouteOptions } from '@hapi/hapi';
 import { fromEvent, NEVER } from 'rxjs';
-import { shareReplay, first, filter } from 'rxjs/operators';
+import { shareReplay, first, filter } from 'rxjs';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { deepFreeze } from '@kbn/std';
 import {
diff --git a/packages/core/http/core-http-server-internal/src/http_server.ts b/packages/core/http/core-http-server-internal/src/http_server.ts
index c023f39206868..7d0c90faa71ad 100644
--- a/packages/core/http/core-http-server-internal/src/http_server.ts
+++ b/packages/core/http/core-http-server-internal/src/http_server.ts
@@ -20,7 +20,7 @@ import {
 
 import type { Duration } from 'moment';
 import { firstValueFrom, Observable, Subscription } from 'rxjs';
-import { take, pairwise } from 'rxjs/operators';
+import { take, pairwise } from 'rxjs';
 import apm from 'elastic-apm-node';
 // @ts-expect-error no type definition
 import Brok from 'brok';
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 3dcab5be510e9..f6cf47ddf65c5 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
@@ -7,7 +7,7 @@
  */
 
 import { Observable, Subscription, combineLatest, firstValueFrom } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { pick } from '@kbn/std';
 
 import { Logger } from '@kbn/logging';
diff --git a/packages/core/integrations/core-integrations-browser-internal/src/moment/moment_service.ts b/packages/core/integrations/core-integrations-browser-internal/src/moment/moment_service.ts
index 633223864f202..1031ff3012ce3 100644
--- a/packages/core/integrations/core-integrations-browser-internal/src/moment/moment_service.ts
+++ b/packages/core/integrations/core-integrations-browser-internal/src/moment/moment_service.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment-timezone';
 import { merge, Subscription } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 
 import type { CoreService } from '@kbn/core-base-browser-internal';
 import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
diff --git a/packages/core/metrics/core-metrics-server-internal/src/metrics_service.test.ts b/packages/core/metrics/core-metrics-server-internal/src/metrics_service.test.ts
index 176ad9c7fa4ce..58c036c32aefe 100644
--- a/packages/core/metrics/core-metrics-server-internal/src/metrics_service.test.ts
+++ b/packages/core/metrics/core-metrics-server-internal/src/metrics_service.test.ts
@@ -8,7 +8,7 @@
 
 import moment from 'moment';
 
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { configServiceMock } from '@kbn/config-mocks';
 import { mockCoreContext } from '@kbn/core-base-server-mocks';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
diff --git a/packages/core/overlays/core-overlays-browser-internal/src/banners/banners_service.test.ts b/packages/core/overlays/core-overlays-browser-internal/src/banners/banners_service.test.ts
index f8aafde90e46b..191e4e9ab5689 100644
--- a/packages/core/overlays/core-overlays-browser-internal/src/banners/banners_service.test.ts
+++ b/packages/core/overlays/core-overlays-browser-internal/src/banners/banners_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { InternalOverlayBannersStart, OverlayBannersService } from './banners_service';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { i18nServiceMock } from '@kbn/core-i18n-browser-mocks';
 import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
 
diff --git a/packages/core/overlays/core-overlays-browser-internal/src/banners/banners_service.tsx b/packages/core/overlays/core-overlays-browser-internal/src/banners/banners_service.tsx
index df38511d83b11..4ae4c6b18baa6 100644
--- a/packages/core/overlays/core-overlays-browser-internal/src/banners/banners_service.tsx
+++ b/packages/core/overlays/core-overlays-browser-internal/src/banners/banners_service.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { BehaviorSubject, type Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 
 import type { I18nStart } from '@kbn/core-i18n-browser';
 import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
diff --git a/packages/core/overlays/core-overlays-browser-internal/src/banners/user_banner_service.tsx b/packages/core/overlays/core-overlays-browser-internal/src/banners/user_banner_service.tsx
index 549b02e4a8f32..b4eb687f604b2 100644
--- a/packages/core/overlays/core-overlays-browser-internal/src/banners/user_banner_service.tsx
+++ b/packages/core/overlays/core-overlays-browser-internal/src/banners/user_banner_service.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import { Subscription } from 'rxjs';
 
 import { FormattedMessage } from '@kbn/i18n-react';
diff --git a/packages/core/plugins/core-plugins-server-internal/src/discovery/plugins_discovery.test.ts b/packages/core/plugins/core-plugins-server-internal/src/discovery/plugins_discovery.test.ts
index 93657a1f2533e..1b0c22aa373c2 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/discovery/plugins_discovery.test.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/discovery/plugins_discovery.test.ts
@@ -15,7 +15,7 @@ import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
 import type { Package } from '@kbn/repo-packages';
 
 import { firstValueFrom, from } from 'rxjs';
-import { map, toArray } from 'rxjs/operators';
+import { map, toArray } from 'rxjs';
 import { resolve } from 'path';
 import { ConfigService, Env } from '@kbn/config';
 import type { CoreContext } from '@kbn/core-base-server-internal';
diff --git a/packages/core/plugins/core-plugins-server-internal/src/discovery/plugins_discovery.ts b/packages/core/plugins/core-plugins-server-internal/src/discovery/plugins_discovery.ts
index 60199d9987ae8..1899b9a350c35 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/discovery/plugins_discovery.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/discovery/plugins_discovery.ts
@@ -7,7 +7,7 @@
  */
 
 import { from, merge, EMPTY } from 'rxjs';
-import { catchError, filter, map, mergeMap, concatMap, shareReplay, toArray } from 'rxjs/operators';
+import { catchError, filter, map, mergeMap, concatMap, shareReplay, toArray } from 'rxjs';
 import { Logger } from '@kbn/logging';
 import { getPluginPackagesFilter } from '@kbn/repo-packages';
 import type { CoreContext } from '@kbn/core-base-server-internal';
diff --git a/packages/core/plugins/core-plugins-server-internal/src/discovery/scan_plugin_search_paths.test.ts b/packages/core/plugins/core-plugins-server-internal/src/discovery/scan_plugin_search_paths.test.ts
index 85b64f0d17de6..3bdae37ed222d 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/discovery/scan_plugin_search_paths.test.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/discovery/scan_plugin_search_paths.test.ts
@@ -8,7 +8,7 @@
 
 import mockFs from 'mock-fs';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 import { resolve } from 'path';
 import { scanPluginSearchPaths } from './scan_plugin_search_paths';
 import { PluginDiscoveryError } from './plugin_discovery_error';
diff --git a/packages/core/plugins/core-plugins-server-internal/src/discovery/scan_plugin_search_paths.ts b/packages/core/plugins/core-plugins-server-internal/src/discovery/scan_plugin_search_paths.ts
index a545e9a19f3c3..68122c7632857 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/discovery/scan_plugin_search_paths.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/discovery/scan_plugin_search_paths.ts
@@ -9,7 +9,7 @@
 import { PathLike, readdir, stat, Stats } from 'fs';
 import { resolve } from 'path';
 import { bindNodeCallback, from, Observable } from 'rxjs';
-import { catchError, mergeMap } from 'rxjs/operators';
+import { catchError, mergeMap } from 'rxjs';
 import type { Logger } from '@kbn/logging';
 import { PluginDiscoveryError } from './plugin_discovery_error';
 
diff --git a/packages/core/plugins/core-plugins-server-internal/src/legacy_config.test.ts b/packages/core/plugins/core-plugins-server-internal/src/legacy_config.test.ts
index 1bb1dbb98cfa3..5e515d8199ef0 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/legacy_config.test.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/legacy_config.test.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { getGlobalConfig, getGlobalConfig$ } from './legacy_config';
 import { duration } from 'moment';
 import { fromRoot } from '@kbn/repo-info';
diff --git a/packages/core/plugins/core-plugins-server-internal/src/legacy_config.ts b/packages/core/plugins/core-plugins-server-internal/src/legacy_config.ts
index 46e792d6b226d..aac4b85bc0c23 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/legacy_config.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/legacy_config.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { map, shareReplay } from 'rxjs/operators';
+import { map, shareReplay } from 'rxjs';
 import { combineLatest, Observable } from 'rxjs';
 import { PathConfigType, config as pathConfig } from '@kbn/utils';
 import { pick, deepFreeze } from '@kbn/std';
diff --git a/packages/core/plugins/core-plugins-server-internal/src/plugin_context.test.ts b/packages/core/plugins/core-plugins-server-internal/src/plugin_context.test.ts
index 22878c820e254..6afc885bd1607 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/plugin_context.test.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/plugin_context.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { duration } from 'moment';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { REPO_ROOT, fromRoot } from '@kbn/repo-info';
 import { rawConfigServiceMock, getEnvOptions, configServiceMock } from '@kbn/config-mocks';
 import type { CoreContext } from '@kbn/core-base-server-internal';
diff --git a/packages/core/plugins/core-plugins-server-internal/src/plugin_context.ts b/packages/core/plugins/core-plugins-server-internal/src/plugin_context.ts
index b287407fa106c..6928c5791c0a8 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/plugin_context.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/plugin_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { shareReplay } from 'rxjs/operators';
+import { shareReplay } from 'rxjs';
 import type { CoreContext } from '@kbn/core-base-server-internal';
 import type { PluginOpaqueId } from '@kbn/core-base-common';
 import type { NodeInfo } from '@kbn/core-node-server';
diff --git a/packages/core/plugins/core-plugins-server-internal/src/plugins_service.test.ts b/packages/core/plugins/core-plugins-server-internal/src/plugins_service.test.ts
index 7d0df69b23891..076245a07b758 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/plugins_service.test.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/plugins_service.test.ts
@@ -25,7 +25,7 @@ import { PluginWrapper } from './plugin';
 import { PluginsService } from './plugins_service';
 import { PluginsSystem } from './plugins_system';
 import { config, PluginsConfigType } from './plugins_config';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import type { PluginConfigDescriptor } from '@kbn/core-plugins-server';
 import { DiscoveredPlugin, PluginType } from '@kbn/core-base-common';
 
diff --git a/packages/core/plugins/core-plugins-server-internal/src/plugins_service.ts b/packages/core/plugins/core-plugins-server-internal/src/plugins_service.ts
index c3828dc75cd50..3db41cb2a8734 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/plugins_service.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/plugins_service.ts
@@ -8,7 +8,7 @@
 
 import Path from 'path';
 import { firstValueFrom, Observable } from 'rxjs';
-import { filter, map, tap, toArray } from 'rxjs/operators';
+import { filter, map, tap, toArray } from 'rxjs';
 import { getFlattenedObject } from '@kbn/std';
 
 import { Logger } from '@kbn/logging';
diff --git a/packages/core/rendering/core-rendering-browser-internal/src/rendering_service.tsx b/packages/core/rendering/core-rendering-browser-internal/src/rendering_service.tsx
index 86c6a98122fa4..38a7dec34690d 100644
--- a/packages/core/rendering/core-rendering-browser-internal/src/rendering_service.tsx
+++ b/packages/core/rendering/core-rendering-browser-internal/src/rendering_service.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { pairwise, startWith } from 'rxjs/operators';
+import { pairwise, startWith } from 'rxjs';
 
 import type { AnalyticsServiceStart } from '@kbn/core-analytics-browser';
 import type { InternalApplicationStart } from '@kbn/core-application-browser-internal';
diff --git a/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx b/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx
index dcf7162b481f8..5b8f86a96697b 100644
--- a/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx
+++ b/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { renderToStaticMarkup } from 'react-dom/server';
 import { firstValueFrom, of } from 'rxjs';
-import { catchError, take, timeout } from 'rxjs/operators';
+import { catchError, take, timeout } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import type { ThemeVersion } from '@kbn/ui-shared-deps-npm';
 
diff --git a/packages/core/root/core-root-server-internal/src/root/index.test.ts b/packages/core/root/core-root-server-internal/src/root/index.test.ts
index 0610d940053dc..b557436956b1e 100644
--- a/packages/core/root/core-root-server-internal/src/root/index.test.ts
+++ b/packages/core/root/core-root-server-internal/src/root/index.test.ts
@@ -9,7 +9,7 @@
 import { rawConfigService, configService, logger, mockServer } from './index.test.mocks';
 
 import { BehaviorSubject } from 'rxjs';
-import { filter, first } from 'rxjs/operators';
+import { filter, first } from 'rxjs';
 import { CriticalError } from '@kbn/core-base-server-internal';
 import { REPO_ROOT } from '@kbn/repo-info';
 import { Env } from '@kbn/config';
diff --git a/packages/core/root/core-root-server-internal/src/root/index.ts b/packages/core/root/core-root-server-internal/src/root/index.ts
index 34f54fa1ebad8..eebd69ef8e3ac 100644
--- a/packages/core/root/core-root-server-internal/src/root/index.ts
+++ b/packages/core/root/core-root-server-internal/src/root/index.ts
@@ -7,14 +7,7 @@
  */
 
 import { ConnectableObservable, Subscription } from 'rxjs';
-import {
-  first,
-  publishReplay,
-  switchMap,
-  concatMap,
-  tap,
-  distinctUntilChanged,
-} from 'rxjs/operators';
+import { first, publishReplay, switchMap, concatMap, tap, distinctUntilChanged } from 'rxjs';
 import type { Logger, LoggerFactory } from '@kbn/logging';
 import type { Env, RawConfigurationProvider } from '@kbn/config';
 import { LoggingConfigType, LoggingSystem } from '@kbn/core-logging-server-internal';
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/kibana_migrator.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/kibana_migrator.test.ts
index 46a7ddf882b8d..80abe48a810c5 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/kibana_migrator.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/kibana_migrator.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.test.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.test.ts
index 5f53633b79c22..904aedcd328e4 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.test.ts
@@ -19,7 +19,7 @@ import {
   applyTypeDefaultsMock,
 } from './saved_objects_service.test.mocks';
 import { BehaviorSubject, firstValueFrom, EMPTY } from 'rxjs';
-import { skip } from 'rxjs/operators';
+import { skip } from 'rxjs';
 import { type RawPackageInfo, Env } from '@kbn/config';
 import { ByteSizeValue } from '@kbn/config-schema';
 import { REPO_ROOT } from '@kbn/repo-info';
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.ts
index f51817815241d..c79c2d0b1a7bb 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/saved_objects_service.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject, Observable, firstValueFrom, of } from 'rxjs';
-import { filter, switchMap } from 'rxjs/operators';
+import { filter, switchMap } from 'rxjs';
 import type { Logger } from '@kbn/logging';
 import { stripVersionQualifier } from '@kbn/std';
 import type { ServiceStatus } from '@kbn/core-status-common';
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/status.test.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/status.test.ts
index 8f7f1281f89ea..368a405295b6c 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/status.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/status.test.ts
@@ -9,7 +9,7 @@
 import { of, Observable } from 'rxjs';
 import { type ServiceStatus, ServiceStatusLevels } from '@kbn/core-status-common';
 import { calculateStatus$ } from './status';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 
 describe('calculateStatus$', () => {
   const expectUnavailableDueToEs = (status$: Observable<ServiceStatus>) =>
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/status.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/status.ts
index 03722e7de00e3..f5260f2e2f791 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/status.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/status.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, combineLatest } from 'rxjs';
-import { startWith, map } from 'rxjs/operators';
+import { startWith, map } from 'rxjs';
 import { type ServiceStatus, ServiceStatusLevels } from '@kbn/core-status-common';
 import type { SavedObjectStatusMeta } from '@kbn/core-saved-objects-server';
 import type { KibanaMigratorStatus } from '@kbn/core-saved-objects-base-server-internal';
diff --git a/packages/core/status/core-status-server-internal/src/log_core_services_status.ts b/packages/core/status/core-status-server-internal/src/log_core_services_status.ts
index e258bdd75a3aa..41b4ed3882779 100644
--- a/packages/core/status/core-status-server-internal/src/log_core_services_status.ts
+++ b/packages/core/status/core-status-server-internal/src/log_core_services_status.ts
@@ -8,7 +8,7 @@
 
 import { uniq } from 'lodash';
 import { merge, type Observable, Subject, type Subscription } from 'rxjs';
-import { pairwise, takeUntil, map, startWith, bufferTime, concatAll, filter } from 'rxjs/operators';
+import { pairwise, takeUntil, map, startWith, bufferTime, concatAll, filter } from 'rxjs';
 import type { Logger } from '@kbn/logging';
 import { type CoreStatus, ServiceStatusLevels } from '@kbn/core-status-common';
 import type { LoggableServiceStatus } from './types';
diff --git a/packages/core/status/core-status-server-internal/src/log_overall_status.ts b/packages/core/status/core-status-server-internal/src/log_overall_status.ts
index cac40b5ec8fa0..77d0460d9c816 100644
--- a/packages/core/status/core-status-server-internal/src/log_overall_status.ts
+++ b/packages/core/status/core-status-server-internal/src/log_overall_status.ts
@@ -7,7 +7,7 @@
  */
 
 import type { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, pairwise, takeUntil, map, startWith } from 'rxjs/operators';
+import { distinctUntilChanged, pairwise, takeUntil, map, startWith } from 'rxjs';
 import { type ServiceStatus, ServiceStatusLevels } from '@kbn/core-status-common';
 import type { Logger } from '@kbn/logging';
 
diff --git a/packages/core/status/core-status-server-internal/src/log_plugins_status.ts b/packages/core/status/core-status-server-internal/src/log_plugins_status.ts
index 3352bf35963b9..2196696ad95bd 100644
--- a/packages/core/status/core-status-server-internal/src/log_plugins_status.ts
+++ b/packages/core/status/core-status-server-internal/src/log_plugins_status.ts
@@ -8,7 +8,7 @@
 
 import { uniq } from 'lodash';
 import { merge, type Observable, Subject, type Subscription } from 'rxjs';
-import { pairwise, takeUntil, map, startWith, bufferTime, filter, concatAll } from 'rxjs/operators';
+import { pairwise, takeUntil, map, startWith, bufferTime, filter, concatAll } from 'rxjs';
 import { Logger } from '@kbn/logging';
 import type { PluginName } from '@kbn/core-base-common';
 import { ServiceStatusLevels } from '@kbn/core-status-common';
diff --git a/packages/core/status/core-status-server-internal/src/plugins_status.test.ts b/packages/core/status/core-status-server-internal/src/plugins_status.test.ts
index ed14eee45229e..84e1d662fa976 100644
--- a/packages/core/status/core-status-server-internal/src/plugins_status.test.ts
+++ b/packages/core/status/core-status-server-internal/src/plugins_status.test.ts
@@ -10,7 +10,7 @@ import type { PluginName } from '@kbn/core-base-common';
 import { PluginsStatusService } from './plugins_status';
 import { of, Observable, BehaviorSubject, ReplaySubject, firstValueFrom } from 'rxjs';
 import { ServiceStatusLevels, CoreStatus, ServiceStatus } from '@kbn/core-status-common';
-import { first, skip } from 'rxjs/operators';
+import { first, skip } from 'rxjs';
 import { ServiceStatusLevelSnapshotSerializer } from './test_helpers';
 
 expect.addSnapshotSerializer(ServiceStatusLevelSnapshotSerializer);
diff --git a/packages/core/status/core-status-server-internal/src/plugins_status.ts b/packages/core/status/core-status-server-internal/src/plugins_status.ts
index a34fb8a98d794..68e38752e5c93 100644
--- a/packages/core/status/core-status-server-internal/src/plugins_status.ts
+++ b/packages/core/status/core-status-server-internal/src/plugins_status.ts
@@ -14,15 +14,7 @@ import {
   Subject,
   type Subscription,
 } from 'rxjs';
-import {
-  map,
-  distinctUntilChanged,
-  filter,
-  tap,
-  debounceTime,
-  takeUntil,
-  delay,
-} from 'rxjs/operators';
+import { map, distinctUntilChanged, filter, tap, debounceTime, takeUntil, delay } from 'rxjs';
 import { isDeepStrictEqual } from 'util';
 import type { PluginName } from '@kbn/core-base-common';
 import { ServiceStatusLevels, type CoreStatus, type ServiceStatus } from '@kbn/core-status-common';
diff --git a/packages/core/status/core-status-server-internal/src/status_service.test.ts b/packages/core/status/core-status-server-internal/src/status_service.test.ts
index c4ae2732af15c..d6f7b3b0757ae 100644
--- a/packages/core/status/core-status-server-internal/src/status_service.test.ts
+++ b/packages/core/status/core-status-server-internal/src/status_service.test.ts
@@ -10,7 +10,7 @@ import { of, BehaviorSubject, firstValueFrom, Observable } from 'rxjs';
 
 import { type ServiceStatus, ServiceStatusLevels, type CoreStatus } from '@kbn/core-status-common';
 import type { ILoggingSystem } from '@kbn/core-logging-server-internal';
-import { first, take, toArray } from 'rxjs/operators';
+import { first, take, toArray } from 'rxjs';
 import { mockCoreContext } from '@kbn/core-base-server-mocks';
 import { environmentServiceMock } from '@kbn/core-environment-server-mocks';
 import { mockRouter, RouterMock } from '@kbn/core-http-router-server-mocks';
diff --git a/packages/core/status/core-status-server-internal/src/status_service.ts b/packages/core/status/core-status-server-internal/src/status_service.ts
index f33621e101a7d..3947f04c61574 100644
--- a/packages/core/status/core-status-server-internal/src/status_service.ts
+++ b/packages/core/status/core-status-server-internal/src/status_service.ts
@@ -15,7 +15,7 @@ import {
   tap,
   BehaviorSubject,
 } from 'rxjs';
-import { map, distinctUntilChanged, shareReplay, takeUntil, debounceTime } from 'rxjs/operators';
+import { map, distinctUntilChanged, shareReplay, takeUntil, debounceTime } from 'rxjs';
 import { isDeepStrictEqual } from 'util';
 
 import type { RootSchema } from '@kbn/analytics-client';
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.test.ts b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.test.ts
index 992e2230988de..aaa86dfc40746 100644
--- a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.test.ts
+++ b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_api.test.ts
@@ -9,7 +9,7 @@
 // @ts-expect-error
 import fetchMock from 'fetch-mock/es5/client';
 import * as Rx from 'rxjs';
-import { takeUntil, toArray } from 'rxjs/operators';
+import { takeUntil, toArray } from 'rxjs';
 
 import { setup as httpSetup } from '@kbn/core-test-helpers-http-setup-browser';
 import { UiSettingsApi } from './ui_settings_api';
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.test.ts b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.test.ts
index 58da98f91e105..4c57ff167a724 100644
--- a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.test.ts
+++ b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { materialize, take, toArray } from 'rxjs/operators';
+import { materialize, take, toArray } from 'rxjs';
 
 import { UiSettingsClient } from './ui_settings_client';
 import { ValidationApiResponse } from './ui_settings_api';
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts
index cccb0f85bb0d7..ad1bfe4d9b994 100644
--- a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts
+++ b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_client_common.ts
@@ -8,7 +8,7 @@
 
 import { cloneDeep, defaultsDeep } from 'lodash';
 import { Observable, Subject, concat, defer, of } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 
 import { UserProvidedValues } from '@kbn/core-ui-settings-common';
 import {
diff --git a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_global_client.test.ts b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_global_client.test.ts
index d1931ef916058..2be6e86184739 100644
--- a/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_global_client.test.ts
+++ b/packages/core/ui-settings/core-ui-settings-browser-internal/src/ui_settings_global_client.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { take, toArray } from 'rxjs/operators';
+import { take, toArray } from 'rxjs';
 
 import { UiSettingsGlobalClient } from './ui_settings_global_client';
 
diff --git a/packages/core/usage-data/core-usage-data-server-internal/src/core_usage_data_service.ts b/packages/core/usage-data/core-usage-data-server-internal/src/core_usage_data_service.ts
index 04673a626860a..0d2ae2ad0f2f7 100644
--- a/packages/core/usage-data/core-usage-data-server-internal/src/core_usage_data_service.ts
+++ b/packages/core/usage-data/core-usage-data-server-internal/src/core_usage_data_service.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subject, Observable, firstValueFrom } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { takeUntil } from 'rxjs';
 import { get } from 'lodash';
 import { hasConfigPathIntersection, ChangedDeprecatedPaths } from '@kbn/config';
 
diff --git a/packages/kbn-cli-dev-mode/src/base_path_proxy_server.ts b/packages/kbn-cli-dev-mode/src/base_path_proxy_server.ts
index 74a1008894a3e..46cd67e1e0642 100644
--- a/packages/kbn-cli-dev-mode/src/base_path_proxy_server.ts
+++ b/packages/kbn-cli-dev-mode/src/base_path_proxy_server.ts
@@ -13,7 +13,7 @@ import { Server, Request } from '@hapi/hapi';
 import HapiProxy from '@hapi/h2o2';
 import { sampleSize } from 'lodash';
 import * as Rx from 'rxjs';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { ByteSizeValue } from '@kbn/config-schema';
 import { createServer, getListenerOptions, getServerOptions } from '@kbn/server-http-tools';
 
diff --git a/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts b/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts
index 5dc2fb9985c31..05791256f1ff1 100644
--- a/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts
+++ b/packages/kbn-cli-dev-mode/src/cli_dev_mode.ts
@@ -20,7 +20,7 @@ import {
   switchMap,
   concatMap,
   takeUntil,
-} from 'rxjs/operators';
+} from 'rxjs';
 import { CliArgs } from '@kbn/config';
 import { CiStatsReporter } from '@kbn/ci-stats-reporter';
 import { REPO_ROOT } from '@kbn/repo-info';
diff --git a/packages/kbn-cli-dev-mode/src/dev_server.ts b/packages/kbn-cli-dev-mode/src/dev_server.ts
index cf89d2c00d16f..2cdabc97dd5a3 100644
--- a/packages/kbn-cli-dev-mode/src/dev_server.ts
+++ b/packages/kbn-cli-dev-mode/src/dev_server.ts
@@ -7,17 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import {
-  map,
-  tap,
-  take,
-  share,
-  mergeMap,
-  switchMap,
-  scan,
-  takeUntil,
-  ignoreElements,
-} from 'rxjs/operators';
+import { map, tap, take, share, mergeMap, switchMap, scan, takeUntil, ignoreElements } from 'rxjs';
 import { observeLines } from '@kbn/stdio-dev-helpers';
 
 import { usingServerProcess } from './using_server_process';
diff --git a/packages/kbn-cli-dev-mode/src/optimizer.test.ts b/packages/kbn-cli-dev-mode/src/optimizer.test.ts
index b4d7fe6c6dfdb..59c46896b287b 100644
--- a/packages/kbn-cli-dev-mode/src/optimizer.test.ts
+++ b/packages/kbn-cli-dev-mode/src/optimizer.test.ts
@@ -9,7 +9,7 @@
 import { PassThrough } from 'stream';
 
 import * as Rx from 'rxjs';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 import { OptimizerUpdate } from '@kbn/optimizer';
 import { observeLines } from '@kbn/stdio-dev-helpers';
 import { createReplaceSerializer } from '@kbn/jest-serializers';
diff --git a/packages/kbn-cli-dev-mode/src/optimizer.ts b/packages/kbn-cli-dev-mode/src/optimizer.ts
index 50f2425f84293..f81f6ec7fb2a4 100644
--- a/packages/kbn-cli-dev-mode/src/optimizer.ts
+++ b/packages/kbn-cli-dev-mode/src/optimizer.ts
@@ -9,7 +9,7 @@
 import Chalk from 'chalk';
 import moment from 'moment';
 import { Writable } from 'stream';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import {
   ToolingLog,
   pickLevelFromFlags,
@@ -17,7 +17,7 @@ import {
   parseLogLevel,
 } from '@kbn/tooling-log';
 import * as Rx from 'rxjs';
-import { ignoreElements } from 'rxjs/operators';
+import { ignoreElements } from 'rxjs';
 import {
   runOptimizer,
   OptimizerConfig,
diff --git a/packages/kbn-config/src/config_service.test.ts b/packages/kbn-config/src/config_service.test.ts
index b03d407c2fcc0..67a8aa0c3d75d 100644
--- a/packages/kbn-config/src/config_service.test.ts
+++ b/packages/kbn-config/src/config_service.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject, firstValueFrom, Observable } from 'rxjs';
-import { first, map, take } from 'rxjs/operators';
+import { first, map, take } from 'rxjs';
 
 import {
   mockApplyDeprecations,
diff --git a/packages/kbn-config/src/config_service.ts b/packages/kbn-config/src/config_service.ts
index 56b6f1b7887cf..38172f57ead0c 100644
--- a/packages/kbn-config/src/config_service.ts
+++ b/packages/kbn-config/src/config_service.ts
@@ -11,7 +11,7 @@ import { SchemaTypeError, Type, ValidationError } from '@kbn/config-schema';
 import { cloneDeep, isEqual, merge } from 'lodash';
 import { set } from '@kbn/safer-lodash-set';
 import { BehaviorSubject, combineLatest, firstValueFrom, Observable, identity } from 'rxjs';
-import { distinctUntilChanged, first, map, shareReplay, tap } from 'rxjs/operators';
+import { distinctUntilChanged, first, map, shareReplay, tap } from 'rxjs';
 import { Logger, LoggerFactory } from '@kbn/logging';
 import { getDocLinks, DocLinks } from '@kbn/doc-links';
 
diff --git a/packages/kbn-config/src/raw/raw_config_service.ts b/packages/kbn-config/src/raw/raw_config_service.ts
index cce1132bebdb0..30a7a92b2f671 100644
--- a/packages/kbn-config/src/raw/raw_config_service.ts
+++ b/packages/kbn-config/src/raw/raw_config_service.ts
@@ -8,7 +8,7 @@
 
 import { cloneDeep, isPlainObject } from 'lodash';
 import { Observable, ReplaySubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import typeDetect from 'type-detect';
 
 import { getConfigFromFiles } from './read_config';
diff --git a/packages/kbn-dev-proc-runner/src/proc.ts b/packages/kbn-dev-proc-runner/src/proc.ts
index 472d43d66e70d..12db44546d3b1 100644
--- a/packages/kbn-dev-proc-runner/src/proc.ts
+++ b/packages/kbn-dev-proc-runner/src/proc.ts
@@ -13,7 +13,7 @@ import stripAnsi from 'strip-ansi';
 
 import execa from 'execa';
 import * as Rx from 'rxjs';
-import { tap, share, take, mergeMap, map, ignoreElements, filter } from 'rxjs/operators';
+import { tap, share, take, mergeMap, map, ignoreElements, filter } from 'rxjs';
 import chalk from 'chalk';
 import treeKill from 'tree-kill';
 import { ToolingLog } from '@kbn/tooling-log';
diff --git a/packages/kbn-dev-utils/src/extract.ts b/packages/kbn-dev-utils/src/extract.ts
index 138e6bd67a50c..30b3bec7a6616 100644
--- a/packages/kbn-dev-utils/src/extract.ts
+++ b/packages/kbn-dev-utils/src/extract.ts
@@ -15,7 +15,7 @@ import { promisify } from 'util';
 import Tar from 'tar';
 import Yauzl, { ZipFile, Entry } from 'yauzl';
 import * as Rx from 'rxjs';
-import { map, mergeMap, takeUntil } from 'rxjs/operators';
+import { map, mergeMap, takeUntil } from 'rxjs';
 
 const strComplete = (obs: Rx.Observable<unknown>) =>
   new Promise<void>((resolve, reject) => {
diff --git a/packages/kbn-ftr-common-functional-ui-services/services/remote/create_stdout_stream.ts b/packages/kbn-ftr-common-functional-ui-services/services/remote/create_stdout_stream.ts
index cb42b5bae7c6b..a4996e800e18d 100644
--- a/packages/kbn-ftr-common-functional-ui-services/services/remote/create_stdout_stream.ts
+++ b/packages/kbn-ftr-common-functional-ui-services/services/remote/create_stdout_stream.ts
@@ -9,7 +9,7 @@
 import Net from 'net';
 
 import * as Rx from 'rxjs';
-import { map, takeUntil, take } from 'rxjs/operators';
+import { map, takeUntil, take } from 'rxjs';
 
 export async function createStdoutSocket() {
   const chunk$ = new Rx.Subject<Buffer>();
diff --git a/packages/kbn-ftr-common-functional-ui-services/services/remote/poll_for_log_entry.ts b/packages/kbn-ftr-common-functional-ui-services/services/remote/poll_for_log_entry.ts
index 133b3da2785f2..be8bb8e9ec6ef 100644
--- a/packages/kbn-ftr-common-functional-ui-services/services/remote/poll_for_log_entry.ts
+++ b/packages/kbn-ftr-common-functional-ui-services/services/remote/poll_for_log_entry.ts
@@ -8,7 +8,7 @@
 
 import { WebDriver, logging } from 'selenium-webdriver';
 import * as Rx from 'rxjs';
-import { mergeMap, catchError, delay, repeat } from 'rxjs/operators';
+import { mergeMap, catchError, delay, repeat } from 'rxjs';
 import { NoSuchSessionError, NoSuchWindowError } from 'selenium-webdriver/lib/error';
 
 export const FINAL_LOG_ENTRY_PREFIX = 'WEBDRIVER SESSION IS STOPPED';
diff --git a/packages/kbn-ftr-common-functional-ui-services/services/remote/webdriver.ts b/packages/kbn-ftr-common-functional-ui-services/services/remote/webdriver.ts
index 8d9196fa8124e..40c9fff679653 100644
--- a/packages/kbn-ftr-common-functional-ui-services/services/remote/webdriver.ts
+++ b/packages/kbn-ftr-common-functional-ui-services/services/remote/webdriver.ts
@@ -10,7 +10,7 @@ import { resolve } from 'path';
 import Fs from 'fs';
 
 import * as Rx from 'rxjs';
-import { mergeMap, map, catchError, ignoreElements, takeWhile } from 'rxjs/operators';
+import { mergeMap, map, catchError, ignoreElements, takeWhile } from 'rxjs';
 import { Lifecycle } from '@kbn/test';
 import { ToolingLog } from '@kbn/tooling-log';
 import chromeDriver from 'chromedriver';
diff --git a/packages/kbn-optimizer/src/common/event_stream_helpers.test.ts b/packages/kbn-optimizer/src/common/event_stream_helpers.test.ts
index 899c62c41e53b..ed27ef6871cd1 100644
--- a/packages/kbn-optimizer/src/common/event_stream_helpers.test.ts
+++ b/packages/kbn-optimizer/src/common/event_stream_helpers.test.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { allValuesFrom } from './rxjs_helpers';
 
 import { summarizeEventStream } from './event_stream_helpers';
diff --git a/packages/kbn-optimizer/src/log_optimizer_progress.ts b/packages/kbn-optimizer/src/log_optimizer_progress.ts
index a4ad2d16d17c3..48a4b76ede58d 100644
--- a/packages/kbn-optimizer/src/log_optimizer_progress.ts
+++ b/packages/kbn-optimizer/src/log_optimizer_progress.ts
@@ -8,7 +8,7 @@
 
 import { ToolingLog } from '@kbn/tooling-log';
 import * as Rx from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 
 import { OptimizerUpdate } from './run_optimizer';
 
diff --git a/packages/kbn-optimizer/src/log_optimizer_state.ts b/packages/kbn-optimizer/src/log_optimizer_state.ts
index 67a35d740ebe7..21cfcddfbac5b 100644
--- a/packages/kbn-optimizer/src/log_optimizer_state.ts
+++ b/packages/kbn-optimizer/src/log_optimizer_state.ts
@@ -9,7 +9,7 @@
 import { inspect } from 'util';
 
 import { ToolingLog } from '@kbn/tooling-log';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 
 import { OptimizerConfig } from './optimizer';
 import { OptimizerUpdate$ } from './run_optimizer';
diff --git a/packages/kbn-optimizer/src/optimizer/bundle_cache.ts b/packages/kbn-optimizer/src/optimizer/bundle_cache.ts
index 9b7299bbae0b1..a906030949d1a 100644
--- a/packages/kbn-optimizer/src/optimizer/bundle_cache.ts
+++ b/packages/kbn-optimizer/src/optimizer/bundle_cache.ts
@@ -9,7 +9,7 @@
 import Fs from 'fs';
 
 import * as Rx from 'rxjs';
-import { mergeAll } from 'rxjs/operators';
+import { mergeAll } from 'rxjs';
 import { dllManifestPath } from '@kbn/ui-shared-deps-npm';
 
 import { Bundle, BundleRemotes, Hashes, parseDllManifest } from '../common';
diff --git a/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.ts b/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.ts
index 7127b4c0684d6..a4f2c7c4a904c 100644
--- a/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.ts
+++ b/packages/kbn-optimizer/src/optimizer/handle_optimizer_completion.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import { createFailError } from '@kbn/dev-cli-errors';
 
 import { pipeClosure } from '../common';
diff --git a/packages/kbn-optimizer/src/optimizer/observe_worker.ts b/packages/kbn-optimizer/src/optimizer/observe_worker.ts
index 0ac2dda605e92..08d205e3f2ed5 100644
--- a/packages/kbn-optimizer/src/optimizer/observe_worker.ts
+++ b/packages/kbn-optimizer/src/optimizer/observe_worker.ts
@@ -10,7 +10,7 @@ import { inspect } from 'util';
 
 import { fork, type ChildProcess } from 'child_process';
 import * as Rx from 'rxjs';
-import { map, takeUntil, first, ignoreElements } from 'rxjs/operators';
+import { map, takeUntil, first, ignoreElements } from 'rxjs';
 
 import { isWorkerMsg, WorkerConfig, WorkerMsg, Bundle, BundleRemotes } from '../common';
 
diff --git a/packages/kbn-optimizer/src/optimizer/run_workers.ts b/packages/kbn-optimizer/src/optimizer/run_workers.ts
index 7c9c3eca1200d..5134e15ee8a59 100644
--- a/packages/kbn-optimizer/src/optimizer/run_workers.ts
+++ b/packages/kbn-optimizer/src/optimizer/run_workers.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap, toArray } from 'rxjs/operators';
+import { mergeMap, toArray } from 'rxjs';
 
 import { maybeMap } from '../common';
 
diff --git a/packages/kbn-optimizer/src/optimizer/watch_bundles_for_changes.ts b/packages/kbn-optimizer/src/optimizer/watch_bundles_for_changes.ts
index c2b8007b72865..dca1e01c17a2d 100644
--- a/packages/kbn-optimizer/src/optimizer/watch_bundles_for_changes.ts
+++ b/packages/kbn-optimizer/src/optimizer/watch_bundles_for_changes.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap, toArray } from 'rxjs/operators';
+import { mergeMap, toArray } from 'rxjs';
 
 import { Bundle, maybeMap } from '../common';
 
diff --git a/packages/kbn-optimizer/src/optimizer/watcher.ts b/packages/kbn-optimizer/src/optimizer/watcher.ts
index 64a2f376ad449..723b77b3b7c42 100644
--- a/packages/kbn-optimizer/src/optimizer/watcher.ts
+++ b/packages/kbn-optimizer/src/optimizer/watcher.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { take, map, share } from 'rxjs/operators';
+import { take, map, share } from 'rxjs';
 import Watchpack from 'watchpack';
 
 import { debounceTimeBuffer, Bundle } from '../common';
diff --git a/packages/kbn-optimizer/src/report_optimizer_timings.ts b/packages/kbn-optimizer/src/report_optimizer_timings.ts
index 2102821c80e2c..87ce046389716 100644
--- a/packages/kbn-optimizer/src/report_optimizer_timings.ts
+++ b/packages/kbn-optimizer/src/report_optimizer_timings.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { concatMap } from 'rxjs/operators';
+import { concatMap } from 'rxjs';
 import { CiStatsReporter } from '@kbn/ci-stats-reporter';
 import { ToolingLog } from '@kbn/tooling-log';
 
diff --git a/packages/kbn-optimizer/src/run_optimizer.ts b/packages/kbn-optimizer/src/run_optimizer.ts
index cde869f4835d0..8987ac12a82b7 100644
--- a/packages/kbn-optimizer/src/run_optimizer.ts
+++ b/packages/kbn-optimizer/src/run_optimizer.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { mergeMap, share, observeOn } from 'rxjs/operators';
+import { mergeMap, share, observeOn } from 'rxjs';
 
 import { summarizeEventStream, Update } from './common';
 
diff --git a/packages/kbn-optimizer/src/worker/run_compilers.ts b/packages/kbn-optimizer/src/worker/run_compilers.ts
index 4dd8f23bd1bdf..b3de65bc871f4 100644
--- a/packages/kbn-optimizer/src/worker/run_compilers.ts
+++ b/packages/kbn-optimizer/src/worker/run_compilers.ts
@@ -10,7 +10,7 @@ import 'source-map-support/register';
 
 import webpack, { Stats } from 'webpack';
 import * as Rx from 'rxjs';
-import { mergeMap, map, mapTo, takeUntil } from 'rxjs/operators';
+import { mergeMap, map, mapTo, takeUntil } from 'rxjs';
 import { isFailureStats, failedStatsToErrorMessage } from '@kbn/optimizer-webpack-helpers';
 
 import {
diff --git a/packages/kbn-optimizer/src/worker/run_worker.ts b/packages/kbn-optimizer/src/worker/run_worker.ts
index 30f4472435731..f5010a398806f 100644
--- a/packages/kbn-optimizer/src/worker/run_worker.ts
+++ b/packages/kbn-optimizer/src/worker/run_worker.ts
@@ -9,7 +9,7 @@
 import { inspect } from 'util';
 
 import * as Rx from 'rxjs';
-import { take, mergeMap } from 'rxjs/operators';
+import { take, mergeMap } from 'rxjs';
 
 import {
   parseBundles,
diff --git a/packages/kbn-reporting/export_types/pdf/printable_pdf.ts b/packages/kbn-reporting/export_types/pdf/printable_pdf.ts
index 113f5035e19e2..e6850048cfe79 100644
--- a/packages/kbn-reporting/export_types/pdf/printable_pdf.ts
+++ b/packages/kbn-reporting/export_types/pdf/printable_pdf.ts
@@ -8,7 +8,7 @@
 
 import apm from 'elastic-apm-node';
 import { Observable, fromEventPattern, lastValueFrom, of, throwError } from 'rxjs';
-import { catchError, map, mergeMap, takeUntil, tap } from 'rxjs/operators';
+import { catchError, map, mergeMap, takeUntil, tap } from 'rxjs';
 import { Writable } from 'stream';
 
 import type { LicenseType } from '@kbn/licensing-plugin/server';
diff --git a/packages/kbn-std/src/iteration/map.test.ts b/packages/kbn-std/src/iteration/map.test.ts
index 33331961c0807..8e12efb1c4d34 100644
--- a/packages/kbn-std/src/iteration/map.test.ts
+++ b/packages/kbn-std/src/iteration/map.test.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { mapTo } from 'rxjs/operators';
+import { mapTo } from 'rxjs';
 
 import { asyncMap, asyncMapWithLimit } from './map';
 import { list } from './test_helpers';
diff --git a/packages/kbn-std/src/iteration/map.ts b/packages/kbn-std/src/iteration/map.ts
index a65951cc14db5..f665c24203167 100644
--- a/packages/kbn-std/src/iteration/map.ts
+++ b/packages/kbn-std/src/iteration/map.ts
@@ -7,7 +7,7 @@
  */
 
 import { from, lastValueFrom } from 'rxjs';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 
 import { IterableInput, AsyncMapFn, AsyncMapResult } from './types';
 import { mapWithLimit$ } from './observable';
diff --git a/packages/kbn-std/src/iteration/observable.test.ts b/packages/kbn-std/src/iteration/observable.test.ts
index b2c5d5d75e07c..0c1f0a7511b63 100644
--- a/packages/kbn-std/src/iteration/observable.test.ts
+++ b/packages/kbn-std/src/iteration/observable.test.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 
 import { map$, mapWithLimit$ } from './observable';
 import { list, sleep, generator } from './test_helpers';
diff --git a/packages/kbn-std/src/iteration/observable.ts b/packages/kbn-std/src/iteration/observable.ts
index d11bdd44e52d5..d62de1488c77e 100644
--- a/packages/kbn-std/src/iteration/observable.ts
+++ b/packages/kbn-std/src/iteration/observable.ts
@@ -7,7 +7,7 @@
  */
 
 import { from } from 'rxjs';
-import { mergeMap } from 'rxjs/operators';
+import { mergeMap } from 'rxjs';
 
 import { IterableInput, AsyncMapFn } from './types';
 
diff --git a/packages/kbn-std/src/semaphore.ts b/packages/kbn-std/src/semaphore.ts
index 4ee63068e5b05..219070e6e7a25 100644
--- a/packages/kbn-std/src/semaphore.ts
+++ b/packages/kbn-std/src/semaphore.ts
@@ -8,7 +8,7 @@
 
 import { Observable } from 'rxjs';
 import type { OperatorFunction } from 'rxjs';
-import { finalize } from 'rxjs/operators';
+import { finalize } from 'rxjs';
 
 type Task = () => void;
 
diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts
index 52fe9cb90d5fc..da3e6842ef671 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/container_logs.ts
@@ -8,7 +8,7 @@
 
 import execa from 'execa';
 import * as Rx from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import { ToolingLog } from '@kbn/tooling-log';
 import { observeLines } from '@kbn/stdio-dev-helpers';
 
diff --git a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts
index b6fdf8d00e54c..463846ec8978a 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/docker_servers/docker_servers_service.ts
@@ -9,7 +9,7 @@
 import Url from 'url';
 import execa from 'execa';
 import * as Rx from 'rxjs';
-import { filter, take, map } from 'rxjs/operators';
+import { filter, take, map } from 'rxjs';
 import { ToolingLog } from '@kbn/tooling-log';
 
 import { Lifecycle } from '../lifecycle';
diff --git a/packages/kbn-test/src/functional_test_runner/lib/lifecycle_phase.test.ts b/packages/kbn-test/src/functional_test_runner/lib/lifecycle_phase.test.ts
index 47ab24169d204..981ff3dea7ed7 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/lifecycle_phase.test.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/lifecycle_phase.test.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { materialize, toArray } from 'rxjs/operators';
+import { materialize, toArray } from 'rxjs';
 
 import { LifecyclePhase } from './lifecycle_phase';
 
diff --git a/packages/kbn-text-based-editor/src/fetch_fields_from_esql.ts b/packages/kbn-text-based-editor/src/fetch_fields_from_esql.ts
index f1013f1a4b329..8697612ae8c23 100644
--- a/packages/kbn-text-based-editor/src/fetch_fields_from_esql.ts
+++ b/packages/kbn-text-based-editor/src/fetch_fields_from_esql.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 import { lastValueFrom } from 'rxjs';
 import { Query, AggregateQuery, TimeRange } from '@kbn/es-query';
 import type { ExpressionsStart } from '@kbn/expressions-plugin/public';
diff --git a/packages/kbn-tooling-log/src/tooling_log.test.ts b/packages/kbn-tooling-log/src/tooling_log.test.ts
index 022d56c1731cf..fab431eff2591 100644
--- a/packages/kbn-tooling-log/src/tooling_log.test.ts
+++ b/packages/kbn-tooling-log/src/tooling_log.test.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { toArray, takeUntil } from 'rxjs/operators';
+import { toArray, takeUntil } from 'rxjs';
 
 import { createStripAnsiSerializer } from '@kbn/jest-serializers';
 
diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js
index 7576ba9e145d9..817a340dc3a8f 100644
--- a/packages/kbn-ui-shared-deps-npm/webpack.config.js
+++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js
@@ -94,7 +94,6 @@ module.exports = (_, argv) => {
         'react',
         'reselect',
         'rxjs',
-        'rxjs/operators',
         'styled-components',
         'tslib',
         'uuid',
diff --git a/packages/kbn-ui-shared-deps-src/src/definitions.js b/packages/kbn-ui-shared-deps-src/src/definitions.js
index 7480303087b6c..e35d736ba503b 100644
--- a/packages/kbn-ui-shared-deps-src/src/definitions.js
+++ b/packages/kbn-ui-shared-deps-src/src/definitions.js
@@ -66,7 +66,6 @@ const externals = {
    * big deps which are locked to a single version
    */
   rxjs: '__kbnSharedDeps__.Rxjs',
-  'rxjs/operators': '__kbnSharedDeps__.RxjsOperators',
   numeral: '__kbnSharedDeps__.ElasticNumeral',
   '@elastic/numeral': '__kbnSharedDeps__.ElasticNumeral',
   '@elastic/charts': '__kbnSharedDeps__.ElasticCharts',
diff --git a/packages/kbn-ui-shared-deps-src/src/entry.js b/packages/kbn-ui-shared-deps-src/src/entry.js
index d0585d0cacc04..785e11ce2affe 100644
--- a/packages/kbn-ui-shared-deps-src/src/entry.js
+++ b/packages/kbn-ui-shared-deps-src/src/entry.js
@@ -38,7 +38,6 @@ Moment.tz.load(require('moment-timezone/data/packed/latest.json'));
 
 // big deps which are locked to a single version
 export const Rxjs = require('rxjs');
-export const RxjsOperators = require('rxjs/operators');
 export const ElasticNumeral = require('@elastic/numeral');
 export const ElasticCharts = require('@elastic/charts');
 export const ElasticEui = require('@elastic/eui');
diff --git a/packages/presentation/presentation_containers/interfaces/last_saved_state.ts b/packages/presentation/presentation_containers/interfaces/last_saved_state.ts
index 7e9519dcbe315..cbbe26f490442 100644
--- a/packages/presentation/presentation_containers/interfaces/last_saved_state.ts
+++ b/packages/presentation/presentation_containers/interfaces/last_saved_state.ts
@@ -8,7 +8,7 @@
 
 import { PublishingSubject } from '@kbn/presentation-publishing';
 import { BehaviorSubject, Subject } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 import { SerializedPanelState } from './serialized_state';
 
 export interface PublishesLastSavedState {
diff --git a/packages/presentation/presentation_publishing/publishing_subject/publishing_batcher.ts b/packages/presentation/presentation_publishing/publishing_subject/publishing_batcher.ts
index c3efa5c06319c..22d93df9534a1 100644
--- a/packages/presentation/presentation_publishing/publishing_subject/publishing_batcher.ts
+++ b/packages/presentation/presentation_publishing/publishing_subject/publishing_batcher.ts
@@ -7,8 +7,7 @@
  */
 
 import { useEffect, useMemo, useRef, useState } from 'react';
-import { combineLatest } from 'rxjs';
-import { debounceTime, skip } from 'rxjs/operators';
+import { combineLatest, debounceTime, skip } from 'rxjs';
 import { AnyPublishingSubject, PublishingSubject, UnwrapPublishingSubjectTuple } from './types';
 
 const hasSubjectsArrayChanged = (
diff --git a/src/cli/serve/integration_tests/reload_logging_config.test.ts b/src/cli/serve/integration_tests/reload_logging_config.test.ts
index 7ad3495c39cd6..37a884fe2108f 100644
--- a/src/cli/serve/integration_tests/reload_logging_config.test.ts
+++ b/src/cli/serve/integration_tests/reload_logging_config.test.ts
@@ -13,7 +13,7 @@ import Os from 'os';
 import Del from 'del';
 
 import * as Rx from 'rxjs';
-import { map, filter, take } from 'rxjs/operators';
+import { map, filter, take } from 'rxjs';
 import { safeDump } from 'js-yaml';
 import { getConfigFromFiles } from '@kbn/config';
 
diff --git a/src/core/server/integration_tests/metrics/server_collector.test.ts b/src/core/server/integration_tests/metrics/server_collector.test.ts
index ef3aceed0faf7..4ae1eec3bbd43 100644
--- a/src/core/server/integration_tests/metrics/server_collector.test.ts
+++ b/src/core/server/integration_tests/metrics/server_collector.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject, Subject } from 'rxjs';
-import { take, filter } from 'rxjs/operators';
+import { take, filter } from 'rxjs';
 import supertest from 'supertest';
 import { Server as HapiServer } from '@hapi/hapi';
 import { createHttpServer } from '@kbn/core-http-server-mocks';
diff --git a/src/dev/build/lib/scan.ts b/src/dev/build/lib/scan.ts
index 1c1a198d6d97d..02685ca871071 100644
--- a/src/dev/build/lib/scan.ts
+++ b/src/dev/build/lib/scan.ts
@@ -10,7 +10,7 @@ import Fs from 'fs';
 
 import { join } from 'path';
 import * as Rx from 'rxjs';
-import { map, mergeAll, mergeMap } from 'rxjs/operators';
+import { map, mergeAll, mergeMap } from 'rxjs';
 
 const getStat$ = Rx.bindNodeCallback<[string], [Fs.Stats]>(Fs.stat);
 const getReadDir$ = Rx.bindNodeCallback<[string], [string[]]>(Fs.readdir);
diff --git a/src/dev/build/tasks/assert_file_time.ts b/src/dev/build/tasks/assert_file_time.ts
index 0f331d05ec913..c4fc2e6b05595 100644
--- a/src/dev/build/tasks/assert_file_time.ts
+++ b/src/dev/build/tasks/assert_file_time.ts
@@ -9,7 +9,7 @@
 import { resolve } from 'path';
 import { statSync } from 'fs';
 
-import { tap, filter, map, toArray } from 'rxjs/operators';
+import { tap, filter, map, toArray } from 'rxjs';
 
 import { scan$, Task } from '../lib';
 
diff --git a/src/dev/code_coverage/ingest_coverage/process.js b/src/dev/code_coverage/ingest_coverage/process.js
index 9bc057713b966..984ebff0d9339 100644
--- a/src/dev/code_coverage/ingest_coverage/process.js
+++ b/src/dev/code_coverage/ingest_coverage/process.js
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { fromEventPattern, fromEvent } from 'rxjs';
-import { map, mergeMap, takeUntil, bufferCount } from 'rxjs/operators';
+import { fromEventPattern, fromEvent, map, mergeMap, takeUntil, bufferCount } from 'rxjs';
 import jsonStream from './json_stream';
 import { pipe, noop } from './utils';
 import { ingestList } from './ingest';
diff --git a/src/dev/code_coverage/ingest_coverage/team_assignment/index.js b/src/dev/code_coverage/ingest_coverage/team_assignment/index.js
index 8db4dd5ddb676..6e291c3ccd7d2 100644
--- a/src/dev/code_coverage/ingest_coverage/team_assignment/index.js
+++ b/src/dev/code_coverage/ingest_coverage/team_assignment/index.js
@@ -13,7 +13,7 @@ import { parse } from './parse_owners';
 import { flush } from './flush';
 import { enumeratePatterns } from './enumerate_patterns';
 import { pipe } from '../utils';
-import { reduce } from 'rxjs/operators';
+import { reduce } from 'rxjs';
 
 const flags = {
   string: ['src', 'dest'],
diff --git a/src/dev/code_coverage/ingest_coverage/team_assignment/parse_owners.js b/src/dev/code_coverage/ingest_coverage/team_assignment/parse_owners.js
index 87d867871f78b..bd1ce2d8d1287 100644
--- a/src/dev/code_coverage/ingest_coverage/team_assignment/parse_owners.js
+++ b/src/dev/code_coverage/ingest_coverage/team_assignment/parse_owners.js
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { fromEvent } from 'rxjs';
-import { map, filter, takeUntil } from 'rxjs/operators';
+import { fromEvent, map, filter, takeUntil } from 'rxjs';
 import { lineRead, pathAndTeams, dropCCDelim } from './parse_owners_helpers';
 import { pipe } from '../utils';
 
diff --git a/src/dev/eslint/run_eslint_with_types.ts b/src/dev/eslint/run_eslint_with_types.ts
index 1ce39beb28206..2a86f4a8e8ecf 100644
--- a/src/dev/eslint/run_eslint_with_types.ts
+++ b/src/dev/eslint/run_eslint_with_types.ts
@@ -12,7 +12,7 @@ import Os from 'os';
 
 import execa from 'execa';
 import * as Rx from 'rxjs';
-import { mergeMap, reduce } from 'rxjs/operators';
+import { mergeMap, reduce } from 'rxjs';
 import { supportsColor } from 'chalk';
 import { run } from '@kbn/dev-cli-runner';
 import { createFailError } from '@kbn/dev-cli-errors';
diff --git a/src/dev/prs/helpers.ts b/src/dev/prs/helpers.ts
index 03f6500b24187..335b88cc9838c 100644
--- a/src/dev/prs/helpers.ts
+++ b/src/dev/prs/helpers.ts
@@ -8,7 +8,7 @@
 
 import { Readable } from 'stream';
 import * as Rx from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { takeUntil } from 'rxjs';
 
 /**
  * Convert a Readable stream to an observable of lines
diff --git a/src/dev/prs/run_update_prs_cli.ts b/src/dev/prs/run_update_prs_cli.ts
index 74a879bb95dc4..f4dfa89150b42 100644
--- a/src/dev/prs/run_update_prs_cli.ts
+++ b/src/dev/prs/run_update_prs_cli.ts
@@ -11,7 +11,7 @@ import { resolve } from 'path';
 import * as Rx from 'rxjs';
 import execa from 'execa';
 import chalk from 'chalk';
-import { first, tap } from 'rxjs/operators';
+import { first, tap } from 'rxjs';
 import dedent from 'dedent';
 
 import { run } from '@kbn/dev-cli-runner';
diff --git a/src/plugins/bfetch/public/streaming/fetch_streaming.ts b/src/plugins/bfetch/public/streaming/fetch_streaming.ts
index d5e99d7eea4c0..18c5fa5c26420 100644
--- a/src/plugins/bfetch/public/streaming/fetch_streaming.ts
+++ b/src/plugins/bfetch/public/streaming/fetch_streaming.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { map, share } from 'rxjs/operators';
+import { map, share } from 'rxjs';
 import { inflateResponse } from '.';
 import { fromStreamingXhr } from './from_streaming_xhr';
 import { split } from './split';
diff --git a/src/plugins/bfetch/public/streaming/split.ts b/src/plugins/bfetch/public/streaming/split.ts
index 9a4439dd6ded1..b18283bca24b3 100644
--- a/src/plugins/bfetch/public/streaming/split.ts
+++ b/src/plugins/bfetch/public/streaming/split.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, Subject } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 
 /**
  * Receives observable that emits strings, and returns a new observable
diff --git a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts b/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
index b3c9c8db12699..eacc2c3432508 100644
--- a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
+++ b/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
@@ -8,7 +8,7 @@
 
 import { promisify } from 'util';
 import { Observable } from 'rxjs';
-import { catchError, concatMap, finalize } from 'rxjs/operators';
+import { catchError, concatMap, finalize } from 'rxjs';
 import { Logger } from '@kbn/core/server';
 import { Stream, PassThrough } from 'stream';
 import { constants, deflate } from 'zlib';
diff --git a/src/plugins/charts/public/services/active_cursor/use_active_cursor.ts b/src/plugins/charts/public/services/active_cursor/use_active_cursor.ts
index b857208e657ae..3bb40b33b566c 100644
--- a/src/plugins/charts/public/services/active_cursor/use_active_cursor.ts
+++ b/src/plugins/charts/public/services/active_cursor/use_active_cursor.ts
@@ -9,7 +9,7 @@
 import { intersection } from 'lodash';
 import { animationFrameScheduler } from 'rxjs';
 import { useCallback, useEffect, RefObject } from 'react';
-import { filter, debounceTime } from 'rxjs/operators';
+import { filter, debounceTime } from 'rxjs';
 
 import type { Chart } from '@elastic/charts';
 
diff --git a/src/plugins/charts/public/services/theme/theme.test.tsx b/src/plugins/charts/public/services/theme/theme.test.tsx
index d71d2beda6bb0..92b0e87f23479 100644
--- a/src/plugins/charts/public/services/theme/theme.test.tsx
+++ b/src/plugins/charts/public/services/theme/theme.test.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { from } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { renderHook, act } from '@testing-library/react-hooks';
 import { render, act as renderAct } from '@testing-library/react';
 
diff --git a/src/plugins/content_management/public/content_client/content_client.test.ts b/src/plugins/content_management/public/content_client/content_client.test.ts
index 8fcd19f7865c9..9b539ba423235 100644
--- a/src/plugins/content_management/public/content_client/content_client.test.ts
+++ b/src/plugins/content_management/public/content_client/content_client.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { lastValueFrom } from 'rxjs';
-import { takeWhile, toArray } from 'rxjs/operators';
+import { takeWhile, toArray } from 'rxjs';
 import { createCrudClientMock } from '../crud_client/crud_client.mock';
 import { ContentClient } from './content_client';
 import type { GetIn, CreateIn, UpdateIn, DeleteIn, SearchIn, MSearchIn } from '../../common';
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 26ddd1c3e0769..7231ecefe7e05 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
@@ -12,7 +12,7 @@ import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
 import { batch, Provider, TypedUseSelectorHook, useSelector } from 'react-redux';
 import { BehaviorSubject, merge, Subject, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, skip } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, skip } from 'rxjs';
 
 import { OverlayRef } from '@kbn/core/public';
 import { Container, EmbeddableFactory } from '@kbn/embeddable-plugin/public';
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 506530edc1857..74f32e335be6c 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
@@ -12,7 +12,7 @@ import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
 import { batch } from 'react-redux';
 import { merge, Subject, Subscription, switchMap, tap } from 'rxjs';
-import { debounceTime, distinctUntilChanged, map, skip } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, map, skip } from 'rxjs';
 
 import { DataView, FieldSpec } from '@kbn/data-views-plugin/public';
 import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
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 368fca384742f..681138564e199 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
@@ -12,7 +12,7 @@ import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
 import { batch } from 'react-redux';
 import { lastValueFrom, Subscription, switchMap } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { distinctUntilChanged, map } from 'rxjs';
 
 import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
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 0502592a68a88..ea6b478fa7961 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
@@ -10,7 +10,7 @@ import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import { ViewMode } from '@kbn/embeddable-plugin/common';
 import React, { FC, useCallback, useMemo, useState } from 'react';
 import { Observable, Subscription } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { useControlGroupContainer } from '../../control_group/embeddable/control_group_container';
 import { useTimeSlider } from '../embeddable/time_slider_embeddable';
 import { TimeSliderStrings } from './time_slider_strings';
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 84ed946f56a9a..c17415679e8e7 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
@@ -11,7 +11,7 @@ import moment from 'moment-timezone';
 import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
 import { Subscription } from 'rxjs';
-import { debounceTime, first, map } from 'rxjs/operators';
+import { debounceTime, first, map } from 'rxjs';
 
 import { Embeddable, IContainer } from '@kbn/embeddable-plugin/public';
 import type { TimeRange } from '@kbn/es-query';
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 45574312ec8e0..6b7cc3c2f7e7b 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
@@ -7,7 +7,7 @@
  */
 
 import _ from 'lodash';
-import { debounceTime } from 'rxjs/operators';
+import { debounceTime } from 'rxjs';
 import semverSatisfies from 'semver/functions/satisfies';
 
 import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.ts
index e06318656cf66..75cb8a8528c85 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/controls/dashboard_control_group_integration.ts
@@ -10,7 +10,7 @@ import { compareFilters, COMPARE_ALL_OPTIONS, type Filter } from '@kbn/es-query'
 import deepEqual from 'fast-deep-equal';
 import { isEqual } from 'lodash';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, skip } from 'rxjs/operators';
+import { distinctUntilChanged, skip } from 'rxjs';
 
 import { ControlGroupInput } from '@kbn/controls-plugin/common';
 import { ControlGroupContainer } from '@kbn/controls-plugin/public';
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
index d82f92deddeab..54a7b2186b0f1 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts
@@ -22,7 +22,7 @@ import { compareFilters, Filter, TimeRange } from '@kbn/es-query';
 import { lazyLoadReduxToolsPackage } from '@kbn/presentation-util-plugin/public';
 import { cloneDeep, identity, omit, pickBy } from 'lodash';
 import { BehaviorSubject, combineLatest, Subject } from 'rxjs';
-import { map, distinctUntilChanged, startWith } from 'rxjs/operators';
+import { map, distinctUntilChanged, startWith } from 'rxjs';
 import { v4 } from 'uuid';
 import { combineDashboardFiltersWithControlGroupFilters } from './controls/dashboard_control_group_integration';
 import { DashboardContainerInput, DashboardPanelState } from '../../../../common';
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/data_views/sync_dashboard_data_views.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/data_views/sync_dashboard_data_views.ts
index d8365394b8a25..3c8f29fcb428d 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/create/data_views/sync_dashboard_data_views.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/data_views/sync_dashboard_data_views.ts
@@ -8,7 +8,7 @@
 
 import deepEqual from 'fast-deep-equal';
 import { Observable, pipe, combineLatest } from 'rxjs';
-import { distinctUntilChanged, switchMap, filter, map } from 'rxjs/operators';
+import { distinctUntilChanged, switchMap, filter, map } from 'rxjs';
 
 import { DataView } from '@kbn/data-views-plugin/common';
 import { isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
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
index 7d74e91ad6c93..a7efcdb9c1d75 100644
--- 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
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { pairwise, skip } from 'rxjs/operators';
+import { pairwise, skip } from 'rxjs';
 
 import { noSearchSessionStorageCapabilityMessage } from '@kbn/data-plugin/public';
 
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/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
index d65ddb18fa40b..65e9622bd4873 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/create/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
@@ -8,7 +8,7 @@
 
 import { Subject } from 'rxjs';
 import fastIsEqual from 'fast-deep-equal';
-import { distinctUntilChanged, finalize, switchMap, tap } from 'rxjs/operators';
+import { distinctUntilChanged, finalize, switchMap, tap } from 'rxjs';
 
 import type { Filter, Query } from '@kbn/es-query';
 import { IKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
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 1a8e10f3999e0..8cf08fab63a9d 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
@@ -40,7 +40,7 @@ import React, { createContext, useContext } from 'react';
 import ReactDOM from 'react-dom';
 import { batch } from 'react-redux';
 import { BehaviorSubject, Subject, Subscription } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { distinctUntilChanged, map } from 'rxjs';
 import { v4 } from 'uuid';
 import { DashboardLocatorParams, DASHBOARD_CONTAINER_TYPE } from '../..';
 import { DashboardContainerInput, DashboardPanelState } from '../../../common';
diff --git a/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.ts b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.ts
index d0ba41e47074a..d540708fb19b4 100644
--- a/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.ts
+++ b/src/plugins/dashboard/public/dashboard_container/state/diffing/dashboard_diffing_integration.ts
@@ -10,7 +10,7 @@ import deepEqual from 'fast-deep-equal';
 import { cloneDeep, omit } from 'lodash';
 import { AnyAction, Middleware } from 'redux';
 import { combineLatest, debounceTime, Observable, of, startWith, switchMap } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { distinctUntilChanged, map } from 'rxjs';
 import { DashboardContainer, DashboardCreationOptions } from '../..';
 import { DashboardContainerInput } from '../../../../common';
 import { CHANGE_CHECK_DEBOUNCE } from '../../../dashboard_constants';
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 8fb1260eb327d..2c6d3ecb9841c 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 
 import {
   App,
diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
index 4c42fdc985ff4..16e47fecc454a 100644
--- a/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
@@ -22,7 +22,7 @@ jest.mock('../../tabify', () => ({
 
 import { tabifyAggResponse } from '../../tabify';
 import { of } from 'rxjs';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 
 describe('esaggs expression function - public', () => {
   let mockParams: MockedKeys<Parameters<typeof handleRequest>[0]>;
diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
index 7f0155d74082f..1cd97dc7aeeb2 100644
--- a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
@@ -8,7 +8,7 @@
 import type { KibanaExecutionContext } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { defer } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs';
 import { Adapters } from '@kbn/inspector-plugin/common';
 import type { DataView } from '@kbn/data-views-plugin/common';
 import type { Filter, TimeRange } from '@kbn/es-query';
diff --git a/src/plugins/data/common/search/expressions/esql.ts b/src/plugins/data/common/search/expressions/esql.ts
index 8b063b7e734c3..7ed11099c4bef 100644
--- a/src/plugins/data/common/search/expressions/esql.ts
+++ b/src/plugins/data/common/search/expressions/esql.ts
@@ -14,7 +14,7 @@ import { RequestAdapter } from '@kbn/inspector-plugin/common';
 
 import { zipObject } from 'lodash';
 import { Observable, defer, throwError } from 'rxjs';
-import { catchError, map, switchMap, tap } from 'rxjs/operators';
+import { catchError, map, switchMap, tap } from 'rxjs';
 import { buildEsQuery } from '@kbn/es-query';
 import type { ESQLSearchReponse, ESQLSearchParams } from '@kbn/es-types';
 import { getEsQueryConfig } from '../../es_query';
diff --git a/src/plugins/data/common/search/expressions/essql.ts b/src/plugins/data/common/search/expressions/essql.ts
index 8c5baa66f9f53..b65e8a06d414e 100644
--- a/src/plugins/data/common/search/expressions/essql.ts
+++ b/src/plugins/data/common/search/expressions/essql.ts
@@ -15,7 +15,7 @@ import { RequestAdapter } from '@kbn/inspector-plugin/common';
 
 import { zipObject } from 'lodash';
 import { Observable, defer, throwError } from 'rxjs';
-import { catchError, map, switchMap, tap } from 'rxjs/operators';
+import { catchError, map, switchMap, tap } from 'rxjs';
 import type { NowProviderPublicContract } from '../../../public';
 import { getEsQueryConfig } from '../../es_query';
 import { getTime } from '../../query';
diff --git a/src/plugins/data/common/search/poll_search.ts b/src/plugins/data/common/search/poll_search.ts
index 8637c472adb16..54985366b9127 100644
--- a/src/plugins/data/common/search/poll_search.ts
+++ b/src/plugins/data/common/search/poll_search.ts
@@ -7,7 +7,7 @@
  */
 
 import { from, Observable, timer, defer, fromEvent, EMPTY } from 'rxjs';
-import { expand, map, switchMap, takeUntil, takeWhile, tap } from 'rxjs/operators';
+import { expand, map, switchMap, takeUntil, takeWhile, tap } from 'rxjs';
 import { AbortError } from '@kbn/kibana-utils-plugin/common';
 import type { IAsyncSearchOptions, IKibanaSearchResponse } from '..';
 import { isAbortResponse, isRunningResponse } from '..';
diff --git a/src/plugins/data/common/search/search_source/search_source.test.ts b/src/plugins/data/common/search/search_source/search_source.test.ts
index 64ae2f3b2ec01..6fd4355fbb6fb 100644
--- a/src/plugins/data/common/search/search_source/search_source.test.ts
+++ b/src/plugins/data/common/search/search_source/search_source.test.ts
@@ -14,7 +14,7 @@ import { SearchSource, SearchSourceDependencies, SortDirection } from '.';
 import { AggConfigs, AggTypesRegistryStart } from '../..';
 import { mockAggTypesRegistry } from '../aggs/test_helpers';
 import { RequestAdapter, RequestResponder } from '@kbn/inspector-plugin/common';
-import { switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs';
 import { Filter } from '@kbn/es-query';
 import { stubIndexPattern } from '../../stubs';
 import { SearchSourceSearchOptions } from './types';
diff --git a/src/plugins/data/common/search/search_source/search_source.ts b/src/plugins/data/common/search/search_source/search_source.ts
index 6fc47ac126431..c91310fc0a7e1 100644
--- a/src/plugins/data/common/search/search_source/search_source.ts
+++ b/src/plugins/data/common/search/search_source/search_source.ts
@@ -60,16 +60,7 @@
 
 import { setWith } from '@kbn/safer-lodash-set';
 import { difference, isEqual, isFunction, isObject, keyBy, pick, uniqueId, concat } from 'lodash';
-import {
-  catchError,
-  finalize,
-  first,
-  last,
-  map,
-  shareReplay,
-  switchMap,
-  tap,
-} from 'rxjs/operators';
+import { catchError, finalize, first, last, map, shareReplay, switchMap, tap } from 'rxjs';
 import { defer, EMPTY, from, lastValueFrom, Observable } from 'rxjs';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import {
diff --git a/src/plugins/data/public/query/persisted_log/persisted_log.ts b/src/plugins/data/public/query/persisted_log/persisted_log.ts
index a4e73d19250e3..fce78608f5367 100644
--- a/src/plugins/data/public/query/persisted_log/persisted_log.ts
+++ b/src/plugins/data/public/query/persisted_log/persisted_log.ts
@@ -8,7 +8,7 @@
 
 import _ from 'lodash';
 import * as Rx from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 
 const defaultIsDuplicate = (oldItem: any, newItem: any) => {
diff --git a/src/plugins/data/public/query/query_service.ts b/src/plugins/data/public/query/query_service.ts
index 894db102aa041..72943d6b0f59b 100644
--- a/src/plugins/data/public/query/query_service.ts
+++ b/src/plugins/data/public/query/query_service.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { share } from 'rxjs/operators';
+import { share } from 'rxjs';
 import { HttpStart, IUiSettingsClient } from '@kbn/core/public';
 import { PersistableStateService, VersionedState } from '@kbn/kibana-utils-plugin/common';
 import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
diff --git a/src/plugins/data/public/query/query_string/query_string_manager.ts b/src/plugins/data/public/query/query_string/query_string_manager.ts
index b259b29130055..b7b4cf8c6082f 100644
--- a/src/plugins/data/public/query/query_string/query_string_manager.ts
+++ b/src/plugins/data/public/query/query_string/query_string_manager.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { skip } from 'rxjs/operators';
+import { skip } from 'rxjs';
 import { PublicMethodsOf } from '@kbn/utility-types';
 import { CoreStart } from '@kbn/core/public';
 import type { Query, AggregateQuery } from '@kbn/es-query';
diff --git a/src/plugins/data/public/query/state_sync/connect_to_query_state.ts b/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
index 41e386ac370d2..01d0fafcd79fe 100644
--- a/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
+++ b/src/plugins/data/public/query/state_sync/connect_to_query_state.ts
@@ -7,7 +7,7 @@
  */
 
 import { Subscription } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 import _ from 'lodash';
 import { COMPARE_ALL_OPTIONS, compareFilters, FilterStateStore } from '@kbn/es-query';
 import { BaseStateContainer } from '@kbn/kibana-utils-plugin/public';
diff --git a/src/plugins/data/public/query/state_sync/create_query_state_observable.ts b/src/plugins/data/public/query/state_sync/create_query_state_observable.ts
index 8520423915dba..f9dc8360f8285 100644
--- a/src/plugins/data/public/query/state_sync/create_query_state_observable.ts
+++ b/src/plugins/data/public/query/state_sync/create_query_state_observable.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, Subscription } from 'rxjs';
-import { map, tap } from 'rxjs/operators';
+import { map, tap } from 'rxjs';
 import { COMPARE_ALL_OPTIONS, compareFilters, isFilterPinned } from '@kbn/es-query';
 import { createStateContainer } from '@kbn/kibana-utils-plugin/public';
 import type { TimefilterSetup } from '../timefilter';
diff --git a/src/plugins/data/public/query/timefilter/lib/auto_refresh_loop.ts b/src/plugins/data/public/query/timefilter/lib/auto_refresh_loop.ts
index a5807a5d7793c..c62e836927733 100644
--- a/src/plugins/data/public/query/timefilter/lib/auto_refresh_loop.ts
+++ b/src/plugins/data/public/query/timefilter/lib/auto_refresh_loop.ts
@@ -7,7 +7,7 @@
  */
 
 import { defer, Subject } from 'rxjs';
-import { finalize, map, delayWhen, filter } from 'rxjs/operators';
+import { finalize, map, delayWhen, filter } from 'rxjs';
 import { once } from 'lodash';
 import { createPageVisibility$ } from './page_visibility';
 
diff --git a/src/plugins/data/public/query/timefilter/lib/page_visibility.ts b/src/plugins/data/public/query/timefilter/lib/page_visibility.ts
index 292047ed0c2b0..39ed0b06fb7f1 100644
--- a/src/plugins/data/public/query/timefilter/lib/page_visibility.ts
+++ b/src/plugins/data/public/query/timefilter/lib/page_visibility.ts
@@ -7,7 +7,7 @@
  */
 
 import { fromEvent, Observable } from 'rxjs';
-import { map, shareReplay, startWith } from 'rxjs/operators';
+import { map, shareReplay, startWith } from 'rxjs';
 
 export function createPageVisibility$(): Observable<DocumentVisibilityState> {
   return fromEvent(document, 'visibilitychange').pipe(
diff --git a/src/plugins/data/public/search/collectors/create_usage_collector.ts b/src/plugins/data/public/search/collectors/create_usage_collector.ts
index 266e3e1e9a1a6..19a4fab7a7478 100644
--- a/src/plugins/data/public/search/collectors/create_usage_collector.ts
+++ b/src/plugins/data/public/search/collectors/create_usage_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { METRIC_TYPE } from '@kbn/analytics';
 import type { UiCounterMetricType } from '@kbn/analytics';
 import type { StartServicesAccessor } from '@kbn/core/public';
diff --git a/src/plugins/data/public/search/expressions/esaggs.ts b/src/plugins/data/public/search/expressions/esaggs.ts
index 5ae0b72e1fe58..888ee850760d3 100644
--- a/src/plugins/data/public/search/expressions/esaggs.ts
+++ b/src/plugins/data/public/search/expressions/esaggs.ts
@@ -8,7 +8,7 @@
 
 import { get } from 'lodash';
 import { defer } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs';
 import { StartServicesAccessor } from '@kbn/core/public';
 import {
   EsaggsExpressionFunctionDefinition,
diff --git a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
index 9fcb74e339403..e08faa03c6c69 100644
--- a/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_interceptor.ts
@@ -29,7 +29,7 @@ import {
   take,
   takeUntil,
   tap,
-} from 'rxjs/operators';
+} from 'rxjs';
 import { estypes } from '@elastic/elasticsearch';
 import { i18n } from '@kbn/i18n';
 import { PublicMethodsOf } from '@kbn/utility-types';
diff --git a/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts b/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
index bab49b22f5a55..25e2d9aefe088 100644
--- a/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
+++ b/src/plugins/data/public/search/search_interceptor/search_response_cache.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { interval, Observable, of, throwError } from 'rxjs';
-import { shareReplay, switchMap, take } from 'rxjs/operators';
+import { shareReplay, switchMap, take } from 'rxjs';
 import { IKibanaSearchResponse } from '../..';
 import { SearchAbortController } from './search_abort_controller';
 import { SearchResponseCache } from './search_response_cache';
diff --git a/src/plugins/data/public/search/session/search_session_state.ts b/src/plugins/data/public/search/session/search_session_state.ts
index dc38ecef07f21..abb7cbc084b89 100644
--- a/src/plugins/data/public/search/session/search_session_state.ts
+++ b/src/plugins/data/public/search/session/search_session_state.ts
@@ -9,7 +9,7 @@
 import { v4 as uuidv4 } from 'uuid';
 import deepEqual from 'fast-deep-equal';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, shareReplay } from 'rxjs/operators';
+import { distinctUntilChanged, map, shareReplay } from 'rxjs';
 import { createStateContainer, StateContainer } from '@kbn/kibana-utils-plugin/public';
 import type { SearchSessionSavedObject } from './sessions_client';
 
diff --git a/src/plugins/data/public/search/session/session_helpers.ts b/src/plugins/data/public/search/session/session_helpers.ts
index 1f0a2da7e93f4..dadae48f6329f 100644
--- a/src/plugins/data/public/search/session/session_helpers.ts
+++ b/src/plugins/data/public/search/session/session_helpers.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { debounceTime, first, skipUntil } from 'rxjs/operators';
+import { debounceTime, first, skipUntil } from 'rxjs';
 import { ISessionService } from './session_service';
 import { SearchSessionState } from './search_session_state';
 
diff --git a/src/plugins/data/public/search/session/session_indicator/connected_search_session_indicator/connected_search_session_indicator.test.tsx b/src/plugins/data/public/search/session/session_indicator/connected_search_session_indicator/connected_search_session_indicator.test.tsx
index 3a97bdddbcf46..f6d9c7471b9ca 100644
--- a/src/plugins/data/public/search/session/session_indicator/connected_search_session_indicator/connected_search_session_indicator.test.tsx
+++ b/src/plugins/data/public/search/session/session_indicator/connected_search_session_indicator/connected_search_session_indicator.test.tsx
@@ -13,7 +13,7 @@ import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { dataPluginMock } from '../../../../mocks';
 import { createConnectedSearchSessionIndicator } from './connected_search_session_indicator';
 import { BehaviorSubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import {
   ISessionService,
   RefreshInterval,
diff --git a/src/plugins/data/public/search/session/session_indicator/connected_search_session_indicator/connected_search_session_indicator.tsx b/src/plugins/data/public/search/session/session_indicator/connected_search_session_indicator/connected_search_session_indicator.tsx
index ccc51091716b5..2ee97c052da85 100644
--- a/src/plugins/data/public/search/session/session_indicator/connected_search_session_indicator/connected_search_session_indicator.tsx
+++ b/src/plugins/data/public/search/session/session_indicator/connected_search_session_indicator/connected_search_session_indicator.tsx
@@ -7,7 +7,7 @@
  */
 
 import React, { useCallback, useEffect, useState } from 'react';
-import { debounce } from 'rxjs/operators';
+import { debounce } from 'rxjs';
 import { timer } from 'rxjs';
 import useObservable from 'react-use/lib/useObservable';
 import { i18n } from '@kbn/i18n';
diff --git a/src/plugins/data/public/search/session/session_service.test.ts b/src/plugins/data/public/search/session/session_service.test.ts
index d74d4d9d93664..e9b61f01e626d 100644
--- a/src/plugins/data/public/search/session/session_service.test.ts
+++ b/src/plugins/data/public/search/session/session_service.test.ts
@@ -8,7 +8,7 @@
 
 import { ISessionService, SessionService } from './session_service';
 import { coreMock } from '@kbn/core/public/mocks';
-import { first, take, toArray } from 'rxjs/operators';
+import { first, take, toArray } from 'rxjs';
 import { getSessionsClientMock } from './mocks';
 import { BehaviorSubject } from 'rxjs';
 import { SearchSessionState } from './search_session_state';
diff --git a/src/plugins/data/public/search/session/session_service.ts b/src/plugins/data/public/search/session/session_service.ts
index 70c343651e611..b6cc43313dc1d 100644
--- a/src/plugins/data/public/search/session/session_service.ts
+++ b/src/plugins/data/public/search/session/session_service.ts
@@ -18,7 +18,7 @@ import {
   switchMap,
   takeUntil,
   tap,
-} from 'rxjs/operators';
+} from 'rxjs';
 import {
   BehaviorSubject,
   combineLatest,
diff --git a/src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts b/src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts
index 753f43dcbb648..f5abbc4c77de8 100644
--- a/src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts
+++ b/src/plugins/data/public/search/session/sessions_mgmt/lib/api.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import type { ApplicationStart, NotificationsStart } from '@kbn/core/public';
 import moment from 'moment';
 import { from, race, timer } from 'rxjs';
-import { mapTo, tap } from 'rxjs/operators';
+import { mapTo, tap } from 'rxjs';
 import type { SharePluginStart } from '@kbn/share-plugin/public';
 import { SerializableRecord } from '@kbn/utility-types';
 import { ACTION } from '../components/actions';
diff --git a/src/plugins/data/server/search/expressions/esaggs.ts b/src/plugins/data/server/search/expressions/esaggs.ts
index 2e1afc0350957..87d57f779e985 100644
--- a/src/plugins/data/server/search/expressions/esaggs.ts
+++ b/src/plugins/data/server/search/expressions/esaggs.ts
@@ -8,7 +8,7 @@
 
 import { get } from 'lodash';
 import { defer } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { KibanaRequest, StartServicesAccessor } from '@kbn/core/server';
 import {
diff --git a/src/plugins/data/server/search/routes/bsearch.ts b/src/plugins/data/server/search/routes/bsearch.ts
index ee19c8cba30a3..62753c0d50375 100644
--- a/src/plugins/data/server/search/routes/bsearch.ts
+++ b/src/plugins/data/server/search/routes/bsearch.ts
@@ -7,7 +7,7 @@
  */
 
 import { firstValueFrom } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { catchError } from 'rxjs';
 import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import type { ExecutionContextSetup } from '@kbn/core/server';
 import apm from 'elastic-apm-node';
diff --git a/src/plugins/data/server/search/routes/search.ts b/src/plugins/data/server/search/routes/search.ts
index 8b302a81aea1a..ef9b39f2f6b99 100644
--- a/src/plugins/data/server/search/routes/search.ts
+++ b/src/plugins/data/server/search/routes/search.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { schema } from '@kbn/config-schema';
 import { reportServerError } from '@kbn/kibana-utils-plugin/server';
 import { reportSearchError } from '../report_search_error';
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index 04b635621c6c8..ad4dec61cab7c 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -19,7 +19,7 @@ import {
   SharedGlobalConfig,
   StartServicesAccessor,
 } from '@kbn/core/server';
-import { catchError, map, switchMap, tap } from 'rxjs/operators';
+import { catchError, map, switchMap, tap } from 'rxjs';
 import { BfetchServerSetup } from '@kbn/bfetch-plugin/server';
 import { ExpressionsServerSetup } from '@kbn/expressions-plugin/server';
 import { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
index 00b8cfdeb52e5..5ad9d2a6617be 100644
--- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
@@ -7,7 +7,7 @@
  */
 
 import type { TransportResult } from '@elastic/elasticsearch';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import type { IScopedClusterClient, Logger } from '@kbn/core/server';
 import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { SearchConfigSchema } from '../../../../config';
diff --git a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
index 319af08750689..2737b264e1c2d 100644
--- a/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/es_search/es_search_strategy.ts
@@ -7,7 +7,7 @@
  */
 
 import { firstValueFrom, from, Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import type { Logger, SharedGlobalConfig } from '@kbn/core/server';
 import { getKbnSearchError, KbnSearchError } from '../../report_search_error';
 import type { ISearchStrategy } from '../../types';
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
index 54b56e45f0a1a..42c74693b3299 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
@@ -8,7 +8,7 @@
 
 import type { Observable } from 'rxjs';
 import type { IScopedClusterClient, Logger, SharedGlobalConfig } from '@kbn/core/server';
-import { catchError, tap } from 'rxjs/operators';
+import { catchError, tap } from 'rxjs';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { firstValueFrom, from } from 'rxjs';
 import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
diff --git a/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts b/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts
index 8bde400db2b45..e779f110e594a 100644
--- a/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts
@@ -7,7 +7,7 @@
  */
 
 import type { IScopedClusterClient, Logger } from '@kbn/core/server';
-import { catchError, tap } from 'rxjs/operators';
+import { catchError, tap } from 'rxjs';
 import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
 import { SqlQueryRequest } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { SqlGetAsyncResponse } from '@elastic/elasticsearch/lib/api/types';
diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
index 9e04675d12247..bd4442afa1aba 100644
--- a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
@@ -8,7 +8,7 @@
 
 import type { IncomingHttpHeaders } from 'http';
 import type { IScopedClusterClient, Logger } from '@kbn/core/server';
-import { catchError, tap } from 'rxjs/operators';
+import { catchError, tap } from 'rxjs';
 import type { DiagnosticResult } from '@elastic/transport';
 import { SqlQueryResponse } from '@elastic/elasticsearch/lib/api/types';
 import { getKbnServerError } from '@kbn/kibana-utils-plugin/server';
diff --git a/src/plugins/data_view_field_editor/public/state_utils.ts b/src/plugins/data_view_field_editor/public/state_utils.ts
index 634dd5d8dc38b..0853279222f90 100644
--- a/src/plugins/data_view_field_editor/public/state_utils.ts
+++ b/src/plugins/data_view_field_editor/public/state_utils.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { distinctUntilChanged, map } from 'rxjs';
 import { useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 
diff --git a/src/plugins/data_views/common/data_views/utils.ts b/src/plugins/data_views/common/data_views/utils.ts
index ec1c41fc3eaca..33ffcf62be92e 100644
--- a/src/plugins/data_views/common/data_views/utils.ts
+++ b/src/plugins/data_views/common/data_views/utils.ts
@@ -7,7 +7,7 @@
  */
 
 import { catchError, from, Observable, of } from 'rxjs';
-import { mergeMap, last, map, toArray } from 'rxjs/operators';
+import { mergeMap, last, map, toArray } from 'rxjs';
 import type { RuntimeField, RuntimeFieldSpec, RuntimePrimitiveTypes } from '../types';
 
 export const removeFieldAttrs = (runtimeField: RuntimeField): RuntimeFieldSpec => {
diff --git a/src/plugins/discover/public/application/main/hooks/use_saved_search_messages.test.ts b/src/plugins/discover/public/application/main/hooks/use_saved_search_messages.test.ts
index 20554ebdaae23..f8c9b87e1699c 100644
--- a/src/plugins/discover/public/application/main/hooks/use_saved_search_messages.test.ts
+++ b/src/plugins/discover/public/application/main/hooks/use_saved_search_messages.test.ts
@@ -23,7 +23,7 @@ import {
   DataMainMsg,
   RecordRawType,
 } from '../services/discover_data_state_container';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import { dataViewMock, esHitsMockWithSort } from '@kbn/discover-utils/src/__mocks__';
 import { buildDataTableRecord } from '@kbn/discover-utils';
 import { searchResponseIncompleteWarningLocalCluster } from '@kbn/search-response-warnings/src/__mocks__/search_response_warnings';
diff --git a/src/plugins/discover/public/application/main/services/discover_search_session.ts b/src/plugins/discover/public/application/main/services/discover_search_session.ts
index c7379e706cf71..afbcca9663317 100644
--- a/src/plugins/discover/public/application/main/services/discover_search_session.ts
+++ b/src/plugins/discover/public/application/main/services/discover_search_session.ts
@@ -8,7 +8,7 @@
 
 import { History } from 'history';
 import * as Rx from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import {
   createQueryParamObservable,
diff --git a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
index 08fae23110972..d9c96e9bce0e9 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_all.test.ts
@@ -7,7 +7,7 @@
  */
 import { FetchStatus } from '../../types';
 import { BehaviorSubject, firstValueFrom, Subject } from 'rxjs';
-import { reduce } from 'rxjs/operators';
+import { reduce } from 'rxjs';
 import { SearchSource } from '@kbn/data-plugin/public';
 import { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
diff --git a/src/plugins/discover/public/application/main/utils/fetch_documents.ts b/src/plugins/discover/public/application/main/utils/fetch_documents.ts
index 5d6206f6776bf..414d4b3a36587 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_documents.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_documents.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { i18n } from '@kbn/i18n';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 import { lastValueFrom } from 'rxjs';
 import { isRunningResponse, ISearchSource } from '@kbn/data-plugin/public';
 import { buildDataTableRecordList } from '@kbn/discover-utils';
diff --git a/src/plugins/discover/public/application/main/utils/fetch_text_based.ts b/src/plugins/discover/public/application/main/utils/fetch_text_based.ts
index 98e8bc5846186..4099a16a9625a 100644
--- a/src/plugins/discover/public/application/main/utils/fetch_text_based.ts
+++ b/src/plugins/discover/public/application/main/utils/fetch_text_based.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 import { lastValueFrom } from 'rxjs';
 import { Query, AggregateQuery, Filter } from '@kbn/es-query';
 import type { Adapters } from '@kbn/inspector-plugin/common';
diff --git a/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts b/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
index f4b8b061d95cb..c6a1aade3679f 100644
--- a/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
+++ b/src/plugins/discover/public/application/main/utils/get_fetch_observable.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { merge } from 'rxjs';
-import { debounceTime, filter, tap } from 'rxjs/operators';
+import { debounceTime, filter, tap } from 'rxjs';
 
 import type {
   AutoRefreshDoneFn,
diff --git a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
index 8ec6a0f0dfa3c..7ae8ac6d132ef 100644
--- a/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
+++ b/src/plugins/discover/public/utils/initialize_kbn_url_tracking.ts
@@ -7,7 +7,7 @@
  */
 import { AppUpdater, CoreSetup, ScopedHistory } from '@kbn/core/public';
 import type { BehaviorSubject } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 import { createKbnUrlTracker } from '@kbn/kibana-utils-plugin/public';
 import { replaceUrlHashQuery } from '@kbn/kibana-utils-plugin/common';
 import { isFilterPinned } from '@kbn/es-query';
diff --git a/src/plugins/embeddable/public/lib/containers/container.ts b/src/plugins/embeddable/public/lib/containers/container.ts
index 9f3ac0f8d38a4..beb324fa20a9d 100644
--- a/src/plugins/embeddable/public/lib/containers/container.ts
+++ b/src/plugins/embeddable/public/lib/containers/container.ts
@@ -18,7 +18,7 @@ import {
   pairwise,
   switchMap,
   take,
-} from 'rxjs/operators';
+} from 'rxjs';
 import { v4 as uuidv4 } from 'uuid';
 
 import {
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.test.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.test.tsx
index b3f4d4d915b74..3ff28fe7d5608 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.test.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.test.tsx
@@ -8,7 +8,7 @@
 
 /* eslint-disable max-classes-per-file */
 
-import { skip, take } from 'rxjs/operators';
+import { skip, take } from 'rxjs';
 import { Embeddable } from './embeddable';
 import { EmbeddableOutput, EmbeddableInput } from './i_embeddable';
 import { ViewMode } from '../types';
diff --git a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
index 3bb51bc2f71a5..2dfa06d8db9d2 100644
--- a/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
+++ b/src/plugins/embeddable/public/lib/embeddables/embeddable.tsx
@@ -10,7 +10,7 @@ import fastIsEqual from 'fast-deep-equal';
 import { cloneDeep } from 'lodash';
 import * as Rx from 'rxjs';
 import { merge } from 'rxjs';
-import { debounceTime, distinctUntilChanged, map, skip } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, map, skip } from 'rxjs';
 import { RenderCompleteDispatcher } from '@kbn/kibana-utils-plugin/public';
 import { Adapters } from '../types';
 import { IContainer } from '../containers';
diff --git a/src/plugins/embeddable/public/lib/filterable_embeddable/should_fetch.tsx b/src/plugins/embeddable/public/lib/filterable_embeddable/should_fetch.tsx
index 68d9df23bb612..64e4d7fe3abf5 100644
--- a/src/plugins/embeddable/public/lib/filterable_embeddable/should_fetch.tsx
+++ b/src/plugins/embeddable/public/lib/filterable_embeddable/should_fetch.tsx
@@ -8,7 +8,7 @@
 
 import fastIsEqual from 'fast-deep-equal';
 import { Observable } from 'rxjs';
-import { map, distinctUntilChanged, skip, startWith } from 'rxjs/operators';
+import { map, distinctUntilChanged, skip, startWith } from 'rxjs';
 import { COMPARE_ALL_OPTIONS, onlyDisabledFiltersChanged } from '@kbn/es-query';
 import type { FilterableEmbeddableInput } from './types';
 
diff --git a/src/plugins/embeddable/public/react_embeddable_system/react_embeddable_unsaved_changes.ts b/src/plugins/embeddable/public/react_embeddable_system/react_embeddable_unsaved_changes.ts
index f4bc6bbfc4ad8..31a92d1e03b59 100644
--- a/src/plugins/embeddable/public/react_embeddable_system/react_embeddable_unsaved_changes.ts
+++ b/src/plugins/embeddable/public/react_embeddable_system/react_embeddable_unsaved_changes.ts
@@ -18,7 +18,7 @@ import {
   StateComparators,
 } from '@kbn/presentation-publishing';
 import { BehaviorSubject, combineLatest } from 'rxjs';
-import { combineLatestWith, debounceTime, map } from 'rxjs/operators';
+import { combineLatestWith, debounceTime, map } from 'rxjs';
 
 const getDefaultDiffingApi = () => {
   return {
diff --git a/src/plugins/embeddable/public/tests/container.test.ts b/src/plugins/embeddable/public/tests/container.test.ts
index 58aab0f0add3c..2ecc7e4205f5e 100644
--- a/src/plugins/embeddable/public/tests/container.test.ts
+++ b/src/plugins/embeddable/public/tests/container.test.ts
@@ -8,7 +8,7 @@
 
 import { coreMock } from '@kbn/core/public/mocks';
 import * as Rx from 'rxjs';
-import { skip } from 'rxjs/operators';
+import { skip } from 'rxjs';
 import { EmbeddableOutput, isErrorEmbeddable, SavedObjectEmbeddableInput, ViewMode } from '../lib';
 import { ERROR_EMBEDDABLE_TYPE } from '../lib/embeddables/error_embeddable';
 import {
diff --git a/src/plugins/embeddable/public/tests/explicit_input.test.ts b/src/plugins/embeddable/public/tests/explicit_input.test.ts
index f278049444d0e..f4ce286fc6ff7 100644
--- a/src/plugins/embeddable/public/tests/explicit_input.test.ts
+++ b/src/plugins/embeddable/public/tests/explicit_input.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { skip } from 'rxjs/operators';
+import { skip } from 'rxjs';
 import { testPlugin } from './test_plugin';
 import {
   MockFilter,
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
index d50ce597fb362..f75a1de311671 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
@@ -8,7 +8,7 @@
 
 import React, { useEffect, FunctionComponent, useState, useCallback } from 'react';
 import { act } from 'react-dom/test-utils';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 
 import { registerTestBed, TestBed } from '../shared_imports';
 import { FormHook, OnUpdateHandler, FieldConfig, FieldHook } from '../types';
diff --git a/src/plugins/expressions/common/execution/execution.test.ts b/src/plugins/expressions/common/execution/execution.test.ts
index 35d31497b8872..cfb07eeb2e9e6 100644
--- a/src/plugins/expressions/common/execution/execution.test.ts
+++ b/src/plugins/expressions/common/execution/execution.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { lastValueFrom, of } from 'rxjs';
-import { scan } from 'rxjs/operators';
+import { scan } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { Execution } from './execution';
 import { parseExpression, ExpressionAstExpression } from '../ast';
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
index 593e437fd9dc7..13162b3a9d825 100644
--- a/src/plugins/expressions/common/execution/execution.ts
+++ b/src/plugins/expressions/common/execution/execution.ts
@@ -26,7 +26,7 @@ import {
   ReplaySubject,
   Subscription,
 } from 'rxjs';
-import { catchError, finalize, map, pluck, shareReplay, switchMap, tap } from 'rxjs/operators';
+import { catchError, finalize, map, pluck, shareReplay, switchMap, tap } from 'rxjs';
 import { now, AbortError } from '@kbn/kibana-utils-plugin/common';
 import { Adapters } from '@kbn/inspector-plugin/common';
 import { Executor } from '../executor';
diff --git a/src/plugins/expressions/common/execution/execution_contract.test.ts b/src/plugins/expressions/common/execution/execution_contract.test.ts
index 6934720d2d70c..248a224167193 100644
--- a/src/plugins/expressions/common/execution/execution_contract.test.ts
+++ b/src/plugins/expressions/common/execution/execution_contract.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, Subscriber } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { Execution } from './execution';
 import { parseExpression } from '../ast';
 import { createUnitTestExecutor } from '../test_helpers';
diff --git a/src/plugins/expressions/common/execution/execution_contract.ts b/src/plugins/expressions/common/execution/execution_contract.ts
index 50dda43661367..f2dbc8254ebd1 100644
--- a/src/plugins/expressions/common/execution/execution_contract.ts
+++ b/src/plugins/expressions/common/execution/execution_contract.ts
@@ -7,7 +7,7 @@
  */
 
 import { of, Observable } from 'rxjs';
-import { catchError } from 'rxjs/operators';
+import { catchError } from 'rxjs';
 import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { Execution, ExecutionResult } from './execution';
 import { ExpressionValueError } from '../expression_types/specs';
diff --git a/src/plugins/expressions/common/expression_functions/specs/map_column.ts b/src/plugins/expressions/common/expression_functions/specs/map_column.ts
index c3a267d9dca6c..659282f121fe0 100644
--- a/src/plugins/expressions/common/expression_functions/specs/map_column.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/map_column.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, combineLatest, defer } from 'rxjs';
-import { defaultIfEmpty, map } from 'rxjs/operators';
+import { defaultIfEmpty, map } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { ExpressionFunctionDefinition } from '../types';
 import { Datatable, DatatableColumnType, getType } from '../../expression_types';
diff --git a/src/plugins/expressions/public/loader.test.ts b/src/plugins/expressions/public/loader.test.ts
index 523adb2151330..b4c25ba06ab89 100644
--- a/src/plugins/expressions/public/loader.test.ts
+++ b/src/plugins/expressions/public/loader.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { firstValueFrom, of } from 'rxjs';
-import { first, skip, toArray } from 'rxjs/operators';
+import { first, skip, toArray } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import { loader, ExpressionLoader } from './loader';
 import { Observable } from 'rxjs';
diff --git a/src/plugins/expressions/public/loader.ts b/src/plugins/expressions/public/loader.ts
index f10b8db1f1287..eb45b581c29a2 100644
--- a/src/plugins/expressions/public/loader.ts
+++ b/src/plugins/expressions/public/loader.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs';
-import { delay, filter, map, shareReplay } from 'rxjs/operators';
+import { delay, filter, map, shareReplay } from 'rxjs';
 import { defaults } from 'lodash';
 import { SerializableRecord, UnwrapObservable } from '@kbn/utility-types';
 import { Adapters } from '@kbn/inspector-plugin/public';
diff --git a/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx b/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
index 015dac1314bab..6064ce18e4ecd 100644
--- a/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
+++ b/src/plugins/expressions/public/react_expression_renderer/react_expression_renderer.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { Subject } from 'rxjs';
-import { share } from 'rxjs/operators';
+import { share } from 'rxjs';
 import { ReactExpressionRenderer } from './react_expression_renderer';
 import { mount } from 'enzyme';
 import { EuiProgress } from '@elastic/eui';
diff --git a/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.ts b/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.ts
index efe089983b639..16c61cac051eb 100644
--- a/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.ts
+++ b/src/plugins/expressions/public/react_expression_renderer/use_expression_renderer.ts
@@ -9,7 +9,7 @@
 import type { Reducer, RefObject } from 'react';
 import { useRef, useEffect, useLayoutEffect, useReducer } from 'react';
 import { Observable } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import useUpdateEffect from 'react-use/lib/useUpdateEffect';
 import {
   ExpressionAstExpression,
diff --git a/src/plugins/expressions/public/render.test.ts b/src/plugins/expressions/public/render.test.ts
index a5b79f20b6fc9..2f1ceeceae843 100644
--- a/src/plugins/expressions/public/render.test.ts
+++ b/src/plugins/expressions/public/render.test.ts
@@ -11,7 +11,7 @@ import { Observable } from 'rxjs';
 import { SerializableRecord } from '@kbn/utility-types';
 import { ExpressionRenderError } from './types';
 import { getRenderersRegistry } from './services';
-import { first, take, toArray } from 'rxjs/operators';
+import { first, take, toArray } from 'rxjs';
 import { IInterpreterRenderHandlers } from '../common';
 
 const element: HTMLElement = {} as HTMLElement;
diff --git a/src/plugins/expressions/public/render.ts b/src/plugins/expressions/public/render.ts
index a7b919625b8d6..189e154c25773 100644
--- a/src/plugins/expressions/public/render.ts
+++ b/src/plugins/expressions/public/render.ts
@@ -8,7 +8,7 @@
 
 import * as Rx from 'rxjs';
 import { Observable } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import { isNumber } from 'lodash';
 import { SerializableRecord } from '@kbn/utility-types';
 import type { KibanaExecutionContext } from '@kbn/core-execution-context-common';
diff --git a/src/plugins/image_embeddable/public/image_editor/configure_image.tsx b/src/plugins/image_embeddable/public/image_editor/configure_image.tsx
index 357f3ff46785a..43961815ca14f 100644
--- a/src/plugins/image_embeddable/public/image_editor/configure_image.tsx
+++ b/src/plugins/image_embeddable/public/image_editor/configure_image.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { FilesContext } from '@kbn/shared-ux-file-context';
-import { skip, take, takeUntil } from 'rxjs/operators';
+import { skip, take, takeUntil } from 'rxjs';
 import { Subject } from 'rxjs';
 import type { AuthenticatedUser } from '@kbn/security-plugin/common';
 import { ImageConfig } from '../types';
diff --git a/src/plugins/interactive_setup/server/elasticsearch_service.ts b/src/plugins/interactive_setup/server/elasticsearch_service.ts
index cc44a9edb4e94..f1b8a7a507ecb 100644
--- a/src/plugins/interactive_setup/server/elasticsearch_service.ts
+++ b/src/plugins/interactive_setup/server/elasticsearch_service.ts
@@ -10,15 +10,18 @@ import { errors } from '@elastic/elasticsearch';
 import type { TransportResult } from '@elastic/elasticsearch';
 import type { Duration } from 'moment';
 import type { Observable } from 'rxjs';
-import { firstValueFrom, from, of, timer } from 'rxjs';
 import {
   catchError,
   distinctUntilChanged,
   exhaustMap,
+  firstValueFrom,
+  from,
   map,
+  of,
   shareReplay,
   takeWhile,
-} from 'rxjs/operators';
+  timer,
+} from 'rxjs';
 import tls from 'tls';
 
 import type {
diff --git a/src/plugins/interactive_setup/server/routes/configure.ts b/src/plugins/interactive_setup/server/routes/configure.ts
index 58629588814b7..cb988a9c92f61 100644
--- a/src/plugins/interactive_setup/server/routes/configure.ts
+++ b/src/plugins/interactive_setup/server/routes/configure.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 
 import { schema } from '@kbn/config-schema';
 
diff --git a/src/plugins/interactive_setup/server/routes/enroll.ts b/src/plugins/interactive_setup/server/routes/enroll.ts
index 162cb623e4ddb..e808b8a1d2864 100644
--- a/src/plugins/interactive_setup/server/routes/enroll.ts
+++ b/src/plugins/interactive_setup/server/routes/enroll.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 
 import { schema } from '@kbn/config-schema';
 
diff --git a/src/plugins/interactive_setup/server/routes/status.ts b/src/plugins/interactive_setup/server/routes/status.ts
index 51b98732853ef..7206c110768c0 100644
--- a/src/plugins/interactive_setup/server/routes/status.ts
+++ b/src/plugins/interactive_setup/server/routes/status.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 
 import type { RouteDefinitionParams } from '.';
 
diff --git a/src/plugins/kibana_overview/public/plugin.ts b/src/plugins/kibana_overview/public/plugin.ts
index 1387d402cbe2d..30ab7fa97d4d6 100644
--- a/src/plugins/kibana_overview/public/plugin.ts
+++ b/src/plugins/kibana_overview/public/plugin.ts
@@ -8,7 +8,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { from } from 'rxjs';
-import { distinct, map, switchMap } from 'rxjs/operators';
+import { distinct, map, switchMap } from 'rxjs';
 import {
   AppMountParameters,
   CoreSetup,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
index 6516565c8fa5a..0904d96a7d390 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_delays.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { takeUntil, finalize, map } from 'rxjs/operators';
+import { takeUntil, finalize, map } from 'rxjs';
 import { Observable, timer, switchMap } from 'rxjs';
 import type { ISavedObjectsRepository } from '@kbn/core/server';
 import type { IEventLoopDelaysMonitor, IntervalHistogram } from '@kbn/core/server';
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
index dbfc670ffdbbd..b205b4cb99950 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/track_threshold.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { takeUntil, finalize } from 'rxjs/operators';
+import { takeUntil, finalize } from 'rxjs';
 import { Observable, timer } from 'rxjs';
 import type { Logger } from '@kbn/core/server';
 import type { UsageCounter } from '@kbn/usage-collection-plugin/server';
diff --git a/src/plugins/kibana_utils/common/distinct_until_changed_with_initial_value.test.ts b/src/plugins/kibana_utils/common/distinct_until_changed_with_initial_value.test.ts
index 741e3252ba334..626c0c1141251 100644
--- a/src/plugins/kibana_utils/common/distinct_until_changed_with_initial_value.test.ts
+++ b/src/plugins/kibana_utils/common/distinct_until_changed_with_initial_value.test.ts
@@ -8,7 +8,7 @@
 
 import { Subject } from 'rxjs';
 import { distinctUntilChangedWithInitialValue } from './distinct_until_changed_with_initial_value';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 import deepEqual from 'fast-deep-equal';
 
 describe('distinctUntilChangedWithInitialValue', () => {
diff --git a/src/plugins/kibana_utils/common/distinct_until_changed_with_initial_value.ts b/src/plugins/kibana_utils/common/distinct_until_changed_with_initial_value.ts
index ca71c8c2acdd3..e97b60ceb7970 100644
--- a/src/plugins/kibana_utils/common/distinct_until_changed_with_initial_value.ts
+++ b/src/plugins/kibana_utils/common/distinct_until_changed_with_initial_value.ts
@@ -7,7 +7,7 @@
  */
 
 import { MonoTypeOperatorFunction, queueScheduler, scheduled, from } from 'rxjs';
-import { concatAll, distinctUntilChanged, skip } from 'rxjs/operators';
+import { concatAll, distinctUntilChanged, skip } from 'rxjs';
 
 export function distinctUntilChangedWithInitialValue<T>(
   initialValue: T | Promise<T>,
diff --git a/src/plugins/kibana_utils/common/state_containers/create_state_container.ts b/src/plugins/kibana_utils/common/state_containers/create_state_container.ts
index 3d7740a74bf5e..bb811d2b4f2b1 100644
--- a/src/plugins/kibana_utils/common/state_containers/create_state_container.ts
+++ b/src/plugins/kibana_utils/common/state_containers/create_state_container.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { skip } from 'rxjs/operators';
+import { skip } from 'rxjs';
 import deepFreeze from 'deep-freeze-strict';
 import {
   PureTransitionsToTransitions,
diff --git a/src/plugins/kibana_utils/docs/state_sync/no_state_containers.md b/src/plugins/kibana_utils/docs/state_sync/no_state_containers.md
index ad78774435825..7db04aa60b7ac 100644
--- a/src/plugins/kibana_utils/docs/state_sync/no_state_containers.md
+++ b/src/plugins/kibana_utils/docs/state_sync/no_state_containers.md
@@ -16,7 +16,7 @@ For example, assuming you have a custom state manager, setting up syncing state
 ```ts
 // my_state_manager.ts
 import { Subject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 
 export class MyStateManager {
   private count: number = 0;
diff --git a/src/plugins/kibana_utils/public/history/history_observable.ts b/src/plugins/kibana_utils/public/history/history_observable.ts
index 0e9aba6572af2..abc23526a0295 100644
--- a/src/plugins/kibana_utils/public/history/history_observable.ts
+++ b/src/plugins/kibana_utils/public/history/history_observable.ts
@@ -10,7 +10,7 @@ import { Action, History, Location } from 'history';
 import { Observable } from 'rxjs';
 import { ParsedQuery } from 'query-string';
 import deepEqual from 'fast-deep-equal';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { getQueryParams } from './get_query_params';
 import { distinctUntilChangedWithInitialValue } from '../../common';
 
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync.ts b/src/plugins/kibana_utils/public/state_sync/state_sync.ts
index 2c3141e76d712..e75335a92f8fe 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync.ts
@@ -7,7 +7,7 @@
  */
 
 import { EMPTY, Subscription } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import defaultComparator from 'fast-deep-equal';
 import { IStateSyncConfig } from './types';
 import { IStateStorage } from './state_sync_state_storage';
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
index 4ce1e906a9ccc..6fa6eb1937547 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.test.ts
@@ -9,7 +9,7 @@
 import { mockStorage } from '../../storage/hashed_item_store/mock';
 import { createKbnUrlStateStorage, IKbnUrlStateStorage } from './create_kbn_url_state_storage';
 import { History, createBrowserHistory } from 'history';
-import { takeUntil, toArray } from 'rxjs/operators';
+import { takeUntil, toArray } from 'rxjs';
 import { Subject } from 'rxjs';
 import { CoreScopedHistory } from '@kbn/core/public';
 import { withNotifyOnErrors, flushNotifyOnErrors } from '../../state_management/url';
diff --git a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
index d823a95da59ce..f9ae547f1ceeb 100644
--- a/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
+++ b/src/plugins/kibana_utils/public/state_sync/state_sync_state_storage/create_kbn_url_state_storage.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, of } from 'rxjs';
-import { catchError, map, share } from 'rxjs/operators';
+import { catchError, map, share } from 'rxjs';
 import { History } from 'history';
 import { throttle } from 'lodash';
 import { IStateStorage } from './types';
diff --git a/src/plugins/links/public/editor/open_editor_flyout.tsx b/src/plugins/links/public/editor/open_editor_flyout.tsx
index 83dffe8e55f23..3fc187a05be1c 100644
--- a/src/plugins/links/public/editor/open_editor_flyout.tsx
+++ b/src/plugins/links/public/editor/open_editor_flyout.tsx
@@ -7,7 +7,7 @@
  */
 
 import React from 'react';
-import { skip, take } from 'rxjs/operators';
+import { skip, take } from 'rxjs';
 import { v4 as uuidv4 } from 'uuid';
 
 import { EuiLoadingSpinner, EuiPanel } from '@elastic/eui';
diff --git a/src/plugins/newsfeed/public/lib/api.test.ts b/src/plugins/newsfeed/public/lib/api.test.ts
index 58d06e72cd77c..f529e8473d59b 100644
--- a/src/plugins/newsfeed/public/lib/api.test.ts
+++ b/src/plugins/newsfeed/public/lib/api.test.ts
@@ -12,7 +12,7 @@ import moment from 'moment';
 import { getApi } from './api';
 import { TestScheduler } from 'rxjs/testing';
 import { FetchResult, NewsfeedPluginBrowserConfig } from '../types';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 
 import { NewsfeedApiDriver as MockNewsfeedApiDriver } from './driver';
 import { NeverFetchNewsfeedApiDriver as MockNeverFetchNewsfeedApiDriver } from './never_fetch_driver';
diff --git a/src/plugins/newsfeed/public/lib/api.ts b/src/plugins/newsfeed/public/lib/api.ts
index 7aafc9fd27625..77097d50046e6 100644
--- a/src/plugins/newsfeed/public/lib/api.ts
+++ b/src/plugins/newsfeed/public/lib/api.ts
@@ -7,7 +7,7 @@
  */
 
 import { combineLatest, Observable, timer, of } from 'rxjs';
-import { map, catchError, filter, mergeMap, tap } from 'rxjs/operators';
+import { map, catchError, filter, mergeMap, tap } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { FetchResult, NewsfeedPluginBrowserConfig } from '../types';
 import { NewsfeedApiDriver } from './driver';
diff --git a/src/plugins/newsfeed/public/lib/driver.test.ts b/src/plugins/newsfeed/public/lib/driver.test.ts
index 38ec90cf20101..c4f3a2d3e2f6d 100644
--- a/src/plugins/newsfeed/public/lib/driver.test.ts
+++ b/src/plugins/newsfeed/public/lib/driver.test.ts
@@ -9,7 +9,7 @@
 import { convertItemsMock } from './driver.test.mocks';
 // @ts-expect-error
 import fetchMock from 'fetch-mock/es5/client';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { NewsfeedApiDriver } from './driver';
 import { storageMock } from './storage.mock';
 
diff --git a/src/plugins/newsfeed/public/lib/storage.test.ts b/src/plugins/newsfeed/public/lib/storage.test.ts
index 1c424d8247e86..63935600b1f3a 100644
--- a/src/plugins/newsfeed/public/lib/storage.test.ts
+++ b/src/plugins/newsfeed/public/lib/storage.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { NewsfeedStorage, getStorageKey } from './storage';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 
 describe('NewsfeedStorage', () => {
   const storagePrefix = 'test';
diff --git a/src/plugins/newsfeed/public/plugin.test.ts b/src/plugins/newsfeed/public/plugin.test.ts
index ee6a051a4bd83..9149404f1a4dd 100644
--- a/src/plugins/newsfeed/public/plugin.test.ts
+++ b/src/plugins/newsfeed/public/plugin.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { coreMock } from '@kbn/core/public/mocks';
 import { NewsfeedPublicPlugin } from './plugin';
 import { NewsfeedApiEndpoint } from './lib/api';
diff --git a/src/plugins/newsfeed/public/plugin.tsx b/src/plugins/newsfeed/public/plugin.tsx
index cb3ab294616ba..31d99501a6fb4 100644
--- a/src/plugins/newsfeed/public/plugin.tsx
+++ b/src/plugins/newsfeed/public/plugin.tsx
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { catchError, takeUntil } from 'rxjs/operators';
+import { catchError, takeUntil } from 'rxjs';
 import ReactDOM from 'react-dom';
 import React from 'react';
 import moment from 'moment';
diff --git a/src/plugins/telemetry/public/services/telemetry_sender.ts b/src/plugins/telemetry/public/services/telemetry_sender.ts
index 3006a328fb620..775209a7d19a7 100644
--- a/src/plugins/telemetry/public/services/telemetry_sender.ts
+++ b/src/plugins/telemetry/public/services/telemetry_sender.ts
@@ -8,7 +8,7 @@
 
 import type { Subscription } from 'rxjs';
 import { fromEvent, interval, merge } from 'rxjs';
-import { exhaustMap } from 'rxjs/operators';
+import { exhaustMap } from 'rxjs';
 import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { LOCALSTORAGE_KEY, PAYLOAD_CONTENT_ENCODING } from '../../common/constants';
 import { TelemetryService } from './telemetry_service';
diff --git a/src/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.ts b/src/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.ts
index 1adeb09c60c7c..1744c982d2be1 100644
--- a/src/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.ts
+++ b/src/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_manager_state.ts
@@ -8,7 +8,7 @@
 
 import useObservable from 'react-use/lib/useObservable';
 import { BehaviorSubject, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { SerializableRecord } from '@kbn/utility-types';
 import { useMemo } from 'react';
 import {
diff --git a/src/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_state.ts b/src/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_state.ts
index 6f90b1c3e1a09..f2e43d8fc6c4c 100644
--- a/src/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_state.ts
+++ b/src/plugins/ui_actions_enhanced/public/drilldowns/drilldown_manager/state/drilldown_state.ts
@@ -8,7 +8,7 @@
 
 import useObservable from 'react-use/lib/useObservable';
 import { Observable, BehaviorSubject, combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import {
   ActionFactory,
   BaseActionConfig,
diff --git a/src/plugins/unified_histogram/public/container/utils/use_state_selector.ts b/src/plugins/unified_histogram/public/container/utils/use_state_selector.ts
index 5920a34f90acb..a370c89c8a84e 100644
--- a/src/plugins/unified_histogram/public/container/utils/use_state_selector.ts
+++ b/src/plugins/unified_histogram/public/container/utils/use_state_selector.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { distinctUntilChanged, map } from 'rxjs';
 import { useEffect, useState } from 'react';
 
 export const useStateSelector = <S, R>(
diff --git a/src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts b/src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts
index 102b50402e3fa..c5212e4d79b36 100644
--- a/src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts
+++ b/src/plugins/unified_search/public/autocomplete/collectors/create_usage_collector.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { METRIC_TYPE } from '@kbn/analytics';
 import type { StartServicesAccessor } from '@kbn/core/public';
 import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
index f7f99fb21eddb..6a56563eeba98 100644
--- a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
@@ -20,7 +20,7 @@ import {
 } from '@kbn/es-query';
 import { TextBasedLangEditor } from '@kbn/text-based-languages/public';
 import { EMPTY } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { throttle } from 'lodash';
 import {
   EuiFlexGroup,
diff --git a/src/plugins/usage_collection/public/services/application_usage.ts b/src/plugins/usage_collection/public/services/application_usage.ts
index 0a63ff6ae8a0f..f6e8a9f116e18 100644
--- a/src/plugins/usage_collection/public/services/application_usage.ts
+++ b/src/plugins/usage_collection/public/services/application_usage.ts
@@ -7,7 +7,7 @@
  */
 
 import { Observable, fromEvent } from 'rxjs';
-import { filter, distinctUntilChanged } from 'rxjs/operators';
+import { filter, distinctUntilChanged } from 'rxjs';
 import { ApplicationUsageTracker } from '@kbn/analytics';
 import { MAIN_APP_DEFAULT_VIEW_ID } from '../../common/constants';
 
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts b/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts
index e22423b2283cf..f3f6c2870ce25 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts
@@ -8,7 +8,7 @@
 import { UsageCounter } from './usage_counter';
 import type { UsageCounters } from '../../common/types';
 import * as Rx from 'rxjs';
-import * as rxOp from 'rxjs/operators';
+import * as rxOp from 'rxjs';
 
 describe('UsageCounter', () => {
   const domainId = 'test-domain-id';
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
index 448e093d597f6..1222924b6ec94 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
@@ -9,7 +9,7 @@
 /* eslint-disable dot-notation */
 import { UsageCountersService } from './usage_counters_service';
 import { loggingSystemMock, coreMock } from '@kbn/core/server/mocks';
-import * as rxOp from 'rxjs/operators';
+import * as rxOp from 'rxjs';
 import moment from 'moment';
 
 const tick = () => {
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
index 1b40e91161704..c0e71bdd28dbf 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
@@ -7,7 +7,7 @@
  */
 
 import * as Rx from 'rxjs';
-import * as rxOp from 'rxjs/operators';
+import * as rxOp from 'rxjs';
 import {
   SavedObjectsRepository,
   SavedObjectsServiceSetup,
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx b/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
index f6261688e8ef4..b83624af0dbda 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_editor.tsx
@@ -8,7 +8,7 @@
 
 import React, { Component } from 'react';
 import * as Rx from 'rxjs';
-import { share } from 'rxjs/operators';
+import { share } from 'rxjs';
 import { isEqual, isEmpty, debounce } from 'lodash';
 import { EventEmitter } from 'events';
 import { css } from '@emotion/react';
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_editor_visualization.js b/src/plugins/vis_types/timeseries/public/application/components/vis_editor_visualization.js
index 7bde7abd961da..213044aa319a0 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_editor_visualization.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_editor_visualization.js
@@ -18,7 +18,7 @@ import {
   EuiSwitch,
 } from '@elastic/eui';
 import { FormattedMessage, injectI18n } from '@kbn/i18n-react';
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 
 import './_vis_editor_visualization.scss';
 
diff --git a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
index 1c3ddc63a8b10..8da9c8a44b22f 100644
--- a/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
+++ b/src/plugins/vis_types/timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import { omit } from 'lodash';
 import type { Observable } from 'rxjs';
 import { DataViewsService } from '@kbn/data-views-plugin/common';
diff --git a/src/plugins/vis_types/timeseries/server/plugin.ts b/src/plugins/vis_types/timeseries/server/plugin.ts
index fc891c758d575..6435840269bbe 100644
--- a/src/plugins/vis_types/timeseries/server/plugin.ts
+++ b/src/plugins/vis_types/timeseries/server/plugin.ts
@@ -17,7 +17,7 @@ import {
 } from '@kbn/core/server';
 import { firstValueFrom, Observable } from 'rxjs';
 import { Server } from '@hapi/hapi';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
 import { PluginStart } from '@kbn/data-plugin/server';
 import type { DataViewsService } from '@kbn/data-views-plugin/common';
diff --git a/src/plugins/vis_types/vega/public/data_model/search_api.ts b/src/plugins/vis_types/vega/public/data_model/search_api.ts
index 40238b445c8c2..eebfc6c3b9b15 100644
--- a/src/plugins/vis_types/vega/public/data_model/search_api.ts
+++ b/src/plugins/vis_types/vega/public/data_model/search_api.ts
@@ -7,7 +7,7 @@
  */
 
 import { combineLatest, from } from 'rxjs';
-import { map, tap, switchMap } from 'rxjs/operators';
+import { map, tap, switchMap } from 'rxjs';
 import type { IUiSettingsClient, KibanaExecutionContext } from '@kbn/core/public';
 import {
   getSearchParamsFromRequest,
diff --git a/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts b/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts
index 9e91b622f9d8e..947e11a4129bd 100644
--- a/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts
+++ b/src/plugins/vis_types/vega/public/vega_inspector/vega_adapter.ts
@@ -9,7 +9,7 @@
 import { i18n } from '@kbn/i18n';
 
 import { Observable, ReplaySubject, fromEventPattern, merge, timer, BehaviorSubject } from 'rxjs';
-import { map, switchMap, filter, debounce } from 'rxjs/operators';
+import { map, switchMap, filter, debounce } from 'rxjs';
 import type { View, Spec } from 'vega';
 import type { Assign } from '@kbn/utility-types';
 
diff --git a/src/plugins/visualizations/public/actions/edit_in_lens_action.tsx b/src/plugins/visualizations/public/actions/edit_in_lens_action.tsx
index 7b63af3ccd851..5bc74accc4649 100644
--- a/src/plugins/visualizations/public/actions/edit_in_lens_action.tsx
+++ b/src/plugins/visualizations/public/actions/edit_in_lens_action.tsx
@@ -24,7 +24,7 @@ import {
 } from '@kbn/presentation-publishing';
 import { Action } from '@kbn/ui-actions-plugin/public';
 import React from 'react';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 import { apiHasVisualizeConfig, HasVisualizeConfig } from '../embeddable';
 import {
   apiHasExpressionVariables,
diff --git a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
index c04dec48f0c97..0aef85a6ec575 100644
--- a/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
+++ b/src/plugins/visualizations/public/embeddable/visualize_embeddable_factory.tsx
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import type { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import type { SavedObjectMetaData } from '@kbn/saved-objects-finder-plugin/public';
 import type { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts
index 594ea6ca9488a..120ef09047b3e 100644
--- a/src/plugins/visualizations/public/plugin.ts
+++ b/src/plugins/visualizations/public/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 import { createHashHistory } from 'history';
 import { BehaviorSubject } from 'rxjs';
 import {
diff --git a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
index 49f9290bb6991..e78216282c8d2 100644
--- a/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
+++ b/src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx
@@ -8,7 +8,7 @@
 
 import React, { useEffect, useState } from 'react';
 import { cloneDeep, isEqual } from 'lodash';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { EventEmitter } from 'events';
 import { i18n } from '@kbn/i18n';
 import { FilterStateStore } from '@kbn/es-query';
diff --git a/test/analytics/plugins/analytics_plugin_a/public/plugin.ts b/test/analytics/plugins/analytics_plugin_a/public/plugin.ts
index a64847e086265..647431f8db239 100644
--- a/test/analytics/plugins/analytics_plugin_a/public/plugin.ts
+++ b/test/analytics/plugins/analytics_plugin_a/public/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject, filter, firstValueFrom, ReplaySubject } from 'rxjs';
-import { takeWhile, tap, toArray } from 'rxjs/operators';
+import { takeWhile, tap, toArray } from 'rxjs';
 import type { Plugin, CoreSetup, CoreStart, TelemetryCounter, Event } from '@kbn/core/server';
 import type { Action } from './custom_shipper';
 import { CustomShipper } from './custom_shipper';
diff --git a/test/analytics/plugins/analytics_plugin_a/server/plugin.ts b/test/analytics/plugins/analytics_plugin_a/server/plugin.ts
index 973bfe24351f4..4b90cb92e3931 100644
--- a/test/analytics/plugins/analytics_plugin_a/server/plugin.ts
+++ b/test/analytics/plugins/analytics_plugin_a/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { BehaviorSubject, filter, firstValueFrom, ReplaySubject } from 'rxjs';
-import { takeWhile, tap, toArray } from 'rxjs/operators';
+import { takeWhile, tap, toArray } from 'rxjs';
 import { schema } from '@kbn/config-schema';
 import type { Plugin, CoreSetup, CoreStart, TelemetryCounter, Event } from '@kbn/core/server';
 import type { Action } from './custom_shipper';
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
index 60db69514f81f..c422d7253bca0 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/app/components/main.tsx
@@ -9,7 +9,7 @@ import './main.scss';
 
 import React from 'react';
 import { EuiPage, EuiPageBody, EuiPageSection, EuiPageHeader } from '@elastic/eui';
-import { first, pluck } from 'rxjs/operators';
+import { first, pluck } from 'rxjs';
 import { IInterpreterRenderHandlers, ExpressionValue } from '@kbn/expressions-plugin/public';
 import { ExpressionRenderHandler } from '../../types';
 import { getExpressions } from '../../services';
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
index 2a87a70c804bb..c21c2acd8f75e 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/server/plugin.ts
@@ -7,7 +7,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 import { CoreSetup, Plugin, HttpResponsePayload } from '@kbn/core/server';
 import { PluginStart as DataPluginStart } from '@kbn/data-plugin/server';
 import { ExpressionsServerStart } from '@kbn/expressions-plugin/server';
diff --git a/x-pack/examples/reporting_example/public/containers/main.tsx b/x-pack/examples/reporting_example/public/containers/main.tsx
index 07d727172b58b..5630976786410 100644
--- a/x-pack/examples/reporting_example/public/containers/main.tsx
+++ b/x-pack/examples/reporting_example/public/containers/main.tsx
@@ -9,7 +9,7 @@ import { parsePath } from 'history';
 import moment from 'moment';
 import React, { useEffect, useState } from 'react';
 import * as Rx from 'rxjs';
-import { takeWhile } from 'rxjs/operators';
+import { takeWhile } from 'rxjs';
 
 import {
   EuiButton,
diff --git a/x-pack/packages/ml/cancellable_search/src/use_cancellable_search.ts b/x-pack/packages/ml/cancellable_search/src/use_cancellable_search.ts
index 4f0d75fdede24..28cf5677df2d3 100644
--- a/x-pack/packages/ml/cancellable_search/src/use_cancellable_search.ts
+++ b/x-pack/packages/ml/cancellable_search/src/use_cancellable_search.ts
@@ -7,7 +7,7 @@
 
 import { useCallback, useRef, useState } from 'react';
 import { type IKibanaSearchResponse, isRunningResponse } from '@kbn/data-plugin/common';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 
 export interface UseCancellableSearch {
diff --git a/x-pack/packages/ml/date_picker/src/hooks/use_timefilter.ts b/x-pack/packages/ml/date_picker/src/hooks/use_timefilter.ts
index a837fd39396ba..e4b62b0367e0a 100644
--- a/x-pack/packages/ml/date_picker/src/hooks/use_timefilter.ts
+++ b/x-pack/packages/ml/date_picker/src/hooks/use_timefilter.ts
@@ -8,7 +8,7 @@
 import { useEffect, useMemo } from 'react';
 import useObservable from 'react-use/lib/useObservable';
 import { merge, type Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { distinctUntilChanged, map } from 'rxjs';
 import { isEqual } from 'lodash';
 
 import type { TimeRange } from '@kbn/es-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 6e8615f0951f8..ac34f0ad4cb76 100644
--- a/x-pack/packages/ml/url_state/src/url_state.tsx
+++ b/x-pack/packages/ml/url_state/src/url_state.tsx
@@ -23,7 +23,7 @@ import { decode, encode } from '@kbn/rison';
 
 import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
-import { distinctUntilChanged } from 'rxjs/operators';
+import { distinctUntilChanged } from 'rxjs';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
 
 export interface Dictionary<TValue> {
diff --git a/x-pack/plugins/aiops/public/components/change_point_detection/change_point_detection_root.tsx b/x-pack/plugins/aiops/public/components/change_point_detection/change_point_detection_root.tsx
index 52a70597e14dc..f8f23b3c19ef3 100644
--- a/x-pack/plugins/aiops/public/components/change_point_detection/change_point_detection_root.tsx
+++ b/x-pack/plugins/aiops/public/components/change_point_detection/change_point_detection_root.tsx
@@ -8,7 +8,7 @@
 import type { FC } from 'react';
 import React, { useMemo } from 'react';
 import type { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { pick } from 'lodash';
 import { EuiThemeProvider as StyledComponentsThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { EuiSpacer } from '@elastic/eui';
diff --git a/x-pack/plugins/aiops/public/components/log_categorization/show_flyout.tsx b/x-pack/plugins/aiops/public/components/log_categorization/show_flyout.tsx
index a4fc24a37d550..843f48400b00d 100644
--- a/x-pack/plugins/aiops/public/components/log_categorization/show_flyout.tsx
+++ b/x-pack/plugins/aiops/public/components/log_categorization/show_flyout.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { takeUntil, distinctUntilChanged, skip } from 'rxjs/operators';
+import { takeUntil, distinctUntilChanged, skip } from 'rxjs';
 import { from } from 'rxjs';
 import { pick } from 'lodash';
 import type { CoreStart } from '@kbn/core/public';
diff --git a/x-pack/plugins/aiops/public/embeddable/embeddable_chart_component_wrapper.tsx b/x-pack/plugins/aiops/public/embeddable/embeddable_chart_component_wrapper.tsx
index 7d7b84fb91686..239d86f145a53 100644
--- a/x-pack/plugins/aiops/public/embeddable/embeddable_chart_component_wrapper.tsx
+++ b/x-pack/plugins/aiops/public/embeddable/embeddable_chart_component_wrapper.tsx
@@ -6,7 +6,7 @@
  */
 
 import { BehaviorSubject, combineLatest, type Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { distinctUntilChanged, map } from 'rxjs';
 import type { FC } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
 import { css } from '@emotion/react';
diff --git a/x-pack/plugins/aiops/public/hooks/use_cancellable_search.ts b/x-pack/plugins/aiops/public/hooks/use_cancellable_search.ts
index 8a828f388c2f2..af6dec9d07734 100644
--- a/x-pack/plugins/aiops/public/hooks/use_cancellable_search.ts
+++ b/x-pack/plugins/aiops/public/hooks/use_cancellable_search.ts
@@ -7,7 +7,7 @@
 
 import { useCallback, useRef, useState } from 'react';
 import { type IKibanaSearchResponse, isRunningResponse } from '@kbn/data-plugin/common';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import { useAiopsAppContext } from './use_aiops_app_context';
 
 export function useCancellableSearch() {
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
index e4219abfc446f..ba2c63d56184e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, defer, isObservable, of } from 'rxjs';
-import { map, concatMap } from 'rxjs/operators';
+import { map, concatMap } from 'rxjs';
 import { ExpressionFunctionDefinition } from '@kbn/expressions-plugin/common';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.ts
index 4923b835d2871..8f696c2f1de49 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, combineLatest, defer } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { Datatable, ExpressionFunctionDefinition } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';
 
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.ts
index 1a38dfa84fd7e..9d1d3083267ac 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.ts
@@ -6,7 +6,7 @@
  */
 
 import { combineLatest, defer, of, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { groupBy, flatten, pick, map as _map, uniqWith } from 'lodash';
 import { Datatable, DatatableColumn, ExpressionFunctionDefinition } from '../../../types';
 import { getFunctionHelp, getFunctionErrors } from '../../../i18n';
diff --git a/x-pack/plugins/canvas/public/services/kibana/expressions.ts b/x-pack/plugins/canvas/public/services/kibana/expressions.ts
index 74a8b28306af8..248cd462bea90 100644
--- a/x-pack/plugins/canvas/public/services/kibana/expressions.ts
+++ b/x-pack/plugins/canvas/public/services/kibana/expressions.ts
@@ -10,7 +10,7 @@ import {
   ExpressionExecutionParams,
   ExpressionValue,
 } from '@kbn/expressions-plugin/common';
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 import { ExpressionsServiceStart } from '@kbn/expressions-plugin/public';
 import { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
 import { buildEmbeddableFilters } from '../../../common/lib/build_embeddable_filters';
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
index 34d3d5bc38c38..db3d6a0cf41df 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/plugin.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import type { EuiMarkdownEditorUiPlugin, EuiMarkdownAstNodePosition } from '@elastic/eui';
 import {
   EuiCodeBlock,
diff --git a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_draft_comment.ts b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_draft_comment.ts
index f8f4582190284..95e558ca1f79f 100644
--- a/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_draft_comment.ts
+++ b/x-pack/plugins/cases/public/components/markdown_editor/plugins/lens/use_lens_draft_comment.ts
@@ -7,7 +7,7 @@
 
 import type { EuiMarkdownAstNodePosition } from '@elastic/eui';
 import { useCallback, useEffect, useState } from 'react';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { useKibana } from '../../../../common/lib/kibana';
 import { DRAFT_COMMENT_STORAGE_ID } from './constants';
 import { VISUALIZATION } from './translations';
diff --git a/x-pack/plugins/data_visualizer/public/application/data_drift/document_count_with_brush.tsx b/x-pack/plugins/data_visualizer/public/application/data_drift/document_count_with_brush.tsx
index 2077b2576c9d4..e4a95623c335a 100644
--- a/x-pack/plugins/data_visualizer/public/application/data_drift/document_count_with_brush.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/data_drift/document_count_with_brush.tsx
@@ -13,7 +13,7 @@ import type { BrushSettings } from '@kbn/aiops-components';
 import type { RandomSampler } from '@kbn/ml-random-sampler-utils';
 import type { Filter } from '@kbn/es-query';
 import useObservable from 'react-use/lib/useObservable';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { isDefined } from '@kbn/ml-is-defined';
 import type { BarStyleAccessor } from '@elastic/charts';
 import type { SingleBrushWindowParameters } from './document_count_chart_single_brush/single_brush';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
index f3ee778c427fd..fa5e7ad5aad00 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_field_stats.ts
@@ -10,7 +10,7 @@ import type { Observable, Subscription } from 'rxjs';
 import { combineLatest, from, Subject } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { last, cloneDeep } from 'lodash';
-import { mergeMap, switchMap } from 'rxjs/operators';
+import { mergeMap, switchMap } from 'rxjs';
 import { Comparators } from '@elastic/eui';
 import type { ISearchOptions } from '@kbn/data-plugin/common';
 import { buildBaseFilterCriteria, getSafeAggregationName } from '@kbn/ml-query-utils';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
index 055d64eb67caa..db15358bf76ef 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_overall_stats.ts
@@ -8,7 +8,7 @@
 import { useCallback, useEffect, useState, useRef, useMemo, useReducer } from 'react';
 import type { Subscription, Observable } from 'rxjs';
 import { from } from 'rxjs';
-import { mergeMap, last, map, toArray } from 'rxjs/operators';
+import { mergeMap, last, map, toArray } from 'rxjs';
 import { chunk } from 'lodash';
 import type {
   IKibanaSearchRequest,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
index df8f34e480f27..0688b53e88776 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_boolean_field_stats.ts
@@ -8,7 +8,7 @@ import { get } from 'lodash';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { Observable } from 'rxjs';
 import { of } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs';
 import type {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
index 7495407c7f7b3..fc6af3bf157c8 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_date_field_stats.ts
@@ -9,7 +9,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import type { Observable } from 'rxjs';
 import { of } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs';
 import type {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
index 6354fca609355..80f4a7d83ab8c 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_field_examples.ts
@@ -7,7 +7,7 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import { combineLatest, of } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs';
 import type {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
index 6249c391fc974..aaa770b78150e 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_numeric_field_stats.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { find, get } from 'lodash';
-import { catchError, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs';
 import type { Observable } from 'rxjs';
 import { of } from 'rxjs';
 import type { AggregationsTermsAggregation } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
index 6963f45904e6e..4555b4c6cc860 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/search_strategy/requests/get_string_field_stats.ts
@@ -8,7 +8,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get } from 'lodash';
 import type { Observable } from 'rxjs';
 import { of } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs';
 import type { AggregationsTermsAggregation } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type {
   IKibanaSearchRequest,
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index 530374c770bbc..6009c87fcde99 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -6,7 +6,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { bufferTime, filter as rxFilter, concatMap } from 'rxjs/operators';
+import { bufferTime, filter as rxFilter, concatMap } from 'rxjs';
 import { reject, isUndefined, isNumber, pick } from 'lodash';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Logger, ElasticsearchClient } from '@kbn/core/server';
diff --git a/x-pack/plugins/fleet/public/search_provider.ts b/x-pack/plugins/fleet/public/search_provider.ts
index 0e9364461c161..ce1ddd10ac5a2 100644
--- a/x-pack/plugins/fleet/public/search_provider.ts
+++ b/x-pack/plugins/fleet/public/search_provider.ts
@@ -8,7 +8,7 @@ import type { CoreSetup, CoreStart, ApplicationStart, IBasePath } from '@kbn/cor
 
 import type { Observable } from 'rxjs';
 import { from, of, combineLatest } from 'rxjs';
-import { map, shareReplay, takeUntil } from 'rxjs/operators';
+import { map, shareReplay, takeUntil } from 'rxjs';
 
 import type {
   GlobalSearchResultProvider,
diff --git a/x-pack/plugins/fleet/server/integration_tests/helpers/docker_registry_helper.ts b/x-pack/plugins/fleet/server/integration_tests/helpers/docker_registry_helper.ts
index 031bd7e16d757..d65a323e84d5b 100644
--- a/x-pack/plugins/fleet/server/integration_tests/helpers/docker_registry_helper.ts
+++ b/x-pack/plugins/fleet/server/integration_tests/helpers/docker_registry_helper.ts
@@ -8,7 +8,7 @@
 import type { ChildProcess } from 'child_process';
 
 import * as Rx from 'rxjs';
-import { filter, take, map, tap } from 'rxjs/operators';
+import { filter, take, map, tap } from 'rxjs';
 import execa from 'execa';
 
 import { observeLines } from '@kbn/stdio-dev-helpers';
diff --git a/x-pack/plugins/fleet/server/plugin.ts b/x-pack/plugins/fleet/server/plugin.ts
index ebd169d76b927..aad61fd21c9ae 100644
--- a/x-pack/plugins/fleet/server/plugin.ts
+++ b/x-pack/plugins/fleet/server/plugin.ts
@@ -8,7 +8,7 @@
 import { backOff } from 'exponential-backoff';
 import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
+import { filter, take } from 'rxjs';
 import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common';
 import { i18n } from '@kbn/i18n';
 import type {
diff --git a/x-pack/plugins/global_search/public/services/fetch_server_results.ts b/x-pack/plugins/global_search/public/services/fetch_server_results.ts
index 26d174621fabc..cc52baad18d83 100644
--- a/x-pack/plugins/global_search/public/services/fetch_server_results.ts
+++ b/x-pack/plugins/global_search/public/services/fetch_server_results.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, from, EMPTY } from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { map, takeUntil } from 'rxjs';
 import { HttpStart } from '@kbn/core/public';
 import { GlobalSearchResult, GlobalSearchProviderFindParams } from '../../common/types';
 import { GlobalSearchFindOptions } from './types';
diff --git a/x-pack/plugins/global_search/public/services/search_service.ts b/x-pack/plugins/global_search/public/services/search_service.ts
index 975dc4a253f4d..e3f47239cdfb4 100644
--- a/x-pack/plugins/global_search/public/services/search_service.ts
+++ b/x-pack/plugins/global_search/public/services/search_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { merge, Observable, timer, throwError, EMPTY } from 'rxjs';
-import { map, takeUntil, catchError } from 'rxjs/operators';
+import { map, takeUntil, catchError } from 'rxjs';
 import { uniq } from 'lodash';
 import { duration } from 'moment';
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/plugins/global_search/server/routes/find.ts b/x-pack/plugins/global_search/server/routes/find.ts
index 64aa76ee64a70..ee151dc1c4856 100644
--- a/x-pack/plugins/global_search/server/routes/find.ts
+++ b/x-pack/plugins/global_search/server/routes/find.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { reduce, map } from 'rxjs/operators';
+import { reduce, map } from 'rxjs';
 import { schema } from '@kbn/config-schema';
 import { GlobalSearchRouter } from '../types';
 import { GlobalSearchFindError } from '../../common/errors';
diff --git a/x-pack/plugins/global_search/server/services/search_service.ts b/x-pack/plugins/global_search/server/services/search_service.ts
index 8aedd2426c136..8089d653d1b2d 100644
--- a/x-pack/plugins/global_search/server/services/search_service.ts
+++ b/x-pack/plugins/global_search/server/services/search_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, timer, merge, throwError, EMPTY } from 'rxjs';
-import { map, takeUntil, catchError } from 'rxjs/operators';
+import { map, takeUntil, catchError } from 'rxjs';
 import { uniq } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { KibanaRequest, CoreStart, IBasePath } from '@kbn/core/server';
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
index 1caa636e86cb5..9cebc018daa11 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
@@ -14,7 +14,7 @@ import { usageCollectionPluginMock } from '@kbn/usage-collection-plugin/public/m
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import React from 'react';
 import { BehaviorSubject, of } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 import { EventReporter } from '../telemetry';
 import { SearchBar } from './search_bar';
 
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.ts b/x-pack/plugins/global_search_providers/public/providers/application.ts
index dd4219d2b08bd..1d36dac4e85c7 100644
--- a/x-pack/plugins/global_search_providers/public/providers/application.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/application.ts
@@ -6,7 +6,7 @@
  */
 
 import { from, of } from 'rxjs';
-import { take, map, takeUntil, mergeMap, shareReplay } from 'rxjs/operators';
+import { take, map, takeUntil, mergeMap, shareReplay } from 'rxjs';
 import { ApplicationStart } from '@kbn/core/public';
 import { GlobalSearchResultProvider } from '@kbn/global-search-plugin/public';
 import { getAppResults } from './get_app_results';
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
index 1943e08df2119..1dc64962d6576 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { EMPTY } from 'rxjs';
-import { toArray } from 'rxjs/operators';
+import { toArray } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 import {
   SavedObjectsFindResponse,
diff --git a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
index 5eba3d940ccb1..0995d1abf4d18 100644
--- a/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
+++ b/x-pack/plugins/global_search_providers/server/providers/saved_objects/provider.ts
@@ -6,7 +6,7 @@
  */
 
 import { from, combineLatest, of } from 'rxjs';
-import { map, takeUntil, first } from 'rxjs/operators';
+import { map, takeUntil, first } from 'rxjs';
 import { SavedObjectsFindOptionsReference } from '@kbn/core/server';
 import { GlobalSearchResultProvider } from '@kbn/global-search-plugin/server';
 import { mapToResults } from './map_object_to_result';
diff --git a/x-pack/plugins/graph/server/lib/license_state.ts b/x-pack/plugins/graph/server/lib/license_state.ts
index c962666b14d33..5bed57f733c11 100644
--- a/x-pack/plugins/graph/server/lib/license_state.ts
+++ b/x-pack/plugins/graph/server/lib/license_state.ts
@@ -6,7 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { Observable, Subscription } from 'rxjs';
 import { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import { ILicense } from '@kbn/licensing-plugin/common/types';
diff --git a/x-pack/plugins/lens/public/datasources/text_based/fetch_data_from_aggregate_query.ts b/x-pack/plugins/lens/public/datasources/text_based/fetch_data_from_aggregate_query.ts
index 0bd710375ab41..84fc5bbd950d1 100644
--- a/x-pack/plugins/lens/public/datasources/text_based/fetch_data_from_aggregate_query.ts
+++ b/x-pack/plugins/lens/public/datasources/text_based/fetch_data_from_aggregate_query.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 import { lastValueFrom } from 'rxjs';
 import { Query, AggregateQuery, Filter } from '@kbn/es-query';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
index 502a84b7253dd..77f2e51b80393 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
@@ -41,7 +41,7 @@ import {
   ErrorLike,
   RenderMode,
 } from '@kbn/expressions-plugin/common';
-import { map, distinctUntilChanged, skip, debounceTime } from 'rxjs/operators';
+import { map, distinctUntilChanged, skip, debounceTime } from 'rxjs';
 import fastIsEqual from 'fast-deep-equal';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts b/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
index 3445e48df0a1b..8a481d767a618 100644
--- a/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
+++ b/x-pack/plugins/lens/public/state_management/context_middleware/subscribe_to_external_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { delay, finalize, switchMap, tap } from 'rxjs/operators';
+import { delay, finalize, switchMap, tap } from 'rxjs';
 import { debounce, isEqual } from 'lodash';
 import { waitUntilNextSessionCompletes$, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { setExecutionContext, LensGetState, LensDispatch } from '..';
diff --git a/x-pack/plugins/licensing/common/license_update.test.ts b/x-pack/plugins/licensing/common/license_update.test.ts
index f86e20d887a8e..312f85fa056eb 100644
--- a/x-pack/plugins/licensing/common/license_update.test.ts
+++ b/x-pack/plugins/licensing/common/license_update.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { firstValueFrom, Subject } from 'rxjs';
-import { take, toArray } from 'rxjs/operators';
+import { take, toArray } from 'rxjs';
 
 import { ILicense } from './types';
 import { createLicenseUpdate } from './license_update';
diff --git a/x-pack/plugins/licensing/common/license_update.ts b/x-pack/plugins/licensing/common/license_update.ts
index b344d8ce2d16a..e501f760dc68a 100644
--- a/x-pack/plugins/licensing/common/license_update.ts
+++ b/x-pack/plugins/licensing/common/license_update.ts
@@ -17,7 +17,7 @@ import {
   takeUntil,
   finalize,
   startWith,
-} from 'rxjs/operators';
+} from 'rxjs';
 import { hasLicenseInfoChanged } from './has_license_info_changed';
 import type { ILicense } from './types';
 
diff --git a/x-pack/plugins/licensing/public/plugin.test.ts b/x-pack/plugins/licensing/public/plugin.test.ts
index 5c571d0c6a40b..ba7e2cd6936e6 100644
--- a/x-pack/plugins/licensing/public/plugin.test.ts
+++ b/x-pack/plugins/licensing/public/plugin.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { firstValueFrom } from 'rxjs';
-import { take, toArray } from 'rxjs/operators';
+import { take, toArray } from 'rxjs';
 import { mountExpiredBannerMock } from './plugin.test.mocks';
 
 import { LicenseType } from '../common/types';
diff --git a/x-pack/plugins/licensing/server/plugin_status.ts b/x-pack/plugins/licensing/server/plugin_status.ts
index a65b51d13eb89..3781fcef94c79 100644
--- a/x-pack/plugins/licensing/server/plugin_status.ts
+++ b/x-pack/plugins/licensing/server/plugin_status.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Observable } from 'rxjs';
-import { takeUntil, map } from 'rxjs/operators';
+import { takeUntil, map } from 'rxjs';
 import { type ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import type { ILicense } from '../common/types';
 
diff --git a/x-pack/plugins/logstash/public/application/index.tsx b/x-pack/plugins/logstash/public/application/index.tsx
index c4c78d6683099..2dd1eb86f24a0 100644
--- a/x-pack/plugins/logstash/public/application/index.tsx
+++ b/x-pack/plugins/logstash/public/application/index.tsx
@@ -10,7 +10,7 @@ import ReactDOM from 'react-dom';
 import { Redirect } from 'react-router-dom';
 import { Router, Routes, Route } from '@kbn/shared-ux-router';
 import { Observable } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 
 import { CoreStart } from '@kbn/core/public';
 import { ManagementAppMountParams } from '@kbn/management-plugin/public';
diff --git a/x-pack/plugins/logstash/public/plugin.ts b/x-pack/plugins/logstash/public/plugin.ts
index a937006898bb1..dce6c41215d63 100644
--- a/x-pack/plugins/logstash/public/plugin.ts
+++ b/x-pack/plugins/logstash/public/plugin.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { Subscription, Subject, combineLatest } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { once } from 'lodash';
 
 import { Capabilities, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
diff --git a/x-pack/plugins/maps/public/classes/sources/esql_source/esql_source.tsx b/x-pack/plugins/maps/public/classes/sources/esql_source/esql_source.tsx
index 1f95158c34b2a..a40e8daf79d4a 100644
--- a/x-pack/plugins/maps/public/classes/sources/esql_source/esql_source.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/esql_source/esql_source.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { lastValueFrom } from 'rxjs';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import { v4 as uuidv4 } from 'uuid';
 import { Adapters } from '@kbn/inspector-plugin/common/adapters';
 import { getIndexPatternFromESQLQuery, getLimitFromESQLQuery } from '@kbn/esql-utils';
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 8af50ec762286..752e5720e6157 100644
--- a/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
+++ b/x-pack/plugins/maps/public/connected_components/timeslider/timeslider.tsx
@@ -8,7 +8,7 @@
 import _ from 'lodash';
 import React, { Component } from 'react';
 import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged } from 'rxjs/operators';
+import { distinctUntilChanged } from 'rxjs';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
 import {
   type ControlGroupInput,
@@ -16,7 +16,7 @@ import {
   type AwaitingControlGroupAPI,
   ControlGroupRenderer,
 } from '@kbn/controls-plugin/public';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import type { TimeRange } from '@kbn/es-query';
 import { Timeslice } from '../../../common/descriptor_types';
 
diff --git a/x-pack/plugins/maps/public/embeddable/map_component.tsx b/x-pack/plugins/maps/public/embeddable/map_component.tsx
index 2e080a46d8478..7d1a3ed734737 100644
--- a/x-pack/plugins/maps/public/embeddable/map_component.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_component.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { Component, RefObject } from 'react';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { v4 as uuidv4 } from 'uuid';
 import type { Filter } from '@kbn/es-query';
 import type { Query, TimeRange } from '@kbn/es-query';
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index eaf48dd5e2ebe..b61a60fd9af4c 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -19,7 +19,7 @@ import {
   map,
   skip,
   startWith,
-} from 'rxjs/operators';
+} from 'rxjs';
 import { Unsubscribe } from 'redux';
 import type { PaletteRegistry } from '@kbn/coloring';
 import type { KibanaExecutionContext } from '@kbn/core/public';
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 ae9d4b6d39329..102d45f092e62 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { EmbeddableFactoryDefinition, IContainer } from '@kbn/embeddable-plugin/public';
 import { MAP_SAVED_OBJECT_TYPE, APP_ICON, MAP_EMBEDDABLE_NAME } from '../../common/constants';
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 e6d317b5aa1e8..4bb8ed74a8195 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
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import _ from 'lodash';
-import { finalize, switchMap, tap } from 'rxjs/operators';
+import { finalize, switchMap, tap } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import {
   AppLeaveAction,
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts b/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
index d809acd07c3b4..90dac09264125 100644
--- a/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
@@ -6,7 +6,7 @@
  */
 
 import { from } from 'rxjs';
-import { debounceTime, first, map, switchMap } from 'rxjs/operators';
+import { debounceTime, first, map, switchMap } from 'rxjs';
 import { getLayerList, getMapZoom } from '../../../selectors/map_selectors';
 import { MapStore } from '../../../reducers/store';
 
diff --git a/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts b/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
index e12efd7a8a99d..1db8dfe0697bf 100644
--- a/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
+++ b/x-pack/plugins/maps/public/routes/map_page/url_state/app_sync.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { FilterStateStore } from '@kbn/es-query';
 import { connectToQueryState } from '@kbn/data-plugin/public';
 import {
diff --git a/x-pack/plugins/ml/common/license/ml_license.ts b/x-pack/plugins/ml/common/license/ml_license.ts
index 2ce717116c980..403786ffa37dc 100644
--- a/x-pack/plugins/ml/common/license/ml_license.ts
+++ b/x-pack/plugins/ml/common/license/ml_license.ts
@@ -8,7 +8,7 @@
 import type { Observable, Subscription } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
 import type { ILicense } from '@kbn/licensing-plugin/common/types';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { distinctUntilChanged, map } from 'rxjs';
 import { isEqual } from 'lodash';
 import { PLUGIN_ID } from '../constants/app';
 
diff --git a/x-pack/plugins/ml/public/application/capabilities/check_capabilities.ts b/x-pack/plugins/ml/public/application/capabilities/check_capabilities.ts
index ef0bf69c59c50..f974ace6f4d06 100644
--- a/x-pack/plugins/ml/public/application/capabilities/check_capabilities.ts
+++ b/x-pack/plugins/ml/public/application/capabilities/check_capabilities.ts
@@ -14,7 +14,7 @@ import {
   timer,
   firstValueFrom,
 } from 'rxjs';
-import { distinctUntilChanged, filter, retry, switchMap, tap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, retry, switchMap, tap } from 'rxjs';
 import { isEqual } from 'lodash';
 import useObservable from 'react-use/lib/useObservable';
 import { useMemo, useRef } from 'react';
diff --git a/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip_service.ts b/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip_service.ts
index a6075c858c831..9b68b89d2e23b 100644
--- a/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip_service.ts
+++ b/x-pack/plugins/ml/public/application/components/chart_tooltip/chart_tooltip_service.ts
@@ -9,7 +9,7 @@ import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
 import { isEqual } from 'lodash';
 import type { TooltipValue, TooltipValueFormatter } from '@elastic/charts';
-import { distinctUntilChanged } from 'rxjs/operators';
+import { distinctUntilChanged } from 'rxjs';
 
 export interface ChartTooltipValue extends TooltipValue {
   skipHeader?: boolean;
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/ml_notifications_context.tsx b/x-pack/plugins/ml/public/application/contexts/ml/ml_notifications_context.tsx
index 760a5d5857a7f..161cdf66e6a44 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/ml_notifications_context.tsx
+++ b/x-pack/plugins/ml/public/application/contexts/ml/ml_notifications_context.tsx
@@ -8,7 +8,7 @@
 import type { FC } from 'react';
 import React, { useContext, useState, useEffect } from 'react';
 import { combineLatest, timer } from 'rxjs';
-import { switchMap, map, tap, retry } from 'rxjs/operators';
+import { switchMap, map, tap, retry } from 'rxjs';
 import moment from 'moment';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
 import { useStorage } from '@kbn/ml-local-storage';
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
index baa411c643167..5d5b397b290c4 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/analytics.ts
@@ -8,7 +8,7 @@
 import { useEffect } from 'react';
 import type { Subscription } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
-import { distinctUntilChanged, filter } from 'rxjs/operators';
+import { distinctUntilChanged, filter } from 'rxjs';
 import { cloneDeep } from 'lodash';
 import { extractErrorMessage } from '@kbn/ml-error-utils';
 import {
diff --git a/x-pack/plugins/ml/public/application/explorer/actions/job_selection.ts b/x-pack/plugins/ml/public/application/explorer/actions/job_selection.ts
index 5ace1a3422aab..60149ef7d4017 100644
--- a/x-pack/plugins/ml/public/application/explorer/actions/job_selection.ts
+++ b/x-pack/plugins/ml/public/application/explorer/actions/job_selection.ts
@@ -6,7 +6,7 @@
  */
 
 import { from } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 
 import type { MlFieldFormatService } from '../../services/field_format_service';
 import { mlJobService } from '../../services/job_service';
diff --git a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
index 342ded29c7542..8d710e0a83b6c 100644
--- a/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
+++ b/x-pack/plugins/ml/public/application/explorer/actions/load_explorer_data.ts
@@ -11,7 +11,7 @@ import useObservable from 'react-use/lib/useObservable';
 
 import type { Observable } from 'rxjs';
 import { forkJoin, of, Subject } from 'rxjs';
-import { switchMap, map } from 'rxjs/operators';
+import { switchMap, map } from 'rxjs';
 
 import { useCallback, useMemo } from 'react';
 import type { TimefilterContract } from '@kbn/data-plugin/public';
diff --git a/x-pack/plugins/ml/public/application/explorer/alerts/anomaly_detection_alerts_state_service.ts b/x-pack/plugins/ml/public/application/explorer/alerts/anomaly_detection_alerts_state_service.ts
index 27902cc4a7653..d02e9baf91c95 100644
--- a/x-pack/plugins/ml/public/application/explorer/alerts/anomaly_detection_alerts_state_service.ts
+++ b/x-pack/plugins/ml/public/application/explorer/alerts/anomaly_detection_alerts_state_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { BehaviorSubject, combineLatest, EMPTY, type Observable, Subscription } from 'rxjs';
-import { catchError, debounceTime, map, startWith, switchMap, tap } from 'rxjs/operators';
+import { catchError, debounceTime, map, startWith, switchMap, tap } from 'rxjs';
 import type { DataPublicPluginStart, TimefilterContract } from '@kbn/data-plugin/public';
 import { isRunningResponse } from '@kbn/data-plugin/public';
 import type {
diff --git a/x-pack/plugins/ml/public/application/explorer/anomaly_charts_state_service.ts b/x-pack/plugins/ml/public/application/explorer/anomaly_charts_state_service.ts
index 82407b9eb99d9..05c6bda4057d4 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomaly_charts_state_service.ts
+++ b/x-pack/plugins/ml/public/application/explorer/anomaly_charts_state_service.ts
@@ -7,7 +7,7 @@
 
 import type { Observable } from 'rxjs';
 import { BehaviorSubject, combineLatest, of, Subscription } from 'rxjs';
-import { distinctUntilChanged, map, skipWhile, switchMap } from 'rxjs/operators';
+import { distinctUntilChanged, map, skipWhile, switchMap } from 'rxjs';
 import type { PageUrlStateService } from '@kbn/ml-url-state';
 import { StateService } from '../services/state_service';
 import type { AnomalyExplorerCommonStateService } from './anomaly_explorer_common_state';
diff --git a/x-pack/plugins/ml/public/application/explorer/anomaly_explorer_common_state.ts b/x-pack/plugins/ml/public/application/explorer/anomaly_explorer_common_state.ts
index e4c7bf6fc45aa..800b3b2bc5eca 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomaly_explorer_common_state.ts
+++ b/x-pack/plugins/ml/public/application/explorer/anomaly_explorer_common_state.ts
@@ -7,7 +7,7 @@
 
 import type { Observable, Subscription } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
-import { distinctUntilChanged, map, shareReplay, filter } from 'rxjs/operators';
+import { distinctUntilChanged, map, shareReplay, filter } from 'rxjs';
 import { isEqual } from 'lodash';
 import type { InfluencersFilterQuery } from '@kbn/ml-anomaly-utils';
 import type { ExplorerJob } from './explorer_utils';
diff --git a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
index 8d434f39dd11c..799e4d4ab9b05 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
+++ b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline_state_service.ts
@@ -16,7 +16,7 @@ import {
   tap,
   debounceTime,
   filter,
-} from 'rxjs/operators';
+} from 'rxjs';
 import { isEqual, sortBy, uniq } from 'lodash';
 import type { TimefilterContract } from '@kbn/data-plugin/public';
 import type { TimeRangeBounds } from '@kbn/data-plugin/common';
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts b/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
index b1a9fe51bd3db..a26a500892727 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
@@ -13,7 +13,7 @@
 import { isEqual } from 'lodash';
 import type { Observable } from 'rxjs';
 import { from, isObservable, Subject } from 'rxjs';
-import { distinctUntilChanged, flatMap, scan, shareReplay } from 'rxjs/operators';
+import { distinctUntilChanged, flatMap, scan, shareReplay } from 'rxjs';
 import type { DeepPartial } from '../../../common/types/common';
 import { jobSelectionActionCreator } from './actions';
 import { EXPLORER_ACTION } from './explorer_constants';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/model_memory_estimator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/model_memory_estimator.ts
index 5015ea2820481..6bcd6adb53c81 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/model_memory_estimator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/model_memory_estimator.ts
@@ -19,7 +19,7 @@ import {
   pairwise,
   filter,
   skipWhile,
-} from 'rxjs/operators';
+} from 'rxjs';
 import { useEffect, useMemo } from 'react';
 
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
index 29b128bb86d5f..d162208bbefe3 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/job_validator.ts
@@ -8,7 +8,7 @@
 import type { ReactElement } from 'react';
 import type { Observable } from 'rxjs';
 import { combineLatest, ReplaySubject, Subject } from 'rxjs';
-import { map, startWith, tap } from 'rxjs/operators';
+import { map, startWith, tap } from 'rxjs';
 import { CATEGORY_EXAMPLES_VALIDATION_STATUS } from '@kbn/ml-category-validator';
 import {
   basicJobValidation,
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/validators.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/validators.ts
index 1629dc8d84618..61bf8487b09e6 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/validators.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_validator/validators.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { distinctUntilChanged, filter, map, pluck, switchMap, startWith } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, pluck, switchMap, startWith } from 'rxjs';
 import type { Observable, Subject } from 'rxjs';
 import { combineLatest } from 'rxjs';
 import type {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/category_stopped_partitions.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/category_stopped_partitions.tsx
index abbf80899019f..836fa2dac8a81 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/category_stopped_partitions.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/category_stopped_partitions.tsx
@@ -11,7 +11,7 @@ import { EuiBasicTable, EuiCallOut, EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { from } from 'rxjs';
-import { switchMap, takeWhile, tap } from 'rxjs/operators';
+import { switchMap, takeWhile, tap } from 'rxjs';
 import { extractErrorProperties } from '@kbn/ml-error-utils';
 import { JobCreatorContext } from '../../../job_creator_context';
 import type { CategorizationJobCreator } from '../../../../../common/job_creator';
diff --git a/x-pack/plugins/ml/public/application/model_management/test_models/models/inference_base.ts b/x-pack/plugins/ml/public/application/model_management/test_models/models/inference_base.ts
index 916959d587e8b..db21b8fca334e 100644
--- a/x-pack/plugins/ml/public/application/model_management/test_models/models/inference_base.ts
+++ b/x-pack/plugins/ml/public/application/model_management/test_models/models/inference_base.ts
@@ -10,7 +10,7 @@ import { BehaviorSubject, combineLatest, Subscription } from 'rxjs';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
 
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { SupportedPytorchTasksType } from '@kbn/ml-trained-models-utils';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import type { MLHttpFetchError } from '@kbn/ml-error-utils';
diff --git a/x-pack/plugins/ml/public/application/model_management/test_models/models/question_answering/question_answering_inference.ts b/x-pack/plugins/ml/public/application/model_management/test_models/models/question_answering/question_answering_inference.ts
index d99072435193e..2bb5593a45a13 100644
--- a/x-pack/plugins/ml/public/application/model_management/test_models/models/question_answering/question_answering_inference.ts
+++ b/x-pack/plugins/ml/public/application/model_management/test_models/models/question_answering/question_answering_inference.ts
@@ -6,7 +6,7 @@
  */
 
 import { BehaviorSubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import type { estypes } from '@elastic/elasticsearch';
 import { SUPPORTED_PYTORCH_TASKS } from '@kbn/ml-trained-models-utils';
diff --git a/x-pack/plugins/ml/public/application/model_management/test_models/models/text_classification/fill_mask_inference.ts b/x-pack/plugins/ml/public/application/model_management/test_models/models/text_classification/fill_mask_inference.ts
index 01ff31e3042eb..156062a77389d 100644
--- a/x-pack/plugins/ml/public/application/model_management/test_models/models/text_classification/fill_mask_inference.ts
+++ b/x-pack/plugins/ml/public/application/model_management/test_models/models/text_classification/fill_mask_inference.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type { estypes } from '@elastic/elasticsearch';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { SUPPORTED_PYTORCH_TASKS } from '@kbn/ml-trained-models-utils';
 import { InferenceBase, INPUT_TYPE } from '../inference_base';
 import type { TextClassificationResponse, RawTextClassificationResponse } from './common';
diff --git a/x-pack/plugins/ml/public/application/model_management/test_models/models/text_classification/zero_shot_classification_inference.ts b/x-pack/plugins/ml/public/application/model_management/test_models/models/text_classification/zero_shot_classification_inference.ts
index ead942ae99941..a06af98081e80 100644
--- a/x-pack/plugins/ml/public/application/model_management/test_models/models/text_classification/zero_shot_classification_inference.ts
+++ b/x-pack/plugins/ml/public/application/model_management/test_models/models/text_classification/zero_shot_classification_inference.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { BehaviorSubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { estypes } from '@elastic/elasticsearch';
 import { SUPPORTED_PYTORCH_TASKS } from '@kbn/ml-trained-models-utils';
 import type { trainedModelsApiProvider } from '../../../../services/ml_api_service/trained_models';
diff --git a/x-pack/plugins/ml/public/application/model_management/test_models/models/text_expansion/text_expansion_inference.ts b/x-pack/plugins/ml/public/application/model_management/test_models/models/text_expansion/text_expansion_inference.ts
index 17a03defa0f71..d1e322e5d5d32 100644
--- a/x-pack/plugins/ml/public/application/model_management/test_models/models/text_expansion/text_expansion_inference.ts
+++ b/x-pack/plugins/ml/public/application/model_management/test_models/models/text_expansion/text_expansion_inference.ts
@@ -9,7 +9,7 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { i18n } from '@kbn/i18n';
 import { SUPPORTED_PYTORCH_TASKS } from '@kbn/ml-trained-models-utils';
 import { BehaviorSubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { trainedModelsApiProvider } from '../../../../services/ml_api_service/trained_models';
 import type { INPUT_TYPE } from '../inference_base';
 import { InferenceBase, type InferResponse } from '../inference_base';
diff --git a/x-pack/plugins/ml/public/application/routing/use_refresh.ts b/x-pack/plugins/ml/public/application/routing/use_refresh.ts
index 691877ebcff0a..480274c6b2a18 100644
--- a/x-pack/plugins/ml/public/application/routing/use_refresh.ts
+++ b/x-pack/plugins/ml/public/application/routing/use_refresh.ts
@@ -7,7 +7,7 @@
 
 import useObservable from 'react-use/lib/useObservable';
 import { merge, type Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 
 import { useMemo } from 'react';
 import { mlTimefilterRefresh$, useTimefilter } from '@kbn/ml-date-picker';
diff --git a/x-pack/plugins/ml/public/application/services/annotations_service.tsx b/x-pack/plugins/ml/public/application/services/annotations_service.tsx
index 4de082b9d4e6c..33c39feec3915 100644
--- a/x-pack/plugins/ml/public/application/services/annotations_service.tsx
+++ b/x-pack/plugins/ml/public/application/services/annotations_service.tsx
@@ -7,7 +7,7 @@
 
 import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
-import { distinctUntilChanged } from 'rxjs/operators';
+import { distinctUntilChanged } from 'rxjs';
 import type { Annotation } from '../../../common/types/annotations';
 
 /*
diff --git a/x-pack/plugins/ml/public/application/services/anomaly_detector_service.ts b/x-pack/plugins/ml/public/application/services/anomaly_detector_service.ts
index 72a3b90898ef0..040753af178b2 100644
--- a/x-pack/plugins/ml/public/application/services/anomaly_detector_service.ts
+++ b/x-pack/plugins/ml/public/application/services/anomaly_detector_service.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { Job, JobId } from '../../../common/types/anomaly_detection_jobs';
 import type { HttpService } from './http_service';
 import { type MlApiServices, mlApiServicesProvider } from './ml_api_service';
diff --git a/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts b/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
index d431c4a23efe5..4cdb96ed1b103 100644
--- a/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
+++ b/x-pack/plugins/ml/public/application/services/anomaly_explorer_charts_service.ts
@@ -7,7 +7,7 @@
 
 import type { Observable } from 'rxjs';
 import { of } from 'rxjs';
-import { map as mapObservable } from 'rxjs/operators';
+import { map as mapObservable } from 'rxjs';
 import type { TimeRange } from '@kbn/es-query';
 import type { TimefilterContract } from '@kbn/data-plugin/public';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
diff --git a/x-pack/plugins/ml/public/application/services/forecast_service.ts b/x-pack/plugins/ml/public/application/services/forecast_service.ts
index d156421902291..316577d98dd44 100644
--- a/x-pack/plugins/ml/public/application/services/forecast_service.ts
+++ b/x-pack/plugins/ml/public/application/services/forecast_service.ts
@@ -10,7 +10,7 @@
 import { useMemo } from 'react';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { get, find, each } from 'lodash';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { MlApiServices } from './ml_api_service';
 import type { Job } from '../../../common/types/anomaly_detection_jobs';
 import { useMlKibana } from '../contexts/kibana';
diff --git a/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts b/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
index 5567051791a8b..281139160bee5 100644
--- a/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
+++ b/x-pack/plugins/ml/public/application/services/results_service/result_service_rx.ts
@@ -13,7 +13,7 @@
 // to that built from the supplied entity fields.
 // Returned response contains a results property containing the requested aggregation.
 import type { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { each, get } from 'lodash';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
 import type { ErrorType } from '@kbn/ml-error-utils';
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index 1fd6cb6e52b79..8569b318c3b1b 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -11,8 +11,16 @@
 
 import { find, get, has, isEqual } from 'lodash';
 import moment from 'moment-timezone';
-import { Subject, Subscription, forkJoin } from 'rxjs';
-import { map, debounceTime, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import {
+  Subject,
+  Subscription,
+  forkJoin,
+  map,
+  debounceTime,
+  switchMap,
+  tap,
+  withLatestFrom,
+} from 'rxjs';
 import PropTypes from 'prop-types';
 import React, { createRef, Fragment } from 'react';
 
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_embeddable_chart/timeseriesexplorer_embeddable_chart.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_embeddable_chart/timeseriesexplorer_embeddable_chart.js
index 457b2994d3626..945a765616f8f 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_embeddable_chart/timeseriesexplorer_embeddable_chart.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_embeddable_chart/timeseriesexplorer_embeddable_chart.js
@@ -11,8 +11,16 @@
 
 import { get, has, isEqual } from 'lodash';
 import moment from 'moment-timezone';
-import { Subject, Subscription, forkJoin } from 'rxjs';
-import { map, debounceTime, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import {
+  Subject,
+  Subscription,
+  forkJoin,
+  map,
+  debounceTime,
+  switchMap,
+  tap,
+  withLatestFrom,
+} from 'rxjs';
 
 import PropTypes from 'prop-types';
 import React, { Fragment } from 'react';
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/time_series_search_service.ts b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/time_series_search_service.ts
index 4c1426266abb2..929ff04656a18 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/time_series_search_service.ts
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/time_series_search_service.ts
@@ -8,7 +8,7 @@
 import { useMemo } from 'react';
 import { each, find, get, filter } from 'lodash';
 import type { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { MlEntityField, ES_AGGREGATION } from '@kbn/ml-anomaly-utils';
 import type { Job } from '../../../../common/types/anomaly_detection_jobs';
 import type { ModelPlotOutput } from '../../services/results_service/result_service_rx';
diff --git a/x-pack/plugins/ml/public/application/util/time_series_explorer_service.ts b/x-pack/plugins/ml/public/application/util/time_series_explorer_service.ts
index ee946d2562373..2687d6f8e8993 100644
--- a/x-pack/plugins/ml/public/application/util/time_series_explorer_service.ts
+++ b/x-pack/plugins/ml/public/application/util/time_series_explorer_service.ts
@@ -14,7 +14,7 @@ import moment from 'moment';
 import type { Observable } from 'rxjs';
 import { forkJoin, of } from 'rxjs';
 import { each, get } from 'lodash';
-import { catchError, map } from 'rxjs/operators';
+import { catchError, map } from 'rxjs';
 import { type MlAnomalyRecordDoc } from '@kbn/ml-anomaly-utils';
 import type { TimeRangeBounds, TimeBucketsInterval } from '@kbn/ml-time-buckets';
 import { parseInterval } from '../../../common/util/parse_interval';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
index a6b5b8b271a4f..7af34daec557d 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/use_anomaly_charts_input_resolver.ts
@@ -8,7 +8,7 @@
 import { useEffect, useMemo, useState } from 'react';
 import type { Observable } from 'rxjs';
 import { combineLatest, of, Subject } from 'rxjs';
-import { catchError, debounceTime, skipWhile, startWith, switchMap, tap } from 'rxjs/operators';
+import { catchError, debounceTime, skipWhile, startWith, switchMap, tap } from 'rxjs';
 import type { CoreStart } from '@kbn/core/public';
 import type { InfluencersFilterQuery } from '@kbn/ml-anomaly-utils';
 import type { MlStartDependencies } from '../../plugin';
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
index 41eb4c115bc29..cfde142511378 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_swimlane/swimlane_input_resolver.ts
@@ -19,7 +19,7 @@ import {
   startWith,
   switchMap,
   tap,
-} from 'rxjs/operators';
+} from 'rxjs';
 import type { CoreStart } from '@kbn/core/public';
 import { UI_SETTINGS } from '@kbn/data-plugin/public';
 import { ViewMode } from '@kbn/embeddable-plugin/public';
diff --git a/x-pack/plugins/ml/public/embeddables/common/get_jobs_observable.ts b/x-pack/plugins/ml/public/embeddables/common/get_jobs_observable.ts
index 406c7deb563c5..18456afd4aaa0 100644
--- a/x-pack/plugins/ml/public/embeddables/common/get_jobs_observable.ts
+++ b/x-pack/plugins/ml/public/embeddables/common/get_jobs_observable.ts
@@ -7,7 +7,7 @@
 
 import type { Observable } from 'rxjs';
 import { of } from 'rxjs';
-import { catchError, distinctUntilChanged, map, pluck, switchMap } from 'rxjs/operators';
+import { catchError, distinctUntilChanged, map, pluck, switchMap } from 'rxjs';
 import { isEqual } from 'lodash';
 import type { AnomalyChartsEmbeddableInput, AnomalySwimlaneEmbeddableInput } from '../types';
 import type { AnomalyDetectorService } from '../../application/services/anomaly_detector_service';
diff --git a/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx b/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
index 78c281f0bd32d..ac8f6c27e8f00 100644
--- a/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
+++ b/x-pack/plugins/ml/public/embeddables/common/resolve_job_selection.tsx
@@ -6,7 +6,7 @@
  */
 import type { CoreStart } from '@kbn/core/public';
 import moment from 'moment';
-import { takeUntil, distinctUntilChanged, skip } from 'rxjs/operators';
+import { takeUntil, distinctUntilChanged, skip } from 'rxjs';
 import { from } from 'rxjs';
 import React from 'react';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/ml/public/embeddables/common/use_embeddable_execution_context.ts b/x-pack/plugins/ml/public/embeddables/common/use_embeddable_execution_context.ts
index 11f8d8b88ae56..28d43ed6fd46a 100644
--- a/x-pack/plugins/ml/public/embeddables/common/use_embeddable_execution_context.ts
+++ b/x-pack/plugins/ml/public/embeddables/common/use_embeddable_execution_context.ts
@@ -6,7 +6,7 @@
  */
 
 import useObservable from 'react-use/lib/useObservable';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { KibanaExecutionContext } from '@kbn/core/types';
 import { useMemo } from 'react';
 import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
diff --git a/x-pack/plugins/ml/public/embeddables/job_creation/common/create_flyout.tsx b/x-pack/plugins/ml/public/embeddables/job_creation/common/create_flyout.tsx
index f5ba980a4d54f..714d5228b8a71 100644
--- a/x-pack/plugins/ml/public/embeddables/job_creation/common/create_flyout.tsx
+++ b/x-pack/plugins/ml/public/embeddables/job_creation/common/create_flyout.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { takeUntil, distinctUntilChanged, skip } from 'rxjs/operators';
+import { takeUntil, distinctUntilChanged, skip } from 'rxjs';
 import { from } from 'rxjs';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { toMountPoint } from '@kbn/react-kibana-mount';
diff --git a/x-pack/plugins/ml/public/embeddables/single_metric_viewer/use_single_metric_viewer_input_resolver.ts b/x-pack/plugins/ml/public/embeddables/single_metric_viewer/use_single_metric_viewer_input_resolver.ts
index 109042120e5ef..6607348e41a5f 100644
--- a/x-pack/plugins/ml/public/embeddables/single_metric_viewer/use_single_metric_viewer_input_resolver.ts
+++ b/x-pack/plugins/ml/public/embeddables/single_metric_viewer/use_single_metric_viewer_input_resolver.ts
@@ -8,7 +8,7 @@
 import { useEffect, useState } from 'react';
 import type { Observable } from 'rxjs';
 import { combineLatest } from 'rxjs';
-import { startWith } from 'rxjs/operators';
+import { startWith } from 'rxjs';
 import type { TimefilterContract } from '@kbn/data-plugin/public';
 import type { TimeRangeBounds } from '@kbn/ml-time-buckets';
 import type { SingleMetricViewerEmbeddableInput } from '..';
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index be063f6a91e52..b71e75b853626 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -14,7 +14,7 @@ import type {
   PluginInitializerContext,
 } from '@kbn/core/public';
 import { BehaviorSubject, mergeMap } from 'rxjs';
-import { take } from 'rxjs/operators';
+import { take } from 'rxjs';
 
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { ManagementSetup } from '@kbn/management-plugin/public';
diff --git a/x-pack/plugins/observability_solution/apm/public/plugin.ts b/x-pack/plugins/observability_solution/apm/public/plugin.ts
index 7223ba7045e9e..a4889d4a49017 100644
--- a/x-pack/plugins/observability_solution/apm/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/apm/public/plugin.ts
@@ -71,7 +71,7 @@ import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import { DashboardStart } from '@kbn/dashboard-plugin/public';
 import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
 import { from } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { CloudSetup } from '@kbn/cloud-plugin/public';
 import type { ConfigSchema } from '.';
 import { registerApmRuleTypes } from './components/alerting/rule_types/register_apm_rule_types';
diff --git a/x-pack/plugins/observability_solution/infra/common/dependency_mocks/index_patterns.ts b/x-pack/plugins/observability_solution/infra/common/dependency_mocks/index_patterns.ts
index 49534ecec8207..360ed1ff6644e 100644
--- a/x-pack/plugins/observability_solution/infra/common/dependency_mocks/index_patterns.ts
+++ b/x-pack/plugins/observability_solution/infra/common/dependency_mocks/index_patterns.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { firstValueFrom, from, of } from 'rxjs';
-import { delay } from 'rxjs/operators';
+import { delay } from 'rxjs';
 import { DataView, DataViewsContract, fieldList, FieldSpec } from '@kbn/data-views-plugin/common';
 
 type IndexPatternMock = Pick<
diff --git a/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_loading_state.test.ts b/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_loading_state.test.ts
index 1a011b4e52a7b..d733d8fa4ca31 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_loading_state.test.ts
+++ b/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_loading_state.test.ts
@@ -8,22 +8,14 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useLoadingState } from './use_loading_state';
 import { useDatePickerContext, type UseDateRangeProviderProps } from './use_date_picker';
-import { BehaviorSubject, EMPTY, of, Subject, Subscription } from 'rxjs';
+import { BehaviorSubject, EMPTY, of, Subject, Subscription, skip } from 'rxjs';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 import { coreMock } from '@kbn/core/public/mocks';
 import { SearchSessionState, waitUntilNextSessionCompletes$ } from '@kbn/data-plugin/public';
 import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
-import { skip } from 'rxjs/operators';
 
 jest.mock('./use_date_picker');
 jest.mock('../../../hooks/use_kibana');
-jest.mock('rxjs', () => {
-  const rxjs = jest.requireActual('rxjs');
-  return {
-    ...jest.requireActual('rxjs'),
-    debounceTime: rxjs.tap,
-  };
-});
 jest.mock('@kbn/data-plugin/public', () => ({
   ...jest.requireActual('@kbn/data-plugin/public'),
   waitUntilNextSessionCompletes$: jest.fn(),
diff --git a/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_loading_state.ts b/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_loading_state.ts
index 0859e240b962a..050d86b00d21b 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_loading_state.ts
+++ b/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_loading_state.ts
@@ -15,9 +15,12 @@ import {
   debounceTime,
   skipUntil,
   withLatestFrom,
-} from 'rxjs/operators';
+  BehaviorSubject,
+  iif,
+  merge,
+  Observable,
+} from 'rxjs';
 import createContainer from 'constate';
-import { BehaviorSubject, iif, merge, Observable } from 'rxjs';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { SearchSessionState, waitUntilNextSessionCompletes$ } from '@kbn/data-plugin/public';
 import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
diff --git a/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_request_observable.ts b/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_request_observable.ts
index 6643108f8a011..00a0ba127d990 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_request_observable.ts
+++ b/x-pack/plugins/observability_solution/infra/public/components/asset_details/hooks/use_request_observable.ts
@@ -6,7 +6,7 @@
  */
 
 import { useEffect, useMemo } from 'react';
-import { map, mergeMap, filter } from 'rxjs/operators';
+import { map, mergeMap, filter } from 'rxjs';
 import { catchError, of, from, BehaviorSubject, withLatestFrom } from 'rxjs';
 import { useLoadingStateContext } from './use_loading_state';
 import { useDatePickerContext } from './use_date_picker';
diff --git a/x-pack/plugins/observability_solution/infra/public/hooks/use_kibana_index_patterns.mock.tsx b/x-pack/plugins/observability_solution/infra/public/hooks/use_kibana_index_patterns.mock.tsx
index 84668132c55a0..1937e1ec7d6f9 100644
--- a/x-pack/plugins/observability_solution/infra/public/hooks/use_kibana_index_patterns.mock.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/hooks/use_kibana_index_patterns.mock.tsx
@@ -7,7 +7,7 @@
 
 import React, { useMemo } from 'react';
 import { firstValueFrom, from, of } from 'rxjs';
-import { delay } from 'rxjs/operators';
+import { delay } from 'rxjs';
 import { CoreStart } from '@kbn/core/public';
 import { FieldSpec } from '@kbn/data-views-plugin/common';
 import { DataView, DataViewsContract } from '@kbn/data-views-plugin/public';
diff --git a/x-pack/plugins/observability_solution/infra/public/observability_logs/log_stream_query_state/src/search_bar_state_service.ts b/x-pack/plugins/observability_solution/infra/public/observability_logs/log_stream_query_state/src/search_bar_state_service.ts
index 85a216dba2472..592bda4a9f97f 100644
--- a/x-pack/plugins/observability_solution/infra/public/observability_logs/log_stream_query_state/src/search_bar_state_service.ts
+++ b/x-pack/plugins/observability_solution/infra/public/observability_logs/log_stream_query_state/src/search_bar_state_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { FilterManager, QueryStringContract } from '@kbn/data-plugin/public';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { InvokeCreator } from 'xstate';
 import type { LogStreamQueryContext, LogStreamQueryEvent } from './types';
 
diff --git a/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/hooks/use_unified_search.ts b/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/hooks/use_unified_search.ts
index caefb2f8a3089..ac6e1d9a5f9e7 100644
--- a/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/hooks/use_unified_search.ts
+++ b/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/hooks/use_unified_search.ts
@@ -7,7 +7,7 @@
 import createContainer from 'constate';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { buildEsQuery, fromKueryExpression, type Query } from '@kbn/es-query';
-import { map, skip, startWith } from 'rxjs/operators';
+import { map, skip, startWith } from 'rxjs';
 import { combineLatest } from 'rxjs';
 import deepEqual from 'fast-deep-equal';
 import useEffectOnce from 'react-use/lib/useEffectOnce';
@@ -78,7 +78,7 @@ export const useUnifiedSearch = () => {
     (params?: HostsSearchPayload) => {
       try {
         setError(null);
-        /* 
+        /*
         / Validates the Search Bar input values before persisting them in the state.
         / Since the search can be triggered by components that are unaware of the Unified Search state (e.g Controls and Host Limit),
         / this will always validates the query bar value, regardless of whether it's been sent in the current event or not.
@@ -86,7 +86,7 @@ export const useUnifiedSearch = () => {
         validateQuery(params?.query ?? (queryStringService.getQuery() as Query));
         setSearch(params ?? {});
       } catch (err) {
-        /* 
+        /*
         / Persists in the state the params so they can be used in case the query bar is fixed by the user.
         / This is needed because the Unified Search observables are unnaware of the other componets in the search bar.
         / Invalid query isn't persisted because it breaks the Control component
diff --git a/x-pack/plugins/observability_solution/infra/public/plugin.ts b/x-pack/plugins/observability_solution/infra/public/plugin.ts
index 497d682d7532e..e6de05f91e937 100644
--- a/x-pack/plugins/observability_solution/infra/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/infra/public/plugin.ts
@@ -18,7 +18,7 @@ import { i18n } from '@kbn/i18n';
 import { enableInfrastructureHostsView } from '@kbn/observability-plugin/public';
 import { ObservabilityTriggerId } from '@kbn/observability-shared-plugin/common';
 import { BehaviorSubject, combineLatest, from } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import type { InfraPublicConfig } from '../common/plugin_config_types';
 import { createInventoryMetricRuleType } from './alerting/inventory';
 import { createLogThresholdRuleType } from './alerting/log_threshold';
diff --git a/x-pack/plugins/observability_solution/infra/public/utils/data_search/flatten_data_search_response.ts b/x-pack/plugins/observability_solution/infra/public/utils/data_search/flatten_data_search_response.ts
index 52f08f39bc2d4..9a0ee481814d0 100644
--- a/x-pack/plugins/observability_solution/infra/public/utils/data_search/flatten_data_search_response.ts
+++ b/x-pack/plugins/observability_solution/infra/public/utils/data_search/flatten_data_search_response.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { ParsedDataSearchRequestDescriptor } from './types';
 
diff --git a/x-pack/plugins/observability_solution/infra/public/utils/data_search/normalize_data_search_responses.ts b/x-pack/plugins/observability_solution/infra/public/utils/data_search/normalize_data_search_responses.ts
index 0056b7466759a..20f19656059f8 100644
--- a/x-pack/plugins/observability_solution/infra/public/utils/data_search/normalize_data_search_responses.ts
+++ b/x-pack/plugins/observability_solution/infra/public/utils/data_search/normalize_data_search_responses.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, of } from 'rxjs';
-import { catchError, map, startWith } from 'rxjs/operators';
+import { catchError, map, startWith } from 'rxjs';
 import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import { AbortError } from '@kbn/kibana-utils-plugin/public';
 import { SearchStrategyError } from '../../../common/search_strategies/common/errors';
diff --git a/x-pack/plugins/observability_solution/infra/public/utils/data_search/use_data_search_request.ts b/x-pack/plugins/observability_solution/infra/public/utils/data_search/use_data_search_request.ts
index 230c2d87e0654..6d0e03d48ff8b 100644
--- a/x-pack/plugins/observability_solution/infra/public/utils/data_search/use_data_search_request.ts
+++ b/x-pack/plugins/observability_solution/infra/public/utils/data_search/use_data_search_request.ts
@@ -7,7 +7,7 @@
 
 import { useCallback } from 'react';
 import { OperatorFunction, ReplaySubject } from 'rxjs';
-import { share, tap } from 'rxjs/operators';
+import { share, tap } from 'rxjs';
 import {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
diff --git a/x-pack/plugins/observability_solution/infra/public/utils/data_search/use_latest_partial_data_search_response.ts b/x-pack/plugins/observability_solution/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
index 48ff61eb676b9..12a169a3a82aa 100644
--- a/x-pack/plugins/observability_solution/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
+++ b/x-pack/plugins/observability_solution/infra/public/utils/data_search/use_latest_partial_data_search_response.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs';
 import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { useOperator } from '../use_observable';
 import { flattenDataSearchResponseDescriptor } from './flatten_data_search_response';
diff --git a/x-pack/plugins/observability_solution/infra/public/utils/use_observable.ts b/x-pack/plugins/observability_solution/infra/public/utils/use_observable.ts
index 00efc4900b82f..2634a156be986 100644
--- a/x-pack/plugins/observability_solution/infra/public/utils/use_observable.ts
+++ b/x-pack/plugins/observability_solution/infra/public/utils/use_observable.ts
@@ -14,7 +14,7 @@ import {
   ReplaySubject,
   Subscription,
 } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs';
 
 export const useLatest = <Value>(value: Value) => {
   const valueRef = useRef(value);
diff --git a/x-pack/plugins/observability_solution/infra/public/utils/wrap_state_container.ts b/x-pack/plugins/observability_solution/infra/public/utils/wrap_state_container.ts
index d6ec59ded314b..2b0740364e829 100644
--- a/x-pack/plugins/observability_solution/infra/public/utils/wrap_state_container.ts
+++ b/x-pack/plugins/observability_solution/infra/public/utils/wrap_state_container.ts
@@ -6,7 +6,7 @@
  */
 
 import { BaseState, BaseStateContainer } from '@kbn/kibana-utils-plugin/public';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 
 export const wrapStateContainer =
   <StateA extends BaseState, StateB extends BaseState>({
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/components/log_stream/log_stream.story_decorators.tsx b/x-pack/plugins/observability_solution/logs_shared/public/components/log_stream/log_stream.story_decorators.tsx
index 3e600d2c95449..3023400226690 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/components/log_stream/log_stream.story_decorators.tsx
+++ b/x-pack/plugins/observability_solution/logs_shared/public/components/log_stream/log_stream.story_decorators.tsx
@@ -8,7 +8,7 @@
 import type { StoryContext } from '@storybook/react';
 import React from 'react';
 import { defer, of, Subject } from 'rxjs';
-import { delay } from 'rxjs/operators';
+import { delay } from 'rxjs';
 import {
   ENHANCED_ES_SEARCH_STRATEGY,
   ES_SEARCH_STRATEGY,
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_after.ts b/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
index 168d2e8577b85..bfa7019ae3113 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_after.ts
@@ -8,7 +8,7 @@
 import { JsonObject } from '@kbn/utility-types';
 import { useCallback } from 'react';
 import { Observable } from 'rxjs';
-import { exhaustMap } from 'rxjs/operators';
+import { exhaustMap } from 'rxjs';
 import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { LogEntryAfterCursor } from '../../../../common/log_entry';
 import { LogViewColumnConfiguration, LogViewReference } from '../../../../common/log_views';
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_around.ts b/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_around.ts
index 6dd2566392ee0..a24dfbdddefc0 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_around.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_around.ts
@@ -7,7 +7,7 @@
 
 import { useCallback } from 'react';
 import { combineLatest, Observable, ReplaySubject } from 'rxjs';
-import { last, map, startWith, switchMap } from 'rxjs/operators';
+import { last, map, startWith, switchMap } from 'rxjs';
 import { subtractMillisecondsFromDate } from '../../../../common/utils';
 import { LogEntryCursor } from '../../../../common/log_entry';
 import { LogViewColumnConfiguration, LogViewReference } from '../../../../common/log_views';
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_before.ts b/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
index a745b5f13a19f..1763ce576ecab 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/containers/logs/log_stream/use_fetch_log_entries_before.ts
@@ -8,7 +8,7 @@
 import { JsonObject } from '@kbn/utility-types';
 import { useCallback } from 'react';
 import { Observable } from 'rxjs';
-import { exhaustMap } from 'rxjs/operators';
+import { exhaustMap } from 'rxjs';
 import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { LogEntryBeforeCursor } from '../../../../common/log_entry';
 import { LogViewColumnConfiguration, LogViewReference } from '../../../../common/log_views';
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/flatten_data_search_response.ts b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/flatten_data_search_response.ts
index 52f08f39bc2d4..9a0ee481814d0 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/flatten_data_search_response.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/flatten_data_search_response.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { ParsedDataSearchRequestDescriptor } from './types';
 
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/normalize_data_search_responses.ts b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/normalize_data_search_responses.ts
index 0056b7466759a..20f19656059f8 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/normalize_data_search_responses.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/normalize_data_search_responses.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, of } from 'rxjs';
-import { catchError, map, startWith } from 'rxjs/operators';
+import { catchError, map, startWith } from 'rxjs';
 import { IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import { AbortError } from '@kbn/kibana-utils-plugin/public';
 import { SearchStrategyError } from '../../../common/search_strategies/common/errors';
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_data_search_request.ts b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_data_search_request.ts
index 230c2d87e0654..6d0e03d48ff8b 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_data_search_request.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_data_search_request.ts
@@ -7,7 +7,7 @@
 
 import { useCallback } from 'react';
 import { OperatorFunction, ReplaySubject } from 'rxjs';
-import { share, tap } from 'rxjs/operators';
+import { share, tap } from 'rxjs';
 import {
   IKibanaSearchRequest,
   IKibanaSearchResponse,
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_latest_partial_data_search_response.ts b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_latest_partial_data_search_response.ts
index 48ff61eb676b9..12a169a3a82aa 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_latest_partial_data_search_response.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/utils/data_search/use_latest_partial_data_search_response.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs';
 import { IKibanaSearchRequest } from '@kbn/data-plugin/public';
 import { useOperator } from '../use_observable';
 import { flattenDataSearchResponseDescriptor } from './flatten_data_search_response';
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/utils/use_observable.ts b/x-pack/plugins/observability_solution/logs_shared/public/utils/use_observable.ts
index 00efc4900b82f..2634a156be986 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/utils/use_observable.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/utils/use_observable.ts
@@ -14,7 +14,7 @@ import {
   ReplaySubject,
   Subscription,
 } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs';
 
 export const useLatest = <Value>(value: Value) => {
   const valueRef = useRef(value);
diff --git a/x-pack/plugins/observability_solution/logs_shared/server/services/log_entries/log_entries_search_strategy.ts b/x-pack/plugins/observability_solution/logs_shared/server/services/log_entries/log_entries_search_strategy.ts
index fb305d9ae73e4..392b3de9bde81 100644
--- a/x-pack/plugins/observability_solution/logs_shared/server/services/log_entries/log_entries_search_strategy.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/server/services/log_entries/log_entries_search_strategy.ts
@@ -8,7 +8,7 @@
 import { pick } from '@kbn/std';
 import * as rt from 'io-ts';
 import { combineLatest, concat, defer, forkJoin, of } from 'rxjs';
-import { concatMap, filter, map, shareReplay, take } from 'rxjs/operators';
+import { concatMap, filter, map, shareReplay, take } from 'rxjs';
 import type {
   IEsSearchRequest,
   IKibanaSearchRequest,
diff --git a/x-pack/plugins/observability_solution/logs_shared/server/services/log_entries/log_entry_search_strategy.ts b/x-pack/plugins/observability_solution/logs_shared/server/services/log_entries/log_entry_search_strategy.ts
index 1d558094e351d..756bb4aa76c53 100644
--- a/x-pack/plugins/observability_solution/logs_shared/server/services/log_entries/log_entry_search_strategy.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/server/services/log_entries/log_entry_search_strategy.ts
@@ -7,7 +7,7 @@
 
 import * as rt from 'io-ts';
 import { concat, defer, of } from 'rxjs';
-import { concatMap, filter, map, shareReplay, take } from 'rxjs/operators';
+import { concatMap, filter, map, shareReplay, take } from 'rxjs';
 import type {
   IEsSearchRequest,
   IKibanaSearchRequest,
diff --git a/x-pack/plugins/observability_solution/observability/public/plugin.ts b/x-pack/plugins/observability_solution/observability/public/plugin.ts
index bd123c5d06564..b570ce6660197 100644
--- a/x-pack/plugins/observability_solution/observability/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/observability/public/plugin.ts
@@ -45,7 +45,7 @@ import {
   TriggersAndActionsUIPublicPluginStart,
 } from '@kbn/triggers-actions-ui-plugin/public';
 import { BehaviorSubject, from } from 'rxjs';
-import { map, mergeMap } from 'rxjs/operators';
+import { map, mergeMap } from 'rxjs';
 
 import { AiopsPluginStart } from '@kbn/aiops-plugin/public/types';
 import type { EmbeddableSetup } from '@kbn/embeddable-plugin/public';
diff --git a/x-pack/plugins/observability_solution/synthetics/public/plugin.ts b/x-pack/plugins/observability_solution/synthetics/public/plugin.ts
index 88d0071ef1f13..aed84c6b974c4 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/synthetics/public/plugin.ts
@@ -14,7 +14,7 @@ import {
   PackageInfo,
 } from '@kbn/core/public';
 import { from } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
 import { DiscoverStart } from '@kbn/discover-plugin/public';
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.ts
index 92d29145593ab..4f504d50de2b7 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/service_api_client.ts
@@ -7,7 +7,7 @@
 
 import axios, { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
 import { forkJoin, from as rxjsFrom, Observable, of } from 'rxjs';
-import { catchError, tap } from 'rxjs/operators';
+import { catchError, tap } from 'rxjs';
 import * as https from 'https';
 import { SslConfig } from '@kbn/server-http-tools';
 import { Logger } from '@kbn/core/server';
diff --git a/x-pack/plugins/observability_solution/ux/public/plugin.ts b/x-pack/plugins/observability_solution/ux/public/plugin.ts
index a48775fe0899f..7ee7691280742 100644
--- a/x-pack/plugins/observability_solution/ux/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/ux/public/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { from } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import {
   FetchDataParams,
diff --git a/x-pack/plugins/osquery/server/routes/live_query/utils.ts b/x-pack/plugins/osquery/server/routes/live_query/utils.ts
index dd082b1964d62..0ad6e696df433 100644
--- a/x-pack/plugins/osquery/server/routes/live_query/utils.ts
+++ b/x-pack/plugins/osquery/server/routes/live_query/utils.ts
@@ -7,7 +7,7 @@
 
 import type { Observable } from 'rxjs';
 import { of } from 'rxjs';
-import { mergeMap } from 'rxjs/operators';
+import { mergeMap } from 'rxjs';
 import type { IScopedSearchClient } from '@kbn/data-plugin/server';
 import type { estypes } from '@elastic/elasticsearch';
 import { generateTablePaginationOptions } from '../../../common/utils/build_query';
diff --git a/x-pack/plugins/reporting/public/lib/stream_handler.ts b/x-pack/plugins/reporting/public/lib/stream_handler.ts
index 2a7124e1e5e3c..049aea96e1af2 100644
--- a/x-pack/plugins/reporting/public/lib/stream_handler.ts
+++ b/x-pack/plugins/reporting/public/lib/stream_handler.ts
@@ -6,7 +6,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { catchError, filter, map, mergeMap, takeUntil } from 'rxjs/operators';
+import { catchError, filter, map, mergeMap, takeUntil } from 'rxjs';
 
 import { DocLinksStart, NotificationsSetup, ThemeServiceStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
index 02f42086dc468..5a2b8c1533396 100644
--- a/x-pack/plugins/reporting/server/core.ts
+++ b/x-pack/plugins/reporting/server/core.ts
@@ -6,7 +6,7 @@
  */
 
 import * as Rx from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import { map, take } from 'rxjs';
 
 import type {
   AnalyticsServiceStart,
diff --git a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
index 25be53d19f1e1..598055cb175d1 100644
--- a/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
+++ b/x-pack/plugins/reporting/server/lib/tasks/execute_report.ts
@@ -7,7 +7,7 @@
 
 import moment from 'moment';
 import * as Rx from 'rxjs';
-import { timeout } from 'rxjs/operators';
+import { timeout } from 'rxjs';
 import { Writable } from 'stream';
 import { finished } from 'stream/promises';
 import { setTimeout } from 'timers/promises';
diff --git a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
index b9680d6472691..da41229e8107e 100644
--- a/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
+++ b/x-pack/plugins/rule_registry/server/search_strategy/search_strategy.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { map, mergeMap, catchError } from 'rxjs/operators';
+import { map, mergeMap, catchError } from 'rxjs';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { Logger } from '@kbn/core/server';
 import { from, of } from 'rxjs';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts b/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
index 7798c74bc3afc..22ab4dc95a2fc 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/actions/assign.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable, from } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { takeUntil } from 'rxjs';
 import { i18n } from '@kbn/i18n';
 import { NotificationsStart, OverlayStart, ThemeServiceStart } from '@kbn/core/public';
 import { TagWithRelations } from '../../../common';
diff --git a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
index f09051678b06c..bbb2081b198cf 100644
--- a/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/management/bulk_actions/bulk_assign.ts
@@ -6,7 +6,7 @@
  */
 
 import { from } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
+import { takeUntil } from 'rxjs';
 import { OverlayStart, NotificationsStart, ThemeServiceStart } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
 import { ITagsCache, ITagAssignmentService } from '../../services';
diff --git a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
index 51539c970c7f3..512c524cdbd27 100644
--- a/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/services/tags/tags_cache.ts
@@ -7,7 +7,7 @@
 
 import { Duration } from 'moment';
 import { Observable, BehaviorSubject, Subject } from 'rxjs';
-import { takeUntil, first, mergeMap } from 'rxjs/operators';
+import { takeUntil, first, mergeMap } from 'rxjs';
 import { ITagsCache } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import { Tag, TagAttributes } from '../../../common/types';
 
diff --git a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
index eef74321cb9cb..625c77094177f 100644
--- a/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
+++ b/x-pack/plugins/saved_objects_tagging/public/ui_api/parse_search_query.ts
@@ -6,7 +6,7 @@
  */
 
 import { lastValueFrom } from 'rxjs';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 import { Query } from '@elastic/eui';
 import { SavedObjectsFindOptionsReference } from '@kbn/core/public';
 import {
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
index c3e6f75d6d511..317614e7733d1 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.test.ts
@@ -10,7 +10,7 @@ import { loggerMock } from '@kbn/logging-mocks';
 import type { ScreenshotModePluginSetup } from '@kbn/screenshot-mode-plugin/server';
 import * as puppeteer from 'puppeteer';
 import * as Rx from 'rxjs';
-import { mergeMap, take } from 'rxjs/operators';
+import { mergeMap, take } from 'rxjs';
 import { DEFAULT_VIEWPORT, HeadlessChromiumDriverFactory } from '.';
 import { ConfigType } from '../../../config';
 
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
index ad2cde68e4dde..1c562a481790e 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/driver_factory/index.ts
@@ -16,16 +16,7 @@ import path from 'path';
 import puppeteer, { Browser, ConsoleMessage, Page, Viewport, PageEvents } from 'puppeteer';
 import { createInterface } from 'readline';
 import * as Rx from 'rxjs';
-import {
-  catchError,
-  concatMap,
-  ignoreElements,
-  mergeMap,
-  map,
-  reduce,
-  takeUntil,
-  tap,
-} from 'rxjs/operators';
+import { catchError, concatMap, ignoreElements, mergeMap, map, reduce, takeUntil, tap } from 'rxjs';
 import { PerformanceMetrics } from '../../../../common/types';
 import { getChromiumDisconnectedError } from '..';
 import { errors } from '../../../../common';
diff --git a/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts b/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
index f0675b7fdf16d..fc64230e42545 100644
--- a/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/safe_child_process.ts
@@ -6,7 +6,7 @@
  */
 
 import { fromEvent, merge, Observable } from 'rxjs';
-import { take, share, mapTo, delay, tap } from 'rxjs/operators';
+import { take, share, mapTo, delay, tap } from 'rxjs';
 import type { Logger } from '@kbn/core/server';
 
 interface IChild {
diff --git a/x-pack/plugins/screenshotting/server/plugin.ts b/x-pack/plugins/screenshotting/server/plugin.ts
index 144b88a2c1c75..7cfb5d3982eb8 100755
--- a/x-pack/plugins/screenshotting/server/plugin.ts
+++ b/x-pack/plugins/screenshotting/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { from } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import { switchMap } from 'rxjs';
 import type {
   CoreSetup,
   CoreStart,
diff --git a/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts b/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
index 363c30ad83f33..9ebbead104cc6 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/observable.test.ts
@@ -7,7 +7,7 @@
 
 import { loggingSystemMock } from '@kbn/core/server/mocks';
 import { interval, lastValueFrom, of, throwError } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { createMockBrowserDriver } from '../browsers/mock';
 import type { ConfigType } from '../config';
 import { createMockLayout } from '../layouts/mock';
diff --git a/x-pack/plugins/screenshotting/server/screenshots/observable.ts b/x-pack/plugins/screenshotting/server/screenshots/observable.ts
index f5662ee920bf4..8c9854f376706 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/observable.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/observable.ts
@@ -7,7 +7,7 @@
 
 import type { Headers } from '@kbn/core/server';
 import { defer, forkJoin, Observable, throwError } from 'rxjs';
-import { catchError, mergeMap, switchMapTo, timeoutWith } from 'rxjs/operators';
+import { catchError, mergeMap, switchMapTo, timeoutWith } from 'rxjs';
 import { errors } from '../../common';
 import {
   Context,
diff --git a/x-pack/plugins/screenshotting/server/screenshots/screenshots.ts b/x-pack/plugins/screenshotting/server/screenshots/screenshots.ts
index 8a35ce48fe1ae..24a00ed00108a 100644
--- a/x-pack/plugins/screenshotting/server/screenshots/screenshots.ts
+++ b/x-pack/plugins/screenshotting/server/screenshots/screenshots.ts
@@ -9,17 +9,7 @@ import ipaddr from 'ipaddr.js';
 import { defaultsDeep, sum } from 'lodash';
 import moment from 'moment';
 import { Observable, from, of, throwError } from 'rxjs';
-import {
-  catchError,
-  concatMap,
-  first,
-  map,
-  mergeMap,
-  take,
-  takeUntil,
-  tap,
-  toArray,
-} from 'rxjs/operators';
+import { catchError, concatMap, first, map, mergeMap, take, takeUntil, tap, toArray } from 'rxjs';
 
 import type { CloudSetup } from '@kbn/cloud-plugin/server';
 import type { HttpServiceSetup, Logger, PackageInfo } from '@kbn/core/server';
diff --git a/x-pack/plugins/security/common/licensing/license_service.ts b/x-pack/plugins/security/common/licensing/license_service.ts
index 9605e4262347a..70b84e1712e08 100644
--- a/x-pack/plugins/security/common/licensing/license_service.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 
 import type { ILicense, LicenseType } from '@kbn/licensing-plugin/common/types';
 import type { SecurityLicenseFeatures } from '@kbn/security-plugin-types-common';
diff --git a/x-pack/plugins/security/public/analytics/analytics_service.ts b/x-pack/plugins/security/public/analytics/analytics_service.ts
index 8d4e173246ffd..b920a3af934b4 100644
--- a/x-pack/plugins/security/public/analytics/analytics_service.ts
+++ b/x-pack/plugins/security/public/analytics/analytics_service.ts
@@ -6,8 +6,7 @@
  */
 
 import type { Subscription } from 'rxjs';
-import { filter, switchMap } from 'rxjs';
-import { throttleTime } from 'rxjs/operators';
+import { filter, switchMap, throttleTime } from 'rxjs';
 
 import type {
   AnalyticsServiceSetup as CoreAnalyticsServiceSetup,
diff --git a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
index bfea42ca97e90..a9098396bd189 100644
--- a/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
+++ b/x-pack/plugins/security/public/nav_control/nav_control_service.tsx
@@ -10,8 +10,7 @@ import type { FunctionComponent } from 'react';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import type { Observable, Subscription } from 'rxjs';
-import { BehaviorSubject, ReplaySubject } from 'rxjs';
-import { map, takeUntil } from 'rxjs/operators';
+import { BehaviorSubject, map, ReplaySubject, takeUntil } from 'rxjs';
 
 import type { BuildFlavor } from '@kbn/config/src/types';
 import type { CoreStart, CoreTheme } from '@kbn/core/public';
diff --git a/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx b/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
index d2b3e31f48a59..26cdc410825c0 100644
--- a/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
+++ b/x-pack/plugins/security/public/security_checkup/security_checkup_service.tsx
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { BehaviorSubject, combineLatest, from } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import { BehaviorSubject, combineLatest, distinctUntilChanged, from, map } from 'rxjs';
 
 import type {
   DocLinksStart,
diff --git a/x-pack/plugins/security/public/session/session_timeout.ts b/x-pack/plugins/security/public/session/session_timeout.ts
index 0d116641c1179..34255657857c9 100644
--- a/x-pack/plugins/security/public/session/session_timeout.ts
+++ b/x-pack/plugins/security/public/session/session_timeout.ts
@@ -6,8 +6,7 @@
  */
 
 import type { Subscription } from 'rxjs';
-import { BehaviorSubject } from 'rxjs';
-import { skip, tap, throttleTime } from 'rxjs/operators';
+import { BehaviorSubject, skip, tap, throttleTime } from 'rxjs';
 
 import type {
   HttpFetchOptionsWithPath,
diff --git a/x-pack/plugins/security/server/audit/audit_service.ts b/x-pack/plugins/security/server/audit/audit_service.ts
index 551394b43e7a6..6539b8208c3de 100644
--- a/x-pack/plugins/security/server/audit/audit_service.ts
+++ b/x-pack/plugins/security/server/audit/audit_service.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { distinctUntilKeyChanged, map } from 'rxjs/operators';
+import { distinctUntilKeyChanged, map } from 'rxjs';
 
 import type {
   HttpServiceSetup,
diff --git a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
index 2bc8a643275c1..afe0df5b68b2e 100644
--- a/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
+++ b/x-pack/plugins/security/server/elasticsearch/elasticsearch_service.ts
@@ -6,8 +6,15 @@
  */
 
 import type { Observable } from 'rxjs';
-import { BehaviorSubject, combineLatest } from 'rxjs';
-import { distinctUntilChanged, filter, map, shareReplay, tap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  combineLatest,
+  distinctUntilChanged,
+  filter,
+  map,
+  shareReplay,
+  tap,
+} from 'rxjs';
 
 import type { Logger, StatusServiceSetup } from '@kbn/core/server';
 import { ServiceStatusLevels } from '@kbn/core/server';
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index 71ae6c6436063..cfd2a0e22c11d 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 
 import type { CloudStart } from '@kbn/cloud-plugin/server';
 import type { TypeOf } from '@kbn/config-schema';
diff --git a/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts b/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
index 1b46d071d244d..736a170382dae 100644
--- a/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/cti/event_enrichment/api.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Observable } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { isRunningResponse } from '@kbn/data-plugin/common';
diff --git a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
index 75eb80debeb3c..f670a061f0b63 100644
--- a/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/containers/use_search_strategy/index.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import { noop, omit } from 'lodash/fp';
 import { useCallback, useEffect, useRef, useMemo } from 'react';
 import type { Observable } from 'rxjs';
diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
index 5f27cbf9cdaed..5c0af6acd8306 100644
--- a/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
+++ b/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/use_ti_data_sources.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import type { Observable } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import { useEffect, useState } from 'react';
 import { useObservable, withOptionalSignal } from '@kbn/securitysolution-hook-utils';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/endpoint/index.ts b/x-pack/plugins/security_solution/server/search_strategy/endpoint/index.ts
index ef7f6e6ae0dfa..3665e11023308 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/endpoint/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/endpoint/index.ts
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import { map, mergeMap } from 'rxjs/operators';
+import { map, mergeMap, from } from 'rxjs';
 import type { ISearchStrategy, PluginStart } from '@kbn/data-plugin/server';
 import { shimHitsTotal } from '@kbn/data-plugin/server';
-import { from } from 'rxjs';
 import type {
   EndpointStrategyParseResponseType,
   EndpointStrategyRequestType,
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
index ede2f76c64bb9..0a36478f7a352 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { map, mergeMap } from 'rxjs/operators';
+import { map, mergeMap } from 'rxjs';
 import type { ISearchStrategy, PluginStart } from '@kbn/data-plugin/server';
 import { shimHitsTotal } from '@kbn/data-plugin/server';
 import type { KibanaRequest } from '@kbn/core/server';
diff --git a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
index 91c1de5367282..a7f0ef218aa72 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
+++ b/x-pack/plugins/spaces/public/legacy_urls/components/legacy_url_conflict_internal.tsx
@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 import React, { useState } from 'react';
 import useAsync from 'react-use/lib/useAsync';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 
 import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
index 1d60a24460595..c53f185ed0b36 100644
--- a/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
+++ b/x-pack/plugins/spaces/public/legacy_urls/redirect_legacy_url.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 
 import type { StartServicesAccessor } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
diff --git a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
index 3f2dff01d8914..7762158a4379b 100644
--- a/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
+++ b/x-pack/plugins/spaces/public/spaces_manager/spaces_manager.ts
@@ -6,8 +6,7 @@
  */
 
 import type { Observable } from 'rxjs';
-import { BehaviorSubject } from 'rxjs';
-import { skipWhile } from 'rxjs/operators';
+import { BehaviorSubject, skipWhile } from 'rxjs';
 
 import type { HttpSetup } from '@kbn/core/public';
 import type { SavedObjectsCollectMultiNamespaceReferencesResponse } from '@kbn/core-saved-objects-api-server';
diff --git a/x-pack/plugins/spaces/server/default_space/default_space_service.ts b/x-pack/plugins/spaces/server/default_space/default_space_service.ts
index 26059fe90ea36..d4c601369fde1 100644
--- a/x-pack/plugins/spaces/server/default_space/default_space_service.ts
+++ b/x-pack/plugins/spaces/server/default_space/default_space_service.ts
@@ -6,8 +6,18 @@
  */
 
 import type { Observable, ObservableInput, Subscription } from 'rxjs';
-import { BehaviorSubject, combineLatest, concat, defer, of, timer } from 'rxjs';
-import { catchError, mergeMap, switchMap, tap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  catchError,
+  combineLatest,
+  concat,
+  defer,
+  mergeMap,
+  of,
+  switchMap,
+  tap,
+  timer,
+} from 'rxjs';
 
 import type { CoreSetup, Logger, SavedObjectsServiceStart, ServiceStatus } from '@kbn/core/server';
 import { ServiceStatusLevels } from '@kbn/core/server';
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
index e5ca18f39c0b4..37cc166ece211 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.ts
@@ -6,7 +6,7 @@
  */
 
 import { Subject, Observable, Subscription } from 'rxjs';
-import { filter } from 'rxjs/operators';
+import { filter } from 'rxjs';
 import { Logger, ExecutionContextStart } from '@kbn/core/server';
 
 import { Result, asErr, asOk } from './lib/result_type';
diff --git a/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts b/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
index 874592c4e5d01..20ac17a0e57f6 100644
--- a/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
+++ b/x-pack/plugins/task_manager/server/lib/bulk_operation_buffer.ts
@@ -8,7 +8,7 @@
 import { Logger } from '@kbn/core/server';
 import { map } from 'lodash';
 import { Subject, race, from } from 'rxjs';
-import { bufferWhen, filter, bufferCount, flatMap, mapTo, first } from 'rxjs/operators';
+import { bufferWhen, filter, bufferCount, flatMap, mapTo, first } from 'rxjs';
 import { SavedObjectError } from '@kbn/core-saved-objects-common';
 import { either, Result, asOk, asErr, Ok, Err } from './result_type';
 
diff --git a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
index 70c1e53ff6de1..5c7b1a16a4308 100644
--- a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
+++ b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
@@ -6,7 +6,7 @@
  */
 
 import { interval, merge, of, Observable } from 'rxjs';
-import { filter, mergeScan, map, scan, distinctUntilChanged, startWith } from 'rxjs/operators';
+import { filter, mergeScan, map, scan, distinctUntilChanged, startWith } from 'rxjs';
 import { SavedObjectsErrorHelpers } from '@kbn/core/server';
 import { Logger } from '@kbn/core/server';
 import { isEsCannotExecuteScriptError } from './identify_es_error';
diff --git a/x-pack/plugins/task_manager/server/lib/fill_pool.ts b/x-pack/plugins/task_manager/server/lib/fill_pool.ts
index 5d7d7a2a735c1..bf1ed95da363b 100644
--- a/x-pack/plugins/task_manager/server/lib/fill_pool.ts
+++ b/x-pack/plugins/task_manager/server/lib/fill_pool.ts
@@ -6,7 +6,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { concatMap, last } from 'rxjs/operators';
+import { concatMap, last } from 'rxjs';
 import { ClaimOwnershipResult } from '../queries/task_claiming';
 import { ConcreteTaskInstance } from '../task';
 import { WithTaskTiming, startTaskTimer } from '../task_events';
diff --git a/x-pack/plugins/task_manager/server/metrics/create_aggregator.test.ts b/x-pack/plugins/task_manager/server/metrics/create_aggregator.test.ts
index 07323cb5b203d..92b2fe958b1b3 100644
--- a/x-pack/plugins/task_manager/server/metrics/create_aggregator.test.ts
+++ b/x-pack/plugins/task_manager/server/metrics/create_aggregator.test.ts
@@ -7,7 +7,7 @@
 
 import sinon from 'sinon';
 import { Subject } from 'rxjs';
-import { take, bufferCount, skip } from 'rxjs/operators';
+import { take, bufferCount, skip } from 'rxjs';
 import {
   isTaskManagerMetricEvent,
   isTaskManagerStatEvent,
diff --git a/x-pack/plugins/task_manager/server/metrics/metrics_stream.test.ts b/x-pack/plugins/task_manager/server/metrics/metrics_stream.test.ts
index 5aec856a7a4f0..61f89af7282d0 100644
--- a/x-pack/plugins/task_manager/server/metrics/metrics_stream.test.ts
+++ b/x-pack/plugins/task_manager/server/metrics/metrics_stream.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { take, bufferCount } from 'rxjs/operators';
+import { take, bufferCount } from 'rxjs';
 import { createMetricsStream } from './metrics_stream';
 import { JsonValue } from '@kbn/utility-types';
 import { AggregatedStat } from '../lib/runtime_statistics_aggregator';
diff --git a/x-pack/plugins/task_manager/server/metrics/metrics_stream.ts b/x-pack/plugins/task_manager/server/metrics/metrics_stream.ts
index 6f4a342fcb3a2..ba57153ed9a0a 100644
--- a/x-pack/plugins/task_manager/server/metrics/metrics_stream.ts
+++ b/x-pack/plugins/task_manager/server/metrics/metrics_stream.ts
@@ -6,7 +6,7 @@
  */
 
 import { merge, of, Observable } from 'rxjs';
-import { map, scan } from 'rxjs/operators';
+import { map, scan } from 'rxjs';
 import { set } from '@kbn/safer-lodash-set';
 import { TaskLifecycleEvent, TaskPollingLifecycle } from '../polling_lifecycle';
 import { TaskManagerConfig } from '../config';
diff --git a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
index b2dae1a045d6a..104a6aad86207 100644
--- a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
@@ -7,7 +7,7 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import { Subject, Observable } from 'rxjs';
-import { take, bufferCount, skip, map } from 'rxjs/operators';
+import { take, bufferCount, skip, map } from 'rxjs';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
 import {
   asTaskRunEvent,
diff --git a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
index 886f528fd25d2..822356e2d6534 100644
--- a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { Subject } from 'rxjs';
-import { take, bufferCount } from 'rxjs/operators';
+import { take, bufferCount } from 'rxjs';
 import { createConfigurationAggregator } from './configuration_statistics';
 import { TaskManagerConfig } from '../config';
 
diff --git a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.ts
index 2212affcc8db3..577665a0556d4 100644
--- a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.ts
@@ -7,7 +7,7 @@
 
 import { combineLatest, of } from 'rxjs';
 import { pick, merge } from 'lodash';
-import { map, startWith } from 'rxjs/operators';
+import { map, startWith } from 'rxjs';
 import { AggregatedStatProvider } from '../lib/runtime_statistics_aggregator';
 import { TaskManagerConfig } from '../config';
 import { ManagedConfiguration } from '../lib/create_managed_configuration';
diff --git a/x-pack/plugins/task_manager/server/monitoring/ephemeral_task_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/ephemeral_task_statistics.test.ts
index bbbb13dd9060f..d7135837e052e 100644
--- a/x-pack/plugins/task_manager/server/monitoring/ephemeral_task_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/ephemeral_task_statistics.test.ts
@@ -8,7 +8,7 @@
 import { v4 as uuidv4 } from 'uuid';
 import { Subject, Observable } from 'rxjs';
 import stats from 'stats-lite';
-import { take, bufferCount, skip, map } from 'rxjs/operators';
+import { take, bufferCount, skip, map } from 'rxjs';
 
 import { ConcreteTaskInstance, TaskStatus } from '../task';
 import {
diff --git a/x-pack/plugins/task_manager/server/monitoring/ephemeral_task_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/ephemeral_task_statistics.ts
index 8a6ade503b041..b77eae1080fbc 100644
--- a/x-pack/plugins/task_manager/server/monitoring/ephemeral_task_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/ephemeral_task_statistics.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { map, filter, startWith, buffer, share } from 'rxjs/operators';
+import { map, filter, startWith, buffer, share } from 'rxjs';
 import { JsonObject } from '@kbn/utility-types';
 import { combineLatest, Observable, zip } from 'rxjs';
 import { isOk, Ok } from '../lib/result_type';
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
index 7d904565e6403..f4da53871ffa3 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
@@ -7,7 +7,7 @@
 
 import { TaskManagerConfig } from '../config';
 import { of, Subject } from 'rxjs';
-import { take, bufferCount } from 'rxjs/operators';
+import { take, bufferCount } from 'rxjs';
 import { createMonitoringStatsStream } from './monitoring_stats_stream';
 import { JsonValue } from '@kbn/utility-types';
 import { AggregatedStat } from '../lib/runtime_statistics_aggregator';
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 a05eca7079ca4..5ee6465dae0eb 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
@@ -6,7 +6,7 @@
  */
 
 import { merge, of, Observable } from 'rxjs';
-import { map, scan } from 'rxjs/operators';
+import { map, scan } from 'rxjs';
 import { set } from '@kbn/safer-lodash-set';
 import { Logger } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
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 9dfa3e8cadfe7..fa6fbe0d3a2b9 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
@@ -9,7 +9,7 @@ import { v4 as uuidv4 } from 'uuid';
 import { Subject, Observable } from 'rxjs';
 import stats from 'stats-lite';
 import sinon from 'sinon';
-import { take, tap, bufferCount, skip, map } from 'rxjs/operators';
+import { take, tap, bufferCount, skip, map } from 'rxjs';
 import { mockLogger } from '../test_utils';
 
 import { ConcreteTaskInstance, TaskStatus } from '../task';
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 7b7db8cb25eed..27305a93f5de3 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
@@ -6,7 +6,7 @@
  */
 
 import { combineLatest, Observable } from 'rxjs';
-import { filter, startWith, map } from 'rxjs/operators';
+import { filter, startWith, map } from 'rxjs';
 import { JsonObject, JsonValue } from '@kbn/utility-types';
 import { isNumber, mapValues } from 'lodash';
 import { Logger } from '@kbn/core/server';
diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
index f60531886453f..7ef860efa783a 100644
--- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { first, take, bufferCount } from 'rxjs/operators';
+import { first, take, bufferCount } from 'rxjs';
 import { loggingSystemMock, elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import {
   TaskTypeAggregation,
diff --git a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
index b4d5db14a12e4..9fa41b0c45665 100644
--- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
@@ -6,7 +6,7 @@
  */
 
 import { combineLatest, Observable, timer } from 'rxjs';
-import { mergeMap, map, filter, switchMap, catchError } from 'rxjs/operators';
+import { mergeMap, map, filter, switchMap, catchError } from 'rxjs';
 import { Logger } from '@kbn/core/server';
 import { JsonObject } from '@kbn/utility-types';
 import { keyBy, mapValues } from 'lodash';
diff --git a/x-pack/plugins/task_manager/server/plugin.test.ts b/x-pack/plugins/task_manager/server/plugin.test.ts
index b0725bdd86258..7b80920a57559 100644
--- a/x-pack/plugins/task_manager/server/plugin.test.ts
+++ b/x-pack/plugins/task_manager/server/plugin.test.ts
@@ -9,7 +9,7 @@ import { TaskManagerPlugin, getElasticsearchAndSOAvailability } from './plugin';
 import { coreMock } from '@kbn/core/server/mocks';
 import { TaskManagerConfig } from './config';
 import { Subject } from 'rxjs';
-import { bufferCount, take } from 'rxjs/operators';
+import { bufferCount, take } from 'rxjs';
 import { CoreStatus, ServiceStatusLevels } from '@kbn/core/server';
 import { taskPollingLifecycleMock } from './polling_lifecycle.mock';
 import { TaskPollingLifecycle } from './polling_lifecycle';
diff --git a/x-pack/plugins/task_manager/server/plugin.ts b/x-pack/plugins/task_manager/server/plugin.ts
index 0baedbaf2bf54..7d5313391595a 100644
--- a/x-pack/plugins/task_manager/server/plugin.ts
+++ b/x-pack/plugins/task_manager/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { combineLatest, Observable, Subject } from 'rxjs';
-import { map, distinctUntilChanged } from 'rxjs/operators';
+import { map, distinctUntilChanged } from 'rxjs';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { UsageCollectionSetup, UsageCounter } from '@kbn/usage-collection-plugin/server';
 import {
diff --git a/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.test.ts b/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.test.ts
index dc4071315a781..f06c43bc15587 100644
--- a/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.test.ts
+++ b/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.test.ts
@@ -11,7 +11,7 @@ import { sleep } from '../test_utils';
 import { asOk } from '../lib/result_type';
 import { delayOnClaimConflicts } from './delay_on_claim_conflicts';
 import { asTaskPollingCycleEvent } from '../task_events';
-import { bufferCount, take } from 'rxjs/operators';
+import { bufferCount, take } from 'rxjs';
 import { TaskLifecycleEvent } from '../polling_lifecycle';
 import { FillPoolResult } from '../lib/fill_pool';
 
diff --git a/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.ts b/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.ts
index 6d7cb77625b58..f491d58fc59ee 100644
--- a/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.ts
+++ b/x-pack/plugins/task_manager/server/polling/delay_on_claim_conflicts.ts
@@ -12,7 +12,7 @@
 import stats from 'stats-lite';
 import { isNumber, random } from 'lodash';
 import { merge, of, Observable, combineLatest, ReplaySubject } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import { filter, map } from 'rxjs';
 import { Option, none, some, isSome, Some } from 'fp-ts/lib/Option';
 import { isOk } from '../lib/result_type';
 import { ManagedConfiguration } from '../lib/create_managed_configuration';
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
index 4d8818813c957..e21cfaa4f7cec 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
@@ -8,7 +8,7 @@
 import { Subject, Observable } from 'rxjs';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { map as mapOptional } from 'fp-ts/lib/Option';
-import { tap } from 'rxjs/operators';
+import { tap } from 'rxjs';
 import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import type { Logger, ExecutionContextStart } from '@kbn/core/server';
 
diff --git a/x-pack/plugins/task_manager/server/queries/task_claiming.ts b/x-pack/plugins/task_manager/server/queries/task_claiming.ts
index 1e31bb5a2ed65..8216e7c8d8dfb 100644
--- a/x-pack/plugins/task_manager/server/queries/task_claiming.ts
+++ b/x-pack/plugins/task_manager/server/queries/task_claiming.ts
@@ -9,7 +9,7 @@
  * This module contains helpers for managing the task manager storage layer.
  */
 import { Subject, Observable, of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { groupBy, isPlainObject } from 'lodash';
 
 import { Logger } from '@kbn/core/server';
diff --git a/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts b/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
index b72b8ad5a7043..43cc2a69fe11c 100644
--- a/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
+++ b/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
@@ -15,7 +15,7 @@ import {
 } from '@kbn/core/server';
 import { IClusterClient } from '@kbn/core/server';
 import { Observable, Subject } from 'rxjs';
-import { throttleTime, tap, map } from 'rxjs/operators';
+import { throttleTime, tap, map } from 'rxjs';
 import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { MonitoringStats } from '../monitoring';
 import { TaskManagerConfig } from '../config';
diff --git a/x-pack/plugins/task_manager/server/routes/health.ts b/x-pack/plugins/task_manager/server/routes/health.ts
index f6c6dfb88aad4..013fa1e4a06aa 100644
--- a/x-pack/plugins/task_manager/server/routes/health.ts
+++ b/x-pack/plugins/task_manager/server/routes/health.ts
@@ -14,8 +14,8 @@ import {
 } from '@kbn/core/server';
 import { IClusterClient, DocLinksServiceSetup } from '@kbn/core/server';
 import { Observable, Subject } from 'rxjs';
-import { tap, map, filter } from 'rxjs/operators';
-import { throttleTime } from 'rxjs/operators';
+import { tap, map, filter } from 'rxjs';
+import { throttleTime } from 'rxjs';
 import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { Logger, ServiceStatus, ServiceStatusLevels } from '@kbn/core/server';
 import {
diff --git a/x-pack/plugins/task_manager/server/task_claimers/strategy_default.test.ts b/x-pack/plugins/task_manager/server/task_claimers/strategy_default.test.ts
index d6911b1b67e20..bb511cdc0958f 100644
--- a/x-pack/plugins/task_manager/server/task_claimers/strategy_default.test.ts
+++ b/x-pack/plugins/task_manager/server/task_claimers/strategy_default.test.ts
@@ -7,7 +7,7 @@
 
 import _ from 'lodash';
 import { v1 as uuidv1, v4 as uuidv4 } from 'uuid';
-import { filter, take, toArray } from 'rxjs/operators';
+import { filter, take, toArray } from 'rxjs';
 
 import { TaskStatus, ConcreteTaskInstance, TaskPriority } from '../task';
 import { SearchOpts, StoreOpts, UpdateByQueryOpts, UpdateByQuerySearchOpts } from '../task_store';
diff --git a/x-pack/plugins/task_manager/server/task_claimers/strategy_default.ts b/x-pack/plugins/task_manager/server/task_claimers/strategy_default.ts
index 93101b19cd77f..765be571eeb5d 100644
--- a/x-pack/plugins/task_manager/server/task_claimers/strategy_default.ts
+++ b/x-pack/plugins/task_manager/server/task_claimers/strategy_default.ts
@@ -12,7 +12,7 @@ import type { estypes } from '@elastic/elasticsearch';
 import apm from 'elastic-apm-node';
 import minimatch from 'minimatch';
 import { Subject, Observable, from, of } from 'rxjs';
-import { mergeScan } from 'rxjs/operators';
+import { mergeScan } from 'rxjs';
 import { groupBy, pick } from 'lodash';
 
 import { asOk } from '../lib/result_type';
diff --git a/x-pack/plugins/task_manager/server/task_scheduling.ts b/x-pack/plugins/task_manager/server/task_scheduling.ts
index c0e28a5fae3bd..7cb13182820b7 100644
--- a/x-pack/plugins/task_manager/server/task_scheduling.ts
+++ b/x-pack/plugins/task_manager/server/task_scheduling.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { filter, take } from 'rxjs/operators';
+import { filter, take } from 'rxjs';
 import pMap from 'p-map';
 import { SavedObjectError } from '@kbn/core-saved-objects-common';
 
diff --git a/x-pack/plugins/task_manager/server/task_store.test.ts b/x-pack/plugins/task_manager/server/task_store.test.ts
index a712cc5814a7d..69179366d574f 100644
--- a/x-pack/plugins/task_manager/server/task_store.test.ts
+++ b/x-pack/plugins/task_manager/server/task_store.test.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 import { Client } from '@elastic/elasticsearch';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import _ from 'lodash';
-import { first } from 'rxjs/operators';
+import { first } from 'rxjs';
 
 import {
   TaskInstance,
diff --git a/x-pack/plugins/threat_intelligence/server/search_strategy.ts b/x-pack/plugins/threat_intelligence/server/search_strategy.ts
index 0ea7a7a9458a8..ebd50c16425fc 100644
--- a/x-pack/plugins/threat_intelligence/server/search_strategy.ts
+++ b/x-pack/plugins/threat_intelligence/server/search_strategy.ts
@@ -11,7 +11,7 @@ import {
   ISearchRequestParams,
 } from '@kbn/data-plugin/common';
 import { ISearchStrategy, PluginStart, shimHitsTotal } from '@kbn/data-plugin/server';
-import { map } from 'rxjs/operators';
+import { map } from 'rxjs';
 import { BARCHART_AGGREGATION_NAME, FactoryQueryType } from '../common/constants';
 import { RawIndicatorFieldId } from '../common/types/indicator';
 import { calculateBarchartColumnTimeInterval } from './utils/calculate_barchart_time_interval';
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
index 2f52dd9e224f2..73875f8295933 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/eql/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { map, mergeMap } from 'rxjs/operators';
+import { map, mergeMap } from 'rxjs';
 import { ISearchStrategy, PluginStart, shimHitsTotal } from '@kbn/data-plugin/server';
 import { EqlSearchStrategyResponse, EQL_SEARCH_STRATEGY } from '@kbn/data-plugin/common';
 import { TimelineEqlRequestOptions } from '../../../../common/api/search_strategy';
diff --git a/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts b/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
index 2281109863976..6c06b34a0fdd3 100644
--- a/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
+++ b/x-pack/plugins/timelines/server/search_strategy/timeline/index.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { map, mergeMap } from 'rxjs/operators';
+import { map, mergeMap } from 'rxjs';
 import {
   ISearchStrategy,
   PluginStart,
diff --git a/x-pack/plugins/transform/public/alerting/transform_alerting_flyout.tsx b/x-pack/plugins/transform/public/alerting/transform_alerting_flyout.tsx
index 0267c4ee46468..e83ecfa606762 100644
--- a/x-pack/plugins/transform/public/alerting/transform_alerting_flyout.tsx
+++ b/x-pack/plugins/transform/public/alerting/transform_alerting_flyout.tsx
@@ -10,7 +10,7 @@ import React, { createContext, useContext, useMemo } from 'react';
 import { memoize } from 'lodash';
 import type { Observable } from 'rxjs';
 import { BehaviorSubject } from 'rxjs';
-import { pluck } from 'rxjs/operators';
+import { pluck } from 'rxjs';
 import useObservable from 'react-use/lib/useObservable';
 import { useAppDependencies } from '../app/app_dependencies';
 import type {
diff --git a/x-pack/plugins/watcher/public/plugin.ts b/x-pack/plugins/watcher/public/plugin.ts
index e5e6dd1b4d4c0..43c17aac84fea 100644
--- a/x-pack/plugins/watcher/public/plugin.ts
+++ b/x-pack/plugins/watcher/public/plugin.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { CoreSetup, Plugin, CoreStart, Capabilities } from '@kbn/core/public';
-import { first, map, skip } from 'rxjs/operators';
+import { first, map, skip } from 'rxjs';
 import { Subject, combineLatest } from 'rxjs';
 
 import type { FeatureCatalogueEntry } from '@kbn/home-plugin/public';
diff --git a/x-pack/test/functional_enterprise_search/enterprise_search_server.ts b/x-pack/test/functional_enterprise_search/enterprise_search_server.ts
index 2f9eacff934d8..4812912809433 100644
--- a/x-pack/test/functional_enterprise_search/enterprise_search_server.ts
+++ b/x-pack/test/functional_enterprise_search/enterprise_search_server.ts
@@ -10,7 +10,7 @@ import { spawn, ChildProcess } from 'child_process';
 import { observeLines } from '@kbn/stdio-dev-helpers';
 import { ToolingLog } from '@kbn/tooling-log';
 import * as Rx from 'rxjs';
-import { filter, take, map, tap } from 'rxjs/operators';
+import { filter, take, map, tap } from 'rxjs';
 import { getLatestVersion } from './artifact_manager';
 
 let enterpriseSearchProcess: ChildProcess | undefined;
diff --git a/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts b/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
index b203006c60b6b..6efd535b9f0cf 100644
--- a/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
+++ b/x-pack/test/plugin_functional/plugins/global_search_test/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { map, reduce } from 'rxjs/operators';
+import { map, reduce } from 'rxjs';
 import { Plugin, CoreSetup, CoreStart, AppMountParameters } from '@kbn/core/public';
 import { lastValueFrom } from 'rxjs';
 import {
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
index 8db27a6817a80..4058d18862d91 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import * as Rx from 'rxjs';
 import { lastValueFrom } from 'rxjs';
-import { filter, first, map, switchMap, tap, timeout } from 'rxjs/operators';
+import { filter, first, map, switchMap, tap, timeout } from 'rxjs';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/test/security_functional/plugins/test_endpoints/public/plugin.tsx b/x-pack/test/security_functional/plugins/test_endpoints/public/plugin.tsx
index 57879cd2520d1..716187792615d 100644
--- a/x-pack/test/security_functional/plugins/test_endpoints/public/plugin.tsx
+++ b/x-pack/test/security_functional/plugins/test_endpoints/public/plugin.tsx
@@ -8,7 +8,7 @@
 import type { CoreSetup, Plugin } from '@kbn/core/public';
 import ReactDOM from 'react-dom';
 import React from 'react';
-import { debounce, filter, first } from 'rxjs/operators';
+import { debounce, filter, first } from 'rxjs';
 import { timer } from 'rxjs';
 import { SecurityPluginStart } from '@kbn/security-plugin/public';
 

From 0cc84c17e95a1bd453e05c97f6c603a663228cfb Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Tue, 2 Apr 2024 15:11:33 -0400
Subject: [PATCH 46/63] [ES|QL] Update grammars (#179850)

This PR updates the ES|QL grammars (lexer and parser) to match the
latest version in Elasticsearch.

---------

Co-authored-by: Drew Tate <andrew.tate@elastic.co>
---
 packages/kbn-esql-ast/src/antlr/esql_lexer.g4 |    6 +-
 .../kbn-esql-ast/src/antlr/esql_lexer.interp  |   10 +-
 .../kbn-esql-ast/src/antlr/esql_lexer.tokens  |   94 +-
 packages/kbn-esql-ast/src/antlr/esql_lexer.ts |  815 ++++-----
 .../kbn-esql-ast/src/antlr/esql_parser.g4     |   21 +-
 .../kbn-esql-ast/src/antlr/esql_parser.interp |   10 +-
 .../kbn-esql-ast/src/antlr/esql_parser.tokens |   94 +-
 .../kbn-esql-ast/src/antlr/esql_parser.ts     | 1480 +++++++++--------
 .../src/antlr/esql_parser_listener.ts         |   44 +-
 packages/kbn-esql-ast/src/ast_walker.ts       |   10 +-
 .../src/code_actions/actions.ts               |    2 +-
 .../esql_validation_meta_tests.json           |   54 +-
 .../src/validation/validation.test.ts         |   46 +-
 13 files changed, 1454 insertions(+), 1232 deletions(-)

diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.g4 b/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
index c116f045a19a8..248426ed52359 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
@@ -99,7 +99,7 @@ fragment UNQUOTED_ID_BODY
     : (LETTER | DIGIT | UNDERSCORE)
     ;
 
-STRING
+QUOTED_STRING
     : '"' (ESCAPE_SEQUENCE | UNESCAPED_CHARS)* '"'
     | '"""' (~[\r\n])*? '"""' '"'? '"'?
     ;
@@ -196,8 +196,10 @@ FROM_OPENING_BRACKET : OPENING_BRACKET -> type(OPENING_BRACKET);
 FROM_CLOSING_BRACKET : CLOSING_BRACKET -> type(CLOSING_BRACKET);
 FROM_COMMA : COMMA -> type(COMMA);
 FROM_ASSIGN : ASSIGN -> type(ASSIGN);
+FROM_QUOTED_STRING : QUOTED_STRING -> type(QUOTED_STRING);
 
-METADATA: 'metadata';
+OPTIONS : 'options';
+METADATA : 'metadata';
 
 fragment FROM_UNQUOTED_IDENTIFIER_PART
     : ~[=`|,[\]/ \t\r\n]
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.interp b/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
index ecf5ef0f4ffd5..3e9d190a45634 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
@@ -70,6 +70,7 @@ null
 null
 null
 null
+'options'
 'metadata'
 null
 null
@@ -137,7 +138,7 @@ EXPLAIN_WS
 EXPLAIN_LINE_COMMENT
 EXPLAIN_MULTILINE_COMMENT
 PIPE
-STRING
+QUOTED_STRING
 INTEGER_LITERAL
 DECIMAL_LITERAL
 BY
@@ -181,6 +182,7 @@ QUOTED_IDENTIFIER
 EXPR_LINE_COMMENT
 EXPR_MULTILINE_COMMENT
 EXPR_WS
+OPTIONS
 METADATA
 FROM_UNQUOTED_IDENTIFIER
 FROM_LINE_COMMENT
@@ -259,7 +261,7 @@ BACKQUOTE
 BACKQUOTE_BLOCK
 UNDERSCORE
 UNQUOTED_ID_BODY
-STRING
+QUOTED_STRING
 INTEGER_LITERAL
 DECIMAL_LITERAL
 BY
@@ -309,6 +311,8 @@ FROM_OPENING_BRACKET
 FROM_CLOSING_BRACKET
 FROM_COMMA
 FROM_ASSIGN
+FROM_QUOTED_STRING
+OPTIONS
 METADATA
 FROM_UNQUOTED_IDENTIFIER_PART
 FROM_UNQUOTED_IDENTIFIER
@@ -398,4 +402,4 @@ META_MODE
 SETTING_MODE
 
 atn:
-[4, 0, 108, 1182, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 2, 81, 7, 81, 2, 82, 7, 82, 2, 83, 7, 83, 2, 84, 7, 84, 2, 85, 7, 85, 2, 86, 7, 86, 2, 87, 7, 87, 2, 88, 7, 88, 2, 89, 7, 89, 2, 90, 7, 90, 2, 91, 7, 91, 2, 92, 7, 92, 2, 93, 7, 93, 2, 94, 7, 94, 2, 95, 7, 95, 2, 96, 7, 96, 2, 97, 7, 97, 2, 98, 7, 98, 2, 99, 7, 99, 2, 100, 7, 100, 2, 101, 7, 101, 2, 102, 7, 102, 2, 103, 7, 103, 2, 104, 7, 104, 2, 105, 7, 105, 2, 106, 7, 106, 2, 107, 7, 107, 2, 108, 7, 108, 2, 109, 7, 109, 2, 110, 7, 110, 2, 111, 7, 111, 2, 112, 7, 112, 2, 113, 7, 113, 2, 114, 7, 114, 2, 115, 7, 115, 2, 116, 7, 116, 2, 117, 7, 117, 2, 118, 7, 118, 2, 119, 7, 119, 2, 120, 7, 120, 2, 121, 7, 121, 2, 122, 7, 122, 2, 123, 7, 123, 2, 124, 7, 124, 2, 125, 7, 125, 2, 126, 7, 126, 2, 127, 7, 127, 2, 128, 7, 128, 2, 129, 7, 129, 2, 130, 7, 130, 2, 131, 7, 131, 2, 132, 7, 132, 2, 133, 7, 133, 2, 134, 7, 134, 2, 135, 7, 135, 2, 136, 7, 136, 2, 137, 7, 137, 2, 138, 7, 138, 2, 139, 7, 139, 2, 140, 7, 140, 2, 141, 7, 141, 2, 142, 7, 142, 2, 143, 7, 143, 2, 144, 7, 144, 2, 145, 7, 145, 2, 146, 7, 146, 2, 147, 7, 147, 2, 148, 7, 148, 2, 149, 7, 149, 2, 150, 7, 150, 2, 151, 7, 151, 2, 152, 7, 152, 2, 153, 7, 153, 2, 154, 7, 154, 2, 155, 7, 155, 2, 156, 7, 156, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 4, 18, 478, 8, 18, 11, 18, 12, 18, 479, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 5, 19, 488, 8, 19, 10, 19, 12, 19, 491, 9, 19, 1, 19, 3, 19, 494, 8, 19, 1, 19, 3, 19, 497, 8, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 5, 20, 506, 8, 20, 10, 20, 12, 20, 509, 9, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 4, 21, 517, 8, 21, 11, 21, 12, 21, 518, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 3, 32, 560, 8, 32, 1, 32, 4, 32, 563, 8, 32, 11, 32, 12, 32, 564, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 3, 35, 574, 8, 35, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 3, 37, 581, 8, 37, 1, 38, 1, 38, 1, 38, 5, 38, 586, 8, 38, 10, 38, 12, 38, 589, 9, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 5, 38, 597, 8, 38, 10, 38, 12, 38, 600, 9, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 3, 38, 607, 8, 38, 1, 38, 3, 38, 610, 8, 38, 3, 38, 612, 8, 38, 1, 39, 4, 39, 615, 8, 39, 11, 39, 12, 39, 616, 1, 40, 4, 40, 620, 8, 40, 11, 40, 12, 40, 621, 1, 40, 1, 40, 5, 40, 626, 8, 40, 10, 40, 12, 40, 629, 9, 40, 1, 40, 1, 40, 4, 40, 633, 8, 40, 11, 40, 12, 40, 634, 1, 40, 4, 40, 638, 8, 40, 11, 40, 12, 40, 639, 1, 40, 1, 40, 5, 40, 644, 8, 40, 10, 40, 12, 40, 647, 9, 40, 3, 40, 649, 8, 40, 1, 40, 1, 40, 1, 40, 1, 40, 4, 40, 655, 8, 40, 11, 40, 12, 40, 656, 1, 40, 1, 40, 3, 40, 661, 8, 40, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 1, 56, 1, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 59, 1, 59, 1, 60, 1, 60, 1, 60, 1, 60, 1, 60, 1, 60, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 63, 1, 63, 1, 63, 1, 64, 1, 64, 1, 64, 1, 65, 1, 65, 1, 65, 1, 66, 1, 66, 1, 67, 1, 67, 1, 67, 1, 68, 1, 68, 1, 69, 1, 69, 1, 69, 1, 70, 1, 70, 1, 71, 1, 71, 1, 72, 1, 72, 1, 73, 1, 73, 1, 74, 1, 74, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 76, 1, 76, 1, 76, 1, 76, 1, 76, 1, 77, 1, 77, 5, 77, 789, 8, 77, 10, 77, 12, 77, 792, 9, 77, 1, 77, 1, 77, 3, 77, 796, 8, 77, 1, 77, 4, 77, 799, 8, 77, 11, 77, 12, 77, 800, 3, 77, 803, 8, 77, 1, 78, 1, 78, 4, 78, 807, 8, 78, 11, 78, 12, 78, 808, 1, 78, 1, 78, 1, 79, 1, 79, 1, 80, 1, 80, 1, 80, 1, 80, 1, 81, 1, 81, 1, 81, 1, 81, 1, 82, 1, 82, 1, 82, 1, 82, 1, 83, 1, 83, 1, 83, 1, 83, 1, 83, 1, 84, 1, 84, 1, 84, 1, 84, 1, 85, 1, 85, 1, 85, 1, 85, 1, 86, 1, 86, 1, 86, 1, 86, 1, 87, 1, 87, 1, 87, 1, 87, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 88, 1, 89, 1, 89, 1, 89, 3, 89, 860, 8, 89, 1, 90, 4, 90, 863, 8, 90, 11, 90, 12, 90, 864, 1, 91, 1, 91, 1, 91, 1, 91, 1, 92, 1, 92, 1, 92, 1, 92, 1, 93, 1, 93, 1, 93, 1, 93, 1, 94, 1, 94, 1, 94, 1, 94, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 96, 1, 96, 1, 96, 1, 96, 1, 97, 1, 97, 1, 97, 1, 97, 1, 98, 1, 98, 1, 98, 1, 98, 3, 98, 900, 8, 98, 1, 99, 1, 99, 3, 99, 904, 8, 99, 1, 99, 5, 99, 907, 8, 99, 10, 99, 12, 99, 910, 9, 99, 1, 99, 1, 99, 3, 99, 914, 8, 99, 1, 99, 4, 99, 917, 8, 99, 11, 99, 12, 99, 918, 3, 99, 921, 8, 99, 1, 100, 1, 100, 4, 100, 925, 8, 100, 11, 100, 12, 100, 926, 1, 101, 1, 101, 1, 101, 1, 101, 1, 102, 1, 102, 1, 102, 1, 102, 1, 103, 1, 103, 1, 103, 1, 103, 1, 104, 1, 104, 1, 104, 1, 104, 1, 104, 1, 105, 1, 105, 1, 105, 1, 105, 1, 106, 1, 106, 1, 106, 1, 106, 1, 107, 1, 107, 1, 107, 1, 107, 1, 108, 1, 108, 1, 108, 1, 109, 1, 109, 1, 109, 1, 109, 1, 110, 1, 110, 1, 110, 1, 110, 1, 111, 1, 111, 1, 111, 1, 111, 1, 112, 1, 112, 1, 112, 1, 112, 1, 113, 1, 113, 1, 113, 1, 113, 1, 113, 1, 114, 1, 114, 1, 114, 1, 114, 1, 114, 1, 115, 1, 115, 1, 115, 1, 115, 1, 115, 1, 116, 1, 116, 1, 116, 1, 116, 1, 116, 1, 116, 1, 116, 1, 117, 1, 117, 1, 118, 4, 118, 1002, 8, 118, 11, 118, 12, 118, 1003, 1, 118, 1, 118, 3, 118, 1008, 8, 118, 1, 118, 4, 118, 1011, 8, 118, 11, 118, 12, 118, 1012, 1, 119, 1, 119, 1, 119, 1, 119, 1, 120, 1, 120, 1, 120, 1, 120, 1, 121, 1, 121, 1, 121, 1, 121, 1, 122, 1, 122, 1, 122, 1, 122, 1, 123, 1, 123, 1, 123, 1, 123, 1, 124, 1, 124, 1, 124, 1, 124, 1, 124, 1, 124, 1, 125, 1, 125, 1, 125, 1, 125, 1, 126, 1, 126, 1, 126, 1, 126, 1, 127, 1, 127, 1, 127, 1, 127, 1, 128, 1, 128, 1, 128, 1, 128, 1, 129, 1, 129, 1, 129, 1, 129, 1, 130, 1, 130, 1, 130, 1, 130, 1, 131, 1, 131, 1, 131, 1, 131, 1, 132, 1, 132, 1, 132, 1, 132, 1, 133, 1, 133, 1, 133, 1, 133, 1, 134, 1, 134, 1, 134, 1, 134, 1, 134, 1, 135, 1, 135, 1, 135, 1, 135, 1, 136, 1, 136, 1, 136, 1, 136, 1, 137, 1, 137, 1, 137, 1, 137, 1, 138, 1, 138, 1, 138, 1, 138, 1, 139, 1, 139, 1, 139, 1, 139, 1, 140, 1, 140, 1, 140, 1, 140, 1, 141, 1, 141, 1, 141, 1, 141, 1, 141, 1, 142, 1, 142, 1, 142, 1, 142, 1, 142, 1, 143, 1, 143, 1, 143, 1, 143, 1, 144, 1, 144, 1, 144, 1, 144, 1, 145, 1, 145, 1, 145, 1, 145, 1, 146, 1, 146, 1, 146, 1, 146, 1, 146, 1, 147, 1, 147, 1, 147, 1, 147, 1, 147, 1, 147, 1, 147, 1, 147, 1, 147, 1, 147, 1, 148, 1, 148, 1, 148, 1, 148, 1, 149, 1, 149, 1, 149, 1, 149, 1, 150, 1, 150, 1, 150, 1, 150, 1, 151, 1, 151, 1, 151, 1, 151, 1, 151, 1, 152, 1, 152, 1, 153, 1, 153, 1, 153, 1, 153, 1, 153, 4, 153, 1167, 8, 153, 11, 153, 12, 153, 1168, 1, 154, 1, 154, 1, 154, 1, 154, 1, 155, 1, 155, 1, 155, 1, 155, 1, 156, 1, 156, 1, 156, 1, 156, 2, 507, 598, 0, 157, 12, 1, 14, 2, 16, 3, 18, 4, 20, 5, 22, 6, 24, 7, 26, 8, 28, 9, 30, 10, 32, 11, 34, 12, 36, 13, 38, 14, 40, 15, 42, 16, 44, 17, 46, 18, 48, 19, 50, 20, 52, 21, 54, 22, 56, 0, 58, 0, 60, 23, 62, 24, 64, 25, 66, 26, 68, 0, 70, 0, 72, 0, 74, 0, 76, 0, 78, 0, 80, 0, 82, 0, 84, 0, 86, 0, 88, 27, 90, 28, 92, 29, 94, 30, 96, 31, 98, 32, 100, 33, 102, 34, 104, 35, 106, 36, 108, 37, 110, 38, 112, 39, 114, 40, 116, 41, 118, 42, 120, 43, 122, 44, 124, 45, 126, 46, 128, 47, 130, 48, 132, 49, 134, 50, 136, 51, 138, 52, 140, 53, 142, 54, 144, 55, 146, 56, 148, 57, 150, 58, 152, 59, 154, 60, 156, 61, 158, 62, 160, 63, 162, 64, 164, 65, 166, 66, 168, 0, 170, 67, 172, 68, 174, 69, 176, 70, 178, 0, 180, 0, 182, 0, 184, 0, 186, 0, 188, 71, 190, 0, 192, 72, 194, 0, 196, 73, 198, 74, 200, 75, 202, 0, 204, 0, 206, 0, 208, 0, 210, 0, 212, 76, 214, 77, 216, 78, 218, 79, 220, 0, 222, 0, 224, 0, 226, 0, 228, 80, 230, 0, 232, 81, 234, 82, 236, 83, 238, 0, 240, 0, 242, 84, 244, 85, 246, 0, 248, 86, 250, 0, 252, 0, 254, 87, 256, 88, 258, 89, 260, 0, 262, 0, 264, 0, 266, 0, 268, 0, 270, 0, 272, 0, 274, 90, 276, 91, 278, 92, 280, 0, 282, 0, 284, 0, 286, 0, 288, 93, 290, 94, 292, 95, 294, 0, 296, 96, 298, 97, 300, 98, 302, 99, 304, 0, 306, 100, 308, 101, 310, 102, 312, 103, 314, 0, 316, 104, 318, 105, 320, 106, 322, 107, 324, 108, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 35, 2, 0, 68, 68, 100, 100, 2, 0, 73, 73, 105, 105, 2, 0, 83, 83, 115, 115, 2, 0, 69, 69, 101, 101, 2, 0, 67, 67, 99, 99, 2, 0, 84, 84, 116, 116, 2, 0, 82, 82, 114, 114, 2, 0, 79, 79, 111, 111, 2, 0, 80, 80, 112, 112, 2, 0, 78, 78, 110, 110, 2, 0, 72, 72, 104, 104, 2, 0, 86, 86, 118, 118, 2, 0, 65, 65, 97, 97, 2, 0, 76, 76, 108, 108, 2, 0, 88, 88, 120, 120, 2, 0, 70, 70, 102, 102, 2, 0, 77, 77, 109, 109, 2, 0, 71, 71, 103, 103, 2, 0, 75, 75, 107, 107, 2, 0, 87, 87, 119, 119, 6, 0, 9, 10, 13, 13, 32, 32, 47, 47, 91, 91, 93, 93, 2, 0, 10, 10, 13, 13, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 2, 0, 65, 90, 97, 122, 8, 0, 34, 34, 78, 78, 82, 82, 84, 84, 92, 92, 110, 110, 114, 114, 116, 116, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 2, 0, 43, 43, 45, 45, 1, 0, 96, 96, 2, 0, 66, 66, 98, 98, 2, 0, 89, 89, 121, 121, 2, 0, 85, 85, 117, 117, 10, 0, 9, 10, 13, 13, 32, 32, 44, 44, 47, 47, 61, 61, 91, 91, 93, 93, 96, 96, 124, 124, 2, 0, 42, 42, 47, 47, 11, 0, 9, 10, 13, 13, 32, 32, 34, 35, 44, 44, 47, 47, 58, 58, 60, 60, 62, 63, 92, 92, 124, 124, 1209, 0, 12, 1, 0, 0, 0, 0, 14, 1, 0, 0, 0, 0, 16, 1, 0, 0, 0, 0, 18, 1, 0, 0, 0, 0, 20, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 24, 1, 0, 0, 0, 0, 26, 1, 0, 0, 0, 0, 28, 1, 0, 0, 0, 0, 30, 1, 0, 0, 0, 0, 32, 1, 0, 0, 0, 0, 34, 1, 0, 0, 0, 0, 36, 1, 0, 0, 0, 0, 38, 1, 0, 0, 0, 0, 40, 1, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 46, 1, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 50, 1, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 54, 1, 0, 0, 0, 1, 56, 1, 0, 0, 0, 1, 58, 1, 0, 0, 0, 1, 60, 1, 0, 0, 0, 1, 62, 1, 0, 0, 0, 1, 64, 1, 0, 0, 0, 2, 66, 1, 0, 0, 0, 2, 88, 1, 0, 0, 0, 2, 90, 1, 0, 0, 0, 2, 92, 1, 0, 0, 0, 2, 94, 1, 0, 0, 0, 2, 96, 1, 0, 0, 0, 2, 98, 1, 0, 0, 0, 2, 100, 1, 0, 0, 0, 2, 102, 1, 0, 0, 0, 2, 104, 1, 0, 0, 0, 2, 106, 1, 0, 0, 0, 2, 108, 1, 0, 0, 0, 2, 110, 1, 0, 0, 0, 2, 112, 1, 0, 0, 0, 2, 114, 1, 0, 0, 0, 2, 116, 1, 0, 0, 0, 2, 118, 1, 0, 0, 0, 2, 120, 1, 0, 0, 0, 2, 122, 1, 0, 0, 0, 2, 124, 1, 0, 0, 0, 2, 126, 1, 0, 0, 0, 2, 128, 1, 0, 0, 0, 2, 130, 1, 0, 0, 0, 2, 132, 1, 0, 0, 0, 2, 134, 1, 0, 0, 0, 2, 136, 1, 0, 0, 0, 2, 138, 1, 0, 0, 0, 2, 140, 1, 0, 0, 0, 2, 142, 1, 0, 0, 0, 2, 144, 1, 0, 0, 0, 2, 146, 1, 0, 0, 0, 2, 148, 1, 0, 0, 0, 2, 150, 1, 0, 0, 0, 2, 152, 1, 0, 0, 0, 2, 154, 1, 0, 0, 0, 2, 156, 1, 0, 0, 0, 2, 158, 1, 0, 0, 0, 2, 160, 1, 0, 0, 0, 2, 162, 1, 0, 0, 0, 2, 164, 1, 0, 0, 0, 2, 166, 1, 0, 0, 0, 2, 170, 1, 0, 0, 0, 2, 172, 1, 0, 0, 0, 2, 174, 1, 0, 0, 0, 2, 176, 1, 0, 0, 0, 3, 178, 1, 0, 0, 0, 3, 180, 1, 0, 0, 0, 3, 182, 1, 0, 0, 0, 3, 184, 1, 0, 0, 0, 3, 186, 1, 0, 0, 0, 3, 188, 1, 0, 0, 0, 3, 192, 1, 0, 0, 0, 3, 194, 1, 0, 0, 0, 3, 196, 1, 0, 0, 0, 3, 198, 1, 0, 0, 0, 3, 200, 1, 0, 0, 0, 4, 202, 1, 0, 0, 0, 4, 204, 1, 0, 0, 0, 4, 206, 1, 0, 0, 0, 4, 212, 1, 0, 0, 0, 4, 214, 1, 0, 0, 0, 4, 216, 1, 0, 0, 0, 4, 218, 1, 0, 0, 0, 5, 220, 1, 0, 0, 0, 5, 222, 1, 0, 0, 0, 5, 224, 1, 0, 0, 0, 5, 226, 1, 0, 0, 0, 5, 228, 1, 0, 0, 0, 5, 230, 1, 0, 0, 0, 5, 232, 1, 0, 0, 0, 5, 234, 1, 0, 0, 0, 5, 236, 1, 0, 0, 0, 6, 238, 1, 0, 0, 0, 6, 240, 1, 0, 0, 0, 6, 242, 1, 0, 0, 0, 6, 244, 1, 0, 0, 0, 6, 248, 1, 0, 0, 0, 6, 250, 1, 0, 0, 0, 6, 252, 1, 0, 0, 0, 6, 254, 1, 0, 0, 0, 6, 256, 1, 0, 0, 0, 6, 258, 1, 0, 0, 0, 7, 260, 1, 0, 0, 0, 7, 262, 1, 0, 0, 0, 7, 264, 1, 0, 0, 0, 7, 266, 1, 0, 0, 0, 7, 268, 1, 0, 0, 0, 7, 270, 1, 0, 0, 0, 7, 272, 1, 0, 0, 0, 7, 274, 1, 0, 0, 0, 7, 276, 1, 0, 0, 0, 7, 278, 1, 0, 0, 0, 8, 280, 1, 0, 0, 0, 8, 282, 1, 0, 0, 0, 8, 284, 1, 0, 0, 0, 8, 286, 1, 0, 0, 0, 8, 288, 1, 0, 0, 0, 8, 290, 1, 0, 0, 0, 8, 292, 1, 0, 0, 0, 9, 294, 1, 0, 0, 0, 9, 296, 1, 0, 0, 0, 9, 298, 1, 0, 0, 0, 9, 300, 1, 0, 0, 0, 9, 302, 1, 0, 0, 0, 10, 304, 1, 0, 0, 0, 10, 306, 1, 0, 0, 0, 10, 308, 1, 0, 0, 0, 10, 310, 1, 0, 0, 0, 10, 312, 1, 0, 0, 0, 11, 314, 1, 0, 0, 0, 11, 316, 1, 0, 0, 0, 11, 318, 1, 0, 0, 0, 11, 320, 1, 0, 0, 0, 11, 322, 1, 0, 0, 0, 11, 324, 1, 0, 0, 0, 12, 326, 1, 0, 0, 0, 14, 336, 1, 0, 0, 0, 16, 343, 1, 0, 0, 0, 18, 352, 1, 0, 0, 0, 20, 359, 1, 0, 0, 0, 22, 369, 1, 0, 0, 0, 24, 376, 1, 0, 0, 0, 26, 383, 1, 0, 0, 0, 28, 397, 1, 0, 0, 0, 30, 404, 1, 0, 0, 0, 32, 412, 1, 0, 0, 0, 34, 419, 1, 0, 0, 0, 36, 431, 1, 0, 0, 0, 38, 440, 1, 0, 0, 0, 40, 446, 1, 0, 0, 0, 42, 453, 1, 0, 0, 0, 44, 460, 1, 0, 0, 0, 46, 468, 1, 0, 0, 0, 48, 477, 1, 0, 0, 0, 50, 483, 1, 0, 0, 0, 52, 500, 1, 0, 0, 0, 54, 516, 1, 0, 0, 0, 56, 522, 1, 0, 0, 0, 58, 527, 1, 0, 0, 0, 60, 532, 1, 0, 0, 0, 62, 536, 1, 0, 0, 0, 64, 540, 1, 0, 0, 0, 66, 544, 1, 0, 0, 0, 68, 548, 1, 0, 0, 0, 70, 550, 1, 0, 0, 0, 72, 552, 1, 0, 0, 0, 74, 555, 1, 0, 0, 0, 76, 557, 1, 0, 0, 0, 78, 566, 1, 0, 0, 0, 80, 568, 1, 0, 0, 0, 82, 573, 1, 0, 0, 0, 84, 575, 1, 0, 0, 0, 86, 580, 1, 0, 0, 0, 88, 611, 1, 0, 0, 0, 90, 614, 1, 0, 0, 0, 92, 660, 1, 0, 0, 0, 94, 662, 1, 0, 0, 0, 96, 665, 1, 0, 0, 0, 98, 669, 1, 0, 0, 0, 100, 673, 1, 0, 0, 0, 102, 675, 1, 0, 0, 0, 104, 677, 1, 0, 0, 0, 106, 682, 1, 0, 0, 0, 108, 684, 1, 0, 0, 0, 110, 690, 1, 0, 0, 0, 112, 696, 1, 0, 0, 0, 114, 701, 1, 0, 0, 0, 116, 703, 1, 0, 0, 0, 118, 706, 1, 0, 0, 0, 120, 709, 1, 0, 0, 0, 122, 714, 1, 0, 0, 0, 124, 718, 1, 0, 0, 0, 126, 723, 1, 0, 0, 0, 128, 729, 1, 0, 0, 0, 130, 732, 1, 0, 0, 0, 132, 734, 1, 0, 0, 0, 134, 740, 1, 0, 0, 0, 136, 742, 1, 0, 0, 0, 138, 747, 1, 0, 0, 0, 140, 750, 1, 0, 0, 0, 142, 753, 1, 0, 0, 0, 144, 756, 1, 0, 0, 0, 146, 758, 1, 0, 0, 0, 148, 761, 1, 0, 0, 0, 150, 763, 1, 0, 0, 0, 152, 766, 1, 0, 0, 0, 154, 768, 1, 0, 0, 0, 156, 770, 1, 0, 0, 0, 158, 772, 1, 0, 0, 0, 160, 774, 1, 0, 0, 0, 162, 776, 1, 0, 0, 0, 164, 781, 1, 0, 0, 0, 166, 802, 1, 0, 0, 0, 168, 804, 1, 0, 0, 0, 170, 812, 1, 0, 0, 0, 172, 814, 1, 0, 0, 0, 174, 818, 1, 0, 0, 0, 176, 822, 1, 0, 0, 0, 178, 826, 1, 0, 0, 0, 180, 831, 1, 0, 0, 0, 182, 835, 1, 0, 0, 0, 184, 839, 1, 0, 0, 0, 186, 843, 1, 0, 0, 0, 188, 847, 1, 0, 0, 0, 190, 859, 1, 0, 0, 0, 192, 862, 1, 0, 0, 0, 194, 866, 1, 0, 0, 0, 196, 870, 1, 0, 0, 0, 198, 874, 1, 0, 0, 0, 200, 878, 1, 0, 0, 0, 202, 882, 1, 0, 0, 0, 204, 887, 1, 0, 0, 0, 206, 891, 1, 0, 0, 0, 208, 899, 1, 0, 0, 0, 210, 920, 1, 0, 0, 0, 212, 924, 1, 0, 0, 0, 214, 928, 1, 0, 0, 0, 216, 932, 1, 0, 0, 0, 218, 936, 1, 0, 0, 0, 220, 940, 1, 0, 0, 0, 222, 945, 1, 0, 0, 0, 224, 949, 1, 0, 0, 0, 226, 953, 1, 0, 0, 0, 228, 957, 1, 0, 0, 0, 230, 960, 1, 0, 0, 0, 232, 964, 1, 0, 0, 0, 234, 968, 1, 0, 0, 0, 236, 972, 1, 0, 0, 0, 238, 976, 1, 0, 0, 0, 240, 981, 1, 0, 0, 0, 242, 986, 1, 0, 0, 0, 244, 991, 1, 0, 0, 0, 246, 998, 1, 0, 0, 0, 248, 1007, 1, 0, 0, 0, 250, 1014, 1, 0, 0, 0, 252, 1018, 1, 0, 0, 0, 254, 1022, 1, 0, 0, 0, 256, 1026, 1, 0, 0, 0, 258, 1030, 1, 0, 0, 0, 260, 1034, 1, 0, 0, 0, 262, 1040, 1, 0, 0, 0, 264, 1044, 1, 0, 0, 0, 266, 1048, 1, 0, 0, 0, 268, 1052, 1, 0, 0, 0, 270, 1056, 1, 0, 0, 0, 272, 1060, 1, 0, 0, 0, 274, 1064, 1, 0, 0, 0, 276, 1068, 1, 0, 0, 0, 278, 1072, 1, 0, 0, 0, 280, 1076, 1, 0, 0, 0, 282, 1081, 1, 0, 0, 0, 284, 1085, 1, 0, 0, 0, 286, 1089, 1, 0, 0, 0, 288, 1093, 1, 0, 0, 0, 290, 1097, 1, 0, 0, 0, 292, 1101, 1, 0, 0, 0, 294, 1105, 1, 0, 0, 0, 296, 1110, 1, 0, 0, 0, 298, 1115, 1, 0, 0, 0, 300, 1119, 1, 0, 0, 0, 302, 1123, 1, 0, 0, 0, 304, 1127, 1, 0, 0, 0, 306, 1132, 1, 0, 0, 0, 308, 1142, 1, 0, 0, 0, 310, 1146, 1, 0, 0, 0, 312, 1150, 1, 0, 0, 0, 314, 1154, 1, 0, 0, 0, 316, 1159, 1, 0, 0, 0, 318, 1166, 1, 0, 0, 0, 320, 1170, 1, 0, 0, 0, 322, 1174, 1, 0, 0, 0, 324, 1178, 1, 0, 0, 0, 326, 327, 7, 0, 0, 0, 327, 328, 7, 1, 0, 0, 328, 329, 7, 2, 0, 0, 329, 330, 7, 2, 0, 0, 330, 331, 7, 3, 0, 0, 331, 332, 7, 4, 0, 0, 332, 333, 7, 5, 0, 0, 333, 334, 1, 0, 0, 0, 334, 335, 6, 0, 0, 0, 335, 13, 1, 0, 0, 0, 336, 337, 7, 0, 0, 0, 337, 338, 7, 6, 0, 0, 338, 339, 7, 7, 0, 0, 339, 340, 7, 8, 0, 0, 340, 341, 1, 0, 0, 0, 341, 342, 6, 1, 1, 0, 342, 15, 1, 0, 0, 0, 343, 344, 7, 3, 0, 0, 344, 345, 7, 9, 0, 0, 345, 346, 7, 6, 0, 0, 346, 347, 7, 1, 0, 0, 347, 348, 7, 4, 0, 0, 348, 349, 7, 10, 0, 0, 349, 350, 1, 0, 0, 0, 350, 351, 6, 2, 2, 0, 351, 17, 1, 0, 0, 0, 352, 353, 7, 3, 0, 0, 353, 354, 7, 11, 0, 0, 354, 355, 7, 12, 0, 0, 355, 356, 7, 13, 0, 0, 356, 357, 1, 0, 0, 0, 357, 358, 6, 3, 0, 0, 358, 19, 1, 0, 0, 0, 359, 360, 7, 3, 0, 0, 360, 361, 7, 14, 0, 0, 361, 362, 7, 8, 0, 0, 362, 363, 7, 13, 0, 0, 363, 364, 7, 12, 0, 0, 364, 365, 7, 1, 0, 0, 365, 366, 7, 9, 0, 0, 366, 367, 1, 0, 0, 0, 367, 368, 6, 4, 3, 0, 368, 21, 1, 0, 0, 0, 369, 370, 7, 15, 0, 0, 370, 371, 7, 6, 0, 0, 371, 372, 7, 7, 0, 0, 372, 373, 7, 16, 0, 0, 373, 374, 1, 0, 0, 0, 374, 375, 6, 5, 4, 0, 375, 23, 1, 0, 0, 0, 376, 377, 7, 17, 0, 0, 377, 378, 7, 6, 0, 0, 378, 379, 7, 7, 0, 0, 379, 380, 7, 18, 0, 0, 380, 381, 1, 0, 0, 0, 381, 382, 6, 6, 0, 0, 382, 25, 1, 0, 0, 0, 383, 384, 7, 1, 0, 0, 384, 385, 7, 9, 0, 0, 385, 386, 7, 13, 0, 0, 386, 387, 7, 1, 0, 0, 387, 388, 7, 9, 0, 0, 388, 389, 7, 3, 0, 0, 389, 390, 7, 2, 0, 0, 390, 391, 7, 5, 0, 0, 391, 392, 7, 12, 0, 0, 392, 393, 7, 5, 0, 0, 393, 394, 7, 2, 0, 0, 394, 395, 1, 0, 0, 0, 395, 396, 6, 7, 0, 0, 396, 27, 1, 0, 0, 0, 397, 398, 7, 18, 0, 0, 398, 399, 7, 3, 0, 0, 399, 400, 7, 3, 0, 0, 400, 401, 7, 8, 0, 0, 401, 402, 1, 0, 0, 0, 402, 403, 6, 8, 1, 0, 403, 29, 1, 0, 0, 0, 404, 405, 7, 13, 0, 0, 405, 406, 7, 1, 0, 0, 406, 407, 7, 16, 0, 0, 407, 408, 7, 1, 0, 0, 408, 409, 7, 5, 0, 0, 409, 410, 1, 0, 0, 0, 410, 411, 6, 9, 0, 0, 411, 31, 1, 0, 0, 0, 412, 413, 7, 16, 0, 0, 413, 414, 7, 3, 0, 0, 414, 415, 7, 5, 0, 0, 415, 416, 7, 12, 0, 0, 416, 417, 1, 0, 0, 0, 417, 418, 6, 10, 5, 0, 418, 33, 1, 0, 0, 0, 419, 420, 7, 16, 0, 0, 420, 421, 7, 11, 0, 0, 421, 422, 5, 95, 0, 0, 422, 423, 7, 3, 0, 0, 423, 424, 7, 14, 0, 0, 424, 425, 7, 8, 0, 0, 425, 426, 7, 12, 0, 0, 426, 427, 7, 9, 0, 0, 427, 428, 7, 0, 0, 0, 428, 429, 1, 0, 0, 0, 429, 430, 6, 11, 6, 0, 430, 35, 1, 0, 0, 0, 431, 432, 7, 6, 0, 0, 432, 433, 7, 3, 0, 0, 433, 434, 7, 9, 0, 0, 434, 435, 7, 12, 0, 0, 435, 436, 7, 16, 0, 0, 436, 437, 7, 3, 0, 0, 437, 438, 1, 0, 0, 0, 438, 439, 6, 12, 7, 0, 439, 37, 1, 0, 0, 0, 440, 441, 7, 6, 0, 0, 441, 442, 7, 7, 0, 0, 442, 443, 7, 19, 0, 0, 443, 444, 1, 0, 0, 0, 444, 445, 6, 13, 0, 0, 445, 39, 1, 0, 0, 0, 446, 447, 7, 2, 0, 0, 447, 448, 7, 10, 0, 0, 448, 449, 7, 7, 0, 0, 449, 450, 7, 19, 0, 0, 450, 451, 1, 0, 0, 0, 451, 452, 6, 14, 8, 0, 452, 41, 1, 0, 0, 0, 453, 454, 7, 2, 0, 0, 454, 455, 7, 7, 0, 0, 455, 456, 7, 6, 0, 0, 456, 457, 7, 5, 0, 0, 457, 458, 1, 0, 0, 0, 458, 459, 6, 15, 0, 0, 459, 43, 1, 0, 0, 0, 460, 461, 7, 2, 0, 0, 461, 462, 7, 5, 0, 0, 462, 463, 7, 12, 0, 0, 463, 464, 7, 5, 0, 0, 464, 465, 7, 2, 0, 0, 465, 466, 1, 0, 0, 0, 466, 467, 6, 16, 0, 0, 467, 45, 1, 0, 0, 0, 468, 469, 7, 19, 0, 0, 469, 470, 7, 10, 0, 0, 470, 471, 7, 3, 0, 0, 471, 472, 7, 6, 0, 0, 472, 473, 7, 3, 0, 0, 473, 474, 1, 0, 0, 0, 474, 475, 6, 17, 0, 0, 475, 47, 1, 0, 0, 0, 476, 478, 8, 20, 0, 0, 477, 476, 1, 0, 0, 0, 478, 479, 1, 0, 0, 0, 479, 477, 1, 0, 0, 0, 479, 480, 1, 0, 0, 0, 480, 481, 1, 0, 0, 0, 481, 482, 6, 18, 0, 0, 482, 49, 1, 0, 0, 0, 483, 484, 5, 47, 0, 0, 484, 485, 5, 47, 0, 0, 485, 489, 1, 0, 0, 0, 486, 488, 8, 21, 0, 0, 487, 486, 1, 0, 0, 0, 488, 491, 1, 0, 0, 0, 489, 487, 1, 0, 0, 0, 489, 490, 1, 0, 0, 0, 490, 493, 1, 0, 0, 0, 491, 489, 1, 0, 0, 0, 492, 494, 5, 13, 0, 0, 493, 492, 1, 0, 0, 0, 493, 494, 1, 0, 0, 0, 494, 496, 1, 0, 0, 0, 495, 497, 5, 10, 0, 0, 496, 495, 1, 0, 0, 0, 496, 497, 1, 0, 0, 0, 497, 498, 1, 0, 0, 0, 498, 499, 6, 19, 9, 0, 499, 51, 1, 0, 0, 0, 500, 501, 5, 47, 0, 0, 501, 502, 5, 42, 0, 0, 502, 507, 1, 0, 0, 0, 503, 506, 3, 52, 20, 0, 504, 506, 9, 0, 0, 0, 505, 503, 1, 0, 0, 0, 505, 504, 1, 0, 0, 0, 506, 509, 1, 0, 0, 0, 507, 508, 1, 0, 0, 0, 507, 505, 1, 0, 0, 0, 508, 510, 1, 0, 0, 0, 509, 507, 1, 0, 0, 0, 510, 511, 5, 42, 0, 0, 511, 512, 5, 47, 0, 0, 512, 513, 1, 0, 0, 0, 513, 514, 6, 20, 9, 0, 514, 53, 1, 0, 0, 0, 515, 517, 7, 22, 0, 0, 516, 515, 1, 0, 0, 0, 517, 518, 1, 0, 0, 0, 518, 516, 1, 0, 0, 0, 518, 519, 1, 0, 0, 0, 519, 520, 1, 0, 0, 0, 520, 521, 6, 21, 9, 0, 521, 55, 1, 0, 0, 0, 522, 523, 3, 162, 75, 0, 523, 524, 1, 0, 0, 0, 524, 525, 6, 22, 10, 0, 525, 526, 6, 22, 11, 0, 526, 57, 1, 0, 0, 0, 527, 528, 3, 66, 27, 0, 528, 529, 1, 0, 0, 0, 529, 530, 6, 23, 12, 0, 530, 531, 6, 23, 13, 0, 531, 59, 1, 0, 0, 0, 532, 533, 3, 54, 21, 0, 533, 534, 1, 0, 0, 0, 534, 535, 6, 24, 9, 0, 535, 61, 1, 0, 0, 0, 536, 537, 3, 50, 19, 0, 537, 538, 1, 0, 0, 0, 538, 539, 6, 25, 9, 0, 539, 63, 1, 0, 0, 0, 540, 541, 3, 52, 20, 0, 541, 542, 1, 0, 0, 0, 542, 543, 6, 26, 9, 0, 543, 65, 1, 0, 0, 0, 544, 545, 5, 124, 0, 0, 545, 546, 1, 0, 0, 0, 546, 547, 6, 27, 13, 0, 547, 67, 1, 0, 0, 0, 548, 549, 7, 23, 0, 0, 549, 69, 1, 0, 0, 0, 550, 551, 7, 24, 0, 0, 551, 71, 1, 0, 0, 0, 552, 553, 5, 92, 0, 0, 553, 554, 7, 25, 0, 0, 554, 73, 1, 0, 0, 0, 555, 556, 8, 26, 0, 0, 556, 75, 1, 0, 0, 0, 557, 559, 7, 3, 0, 0, 558, 560, 7, 27, 0, 0, 559, 558, 1, 0, 0, 0, 559, 560, 1, 0, 0, 0, 560, 562, 1, 0, 0, 0, 561, 563, 3, 68, 28, 0, 562, 561, 1, 0, 0, 0, 563, 564, 1, 0, 0, 0, 564, 562, 1, 0, 0, 0, 564, 565, 1, 0, 0, 0, 565, 77, 1, 0, 0, 0, 566, 567, 5, 64, 0, 0, 567, 79, 1, 0, 0, 0, 568, 569, 5, 96, 0, 0, 569, 81, 1, 0, 0, 0, 570, 574, 8, 28, 0, 0, 571, 572, 5, 96, 0, 0, 572, 574, 5, 96, 0, 0, 573, 570, 1, 0, 0, 0, 573, 571, 1, 0, 0, 0, 574, 83, 1, 0, 0, 0, 575, 576, 5, 95, 0, 0, 576, 85, 1, 0, 0, 0, 577, 581, 3, 70, 29, 0, 578, 581, 3, 68, 28, 0, 579, 581, 3, 84, 36, 0, 580, 577, 1, 0, 0, 0, 580, 578, 1, 0, 0, 0, 580, 579, 1, 0, 0, 0, 581, 87, 1, 0, 0, 0, 582, 587, 5, 34, 0, 0, 583, 586, 3, 72, 30, 0, 584, 586, 3, 74, 31, 0, 585, 583, 1, 0, 0, 0, 585, 584, 1, 0, 0, 0, 586, 589, 1, 0, 0, 0, 587, 585, 1, 0, 0, 0, 587, 588, 1, 0, 0, 0, 588, 590, 1, 0, 0, 0, 589, 587, 1, 0, 0, 0, 590, 612, 5, 34, 0, 0, 591, 592, 5, 34, 0, 0, 592, 593, 5, 34, 0, 0, 593, 594, 5, 34, 0, 0, 594, 598, 1, 0, 0, 0, 595, 597, 8, 21, 0, 0, 596, 595, 1, 0, 0, 0, 597, 600, 1, 0, 0, 0, 598, 599, 1, 0, 0, 0, 598, 596, 1, 0, 0, 0, 599, 601, 1, 0, 0, 0, 600, 598, 1, 0, 0, 0, 601, 602, 5, 34, 0, 0, 602, 603, 5, 34, 0, 0, 603, 604, 5, 34, 0, 0, 604, 606, 1, 0, 0, 0, 605, 607, 5, 34, 0, 0, 606, 605, 1, 0, 0, 0, 606, 607, 1, 0, 0, 0, 607, 609, 1, 0, 0, 0, 608, 610, 5, 34, 0, 0, 609, 608, 1, 0, 0, 0, 609, 610, 1, 0, 0, 0, 610, 612, 1, 0, 0, 0, 611, 582, 1, 0, 0, 0, 611, 591, 1, 0, 0, 0, 612, 89, 1, 0, 0, 0, 613, 615, 3, 68, 28, 0, 614, 613, 1, 0, 0, 0, 615, 616, 1, 0, 0, 0, 616, 614, 1, 0, 0, 0, 616, 617, 1, 0, 0, 0, 617, 91, 1, 0, 0, 0, 618, 620, 3, 68, 28, 0, 619, 618, 1, 0, 0, 0, 620, 621, 1, 0, 0, 0, 621, 619, 1, 0, 0, 0, 621, 622, 1, 0, 0, 0, 622, 623, 1, 0, 0, 0, 623, 627, 3, 106, 47, 0, 624, 626, 3, 68, 28, 0, 625, 624, 1, 0, 0, 0, 626, 629, 1, 0, 0, 0, 627, 625, 1, 0, 0, 0, 627, 628, 1, 0, 0, 0, 628, 661, 1, 0, 0, 0, 629, 627, 1, 0, 0, 0, 630, 632, 3, 106, 47, 0, 631, 633, 3, 68, 28, 0, 632, 631, 1, 0, 0, 0, 633, 634, 1, 0, 0, 0, 634, 632, 1, 0, 0, 0, 634, 635, 1, 0, 0, 0, 635, 661, 1, 0, 0, 0, 636, 638, 3, 68, 28, 0, 637, 636, 1, 0, 0, 0, 638, 639, 1, 0, 0, 0, 639, 637, 1, 0, 0, 0, 639, 640, 1, 0, 0, 0, 640, 648, 1, 0, 0, 0, 641, 645, 3, 106, 47, 0, 642, 644, 3, 68, 28, 0, 643, 642, 1, 0, 0, 0, 644, 647, 1, 0, 0, 0, 645, 643, 1, 0, 0, 0, 645, 646, 1, 0, 0, 0, 646, 649, 1, 0, 0, 0, 647, 645, 1, 0, 0, 0, 648, 641, 1, 0, 0, 0, 648, 649, 1, 0, 0, 0, 649, 650, 1, 0, 0, 0, 650, 651, 3, 76, 32, 0, 651, 661, 1, 0, 0, 0, 652, 654, 3, 106, 47, 0, 653, 655, 3, 68, 28, 0, 654, 653, 1, 0, 0, 0, 655, 656, 1, 0, 0, 0, 656, 654, 1, 0, 0, 0, 656, 657, 1, 0, 0, 0, 657, 658, 1, 0, 0, 0, 658, 659, 3, 76, 32, 0, 659, 661, 1, 0, 0, 0, 660, 619, 1, 0, 0, 0, 660, 630, 1, 0, 0, 0, 660, 637, 1, 0, 0, 0, 660, 652, 1, 0, 0, 0, 661, 93, 1, 0, 0, 0, 662, 663, 7, 29, 0, 0, 663, 664, 7, 30, 0, 0, 664, 95, 1, 0, 0, 0, 665, 666, 7, 12, 0, 0, 666, 667, 7, 9, 0, 0, 667, 668, 7, 0, 0, 0, 668, 97, 1, 0, 0, 0, 669, 670, 7, 12, 0, 0, 670, 671, 7, 2, 0, 0, 671, 672, 7, 4, 0, 0, 672, 99, 1, 0, 0, 0, 673, 674, 5, 61, 0, 0, 674, 101, 1, 0, 0, 0, 675, 676, 5, 44, 0, 0, 676, 103, 1, 0, 0, 0, 677, 678, 7, 0, 0, 0, 678, 679, 7, 3, 0, 0, 679, 680, 7, 2, 0, 0, 680, 681, 7, 4, 0, 0, 681, 105, 1, 0, 0, 0, 682, 683, 5, 46, 0, 0, 683, 107, 1, 0, 0, 0, 684, 685, 7, 15, 0, 0, 685, 686, 7, 12, 0, 0, 686, 687, 7, 13, 0, 0, 687, 688, 7, 2, 0, 0, 688, 689, 7, 3, 0, 0, 689, 109, 1, 0, 0, 0, 690, 691, 7, 15, 0, 0, 691, 692, 7, 1, 0, 0, 692, 693, 7, 6, 0, 0, 693, 694, 7, 2, 0, 0, 694, 695, 7, 5, 0, 0, 695, 111, 1, 0, 0, 0, 696, 697, 7, 13, 0, 0, 697, 698, 7, 12, 0, 0, 698, 699, 7, 2, 0, 0, 699, 700, 7, 5, 0, 0, 700, 113, 1, 0, 0, 0, 701, 702, 5, 40, 0, 0, 702, 115, 1, 0, 0, 0, 703, 704, 7, 1, 0, 0, 704, 705, 7, 9, 0, 0, 705, 117, 1, 0, 0, 0, 706, 707, 7, 1, 0, 0, 707, 708, 7, 2, 0, 0, 708, 119, 1, 0, 0, 0, 709, 710, 7, 13, 0, 0, 710, 711, 7, 1, 0, 0, 711, 712, 7, 18, 0, 0, 712, 713, 7, 3, 0, 0, 713, 121, 1, 0, 0, 0, 714, 715, 7, 9, 0, 0, 715, 716, 7, 7, 0, 0, 716, 717, 7, 5, 0, 0, 717, 123, 1, 0, 0, 0, 718, 719, 7, 9, 0, 0, 719, 720, 7, 31, 0, 0, 720, 721, 7, 13, 0, 0, 721, 722, 7, 13, 0, 0, 722, 125, 1, 0, 0, 0, 723, 724, 7, 9, 0, 0, 724, 725, 7, 31, 0, 0, 725, 726, 7, 13, 0, 0, 726, 727, 7, 13, 0, 0, 727, 728, 7, 2, 0, 0, 728, 127, 1, 0, 0, 0, 729, 730, 7, 7, 0, 0, 730, 731, 7, 6, 0, 0, 731, 129, 1, 0, 0, 0, 732, 733, 5, 63, 0, 0, 733, 131, 1, 0, 0, 0, 734, 735, 7, 6, 0, 0, 735, 736, 7, 13, 0, 0, 736, 737, 7, 1, 0, 0, 737, 738, 7, 18, 0, 0, 738, 739, 7, 3, 0, 0, 739, 133, 1, 0, 0, 0, 740, 741, 5, 41, 0, 0, 741, 135, 1, 0, 0, 0, 742, 743, 7, 5, 0, 0, 743, 744, 7, 6, 0, 0, 744, 745, 7, 31, 0, 0, 745, 746, 7, 3, 0, 0, 746, 137, 1, 0, 0, 0, 747, 748, 5, 61, 0, 0, 748, 749, 5, 61, 0, 0, 749, 139, 1, 0, 0, 0, 750, 751, 5, 61, 0, 0, 751, 752, 5, 126, 0, 0, 752, 141, 1, 0, 0, 0, 753, 754, 5, 33, 0, 0, 754, 755, 5, 61, 0, 0, 755, 143, 1, 0, 0, 0, 756, 757, 5, 60, 0, 0, 757, 145, 1, 0, 0, 0, 758, 759, 5, 60, 0, 0, 759, 760, 5, 61, 0, 0, 760, 147, 1, 0, 0, 0, 761, 762, 5, 62, 0, 0, 762, 149, 1, 0, 0, 0, 763, 764, 5, 62, 0, 0, 764, 765, 5, 61, 0, 0, 765, 151, 1, 0, 0, 0, 766, 767, 5, 43, 0, 0, 767, 153, 1, 0, 0, 0, 768, 769, 5, 45, 0, 0, 769, 155, 1, 0, 0, 0, 770, 771, 5, 42, 0, 0, 771, 157, 1, 0, 0, 0, 772, 773, 5, 47, 0, 0, 773, 159, 1, 0, 0, 0, 774, 775, 5, 37, 0, 0, 775, 161, 1, 0, 0, 0, 776, 777, 5, 91, 0, 0, 777, 778, 1, 0, 0, 0, 778, 779, 6, 75, 0, 0, 779, 780, 6, 75, 0, 0, 780, 163, 1, 0, 0, 0, 781, 782, 5, 93, 0, 0, 782, 783, 1, 0, 0, 0, 783, 784, 6, 76, 13, 0, 784, 785, 6, 76, 13, 0, 785, 165, 1, 0, 0, 0, 786, 790, 3, 70, 29, 0, 787, 789, 3, 86, 37, 0, 788, 787, 1, 0, 0, 0, 789, 792, 1, 0, 0, 0, 790, 788, 1, 0, 0, 0, 790, 791, 1, 0, 0, 0, 791, 803, 1, 0, 0, 0, 792, 790, 1, 0, 0, 0, 793, 796, 3, 84, 36, 0, 794, 796, 3, 78, 33, 0, 795, 793, 1, 0, 0, 0, 795, 794, 1, 0, 0, 0, 796, 798, 1, 0, 0, 0, 797, 799, 3, 86, 37, 0, 798, 797, 1, 0, 0, 0, 799, 800, 1, 0, 0, 0, 800, 798, 1, 0, 0, 0, 800, 801, 1, 0, 0, 0, 801, 803, 1, 0, 0, 0, 802, 786, 1, 0, 0, 0, 802, 795, 1, 0, 0, 0, 803, 167, 1, 0, 0, 0, 804, 806, 3, 80, 34, 0, 805, 807, 3, 82, 35, 0, 806, 805, 1, 0, 0, 0, 807, 808, 1, 0, 0, 0, 808, 806, 1, 0, 0, 0, 808, 809, 1, 0, 0, 0, 809, 810, 1, 0, 0, 0, 810, 811, 3, 80, 34, 0, 811, 169, 1, 0, 0, 0, 812, 813, 3, 168, 78, 0, 813, 171, 1, 0, 0, 0, 814, 815, 3, 50, 19, 0, 815, 816, 1, 0, 0, 0, 816, 817, 6, 80, 9, 0, 817, 173, 1, 0, 0, 0, 818, 819, 3, 52, 20, 0, 819, 820, 1, 0, 0, 0, 820, 821, 6, 81, 9, 0, 821, 175, 1, 0, 0, 0, 822, 823, 3, 54, 21, 0, 823, 824, 1, 0, 0, 0, 824, 825, 6, 82, 9, 0, 825, 177, 1, 0, 0, 0, 826, 827, 3, 66, 27, 0, 827, 828, 1, 0, 0, 0, 828, 829, 6, 83, 12, 0, 829, 830, 6, 83, 13, 0, 830, 179, 1, 0, 0, 0, 831, 832, 3, 162, 75, 0, 832, 833, 1, 0, 0, 0, 833, 834, 6, 84, 10, 0, 834, 181, 1, 0, 0, 0, 835, 836, 3, 164, 76, 0, 836, 837, 1, 0, 0, 0, 837, 838, 6, 85, 14, 0, 838, 183, 1, 0, 0, 0, 839, 840, 3, 102, 45, 0, 840, 841, 1, 0, 0, 0, 841, 842, 6, 86, 15, 0, 842, 185, 1, 0, 0, 0, 843, 844, 3, 100, 44, 0, 844, 845, 1, 0, 0, 0, 845, 846, 6, 87, 16, 0, 846, 187, 1, 0, 0, 0, 847, 848, 7, 16, 0, 0, 848, 849, 7, 3, 0, 0, 849, 850, 7, 5, 0, 0, 850, 851, 7, 12, 0, 0, 851, 852, 7, 0, 0, 0, 852, 853, 7, 12, 0, 0, 853, 854, 7, 5, 0, 0, 854, 855, 7, 12, 0, 0, 855, 189, 1, 0, 0, 0, 856, 860, 8, 32, 0, 0, 857, 858, 5, 47, 0, 0, 858, 860, 8, 33, 0, 0, 859, 856, 1, 0, 0, 0, 859, 857, 1, 0, 0, 0, 860, 191, 1, 0, 0, 0, 861, 863, 3, 190, 89, 0, 862, 861, 1, 0, 0, 0, 863, 864, 1, 0, 0, 0, 864, 862, 1, 0, 0, 0, 864, 865, 1, 0, 0, 0, 865, 193, 1, 0, 0, 0, 866, 867, 3, 170, 79, 0, 867, 868, 1, 0, 0, 0, 868, 869, 6, 91, 17, 0, 869, 195, 1, 0, 0, 0, 870, 871, 3, 50, 19, 0, 871, 872, 1, 0, 0, 0, 872, 873, 6, 92, 9, 0, 873, 197, 1, 0, 0, 0, 874, 875, 3, 52, 20, 0, 875, 876, 1, 0, 0, 0, 876, 877, 6, 93, 9, 0, 877, 199, 1, 0, 0, 0, 878, 879, 3, 54, 21, 0, 879, 880, 1, 0, 0, 0, 880, 881, 6, 94, 9, 0, 881, 201, 1, 0, 0, 0, 882, 883, 3, 66, 27, 0, 883, 884, 1, 0, 0, 0, 884, 885, 6, 95, 12, 0, 885, 886, 6, 95, 13, 0, 886, 203, 1, 0, 0, 0, 887, 888, 3, 106, 47, 0, 888, 889, 1, 0, 0, 0, 889, 890, 6, 96, 18, 0, 890, 205, 1, 0, 0, 0, 891, 892, 3, 102, 45, 0, 892, 893, 1, 0, 0, 0, 893, 894, 6, 97, 15, 0, 894, 207, 1, 0, 0, 0, 895, 900, 3, 70, 29, 0, 896, 900, 3, 68, 28, 0, 897, 900, 3, 84, 36, 0, 898, 900, 3, 156, 72, 0, 899, 895, 1, 0, 0, 0, 899, 896, 1, 0, 0, 0, 899, 897, 1, 0, 0, 0, 899, 898, 1, 0, 0, 0, 900, 209, 1, 0, 0, 0, 901, 904, 3, 70, 29, 0, 902, 904, 3, 156, 72, 0, 903, 901, 1, 0, 0, 0, 903, 902, 1, 0, 0, 0, 904, 908, 1, 0, 0, 0, 905, 907, 3, 208, 98, 0, 906, 905, 1, 0, 0, 0, 907, 910, 1, 0, 0, 0, 908, 906, 1, 0, 0, 0, 908, 909, 1, 0, 0, 0, 909, 921, 1, 0, 0, 0, 910, 908, 1, 0, 0, 0, 911, 914, 3, 84, 36, 0, 912, 914, 3, 78, 33, 0, 913, 911, 1, 0, 0, 0, 913, 912, 1, 0, 0, 0, 914, 916, 1, 0, 0, 0, 915, 917, 3, 208, 98, 0, 916, 915, 1, 0, 0, 0, 917, 918, 1, 0, 0, 0, 918, 916, 1, 0, 0, 0, 918, 919, 1, 0, 0, 0, 919, 921, 1, 0, 0, 0, 920, 903, 1, 0, 0, 0, 920, 913, 1, 0, 0, 0, 921, 211, 1, 0, 0, 0, 922, 925, 3, 210, 99, 0, 923, 925, 3, 168, 78, 0, 924, 922, 1, 0, 0, 0, 924, 923, 1, 0, 0, 0, 925, 926, 1, 0, 0, 0, 926, 924, 1, 0, 0, 0, 926, 927, 1, 0, 0, 0, 927, 213, 1, 0, 0, 0, 928, 929, 3, 50, 19, 0, 929, 930, 1, 0, 0, 0, 930, 931, 6, 101, 9, 0, 931, 215, 1, 0, 0, 0, 932, 933, 3, 52, 20, 0, 933, 934, 1, 0, 0, 0, 934, 935, 6, 102, 9, 0, 935, 217, 1, 0, 0, 0, 936, 937, 3, 54, 21, 0, 937, 938, 1, 0, 0, 0, 938, 939, 6, 103, 9, 0, 939, 219, 1, 0, 0, 0, 940, 941, 3, 66, 27, 0, 941, 942, 1, 0, 0, 0, 942, 943, 6, 104, 12, 0, 943, 944, 6, 104, 13, 0, 944, 221, 1, 0, 0, 0, 945, 946, 3, 100, 44, 0, 946, 947, 1, 0, 0, 0, 947, 948, 6, 105, 16, 0, 948, 223, 1, 0, 0, 0, 949, 950, 3, 102, 45, 0, 950, 951, 1, 0, 0, 0, 951, 952, 6, 106, 15, 0, 952, 225, 1, 0, 0, 0, 953, 954, 3, 106, 47, 0, 954, 955, 1, 0, 0, 0, 955, 956, 6, 107, 18, 0, 956, 227, 1, 0, 0, 0, 957, 958, 7, 12, 0, 0, 958, 959, 7, 2, 0, 0, 959, 229, 1, 0, 0, 0, 960, 961, 3, 212, 100, 0, 961, 962, 1, 0, 0, 0, 962, 963, 6, 109, 19, 0, 963, 231, 1, 0, 0, 0, 964, 965, 3, 50, 19, 0, 965, 966, 1, 0, 0, 0, 966, 967, 6, 110, 9, 0, 967, 233, 1, 0, 0, 0, 968, 969, 3, 52, 20, 0, 969, 970, 1, 0, 0, 0, 970, 971, 6, 111, 9, 0, 971, 235, 1, 0, 0, 0, 972, 973, 3, 54, 21, 0, 973, 974, 1, 0, 0, 0, 974, 975, 6, 112, 9, 0, 975, 237, 1, 0, 0, 0, 976, 977, 3, 66, 27, 0, 977, 978, 1, 0, 0, 0, 978, 979, 6, 113, 12, 0, 979, 980, 6, 113, 13, 0, 980, 239, 1, 0, 0, 0, 981, 982, 3, 162, 75, 0, 982, 983, 1, 0, 0, 0, 983, 984, 6, 114, 10, 0, 984, 985, 6, 114, 20, 0, 985, 241, 1, 0, 0, 0, 986, 987, 7, 7, 0, 0, 987, 988, 7, 9, 0, 0, 988, 989, 1, 0, 0, 0, 989, 990, 6, 115, 21, 0, 990, 243, 1, 0, 0, 0, 991, 992, 7, 19, 0, 0, 992, 993, 7, 1, 0, 0, 993, 994, 7, 5, 0, 0, 994, 995, 7, 10, 0, 0, 995, 996, 1, 0, 0, 0, 996, 997, 6, 116, 21, 0, 997, 245, 1, 0, 0, 0, 998, 999, 8, 34, 0, 0, 999, 247, 1, 0, 0, 0, 1000, 1002, 3, 246, 117, 0, 1001, 1000, 1, 0, 0, 0, 1002, 1003, 1, 0, 0, 0, 1003, 1001, 1, 0, 0, 0, 1003, 1004, 1, 0, 0, 0, 1004, 1005, 1, 0, 0, 0, 1005, 1006, 3, 316, 152, 0, 1006, 1008, 1, 0, 0, 0, 1007, 1001, 1, 0, 0, 0, 1007, 1008, 1, 0, 0, 0, 1008, 1010, 1, 0, 0, 0, 1009, 1011, 3, 246, 117, 0, 1010, 1009, 1, 0, 0, 0, 1011, 1012, 1, 0, 0, 0, 1012, 1010, 1, 0, 0, 0, 1012, 1013, 1, 0, 0, 0, 1013, 249, 1, 0, 0, 0, 1014, 1015, 3, 170, 79, 0, 1015, 1016, 1, 0, 0, 0, 1016, 1017, 6, 119, 17, 0, 1017, 251, 1, 0, 0, 0, 1018, 1019, 3, 248, 118, 0, 1019, 1020, 1, 0, 0, 0, 1020, 1021, 6, 120, 22, 0, 1021, 253, 1, 0, 0, 0, 1022, 1023, 3, 50, 19, 0, 1023, 1024, 1, 0, 0, 0, 1024, 1025, 6, 121, 9, 0, 1025, 255, 1, 0, 0, 0, 1026, 1027, 3, 52, 20, 0, 1027, 1028, 1, 0, 0, 0, 1028, 1029, 6, 122, 9, 0, 1029, 257, 1, 0, 0, 0, 1030, 1031, 3, 54, 21, 0, 1031, 1032, 1, 0, 0, 0, 1032, 1033, 6, 123, 9, 0, 1033, 259, 1, 0, 0, 0, 1034, 1035, 3, 66, 27, 0, 1035, 1036, 1, 0, 0, 0, 1036, 1037, 6, 124, 12, 0, 1037, 1038, 6, 124, 13, 0, 1038, 1039, 6, 124, 13, 0, 1039, 261, 1, 0, 0, 0, 1040, 1041, 3, 100, 44, 0, 1041, 1042, 1, 0, 0, 0, 1042, 1043, 6, 125, 16, 0, 1043, 263, 1, 0, 0, 0, 1044, 1045, 3, 102, 45, 0, 1045, 1046, 1, 0, 0, 0, 1046, 1047, 6, 126, 15, 0, 1047, 265, 1, 0, 0, 0, 1048, 1049, 3, 106, 47, 0, 1049, 1050, 1, 0, 0, 0, 1050, 1051, 6, 127, 18, 0, 1051, 267, 1, 0, 0, 0, 1052, 1053, 3, 244, 116, 0, 1053, 1054, 1, 0, 0, 0, 1054, 1055, 6, 128, 23, 0, 1055, 269, 1, 0, 0, 0, 1056, 1057, 3, 212, 100, 0, 1057, 1058, 1, 0, 0, 0, 1058, 1059, 6, 129, 19, 0, 1059, 271, 1, 0, 0, 0, 1060, 1061, 3, 170, 79, 0, 1061, 1062, 1, 0, 0, 0, 1062, 1063, 6, 130, 17, 0, 1063, 273, 1, 0, 0, 0, 1064, 1065, 3, 50, 19, 0, 1065, 1066, 1, 0, 0, 0, 1066, 1067, 6, 131, 9, 0, 1067, 275, 1, 0, 0, 0, 1068, 1069, 3, 52, 20, 0, 1069, 1070, 1, 0, 0, 0, 1070, 1071, 6, 132, 9, 0, 1071, 277, 1, 0, 0, 0, 1072, 1073, 3, 54, 21, 0, 1073, 1074, 1, 0, 0, 0, 1074, 1075, 6, 133, 9, 0, 1075, 279, 1, 0, 0, 0, 1076, 1077, 3, 66, 27, 0, 1077, 1078, 1, 0, 0, 0, 1078, 1079, 6, 134, 12, 0, 1079, 1080, 6, 134, 13, 0, 1080, 281, 1, 0, 0, 0, 1081, 1082, 3, 106, 47, 0, 1082, 1083, 1, 0, 0, 0, 1083, 1084, 6, 135, 18, 0, 1084, 283, 1, 0, 0, 0, 1085, 1086, 3, 170, 79, 0, 1086, 1087, 1, 0, 0, 0, 1087, 1088, 6, 136, 17, 0, 1088, 285, 1, 0, 0, 0, 1089, 1090, 3, 166, 77, 0, 1090, 1091, 1, 0, 0, 0, 1091, 1092, 6, 137, 24, 0, 1092, 287, 1, 0, 0, 0, 1093, 1094, 3, 50, 19, 0, 1094, 1095, 1, 0, 0, 0, 1095, 1096, 6, 138, 9, 0, 1096, 289, 1, 0, 0, 0, 1097, 1098, 3, 52, 20, 0, 1098, 1099, 1, 0, 0, 0, 1099, 1100, 6, 139, 9, 0, 1100, 291, 1, 0, 0, 0, 1101, 1102, 3, 54, 21, 0, 1102, 1103, 1, 0, 0, 0, 1103, 1104, 6, 140, 9, 0, 1104, 293, 1, 0, 0, 0, 1105, 1106, 3, 66, 27, 0, 1106, 1107, 1, 0, 0, 0, 1107, 1108, 6, 141, 12, 0, 1108, 1109, 6, 141, 13, 0, 1109, 295, 1, 0, 0, 0, 1110, 1111, 7, 1, 0, 0, 1111, 1112, 7, 9, 0, 0, 1112, 1113, 7, 15, 0, 0, 1113, 1114, 7, 7, 0, 0, 1114, 297, 1, 0, 0, 0, 1115, 1116, 3, 50, 19, 0, 1116, 1117, 1, 0, 0, 0, 1117, 1118, 6, 143, 9, 0, 1118, 299, 1, 0, 0, 0, 1119, 1120, 3, 52, 20, 0, 1120, 1121, 1, 0, 0, 0, 1121, 1122, 6, 144, 9, 0, 1122, 301, 1, 0, 0, 0, 1123, 1124, 3, 54, 21, 0, 1124, 1125, 1, 0, 0, 0, 1125, 1126, 6, 145, 9, 0, 1126, 303, 1, 0, 0, 0, 1127, 1128, 3, 66, 27, 0, 1128, 1129, 1, 0, 0, 0, 1129, 1130, 6, 146, 12, 0, 1130, 1131, 6, 146, 13, 0, 1131, 305, 1, 0, 0, 0, 1132, 1133, 7, 15, 0, 0, 1133, 1134, 7, 31, 0, 0, 1134, 1135, 7, 9, 0, 0, 1135, 1136, 7, 4, 0, 0, 1136, 1137, 7, 5, 0, 0, 1137, 1138, 7, 1, 0, 0, 1138, 1139, 7, 7, 0, 0, 1139, 1140, 7, 9, 0, 0, 1140, 1141, 7, 2, 0, 0, 1141, 307, 1, 0, 0, 0, 1142, 1143, 3, 50, 19, 0, 1143, 1144, 1, 0, 0, 0, 1144, 1145, 6, 148, 9, 0, 1145, 309, 1, 0, 0, 0, 1146, 1147, 3, 52, 20, 0, 1147, 1148, 1, 0, 0, 0, 1148, 1149, 6, 149, 9, 0, 1149, 311, 1, 0, 0, 0, 1150, 1151, 3, 54, 21, 0, 1151, 1152, 1, 0, 0, 0, 1152, 1153, 6, 150, 9, 0, 1153, 313, 1, 0, 0, 0, 1154, 1155, 3, 164, 76, 0, 1155, 1156, 1, 0, 0, 0, 1156, 1157, 6, 151, 14, 0, 1157, 1158, 6, 151, 13, 0, 1158, 315, 1, 0, 0, 0, 1159, 1160, 5, 58, 0, 0, 1160, 317, 1, 0, 0, 0, 1161, 1167, 3, 78, 33, 0, 1162, 1167, 3, 68, 28, 0, 1163, 1167, 3, 106, 47, 0, 1164, 1167, 3, 70, 29, 0, 1165, 1167, 3, 84, 36, 0, 1166, 1161, 1, 0, 0, 0, 1166, 1162, 1, 0, 0, 0, 1166, 1163, 1, 0, 0, 0, 1166, 1164, 1, 0, 0, 0, 1166, 1165, 1, 0, 0, 0, 1167, 1168, 1, 0, 0, 0, 1168, 1166, 1, 0, 0, 0, 1168, 1169, 1, 0, 0, 0, 1169, 319, 1, 0, 0, 0, 1170, 1171, 3, 50, 19, 0, 1171, 1172, 1, 0, 0, 0, 1172, 1173, 6, 154, 9, 0, 1173, 321, 1, 0, 0, 0, 1174, 1175, 3, 52, 20, 0, 1175, 1176, 1, 0, 0, 0, 1176, 1177, 6, 155, 9, 0, 1177, 323, 1, 0, 0, 0, 1178, 1179, 3, 54, 21, 0, 1179, 1180, 1, 0, 0, 0, 1180, 1181, 6, 156, 9, 0, 1181, 325, 1, 0, 0, 0, 58, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 479, 489, 493, 496, 505, 507, 518, 559, 564, 573, 580, 585, 587, 598, 606, 609, 611, 616, 621, 627, 634, 639, 645, 648, 656, 660, 790, 795, 800, 802, 808, 859, 864, 899, 903, 908, 913, 918, 920, 924, 926, 1003, 1007, 1012, 1166, 1168, 25, 5, 2, 0, 5, 4, 0, 5, 6, 0, 5, 1, 0, 5, 3, 0, 5, 10, 0, 5, 8, 0, 5, 5, 0, 5, 9, 0, 0, 1, 0, 7, 64, 0, 5, 0, 0, 7, 26, 0, 4, 0, 0, 7, 65, 0, 7, 34, 0, 7, 33, 0, 7, 67, 0, 7, 36, 0, 7, 76, 0, 5, 11, 0, 5, 7, 0, 7, 86, 0, 7, 85, 0, 7, 66, 0]
\ No newline at end of file
+[4, 0, 109, 1198, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 2, 81, 7, 81, 2, 82, 7, 82, 2, 83, 7, 83, 2, 84, 7, 84, 2, 85, 7, 85, 2, 86, 7, 86, 2, 87, 7, 87, 2, 88, 7, 88, 2, 89, 7, 89, 2, 90, 7, 90, 2, 91, 7, 91, 2, 92, 7, 92, 2, 93, 7, 93, 2, 94, 7, 94, 2, 95, 7, 95, 2, 96, 7, 96, 2, 97, 7, 97, 2, 98, 7, 98, 2, 99, 7, 99, 2, 100, 7, 100, 2, 101, 7, 101, 2, 102, 7, 102, 2, 103, 7, 103, 2, 104, 7, 104, 2, 105, 7, 105, 2, 106, 7, 106, 2, 107, 7, 107, 2, 108, 7, 108, 2, 109, 7, 109, 2, 110, 7, 110, 2, 111, 7, 111, 2, 112, 7, 112, 2, 113, 7, 113, 2, 114, 7, 114, 2, 115, 7, 115, 2, 116, 7, 116, 2, 117, 7, 117, 2, 118, 7, 118, 2, 119, 7, 119, 2, 120, 7, 120, 2, 121, 7, 121, 2, 122, 7, 122, 2, 123, 7, 123, 2, 124, 7, 124, 2, 125, 7, 125, 2, 126, 7, 126, 2, 127, 7, 127, 2, 128, 7, 128, 2, 129, 7, 129, 2, 130, 7, 130, 2, 131, 7, 131, 2, 132, 7, 132, 2, 133, 7, 133, 2, 134, 7, 134, 2, 135, 7, 135, 2, 136, 7, 136, 2, 137, 7, 137, 2, 138, 7, 138, 2, 139, 7, 139, 2, 140, 7, 140, 2, 141, 7, 141, 2, 142, 7, 142, 2, 143, 7, 143, 2, 144, 7, 144, 2, 145, 7, 145, 2, 146, 7, 146, 2, 147, 7, 147, 2, 148, 7, 148, 2, 149, 7, 149, 2, 150, 7, 150, 2, 151, 7, 151, 2, 152, 7, 152, 2, 153, 7, 153, 2, 154, 7, 154, 2, 155, 7, 155, 2, 156, 7, 156, 2, 157, 7, 157, 2, 158, 7, 158, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 4, 18, 482, 8, 18, 11, 18, 12, 18, 483, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 5, 19, 492, 8, 19, 10, 19, 12, 19, 495, 9, 19, 1, 19, 3, 19, 498, 8, 19, 1, 19, 3, 19, 501, 8, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 5, 20, 510, 8, 20, 10, 20, 12, 20, 513, 9, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 4, 21, 521, 8, 21, 11, 21, 12, 21, 522, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 1, 24, 1, 25, 1, 25, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 32, 1, 32, 3, 32, 564, 8, 32, 1, 32, 4, 32, 567, 8, 32, 11, 32, 12, 32, 568, 1, 33, 1, 33, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 3, 35, 578, 8, 35, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 3, 37, 585, 8, 37, 1, 38, 1, 38, 1, 38, 5, 38, 590, 8, 38, 10, 38, 12, 38, 593, 9, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 5, 38, 601, 8, 38, 10, 38, 12, 38, 604, 9, 38, 1, 38, 1, 38, 1, 38, 1, 38, 1, 38, 3, 38, 611, 8, 38, 1, 38, 3, 38, 614, 8, 38, 3, 38, 616, 8, 38, 1, 39, 4, 39, 619, 8, 39, 11, 39, 12, 39, 620, 1, 40, 4, 40, 624, 8, 40, 11, 40, 12, 40, 625, 1, 40, 1, 40, 5, 40, 630, 8, 40, 10, 40, 12, 40, 633, 9, 40, 1, 40, 1, 40, 4, 40, 637, 8, 40, 11, 40, 12, 40, 638, 1, 40, 4, 40, 642, 8, 40, 11, 40, 12, 40, 643, 1, 40, 1, 40, 5, 40, 648, 8, 40, 10, 40, 12, 40, 651, 9, 40, 3, 40, 653, 8, 40, 1, 40, 1, 40, 1, 40, 1, 40, 4, 40, 659, 8, 40, 11, 40, 12, 40, 660, 1, 40, 1, 40, 3, 40, 665, 8, 40, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 50, 1, 50, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 1, 56, 1, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 59, 1, 59, 1, 60, 1, 60, 1, 60, 1, 60, 1, 60, 1, 60, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 63, 1, 63, 1, 63, 1, 64, 1, 64, 1, 64, 1, 65, 1, 65, 1, 65, 1, 66, 1, 66, 1, 67, 1, 67, 1, 67, 1, 68, 1, 68, 1, 69, 1, 69, 1, 69, 1, 70, 1, 70, 1, 71, 1, 71, 1, 72, 1, 72, 1, 73, 1, 73, 1, 74, 1, 74, 1, 75, 1, 75, 1, 75, 1, 75, 1, 75, 1, 76, 1, 76, 1, 76, 1, 76, 1, 76, 1, 77, 1, 77, 5, 77, 793, 8, 77, 10, 77, 12, 77, 796, 9, 77, 1, 77, 1, 77, 3, 77, 800, 8, 77, 1, 77, 4, 77, 803, 8, 77, 11, 77, 12, 77, 804, 3, 77, 807, 8, 77, 1, 78, 1, 78, 4, 78, 811, 8, 78, 11, 78, 12, 78, 812, 1, 78, 1, 78, 1, 79, 1, 79, 1, 80, 1, 80, 1, 80, 1, 80, 1, 81, 1, 81, 1, 81, 1, 81, 1, 82, 1, 82, 1, 82, 1, 82, 1, 83, 1, 83, 1, 83, 1, 83, 1, 83, 1, 84, 1, 84, 1, 84, 1, 84, 1, 85, 1, 85, 1, 85, 1, 85, 1, 86, 1, 86, 1, 86, 1, 86, 1, 87, 1, 87, 1, 87, 1, 87, 1, 88, 1, 88, 1, 88, 1, 88, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 90, 1, 91, 1, 91, 1, 91, 3, 91, 876, 8, 91, 1, 92, 4, 92, 879, 8, 92, 11, 92, 12, 92, 880, 1, 93, 1, 93, 1, 93, 1, 93, 1, 94, 1, 94, 1, 94, 1, 94, 1, 95, 1, 95, 1, 95, 1, 95, 1, 96, 1, 96, 1, 96, 1, 96, 1, 97, 1, 97, 1, 97, 1, 97, 1, 97, 1, 98, 1, 98, 1, 98, 1, 98, 1, 99, 1, 99, 1, 99, 1, 99, 1, 100, 1, 100, 1, 100, 1, 100, 3, 100, 916, 8, 100, 1, 101, 1, 101, 3, 101, 920, 8, 101, 1, 101, 5, 101, 923, 8, 101, 10, 101, 12, 101, 926, 9, 101, 1, 101, 1, 101, 3, 101, 930, 8, 101, 1, 101, 4, 101, 933, 8, 101, 11, 101, 12, 101, 934, 3, 101, 937, 8, 101, 1, 102, 1, 102, 4, 102, 941, 8, 102, 11, 102, 12, 102, 942, 1, 103, 1, 103, 1, 103, 1, 103, 1, 104, 1, 104, 1, 104, 1, 104, 1, 105, 1, 105, 1, 105, 1, 105, 1, 106, 1, 106, 1, 106, 1, 106, 1, 106, 1, 107, 1, 107, 1, 107, 1, 107, 1, 108, 1, 108, 1, 108, 1, 108, 1, 109, 1, 109, 1, 109, 1, 109, 1, 110, 1, 110, 1, 110, 1, 111, 1, 111, 1, 111, 1, 111, 1, 112, 1, 112, 1, 112, 1, 112, 1, 113, 1, 113, 1, 113, 1, 113, 1, 114, 1, 114, 1, 114, 1, 114, 1, 115, 1, 115, 1, 115, 1, 115, 1, 115, 1, 116, 1, 116, 1, 116, 1, 116, 1, 116, 1, 117, 1, 117, 1, 117, 1, 117, 1, 117, 1, 118, 1, 118, 1, 118, 1, 118, 1, 118, 1, 118, 1, 118, 1, 119, 1, 119, 1, 120, 4, 120, 1018, 8, 120, 11, 120, 12, 120, 1019, 1, 120, 1, 120, 3, 120, 1024, 8, 120, 1, 120, 4, 120, 1027, 8, 120, 11, 120, 12, 120, 1028, 1, 121, 1, 121, 1, 121, 1, 121, 1, 122, 1, 122, 1, 122, 1, 122, 1, 123, 1, 123, 1, 123, 1, 123, 1, 124, 1, 124, 1, 124, 1, 124, 1, 125, 1, 125, 1, 125, 1, 125, 1, 126, 1, 126, 1, 126, 1, 126, 1, 126, 1, 126, 1, 127, 1, 127, 1, 127, 1, 127, 1, 128, 1, 128, 1, 128, 1, 128, 1, 129, 1, 129, 1, 129, 1, 129, 1, 130, 1, 130, 1, 130, 1, 130, 1, 131, 1, 131, 1, 131, 1, 131, 1, 132, 1, 132, 1, 132, 1, 132, 1, 133, 1, 133, 1, 133, 1, 133, 1, 134, 1, 134, 1, 134, 1, 134, 1, 135, 1, 135, 1, 135, 1, 135, 1, 136, 1, 136, 1, 136, 1, 136, 1, 136, 1, 137, 1, 137, 1, 137, 1, 137, 1, 138, 1, 138, 1, 138, 1, 138, 1, 139, 1, 139, 1, 139, 1, 139, 1, 140, 1, 140, 1, 140, 1, 140, 1, 141, 1, 141, 1, 141, 1, 141, 1, 142, 1, 142, 1, 142, 1, 142, 1, 143, 1, 143, 1, 143, 1, 143, 1, 143, 1, 144, 1, 144, 1, 144, 1, 144, 1, 144, 1, 145, 1, 145, 1, 145, 1, 145, 1, 146, 1, 146, 1, 146, 1, 146, 1, 147, 1, 147, 1, 147, 1, 147, 1, 148, 1, 148, 1, 148, 1, 148, 1, 148, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 150, 1, 150, 1, 150, 1, 150, 1, 151, 1, 151, 1, 151, 1, 151, 1, 152, 1, 152, 1, 152, 1, 152, 1, 153, 1, 153, 1, 153, 1, 153, 1, 153, 1, 154, 1, 154, 1, 155, 1, 155, 1, 155, 1, 155, 1, 155, 4, 155, 1183, 8, 155, 11, 155, 12, 155, 1184, 1, 156, 1, 156, 1, 156, 1, 156, 1, 157, 1, 157, 1, 157, 1, 157, 1, 158, 1, 158, 1, 158, 1, 158, 2, 511, 602, 0, 159, 12, 1, 14, 2, 16, 3, 18, 4, 20, 5, 22, 6, 24, 7, 26, 8, 28, 9, 30, 10, 32, 11, 34, 12, 36, 13, 38, 14, 40, 15, 42, 16, 44, 17, 46, 18, 48, 19, 50, 20, 52, 21, 54, 22, 56, 0, 58, 0, 60, 23, 62, 24, 64, 25, 66, 26, 68, 0, 70, 0, 72, 0, 74, 0, 76, 0, 78, 0, 80, 0, 82, 0, 84, 0, 86, 0, 88, 27, 90, 28, 92, 29, 94, 30, 96, 31, 98, 32, 100, 33, 102, 34, 104, 35, 106, 36, 108, 37, 110, 38, 112, 39, 114, 40, 116, 41, 118, 42, 120, 43, 122, 44, 124, 45, 126, 46, 128, 47, 130, 48, 132, 49, 134, 50, 136, 51, 138, 52, 140, 53, 142, 54, 144, 55, 146, 56, 148, 57, 150, 58, 152, 59, 154, 60, 156, 61, 158, 62, 160, 63, 162, 64, 164, 65, 166, 66, 168, 0, 170, 67, 172, 68, 174, 69, 176, 70, 178, 0, 180, 0, 182, 0, 184, 0, 186, 0, 188, 0, 190, 71, 192, 72, 194, 0, 196, 73, 198, 0, 200, 74, 202, 75, 204, 76, 206, 0, 208, 0, 210, 0, 212, 0, 214, 0, 216, 77, 218, 78, 220, 79, 222, 80, 224, 0, 226, 0, 228, 0, 230, 0, 232, 81, 234, 0, 236, 82, 238, 83, 240, 84, 242, 0, 244, 0, 246, 85, 248, 86, 250, 0, 252, 87, 254, 0, 256, 0, 258, 88, 260, 89, 262, 90, 264, 0, 266, 0, 268, 0, 270, 0, 272, 0, 274, 0, 276, 0, 278, 91, 280, 92, 282, 93, 284, 0, 286, 0, 288, 0, 290, 0, 292, 94, 294, 95, 296, 96, 298, 0, 300, 97, 302, 98, 304, 99, 306, 100, 308, 0, 310, 101, 312, 102, 314, 103, 316, 104, 318, 0, 320, 105, 322, 106, 324, 107, 326, 108, 328, 109, 12, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 35, 2, 0, 68, 68, 100, 100, 2, 0, 73, 73, 105, 105, 2, 0, 83, 83, 115, 115, 2, 0, 69, 69, 101, 101, 2, 0, 67, 67, 99, 99, 2, 0, 84, 84, 116, 116, 2, 0, 82, 82, 114, 114, 2, 0, 79, 79, 111, 111, 2, 0, 80, 80, 112, 112, 2, 0, 78, 78, 110, 110, 2, 0, 72, 72, 104, 104, 2, 0, 86, 86, 118, 118, 2, 0, 65, 65, 97, 97, 2, 0, 76, 76, 108, 108, 2, 0, 88, 88, 120, 120, 2, 0, 70, 70, 102, 102, 2, 0, 77, 77, 109, 109, 2, 0, 71, 71, 103, 103, 2, 0, 75, 75, 107, 107, 2, 0, 87, 87, 119, 119, 6, 0, 9, 10, 13, 13, 32, 32, 47, 47, 91, 91, 93, 93, 2, 0, 10, 10, 13, 13, 3, 0, 9, 10, 13, 13, 32, 32, 1, 0, 48, 57, 2, 0, 65, 90, 97, 122, 8, 0, 34, 34, 78, 78, 82, 82, 84, 84, 92, 92, 110, 110, 114, 114, 116, 116, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 2, 0, 43, 43, 45, 45, 1, 0, 96, 96, 2, 0, 66, 66, 98, 98, 2, 0, 89, 89, 121, 121, 2, 0, 85, 85, 117, 117, 10, 0, 9, 10, 13, 13, 32, 32, 44, 44, 47, 47, 61, 61, 91, 91, 93, 93, 96, 96, 124, 124, 2, 0, 42, 42, 47, 47, 11, 0, 9, 10, 13, 13, 32, 32, 34, 35, 44, 44, 47, 47, 58, 58, 60, 60, 62, 63, 92, 92, 124, 124, 1225, 0, 12, 1, 0, 0, 0, 0, 14, 1, 0, 0, 0, 0, 16, 1, 0, 0, 0, 0, 18, 1, 0, 0, 0, 0, 20, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 24, 1, 0, 0, 0, 0, 26, 1, 0, 0, 0, 0, 28, 1, 0, 0, 0, 0, 30, 1, 0, 0, 0, 0, 32, 1, 0, 0, 0, 0, 34, 1, 0, 0, 0, 0, 36, 1, 0, 0, 0, 0, 38, 1, 0, 0, 0, 0, 40, 1, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 46, 1, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 50, 1, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 54, 1, 0, 0, 0, 1, 56, 1, 0, 0, 0, 1, 58, 1, 0, 0, 0, 1, 60, 1, 0, 0, 0, 1, 62, 1, 0, 0, 0, 1, 64, 1, 0, 0, 0, 2, 66, 1, 0, 0, 0, 2, 88, 1, 0, 0, 0, 2, 90, 1, 0, 0, 0, 2, 92, 1, 0, 0, 0, 2, 94, 1, 0, 0, 0, 2, 96, 1, 0, 0, 0, 2, 98, 1, 0, 0, 0, 2, 100, 1, 0, 0, 0, 2, 102, 1, 0, 0, 0, 2, 104, 1, 0, 0, 0, 2, 106, 1, 0, 0, 0, 2, 108, 1, 0, 0, 0, 2, 110, 1, 0, 0, 0, 2, 112, 1, 0, 0, 0, 2, 114, 1, 0, 0, 0, 2, 116, 1, 0, 0, 0, 2, 118, 1, 0, 0, 0, 2, 120, 1, 0, 0, 0, 2, 122, 1, 0, 0, 0, 2, 124, 1, 0, 0, 0, 2, 126, 1, 0, 0, 0, 2, 128, 1, 0, 0, 0, 2, 130, 1, 0, 0, 0, 2, 132, 1, 0, 0, 0, 2, 134, 1, 0, 0, 0, 2, 136, 1, 0, 0, 0, 2, 138, 1, 0, 0, 0, 2, 140, 1, 0, 0, 0, 2, 142, 1, 0, 0, 0, 2, 144, 1, 0, 0, 0, 2, 146, 1, 0, 0, 0, 2, 148, 1, 0, 0, 0, 2, 150, 1, 0, 0, 0, 2, 152, 1, 0, 0, 0, 2, 154, 1, 0, 0, 0, 2, 156, 1, 0, 0, 0, 2, 158, 1, 0, 0, 0, 2, 160, 1, 0, 0, 0, 2, 162, 1, 0, 0, 0, 2, 164, 1, 0, 0, 0, 2, 166, 1, 0, 0, 0, 2, 170, 1, 0, 0, 0, 2, 172, 1, 0, 0, 0, 2, 174, 1, 0, 0, 0, 2, 176, 1, 0, 0, 0, 3, 178, 1, 0, 0, 0, 3, 180, 1, 0, 0, 0, 3, 182, 1, 0, 0, 0, 3, 184, 1, 0, 0, 0, 3, 186, 1, 0, 0, 0, 3, 188, 1, 0, 0, 0, 3, 190, 1, 0, 0, 0, 3, 192, 1, 0, 0, 0, 3, 196, 1, 0, 0, 0, 3, 198, 1, 0, 0, 0, 3, 200, 1, 0, 0, 0, 3, 202, 1, 0, 0, 0, 3, 204, 1, 0, 0, 0, 4, 206, 1, 0, 0, 0, 4, 208, 1, 0, 0, 0, 4, 210, 1, 0, 0, 0, 4, 216, 1, 0, 0, 0, 4, 218, 1, 0, 0, 0, 4, 220, 1, 0, 0, 0, 4, 222, 1, 0, 0, 0, 5, 224, 1, 0, 0, 0, 5, 226, 1, 0, 0, 0, 5, 228, 1, 0, 0, 0, 5, 230, 1, 0, 0, 0, 5, 232, 1, 0, 0, 0, 5, 234, 1, 0, 0, 0, 5, 236, 1, 0, 0, 0, 5, 238, 1, 0, 0, 0, 5, 240, 1, 0, 0, 0, 6, 242, 1, 0, 0, 0, 6, 244, 1, 0, 0, 0, 6, 246, 1, 0, 0, 0, 6, 248, 1, 0, 0, 0, 6, 252, 1, 0, 0, 0, 6, 254, 1, 0, 0, 0, 6, 256, 1, 0, 0, 0, 6, 258, 1, 0, 0, 0, 6, 260, 1, 0, 0, 0, 6, 262, 1, 0, 0, 0, 7, 264, 1, 0, 0, 0, 7, 266, 1, 0, 0, 0, 7, 268, 1, 0, 0, 0, 7, 270, 1, 0, 0, 0, 7, 272, 1, 0, 0, 0, 7, 274, 1, 0, 0, 0, 7, 276, 1, 0, 0, 0, 7, 278, 1, 0, 0, 0, 7, 280, 1, 0, 0, 0, 7, 282, 1, 0, 0, 0, 8, 284, 1, 0, 0, 0, 8, 286, 1, 0, 0, 0, 8, 288, 1, 0, 0, 0, 8, 290, 1, 0, 0, 0, 8, 292, 1, 0, 0, 0, 8, 294, 1, 0, 0, 0, 8, 296, 1, 0, 0, 0, 9, 298, 1, 0, 0, 0, 9, 300, 1, 0, 0, 0, 9, 302, 1, 0, 0, 0, 9, 304, 1, 0, 0, 0, 9, 306, 1, 0, 0, 0, 10, 308, 1, 0, 0, 0, 10, 310, 1, 0, 0, 0, 10, 312, 1, 0, 0, 0, 10, 314, 1, 0, 0, 0, 10, 316, 1, 0, 0, 0, 11, 318, 1, 0, 0, 0, 11, 320, 1, 0, 0, 0, 11, 322, 1, 0, 0, 0, 11, 324, 1, 0, 0, 0, 11, 326, 1, 0, 0, 0, 11, 328, 1, 0, 0, 0, 12, 330, 1, 0, 0, 0, 14, 340, 1, 0, 0, 0, 16, 347, 1, 0, 0, 0, 18, 356, 1, 0, 0, 0, 20, 363, 1, 0, 0, 0, 22, 373, 1, 0, 0, 0, 24, 380, 1, 0, 0, 0, 26, 387, 1, 0, 0, 0, 28, 401, 1, 0, 0, 0, 30, 408, 1, 0, 0, 0, 32, 416, 1, 0, 0, 0, 34, 423, 1, 0, 0, 0, 36, 435, 1, 0, 0, 0, 38, 444, 1, 0, 0, 0, 40, 450, 1, 0, 0, 0, 42, 457, 1, 0, 0, 0, 44, 464, 1, 0, 0, 0, 46, 472, 1, 0, 0, 0, 48, 481, 1, 0, 0, 0, 50, 487, 1, 0, 0, 0, 52, 504, 1, 0, 0, 0, 54, 520, 1, 0, 0, 0, 56, 526, 1, 0, 0, 0, 58, 531, 1, 0, 0, 0, 60, 536, 1, 0, 0, 0, 62, 540, 1, 0, 0, 0, 64, 544, 1, 0, 0, 0, 66, 548, 1, 0, 0, 0, 68, 552, 1, 0, 0, 0, 70, 554, 1, 0, 0, 0, 72, 556, 1, 0, 0, 0, 74, 559, 1, 0, 0, 0, 76, 561, 1, 0, 0, 0, 78, 570, 1, 0, 0, 0, 80, 572, 1, 0, 0, 0, 82, 577, 1, 0, 0, 0, 84, 579, 1, 0, 0, 0, 86, 584, 1, 0, 0, 0, 88, 615, 1, 0, 0, 0, 90, 618, 1, 0, 0, 0, 92, 664, 1, 0, 0, 0, 94, 666, 1, 0, 0, 0, 96, 669, 1, 0, 0, 0, 98, 673, 1, 0, 0, 0, 100, 677, 1, 0, 0, 0, 102, 679, 1, 0, 0, 0, 104, 681, 1, 0, 0, 0, 106, 686, 1, 0, 0, 0, 108, 688, 1, 0, 0, 0, 110, 694, 1, 0, 0, 0, 112, 700, 1, 0, 0, 0, 114, 705, 1, 0, 0, 0, 116, 707, 1, 0, 0, 0, 118, 710, 1, 0, 0, 0, 120, 713, 1, 0, 0, 0, 122, 718, 1, 0, 0, 0, 124, 722, 1, 0, 0, 0, 126, 727, 1, 0, 0, 0, 128, 733, 1, 0, 0, 0, 130, 736, 1, 0, 0, 0, 132, 738, 1, 0, 0, 0, 134, 744, 1, 0, 0, 0, 136, 746, 1, 0, 0, 0, 138, 751, 1, 0, 0, 0, 140, 754, 1, 0, 0, 0, 142, 757, 1, 0, 0, 0, 144, 760, 1, 0, 0, 0, 146, 762, 1, 0, 0, 0, 148, 765, 1, 0, 0, 0, 150, 767, 1, 0, 0, 0, 152, 770, 1, 0, 0, 0, 154, 772, 1, 0, 0, 0, 156, 774, 1, 0, 0, 0, 158, 776, 1, 0, 0, 0, 160, 778, 1, 0, 0, 0, 162, 780, 1, 0, 0, 0, 164, 785, 1, 0, 0, 0, 166, 806, 1, 0, 0, 0, 168, 808, 1, 0, 0, 0, 170, 816, 1, 0, 0, 0, 172, 818, 1, 0, 0, 0, 174, 822, 1, 0, 0, 0, 176, 826, 1, 0, 0, 0, 178, 830, 1, 0, 0, 0, 180, 835, 1, 0, 0, 0, 182, 839, 1, 0, 0, 0, 184, 843, 1, 0, 0, 0, 186, 847, 1, 0, 0, 0, 188, 851, 1, 0, 0, 0, 190, 855, 1, 0, 0, 0, 192, 863, 1, 0, 0, 0, 194, 875, 1, 0, 0, 0, 196, 878, 1, 0, 0, 0, 198, 882, 1, 0, 0, 0, 200, 886, 1, 0, 0, 0, 202, 890, 1, 0, 0, 0, 204, 894, 1, 0, 0, 0, 206, 898, 1, 0, 0, 0, 208, 903, 1, 0, 0, 0, 210, 907, 1, 0, 0, 0, 212, 915, 1, 0, 0, 0, 214, 936, 1, 0, 0, 0, 216, 940, 1, 0, 0, 0, 218, 944, 1, 0, 0, 0, 220, 948, 1, 0, 0, 0, 222, 952, 1, 0, 0, 0, 224, 956, 1, 0, 0, 0, 226, 961, 1, 0, 0, 0, 228, 965, 1, 0, 0, 0, 230, 969, 1, 0, 0, 0, 232, 973, 1, 0, 0, 0, 234, 976, 1, 0, 0, 0, 236, 980, 1, 0, 0, 0, 238, 984, 1, 0, 0, 0, 240, 988, 1, 0, 0, 0, 242, 992, 1, 0, 0, 0, 244, 997, 1, 0, 0, 0, 246, 1002, 1, 0, 0, 0, 248, 1007, 1, 0, 0, 0, 250, 1014, 1, 0, 0, 0, 252, 1023, 1, 0, 0, 0, 254, 1030, 1, 0, 0, 0, 256, 1034, 1, 0, 0, 0, 258, 1038, 1, 0, 0, 0, 260, 1042, 1, 0, 0, 0, 262, 1046, 1, 0, 0, 0, 264, 1050, 1, 0, 0, 0, 266, 1056, 1, 0, 0, 0, 268, 1060, 1, 0, 0, 0, 270, 1064, 1, 0, 0, 0, 272, 1068, 1, 0, 0, 0, 274, 1072, 1, 0, 0, 0, 276, 1076, 1, 0, 0, 0, 278, 1080, 1, 0, 0, 0, 280, 1084, 1, 0, 0, 0, 282, 1088, 1, 0, 0, 0, 284, 1092, 1, 0, 0, 0, 286, 1097, 1, 0, 0, 0, 288, 1101, 1, 0, 0, 0, 290, 1105, 1, 0, 0, 0, 292, 1109, 1, 0, 0, 0, 294, 1113, 1, 0, 0, 0, 296, 1117, 1, 0, 0, 0, 298, 1121, 1, 0, 0, 0, 300, 1126, 1, 0, 0, 0, 302, 1131, 1, 0, 0, 0, 304, 1135, 1, 0, 0, 0, 306, 1139, 1, 0, 0, 0, 308, 1143, 1, 0, 0, 0, 310, 1148, 1, 0, 0, 0, 312, 1158, 1, 0, 0, 0, 314, 1162, 1, 0, 0, 0, 316, 1166, 1, 0, 0, 0, 318, 1170, 1, 0, 0, 0, 320, 1175, 1, 0, 0, 0, 322, 1182, 1, 0, 0, 0, 324, 1186, 1, 0, 0, 0, 326, 1190, 1, 0, 0, 0, 328, 1194, 1, 0, 0, 0, 330, 331, 7, 0, 0, 0, 331, 332, 7, 1, 0, 0, 332, 333, 7, 2, 0, 0, 333, 334, 7, 2, 0, 0, 334, 335, 7, 3, 0, 0, 335, 336, 7, 4, 0, 0, 336, 337, 7, 5, 0, 0, 337, 338, 1, 0, 0, 0, 338, 339, 6, 0, 0, 0, 339, 13, 1, 0, 0, 0, 340, 341, 7, 0, 0, 0, 341, 342, 7, 6, 0, 0, 342, 343, 7, 7, 0, 0, 343, 344, 7, 8, 0, 0, 344, 345, 1, 0, 0, 0, 345, 346, 6, 1, 1, 0, 346, 15, 1, 0, 0, 0, 347, 348, 7, 3, 0, 0, 348, 349, 7, 9, 0, 0, 349, 350, 7, 6, 0, 0, 350, 351, 7, 1, 0, 0, 351, 352, 7, 4, 0, 0, 352, 353, 7, 10, 0, 0, 353, 354, 1, 0, 0, 0, 354, 355, 6, 2, 2, 0, 355, 17, 1, 0, 0, 0, 356, 357, 7, 3, 0, 0, 357, 358, 7, 11, 0, 0, 358, 359, 7, 12, 0, 0, 359, 360, 7, 13, 0, 0, 360, 361, 1, 0, 0, 0, 361, 362, 6, 3, 0, 0, 362, 19, 1, 0, 0, 0, 363, 364, 7, 3, 0, 0, 364, 365, 7, 14, 0, 0, 365, 366, 7, 8, 0, 0, 366, 367, 7, 13, 0, 0, 367, 368, 7, 12, 0, 0, 368, 369, 7, 1, 0, 0, 369, 370, 7, 9, 0, 0, 370, 371, 1, 0, 0, 0, 371, 372, 6, 4, 3, 0, 372, 21, 1, 0, 0, 0, 373, 374, 7, 15, 0, 0, 374, 375, 7, 6, 0, 0, 375, 376, 7, 7, 0, 0, 376, 377, 7, 16, 0, 0, 377, 378, 1, 0, 0, 0, 378, 379, 6, 5, 4, 0, 379, 23, 1, 0, 0, 0, 380, 381, 7, 17, 0, 0, 381, 382, 7, 6, 0, 0, 382, 383, 7, 7, 0, 0, 383, 384, 7, 18, 0, 0, 384, 385, 1, 0, 0, 0, 385, 386, 6, 6, 0, 0, 386, 25, 1, 0, 0, 0, 387, 388, 7, 1, 0, 0, 388, 389, 7, 9, 0, 0, 389, 390, 7, 13, 0, 0, 390, 391, 7, 1, 0, 0, 391, 392, 7, 9, 0, 0, 392, 393, 7, 3, 0, 0, 393, 394, 7, 2, 0, 0, 394, 395, 7, 5, 0, 0, 395, 396, 7, 12, 0, 0, 396, 397, 7, 5, 0, 0, 397, 398, 7, 2, 0, 0, 398, 399, 1, 0, 0, 0, 399, 400, 6, 7, 0, 0, 400, 27, 1, 0, 0, 0, 401, 402, 7, 18, 0, 0, 402, 403, 7, 3, 0, 0, 403, 404, 7, 3, 0, 0, 404, 405, 7, 8, 0, 0, 405, 406, 1, 0, 0, 0, 406, 407, 6, 8, 1, 0, 407, 29, 1, 0, 0, 0, 408, 409, 7, 13, 0, 0, 409, 410, 7, 1, 0, 0, 410, 411, 7, 16, 0, 0, 411, 412, 7, 1, 0, 0, 412, 413, 7, 5, 0, 0, 413, 414, 1, 0, 0, 0, 414, 415, 6, 9, 0, 0, 415, 31, 1, 0, 0, 0, 416, 417, 7, 16, 0, 0, 417, 418, 7, 3, 0, 0, 418, 419, 7, 5, 0, 0, 419, 420, 7, 12, 0, 0, 420, 421, 1, 0, 0, 0, 421, 422, 6, 10, 5, 0, 422, 33, 1, 0, 0, 0, 423, 424, 7, 16, 0, 0, 424, 425, 7, 11, 0, 0, 425, 426, 5, 95, 0, 0, 426, 427, 7, 3, 0, 0, 427, 428, 7, 14, 0, 0, 428, 429, 7, 8, 0, 0, 429, 430, 7, 12, 0, 0, 430, 431, 7, 9, 0, 0, 431, 432, 7, 0, 0, 0, 432, 433, 1, 0, 0, 0, 433, 434, 6, 11, 6, 0, 434, 35, 1, 0, 0, 0, 435, 436, 7, 6, 0, 0, 436, 437, 7, 3, 0, 0, 437, 438, 7, 9, 0, 0, 438, 439, 7, 12, 0, 0, 439, 440, 7, 16, 0, 0, 440, 441, 7, 3, 0, 0, 441, 442, 1, 0, 0, 0, 442, 443, 6, 12, 7, 0, 443, 37, 1, 0, 0, 0, 444, 445, 7, 6, 0, 0, 445, 446, 7, 7, 0, 0, 446, 447, 7, 19, 0, 0, 447, 448, 1, 0, 0, 0, 448, 449, 6, 13, 0, 0, 449, 39, 1, 0, 0, 0, 450, 451, 7, 2, 0, 0, 451, 452, 7, 10, 0, 0, 452, 453, 7, 7, 0, 0, 453, 454, 7, 19, 0, 0, 454, 455, 1, 0, 0, 0, 455, 456, 6, 14, 8, 0, 456, 41, 1, 0, 0, 0, 457, 458, 7, 2, 0, 0, 458, 459, 7, 7, 0, 0, 459, 460, 7, 6, 0, 0, 460, 461, 7, 5, 0, 0, 461, 462, 1, 0, 0, 0, 462, 463, 6, 15, 0, 0, 463, 43, 1, 0, 0, 0, 464, 465, 7, 2, 0, 0, 465, 466, 7, 5, 0, 0, 466, 467, 7, 12, 0, 0, 467, 468, 7, 5, 0, 0, 468, 469, 7, 2, 0, 0, 469, 470, 1, 0, 0, 0, 470, 471, 6, 16, 0, 0, 471, 45, 1, 0, 0, 0, 472, 473, 7, 19, 0, 0, 473, 474, 7, 10, 0, 0, 474, 475, 7, 3, 0, 0, 475, 476, 7, 6, 0, 0, 476, 477, 7, 3, 0, 0, 477, 478, 1, 0, 0, 0, 478, 479, 6, 17, 0, 0, 479, 47, 1, 0, 0, 0, 480, 482, 8, 20, 0, 0, 481, 480, 1, 0, 0, 0, 482, 483, 1, 0, 0, 0, 483, 481, 1, 0, 0, 0, 483, 484, 1, 0, 0, 0, 484, 485, 1, 0, 0, 0, 485, 486, 6, 18, 0, 0, 486, 49, 1, 0, 0, 0, 487, 488, 5, 47, 0, 0, 488, 489, 5, 47, 0, 0, 489, 493, 1, 0, 0, 0, 490, 492, 8, 21, 0, 0, 491, 490, 1, 0, 0, 0, 492, 495, 1, 0, 0, 0, 493, 491, 1, 0, 0, 0, 493, 494, 1, 0, 0, 0, 494, 497, 1, 0, 0, 0, 495, 493, 1, 0, 0, 0, 496, 498, 5, 13, 0, 0, 497, 496, 1, 0, 0, 0, 497, 498, 1, 0, 0, 0, 498, 500, 1, 0, 0, 0, 499, 501, 5, 10, 0, 0, 500, 499, 1, 0, 0, 0, 500, 501, 1, 0, 0, 0, 501, 502, 1, 0, 0, 0, 502, 503, 6, 19, 9, 0, 503, 51, 1, 0, 0, 0, 504, 505, 5, 47, 0, 0, 505, 506, 5, 42, 0, 0, 506, 511, 1, 0, 0, 0, 507, 510, 3, 52, 20, 0, 508, 510, 9, 0, 0, 0, 509, 507, 1, 0, 0, 0, 509, 508, 1, 0, 0, 0, 510, 513, 1, 0, 0, 0, 511, 512, 1, 0, 0, 0, 511, 509, 1, 0, 0, 0, 512, 514, 1, 0, 0, 0, 513, 511, 1, 0, 0, 0, 514, 515, 5, 42, 0, 0, 515, 516, 5, 47, 0, 0, 516, 517, 1, 0, 0, 0, 517, 518, 6, 20, 9, 0, 518, 53, 1, 0, 0, 0, 519, 521, 7, 22, 0, 0, 520, 519, 1, 0, 0, 0, 521, 522, 1, 0, 0, 0, 522, 520, 1, 0, 0, 0, 522, 523, 1, 0, 0, 0, 523, 524, 1, 0, 0, 0, 524, 525, 6, 21, 9, 0, 525, 55, 1, 0, 0, 0, 526, 527, 3, 162, 75, 0, 527, 528, 1, 0, 0, 0, 528, 529, 6, 22, 10, 0, 529, 530, 6, 22, 11, 0, 530, 57, 1, 0, 0, 0, 531, 532, 3, 66, 27, 0, 532, 533, 1, 0, 0, 0, 533, 534, 6, 23, 12, 0, 534, 535, 6, 23, 13, 0, 535, 59, 1, 0, 0, 0, 536, 537, 3, 54, 21, 0, 537, 538, 1, 0, 0, 0, 538, 539, 6, 24, 9, 0, 539, 61, 1, 0, 0, 0, 540, 541, 3, 50, 19, 0, 541, 542, 1, 0, 0, 0, 542, 543, 6, 25, 9, 0, 543, 63, 1, 0, 0, 0, 544, 545, 3, 52, 20, 0, 545, 546, 1, 0, 0, 0, 546, 547, 6, 26, 9, 0, 547, 65, 1, 0, 0, 0, 548, 549, 5, 124, 0, 0, 549, 550, 1, 0, 0, 0, 550, 551, 6, 27, 13, 0, 551, 67, 1, 0, 0, 0, 552, 553, 7, 23, 0, 0, 553, 69, 1, 0, 0, 0, 554, 555, 7, 24, 0, 0, 555, 71, 1, 0, 0, 0, 556, 557, 5, 92, 0, 0, 557, 558, 7, 25, 0, 0, 558, 73, 1, 0, 0, 0, 559, 560, 8, 26, 0, 0, 560, 75, 1, 0, 0, 0, 561, 563, 7, 3, 0, 0, 562, 564, 7, 27, 0, 0, 563, 562, 1, 0, 0, 0, 563, 564, 1, 0, 0, 0, 564, 566, 1, 0, 0, 0, 565, 567, 3, 68, 28, 0, 566, 565, 1, 0, 0, 0, 567, 568, 1, 0, 0, 0, 568, 566, 1, 0, 0, 0, 568, 569, 1, 0, 0, 0, 569, 77, 1, 0, 0, 0, 570, 571, 5, 64, 0, 0, 571, 79, 1, 0, 0, 0, 572, 573, 5, 96, 0, 0, 573, 81, 1, 0, 0, 0, 574, 578, 8, 28, 0, 0, 575, 576, 5, 96, 0, 0, 576, 578, 5, 96, 0, 0, 577, 574, 1, 0, 0, 0, 577, 575, 1, 0, 0, 0, 578, 83, 1, 0, 0, 0, 579, 580, 5, 95, 0, 0, 580, 85, 1, 0, 0, 0, 581, 585, 3, 70, 29, 0, 582, 585, 3, 68, 28, 0, 583, 585, 3, 84, 36, 0, 584, 581, 1, 0, 0, 0, 584, 582, 1, 0, 0, 0, 584, 583, 1, 0, 0, 0, 585, 87, 1, 0, 0, 0, 586, 591, 5, 34, 0, 0, 587, 590, 3, 72, 30, 0, 588, 590, 3, 74, 31, 0, 589, 587, 1, 0, 0, 0, 589, 588, 1, 0, 0, 0, 590, 593, 1, 0, 0, 0, 591, 589, 1, 0, 0, 0, 591, 592, 1, 0, 0, 0, 592, 594, 1, 0, 0, 0, 593, 591, 1, 0, 0, 0, 594, 616, 5, 34, 0, 0, 595, 596, 5, 34, 0, 0, 596, 597, 5, 34, 0, 0, 597, 598, 5, 34, 0, 0, 598, 602, 1, 0, 0, 0, 599, 601, 8, 21, 0, 0, 600, 599, 1, 0, 0, 0, 601, 604, 1, 0, 0, 0, 602, 603, 1, 0, 0, 0, 602, 600, 1, 0, 0, 0, 603, 605, 1, 0, 0, 0, 604, 602, 1, 0, 0, 0, 605, 606, 5, 34, 0, 0, 606, 607, 5, 34, 0, 0, 607, 608, 5, 34, 0, 0, 608, 610, 1, 0, 0, 0, 609, 611, 5, 34, 0, 0, 610, 609, 1, 0, 0, 0, 610, 611, 1, 0, 0, 0, 611, 613, 1, 0, 0, 0, 612, 614, 5, 34, 0, 0, 613, 612, 1, 0, 0, 0, 613, 614, 1, 0, 0, 0, 614, 616, 1, 0, 0, 0, 615, 586, 1, 0, 0, 0, 615, 595, 1, 0, 0, 0, 616, 89, 1, 0, 0, 0, 617, 619, 3, 68, 28, 0, 618, 617, 1, 0, 0, 0, 619, 620, 1, 0, 0, 0, 620, 618, 1, 0, 0, 0, 620, 621, 1, 0, 0, 0, 621, 91, 1, 0, 0, 0, 622, 624, 3, 68, 28, 0, 623, 622, 1, 0, 0, 0, 624, 625, 1, 0, 0, 0, 625, 623, 1, 0, 0, 0, 625, 626, 1, 0, 0, 0, 626, 627, 1, 0, 0, 0, 627, 631, 3, 106, 47, 0, 628, 630, 3, 68, 28, 0, 629, 628, 1, 0, 0, 0, 630, 633, 1, 0, 0, 0, 631, 629, 1, 0, 0, 0, 631, 632, 1, 0, 0, 0, 632, 665, 1, 0, 0, 0, 633, 631, 1, 0, 0, 0, 634, 636, 3, 106, 47, 0, 635, 637, 3, 68, 28, 0, 636, 635, 1, 0, 0, 0, 637, 638, 1, 0, 0, 0, 638, 636, 1, 0, 0, 0, 638, 639, 1, 0, 0, 0, 639, 665, 1, 0, 0, 0, 640, 642, 3, 68, 28, 0, 641, 640, 1, 0, 0, 0, 642, 643, 1, 0, 0, 0, 643, 641, 1, 0, 0, 0, 643, 644, 1, 0, 0, 0, 644, 652, 1, 0, 0, 0, 645, 649, 3, 106, 47, 0, 646, 648, 3, 68, 28, 0, 647, 646, 1, 0, 0, 0, 648, 651, 1, 0, 0, 0, 649, 647, 1, 0, 0, 0, 649, 650, 1, 0, 0, 0, 650, 653, 1, 0, 0, 0, 651, 649, 1, 0, 0, 0, 652, 645, 1, 0, 0, 0, 652, 653, 1, 0, 0, 0, 653, 654, 1, 0, 0, 0, 654, 655, 3, 76, 32, 0, 655, 665, 1, 0, 0, 0, 656, 658, 3, 106, 47, 0, 657, 659, 3, 68, 28, 0, 658, 657, 1, 0, 0, 0, 659, 660, 1, 0, 0, 0, 660, 658, 1, 0, 0, 0, 660, 661, 1, 0, 0, 0, 661, 662, 1, 0, 0, 0, 662, 663, 3, 76, 32, 0, 663, 665, 1, 0, 0, 0, 664, 623, 1, 0, 0, 0, 664, 634, 1, 0, 0, 0, 664, 641, 1, 0, 0, 0, 664, 656, 1, 0, 0, 0, 665, 93, 1, 0, 0, 0, 666, 667, 7, 29, 0, 0, 667, 668, 7, 30, 0, 0, 668, 95, 1, 0, 0, 0, 669, 670, 7, 12, 0, 0, 670, 671, 7, 9, 0, 0, 671, 672, 7, 0, 0, 0, 672, 97, 1, 0, 0, 0, 673, 674, 7, 12, 0, 0, 674, 675, 7, 2, 0, 0, 675, 676, 7, 4, 0, 0, 676, 99, 1, 0, 0, 0, 677, 678, 5, 61, 0, 0, 678, 101, 1, 0, 0, 0, 679, 680, 5, 44, 0, 0, 680, 103, 1, 0, 0, 0, 681, 682, 7, 0, 0, 0, 682, 683, 7, 3, 0, 0, 683, 684, 7, 2, 0, 0, 684, 685, 7, 4, 0, 0, 685, 105, 1, 0, 0, 0, 686, 687, 5, 46, 0, 0, 687, 107, 1, 0, 0, 0, 688, 689, 7, 15, 0, 0, 689, 690, 7, 12, 0, 0, 690, 691, 7, 13, 0, 0, 691, 692, 7, 2, 0, 0, 692, 693, 7, 3, 0, 0, 693, 109, 1, 0, 0, 0, 694, 695, 7, 15, 0, 0, 695, 696, 7, 1, 0, 0, 696, 697, 7, 6, 0, 0, 697, 698, 7, 2, 0, 0, 698, 699, 7, 5, 0, 0, 699, 111, 1, 0, 0, 0, 700, 701, 7, 13, 0, 0, 701, 702, 7, 12, 0, 0, 702, 703, 7, 2, 0, 0, 703, 704, 7, 5, 0, 0, 704, 113, 1, 0, 0, 0, 705, 706, 5, 40, 0, 0, 706, 115, 1, 0, 0, 0, 707, 708, 7, 1, 0, 0, 708, 709, 7, 9, 0, 0, 709, 117, 1, 0, 0, 0, 710, 711, 7, 1, 0, 0, 711, 712, 7, 2, 0, 0, 712, 119, 1, 0, 0, 0, 713, 714, 7, 13, 0, 0, 714, 715, 7, 1, 0, 0, 715, 716, 7, 18, 0, 0, 716, 717, 7, 3, 0, 0, 717, 121, 1, 0, 0, 0, 718, 719, 7, 9, 0, 0, 719, 720, 7, 7, 0, 0, 720, 721, 7, 5, 0, 0, 721, 123, 1, 0, 0, 0, 722, 723, 7, 9, 0, 0, 723, 724, 7, 31, 0, 0, 724, 725, 7, 13, 0, 0, 725, 726, 7, 13, 0, 0, 726, 125, 1, 0, 0, 0, 727, 728, 7, 9, 0, 0, 728, 729, 7, 31, 0, 0, 729, 730, 7, 13, 0, 0, 730, 731, 7, 13, 0, 0, 731, 732, 7, 2, 0, 0, 732, 127, 1, 0, 0, 0, 733, 734, 7, 7, 0, 0, 734, 735, 7, 6, 0, 0, 735, 129, 1, 0, 0, 0, 736, 737, 5, 63, 0, 0, 737, 131, 1, 0, 0, 0, 738, 739, 7, 6, 0, 0, 739, 740, 7, 13, 0, 0, 740, 741, 7, 1, 0, 0, 741, 742, 7, 18, 0, 0, 742, 743, 7, 3, 0, 0, 743, 133, 1, 0, 0, 0, 744, 745, 5, 41, 0, 0, 745, 135, 1, 0, 0, 0, 746, 747, 7, 5, 0, 0, 747, 748, 7, 6, 0, 0, 748, 749, 7, 31, 0, 0, 749, 750, 7, 3, 0, 0, 750, 137, 1, 0, 0, 0, 751, 752, 5, 61, 0, 0, 752, 753, 5, 61, 0, 0, 753, 139, 1, 0, 0, 0, 754, 755, 5, 61, 0, 0, 755, 756, 5, 126, 0, 0, 756, 141, 1, 0, 0, 0, 757, 758, 5, 33, 0, 0, 758, 759, 5, 61, 0, 0, 759, 143, 1, 0, 0, 0, 760, 761, 5, 60, 0, 0, 761, 145, 1, 0, 0, 0, 762, 763, 5, 60, 0, 0, 763, 764, 5, 61, 0, 0, 764, 147, 1, 0, 0, 0, 765, 766, 5, 62, 0, 0, 766, 149, 1, 0, 0, 0, 767, 768, 5, 62, 0, 0, 768, 769, 5, 61, 0, 0, 769, 151, 1, 0, 0, 0, 770, 771, 5, 43, 0, 0, 771, 153, 1, 0, 0, 0, 772, 773, 5, 45, 0, 0, 773, 155, 1, 0, 0, 0, 774, 775, 5, 42, 0, 0, 775, 157, 1, 0, 0, 0, 776, 777, 5, 47, 0, 0, 777, 159, 1, 0, 0, 0, 778, 779, 5, 37, 0, 0, 779, 161, 1, 0, 0, 0, 780, 781, 5, 91, 0, 0, 781, 782, 1, 0, 0, 0, 782, 783, 6, 75, 0, 0, 783, 784, 6, 75, 0, 0, 784, 163, 1, 0, 0, 0, 785, 786, 5, 93, 0, 0, 786, 787, 1, 0, 0, 0, 787, 788, 6, 76, 13, 0, 788, 789, 6, 76, 13, 0, 789, 165, 1, 0, 0, 0, 790, 794, 3, 70, 29, 0, 791, 793, 3, 86, 37, 0, 792, 791, 1, 0, 0, 0, 793, 796, 1, 0, 0, 0, 794, 792, 1, 0, 0, 0, 794, 795, 1, 0, 0, 0, 795, 807, 1, 0, 0, 0, 796, 794, 1, 0, 0, 0, 797, 800, 3, 84, 36, 0, 798, 800, 3, 78, 33, 0, 799, 797, 1, 0, 0, 0, 799, 798, 1, 0, 0, 0, 800, 802, 1, 0, 0, 0, 801, 803, 3, 86, 37, 0, 802, 801, 1, 0, 0, 0, 803, 804, 1, 0, 0, 0, 804, 802, 1, 0, 0, 0, 804, 805, 1, 0, 0, 0, 805, 807, 1, 0, 0, 0, 806, 790, 1, 0, 0, 0, 806, 799, 1, 0, 0, 0, 807, 167, 1, 0, 0, 0, 808, 810, 3, 80, 34, 0, 809, 811, 3, 82, 35, 0, 810, 809, 1, 0, 0, 0, 811, 812, 1, 0, 0, 0, 812, 810, 1, 0, 0, 0, 812, 813, 1, 0, 0, 0, 813, 814, 1, 0, 0, 0, 814, 815, 3, 80, 34, 0, 815, 169, 1, 0, 0, 0, 816, 817, 3, 168, 78, 0, 817, 171, 1, 0, 0, 0, 818, 819, 3, 50, 19, 0, 819, 820, 1, 0, 0, 0, 820, 821, 6, 80, 9, 0, 821, 173, 1, 0, 0, 0, 822, 823, 3, 52, 20, 0, 823, 824, 1, 0, 0, 0, 824, 825, 6, 81, 9, 0, 825, 175, 1, 0, 0, 0, 826, 827, 3, 54, 21, 0, 827, 828, 1, 0, 0, 0, 828, 829, 6, 82, 9, 0, 829, 177, 1, 0, 0, 0, 830, 831, 3, 66, 27, 0, 831, 832, 1, 0, 0, 0, 832, 833, 6, 83, 12, 0, 833, 834, 6, 83, 13, 0, 834, 179, 1, 0, 0, 0, 835, 836, 3, 162, 75, 0, 836, 837, 1, 0, 0, 0, 837, 838, 6, 84, 10, 0, 838, 181, 1, 0, 0, 0, 839, 840, 3, 164, 76, 0, 840, 841, 1, 0, 0, 0, 841, 842, 6, 85, 14, 0, 842, 183, 1, 0, 0, 0, 843, 844, 3, 102, 45, 0, 844, 845, 1, 0, 0, 0, 845, 846, 6, 86, 15, 0, 846, 185, 1, 0, 0, 0, 847, 848, 3, 100, 44, 0, 848, 849, 1, 0, 0, 0, 849, 850, 6, 87, 16, 0, 850, 187, 1, 0, 0, 0, 851, 852, 3, 88, 38, 0, 852, 853, 1, 0, 0, 0, 853, 854, 6, 88, 17, 0, 854, 189, 1, 0, 0, 0, 855, 856, 7, 7, 0, 0, 856, 857, 7, 8, 0, 0, 857, 858, 7, 5, 0, 0, 858, 859, 7, 1, 0, 0, 859, 860, 7, 7, 0, 0, 860, 861, 7, 9, 0, 0, 861, 862, 7, 2, 0, 0, 862, 191, 1, 0, 0, 0, 863, 864, 7, 16, 0, 0, 864, 865, 7, 3, 0, 0, 865, 866, 7, 5, 0, 0, 866, 867, 7, 12, 0, 0, 867, 868, 7, 0, 0, 0, 868, 869, 7, 12, 0, 0, 869, 870, 7, 5, 0, 0, 870, 871, 7, 12, 0, 0, 871, 193, 1, 0, 0, 0, 872, 876, 8, 32, 0, 0, 873, 874, 5, 47, 0, 0, 874, 876, 8, 33, 0, 0, 875, 872, 1, 0, 0, 0, 875, 873, 1, 0, 0, 0, 876, 195, 1, 0, 0, 0, 877, 879, 3, 194, 91, 0, 878, 877, 1, 0, 0, 0, 879, 880, 1, 0, 0, 0, 880, 878, 1, 0, 0, 0, 880, 881, 1, 0, 0, 0, 881, 197, 1, 0, 0, 0, 882, 883, 3, 170, 79, 0, 883, 884, 1, 0, 0, 0, 884, 885, 6, 93, 18, 0, 885, 199, 1, 0, 0, 0, 886, 887, 3, 50, 19, 0, 887, 888, 1, 0, 0, 0, 888, 889, 6, 94, 9, 0, 889, 201, 1, 0, 0, 0, 890, 891, 3, 52, 20, 0, 891, 892, 1, 0, 0, 0, 892, 893, 6, 95, 9, 0, 893, 203, 1, 0, 0, 0, 894, 895, 3, 54, 21, 0, 895, 896, 1, 0, 0, 0, 896, 897, 6, 96, 9, 0, 897, 205, 1, 0, 0, 0, 898, 899, 3, 66, 27, 0, 899, 900, 1, 0, 0, 0, 900, 901, 6, 97, 12, 0, 901, 902, 6, 97, 13, 0, 902, 207, 1, 0, 0, 0, 903, 904, 3, 106, 47, 0, 904, 905, 1, 0, 0, 0, 905, 906, 6, 98, 19, 0, 906, 209, 1, 0, 0, 0, 907, 908, 3, 102, 45, 0, 908, 909, 1, 0, 0, 0, 909, 910, 6, 99, 15, 0, 910, 211, 1, 0, 0, 0, 911, 916, 3, 70, 29, 0, 912, 916, 3, 68, 28, 0, 913, 916, 3, 84, 36, 0, 914, 916, 3, 156, 72, 0, 915, 911, 1, 0, 0, 0, 915, 912, 1, 0, 0, 0, 915, 913, 1, 0, 0, 0, 915, 914, 1, 0, 0, 0, 916, 213, 1, 0, 0, 0, 917, 920, 3, 70, 29, 0, 918, 920, 3, 156, 72, 0, 919, 917, 1, 0, 0, 0, 919, 918, 1, 0, 0, 0, 920, 924, 1, 0, 0, 0, 921, 923, 3, 212, 100, 0, 922, 921, 1, 0, 0, 0, 923, 926, 1, 0, 0, 0, 924, 922, 1, 0, 0, 0, 924, 925, 1, 0, 0, 0, 925, 937, 1, 0, 0, 0, 926, 924, 1, 0, 0, 0, 927, 930, 3, 84, 36, 0, 928, 930, 3, 78, 33, 0, 929, 927, 1, 0, 0, 0, 929, 928, 1, 0, 0, 0, 930, 932, 1, 0, 0, 0, 931, 933, 3, 212, 100, 0, 932, 931, 1, 0, 0, 0, 933, 934, 1, 0, 0, 0, 934, 932, 1, 0, 0, 0, 934, 935, 1, 0, 0, 0, 935, 937, 1, 0, 0, 0, 936, 919, 1, 0, 0, 0, 936, 929, 1, 0, 0, 0, 937, 215, 1, 0, 0, 0, 938, 941, 3, 214, 101, 0, 939, 941, 3, 168, 78, 0, 940, 938, 1, 0, 0, 0, 940, 939, 1, 0, 0, 0, 941, 942, 1, 0, 0, 0, 942, 940, 1, 0, 0, 0, 942, 943, 1, 0, 0, 0, 943, 217, 1, 0, 0, 0, 944, 945, 3, 50, 19, 0, 945, 946, 1, 0, 0, 0, 946, 947, 6, 103, 9, 0, 947, 219, 1, 0, 0, 0, 948, 949, 3, 52, 20, 0, 949, 950, 1, 0, 0, 0, 950, 951, 6, 104, 9, 0, 951, 221, 1, 0, 0, 0, 952, 953, 3, 54, 21, 0, 953, 954, 1, 0, 0, 0, 954, 955, 6, 105, 9, 0, 955, 223, 1, 0, 0, 0, 956, 957, 3, 66, 27, 0, 957, 958, 1, 0, 0, 0, 958, 959, 6, 106, 12, 0, 959, 960, 6, 106, 13, 0, 960, 225, 1, 0, 0, 0, 961, 962, 3, 100, 44, 0, 962, 963, 1, 0, 0, 0, 963, 964, 6, 107, 16, 0, 964, 227, 1, 0, 0, 0, 965, 966, 3, 102, 45, 0, 966, 967, 1, 0, 0, 0, 967, 968, 6, 108, 15, 0, 968, 229, 1, 0, 0, 0, 969, 970, 3, 106, 47, 0, 970, 971, 1, 0, 0, 0, 971, 972, 6, 109, 19, 0, 972, 231, 1, 0, 0, 0, 973, 974, 7, 12, 0, 0, 974, 975, 7, 2, 0, 0, 975, 233, 1, 0, 0, 0, 976, 977, 3, 216, 102, 0, 977, 978, 1, 0, 0, 0, 978, 979, 6, 111, 20, 0, 979, 235, 1, 0, 0, 0, 980, 981, 3, 50, 19, 0, 981, 982, 1, 0, 0, 0, 982, 983, 6, 112, 9, 0, 983, 237, 1, 0, 0, 0, 984, 985, 3, 52, 20, 0, 985, 986, 1, 0, 0, 0, 986, 987, 6, 113, 9, 0, 987, 239, 1, 0, 0, 0, 988, 989, 3, 54, 21, 0, 989, 990, 1, 0, 0, 0, 990, 991, 6, 114, 9, 0, 991, 241, 1, 0, 0, 0, 992, 993, 3, 66, 27, 0, 993, 994, 1, 0, 0, 0, 994, 995, 6, 115, 12, 0, 995, 996, 6, 115, 13, 0, 996, 243, 1, 0, 0, 0, 997, 998, 3, 162, 75, 0, 998, 999, 1, 0, 0, 0, 999, 1000, 6, 116, 10, 0, 1000, 1001, 6, 116, 21, 0, 1001, 245, 1, 0, 0, 0, 1002, 1003, 7, 7, 0, 0, 1003, 1004, 7, 9, 0, 0, 1004, 1005, 1, 0, 0, 0, 1005, 1006, 6, 117, 22, 0, 1006, 247, 1, 0, 0, 0, 1007, 1008, 7, 19, 0, 0, 1008, 1009, 7, 1, 0, 0, 1009, 1010, 7, 5, 0, 0, 1010, 1011, 7, 10, 0, 0, 1011, 1012, 1, 0, 0, 0, 1012, 1013, 6, 118, 22, 0, 1013, 249, 1, 0, 0, 0, 1014, 1015, 8, 34, 0, 0, 1015, 251, 1, 0, 0, 0, 1016, 1018, 3, 250, 119, 0, 1017, 1016, 1, 0, 0, 0, 1018, 1019, 1, 0, 0, 0, 1019, 1017, 1, 0, 0, 0, 1019, 1020, 1, 0, 0, 0, 1020, 1021, 1, 0, 0, 0, 1021, 1022, 3, 320, 154, 0, 1022, 1024, 1, 0, 0, 0, 1023, 1017, 1, 0, 0, 0, 1023, 1024, 1, 0, 0, 0, 1024, 1026, 1, 0, 0, 0, 1025, 1027, 3, 250, 119, 0, 1026, 1025, 1, 0, 0, 0, 1027, 1028, 1, 0, 0, 0, 1028, 1026, 1, 0, 0, 0, 1028, 1029, 1, 0, 0, 0, 1029, 253, 1, 0, 0, 0, 1030, 1031, 3, 170, 79, 0, 1031, 1032, 1, 0, 0, 0, 1032, 1033, 6, 121, 18, 0, 1033, 255, 1, 0, 0, 0, 1034, 1035, 3, 252, 120, 0, 1035, 1036, 1, 0, 0, 0, 1036, 1037, 6, 122, 23, 0, 1037, 257, 1, 0, 0, 0, 1038, 1039, 3, 50, 19, 0, 1039, 1040, 1, 0, 0, 0, 1040, 1041, 6, 123, 9, 0, 1041, 259, 1, 0, 0, 0, 1042, 1043, 3, 52, 20, 0, 1043, 1044, 1, 0, 0, 0, 1044, 1045, 6, 124, 9, 0, 1045, 261, 1, 0, 0, 0, 1046, 1047, 3, 54, 21, 0, 1047, 1048, 1, 0, 0, 0, 1048, 1049, 6, 125, 9, 0, 1049, 263, 1, 0, 0, 0, 1050, 1051, 3, 66, 27, 0, 1051, 1052, 1, 0, 0, 0, 1052, 1053, 6, 126, 12, 0, 1053, 1054, 6, 126, 13, 0, 1054, 1055, 6, 126, 13, 0, 1055, 265, 1, 0, 0, 0, 1056, 1057, 3, 100, 44, 0, 1057, 1058, 1, 0, 0, 0, 1058, 1059, 6, 127, 16, 0, 1059, 267, 1, 0, 0, 0, 1060, 1061, 3, 102, 45, 0, 1061, 1062, 1, 0, 0, 0, 1062, 1063, 6, 128, 15, 0, 1063, 269, 1, 0, 0, 0, 1064, 1065, 3, 106, 47, 0, 1065, 1066, 1, 0, 0, 0, 1066, 1067, 6, 129, 19, 0, 1067, 271, 1, 0, 0, 0, 1068, 1069, 3, 248, 118, 0, 1069, 1070, 1, 0, 0, 0, 1070, 1071, 6, 130, 24, 0, 1071, 273, 1, 0, 0, 0, 1072, 1073, 3, 216, 102, 0, 1073, 1074, 1, 0, 0, 0, 1074, 1075, 6, 131, 20, 0, 1075, 275, 1, 0, 0, 0, 1076, 1077, 3, 170, 79, 0, 1077, 1078, 1, 0, 0, 0, 1078, 1079, 6, 132, 18, 0, 1079, 277, 1, 0, 0, 0, 1080, 1081, 3, 50, 19, 0, 1081, 1082, 1, 0, 0, 0, 1082, 1083, 6, 133, 9, 0, 1083, 279, 1, 0, 0, 0, 1084, 1085, 3, 52, 20, 0, 1085, 1086, 1, 0, 0, 0, 1086, 1087, 6, 134, 9, 0, 1087, 281, 1, 0, 0, 0, 1088, 1089, 3, 54, 21, 0, 1089, 1090, 1, 0, 0, 0, 1090, 1091, 6, 135, 9, 0, 1091, 283, 1, 0, 0, 0, 1092, 1093, 3, 66, 27, 0, 1093, 1094, 1, 0, 0, 0, 1094, 1095, 6, 136, 12, 0, 1095, 1096, 6, 136, 13, 0, 1096, 285, 1, 0, 0, 0, 1097, 1098, 3, 106, 47, 0, 1098, 1099, 1, 0, 0, 0, 1099, 1100, 6, 137, 19, 0, 1100, 287, 1, 0, 0, 0, 1101, 1102, 3, 170, 79, 0, 1102, 1103, 1, 0, 0, 0, 1103, 1104, 6, 138, 18, 0, 1104, 289, 1, 0, 0, 0, 1105, 1106, 3, 166, 77, 0, 1106, 1107, 1, 0, 0, 0, 1107, 1108, 6, 139, 25, 0, 1108, 291, 1, 0, 0, 0, 1109, 1110, 3, 50, 19, 0, 1110, 1111, 1, 0, 0, 0, 1111, 1112, 6, 140, 9, 0, 1112, 293, 1, 0, 0, 0, 1113, 1114, 3, 52, 20, 0, 1114, 1115, 1, 0, 0, 0, 1115, 1116, 6, 141, 9, 0, 1116, 295, 1, 0, 0, 0, 1117, 1118, 3, 54, 21, 0, 1118, 1119, 1, 0, 0, 0, 1119, 1120, 6, 142, 9, 0, 1120, 297, 1, 0, 0, 0, 1121, 1122, 3, 66, 27, 0, 1122, 1123, 1, 0, 0, 0, 1123, 1124, 6, 143, 12, 0, 1124, 1125, 6, 143, 13, 0, 1125, 299, 1, 0, 0, 0, 1126, 1127, 7, 1, 0, 0, 1127, 1128, 7, 9, 0, 0, 1128, 1129, 7, 15, 0, 0, 1129, 1130, 7, 7, 0, 0, 1130, 301, 1, 0, 0, 0, 1131, 1132, 3, 50, 19, 0, 1132, 1133, 1, 0, 0, 0, 1133, 1134, 6, 145, 9, 0, 1134, 303, 1, 0, 0, 0, 1135, 1136, 3, 52, 20, 0, 1136, 1137, 1, 0, 0, 0, 1137, 1138, 6, 146, 9, 0, 1138, 305, 1, 0, 0, 0, 1139, 1140, 3, 54, 21, 0, 1140, 1141, 1, 0, 0, 0, 1141, 1142, 6, 147, 9, 0, 1142, 307, 1, 0, 0, 0, 1143, 1144, 3, 66, 27, 0, 1144, 1145, 1, 0, 0, 0, 1145, 1146, 6, 148, 12, 0, 1146, 1147, 6, 148, 13, 0, 1147, 309, 1, 0, 0, 0, 1148, 1149, 7, 15, 0, 0, 1149, 1150, 7, 31, 0, 0, 1150, 1151, 7, 9, 0, 0, 1151, 1152, 7, 4, 0, 0, 1152, 1153, 7, 5, 0, 0, 1153, 1154, 7, 1, 0, 0, 1154, 1155, 7, 7, 0, 0, 1155, 1156, 7, 9, 0, 0, 1156, 1157, 7, 2, 0, 0, 1157, 311, 1, 0, 0, 0, 1158, 1159, 3, 50, 19, 0, 1159, 1160, 1, 0, 0, 0, 1160, 1161, 6, 150, 9, 0, 1161, 313, 1, 0, 0, 0, 1162, 1163, 3, 52, 20, 0, 1163, 1164, 1, 0, 0, 0, 1164, 1165, 6, 151, 9, 0, 1165, 315, 1, 0, 0, 0, 1166, 1167, 3, 54, 21, 0, 1167, 1168, 1, 0, 0, 0, 1168, 1169, 6, 152, 9, 0, 1169, 317, 1, 0, 0, 0, 1170, 1171, 3, 164, 76, 0, 1171, 1172, 1, 0, 0, 0, 1172, 1173, 6, 153, 14, 0, 1173, 1174, 6, 153, 13, 0, 1174, 319, 1, 0, 0, 0, 1175, 1176, 5, 58, 0, 0, 1176, 321, 1, 0, 0, 0, 1177, 1183, 3, 78, 33, 0, 1178, 1183, 3, 68, 28, 0, 1179, 1183, 3, 106, 47, 0, 1180, 1183, 3, 70, 29, 0, 1181, 1183, 3, 84, 36, 0, 1182, 1177, 1, 0, 0, 0, 1182, 1178, 1, 0, 0, 0, 1182, 1179, 1, 0, 0, 0, 1182, 1180, 1, 0, 0, 0, 1182, 1181, 1, 0, 0, 0, 1183, 1184, 1, 0, 0, 0, 1184, 1182, 1, 0, 0, 0, 1184, 1185, 1, 0, 0, 0, 1185, 323, 1, 0, 0, 0, 1186, 1187, 3, 50, 19, 0, 1187, 1188, 1, 0, 0, 0, 1188, 1189, 6, 156, 9, 0, 1189, 325, 1, 0, 0, 0, 1190, 1191, 3, 52, 20, 0, 1191, 1192, 1, 0, 0, 0, 1192, 1193, 6, 157, 9, 0, 1193, 327, 1, 0, 0, 0, 1194, 1195, 3, 54, 21, 0, 1195, 1196, 1, 0, 0, 0, 1196, 1197, 6, 158, 9, 0, 1197, 329, 1, 0, 0, 0, 58, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 483, 493, 497, 500, 509, 511, 522, 563, 568, 577, 584, 589, 591, 602, 610, 613, 615, 620, 625, 631, 638, 643, 649, 652, 660, 664, 794, 799, 804, 806, 812, 875, 880, 915, 919, 924, 929, 934, 936, 940, 942, 1019, 1023, 1028, 1182, 1184, 26, 5, 2, 0, 5, 4, 0, 5, 6, 0, 5, 1, 0, 5, 3, 0, 5, 10, 0, 5, 8, 0, 5, 5, 0, 5, 9, 0, 0, 1, 0, 7, 64, 0, 5, 0, 0, 7, 26, 0, 4, 0, 0, 7, 65, 0, 7, 34, 0, 7, 33, 0, 7, 27, 0, 7, 67, 0, 7, 36, 0, 7, 77, 0, 5, 11, 0, 5, 7, 0, 7, 87, 0, 7, 86, 0, 7, 66, 0]
\ No newline at end of file
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens b/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
index 5edc646fad10e..fc02831fc219f 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
@@ -24,7 +24,7 @@ EXPLAIN_WS=23
 EXPLAIN_LINE_COMMENT=24
 EXPLAIN_MULTILINE_COMMENT=25
 PIPE=26
-STRING=27
+QUOTED_STRING=27
 INTEGER_LITERAL=28
 DECIMAL_LITERAL=29
 BY=30
@@ -68,44 +68,45 @@ QUOTED_IDENTIFIER=67
 EXPR_LINE_COMMENT=68
 EXPR_MULTILINE_COMMENT=69
 EXPR_WS=70
-METADATA=71
-FROM_UNQUOTED_IDENTIFIER=72
-FROM_LINE_COMMENT=73
-FROM_MULTILINE_COMMENT=74
-FROM_WS=75
-ID_PATTERN=76
-PROJECT_LINE_COMMENT=77
-PROJECT_MULTILINE_COMMENT=78
-PROJECT_WS=79
-AS=80
-RENAME_LINE_COMMENT=81
-RENAME_MULTILINE_COMMENT=82
-RENAME_WS=83
-ON=84
-WITH=85
-ENRICH_POLICY_NAME=86
-ENRICH_LINE_COMMENT=87
-ENRICH_MULTILINE_COMMENT=88
-ENRICH_WS=89
-ENRICH_FIELD_LINE_COMMENT=90
-ENRICH_FIELD_MULTILINE_COMMENT=91
-ENRICH_FIELD_WS=92
-MVEXPAND_LINE_COMMENT=93
-MVEXPAND_MULTILINE_COMMENT=94
-MVEXPAND_WS=95
-INFO=96
-SHOW_LINE_COMMENT=97
-SHOW_MULTILINE_COMMENT=98
-SHOW_WS=99
-FUNCTIONS=100
-META_LINE_COMMENT=101
-META_MULTILINE_COMMENT=102
-META_WS=103
-COLON=104
-SETTING=105
-SETTING_LINE_COMMENT=106
-SETTTING_MULTILINE_COMMENT=107
-SETTING_WS=108
+OPTIONS=71
+METADATA=72
+FROM_UNQUOTED_IDENTIFIER=73
+FROM_LINE_COMMENT=74
+FROM_MULTILINE_COMMENT=75
+FROM_WS=76
+ID_PATTERN=77
+PROJECT_LINE_COMMENT=78
+PROJECT_MULTILINE_COMMENT=79
+PROJECT_WS=80
+AS=81
+RENAME_LINE_COMMENT=82
+RENAME_MULTILINE_COMMENT=83
+RENAME_WS=84
+ON=85
+WITH=86
+ENRICH_POLICY_NAME=87
+ENRICH_LINE_COMMENT=88
+ENRICH_MULTILINE_COMMENT=89
+ENRICH_WS=90
+ENRICH_FIELD_LINE_COMMENT=91
+ENRICH_FIELD_MULTILINE_COMMENT=92
+ENRICH_FIELD_WS=93
+MVEXPAND_LINE_COMMENT=94
+MVEXPAND_MULTILINE_COMMENT=95
+MVEXPAND_WS=96
+INFO=97
+SHOW_LINE_COMMENT=98
+SHOW_MULTILINE_COMMENT=99
+SHOW_WS=100
+FUNCTIONS=101
+META_LINE_COMMENT=102
+META_MULTILINE_COMMENT=103
+META_WS=104
+COLON=105
+SETTING=106
+SETTING_LINE_COMMENT=107
+SETTTING_MULTILINE_COMMENT=108
+SETTING_WS=109
 'dissect'=1
 'drop'=2
 'enrich'=3
@@ -160,10 +161,11 @@ SETTING_WS=108
 '/'=62
 '%'=63
 ']'=65
-'metadata'=71
-'as'=80
-'on'=84
-'with'=85
-'info'=96
-'functions'=100
-':'=104
+'options'=71
+'metadata'=72
+'as'=81
+'on'=85
+'with'=86
+'info'=97
+'functions'=101
+':'=105
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.ts b/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
index 5603ea84b7c00..1bce95673161a 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
@@ -39,7 +39,7 @@ export default class esql_lexer extends Lexer {
 	public static readonly EXPLAIN_LINE_COMMENT = 24;
 	public static readonly EXPLAIN_MULTILINE_COMMENT = 25;
 	public static readonly PIPE = 26;
-	public static readonly STRING = 27;
+	public static readonly QUOTED_STRING = 27;
 	public static readonly INTEGER_LITERAL = 28;
 	public static readonly DECIMAL_LITERAL = 29;
 	public static readonly BY = 30;
@@ -83,44 +83,45 @@ export default class esql_lexer extends Lexer {
 	public static readonly EXPR_LINE_COMMENT = 68;
 	public static readonly EXPR_MULTILINE_COMMENT = 69;
 	public static readonly EXPR_WS = 70;
-	public static readonly METADATA = 71;
-	public static readonly FROM_UNQUOTED_IDENTIFIER = 72;
-	public static readonly FROM_LINE_COMMENT = 73;
-	public static readonly FROM_MULTILINE_COMMENT = 74;
-	public static readonly FROM_WS = 75;
-	public static readonly ID_PATTERN = 76;
-	public static readonly PROJECT_LINE_COMMENT = 77;
-	public static readonly PROJECT_MULTILINE_COMMENT = 78;
-	public static readonly PROJECT_WS = 79;
-	public static readonly AS = 80;
-	public static readonly RENAME_LINE_COMMENT = 81;
-	public static readonly RENAME_MULTILINE_COMMENT = 82;
-	public static readonly RENAME_WS = 83;
-	public static readonly ON = 84;
-	public static readonly WITH = 85;
-	public static readonly ENRICH_POLICY_NAME = 86;
-	public static readonly ENRICH_LINE_COMMENT = 87;
-	public static readonly ENRICH_MULTILINE_COMMENT = 88;
-	public static readonly ENRICH_WS = 89;
-	public static readonly ENRICH_FIELD_LINE_COMMENT = 90;
-	public static readonly ENRICH_FIELD_MULTILINE_COMMENT = 91;
-	public static readonly ENRICH_FIELD_WS = 92;
-	public static readonly MVEXPAND_LINE_COMMENT = 93;
-	public static readonly MVEXPAND_MULTILINE_COMMENT = 94;
-	public static readonly MVEXPAND_WS = 95;
-	public static readonly INFO = 96;
-	public static readonly SHOW_LINE_COMMENT = 97;
-	public static readonly SHOW_MULTILINE_COMMENT = 98;
-	public static readonly SHOW_WS = 99;
-	public static readonly FUNCTIONS = 100;
-	public static readonly META_LINE_COMMENT = 101;
-	public static readonly META_MULTILINE_COMMENT = 102;
-	public static readonly META_WS = 103;
-	public static readonly COLON = 104;
-	public static readonly SETTING = 105;
-	public static readonly SETTING_LINE_COMMENT = 106;
-	public static readonly SETTTING_MULTILINE_COMMENT = 107;
-	public static readonly SETTING_WS = 108;
+	public static readonly OPTIONS = 71;
+	public static readonly METADATA = 72;
+	public static readonly FROM_UNQUOTED_IDENTIFIER = 73;
+	public static readonly FROM_LINE_COMMENT = 74;
+	public static readonly FROM_MULTILINE_COMMENT = 75;
+	public static readonly FROM_WS = 76;
+	public static readonly ID_PATTERN = 77;
+	public static readonly PROJECT_LINE_COMMENT = 78;
+	public static readonly PROJECT_MULTILINE_COMMENT = 79;
+	public static readonly PROJECT_WS = 80;
+	public static readonly AS = 81;
+	public static readonly RENAME_LINE_COMMENT = 82;
+	public static readonly RENAME_MULTILINE_COMMENT = 83;
+	public static readonly RENAME_WS = 84;
+	public static readonly ON = 85;
+	public static readonly WITH = 86;
+	public static readonly ENRICH_POLICY_NAME = 87;
+	public static readonly ENRICH_LINE_COMMENT = 88;
+	public static readonly ENRICH_MULTILINE_COMMENT = 89;
+	public static readonly ENRICH_WS = 90;
+	public static readonly ENRICH_FIELD_LINE_COMMENT = 91;
+	public static readonly ENRICH_FIELD_MULTILINE_COMMENT = 92;
+	public static readonly ENRICH_FIELD_WS = 93;
+	public static readonly MVEXPAND_LINE_COMMENT = 94;
+	public static readonly MVEXPAND_MULTILINE_COMMENT = 95;
+	public static readonly MVEXPAND_WS = 96;
+	public static readonly INFO = 97;
+	public static readonly SHOW_LINE_COMMENT = 98;
+	public static readonly SHOW_MULTILINE_COMMENT = 99;
+	public static readonly SHOW_WS = 100;
+	public static readonly FUNCTIONS = 101;
+	public static readonly META_LINE_COMMENT = 102;
+	public static readonly META_MULTILINE_COMMENT = 103;
+	public static readonly META_WS = 104;
+	public static readonly COLON = 105;
+	public static readonly SETTING = 106;
+	public static readonly SETTING_LINE_COMMENT = 107;
+	public static readonly SETTTING_MULTILINE_COMMENT = 108;
+	public static readonly SETTING_WS = 109;
 	public static readonly EOF = Token.EOF;
 	public static readonly EXPLAIN_MODE = 1;
 	public static readonly EXPRESSION_MODE = 2;
@@ -171,7 +172,8 @@ export default class esql_lexer extends Lexer {
                                                             null, "']'", 
                                                             null, null, 
                                                             null, null, 
-                                                            null, "'metadata'", 
+                                                            null, "'options'", 
+                                                            "'metadata'", 
                                                             null, null, 
                                                             null, null, 
                                                             null, null, 
@@ -205,7 +207,7 @@ export default class esql_lexer extends Lexer {
                                                              "WS", "EXPLAIN_WS", 
                                                              "EXPLAIN_LINE_COMMENT", 
                                                              "EXPLAIN_MULTILINE_COMMENT", 
-                                                             "PIPE", "STRING", 
+                                                             "PIPE", "QUOTED_STRING", 
                                                              "INTEGER_LITERAL", 
                                                              "DECIMAL_LITERAL", 
                                                              "BY", "AND", 
@@ -232,6 +234,7 @@ export default class esql_lexer extends Lexer {
                                                              "EXPR_LINE_COMMENT", 
                                                              "EXPR_MULTILINE_COMMENT", 
                                                              "EXPR_WS", 
+                                                             "OPTIONS", 
                                                              "METADATA", 
                                                              "FROM_UNQUOTED_IDENTIFIER", 
                                                              "FROM_LINE_COMMENT", 
@@ -280,14 +283,15 @@ export default class esql_lexer extends Lexer {
 		"WS", "EXPLAIN_OPENING_BRACKET", "EXPLAIN_PIPE", "EXPLAIN_WS", "EXPLAIN_LINE_COMMENT", 
 		"EXPLAIN_MULTILINE_COMMENT", "PIPE", "DIGIT", "LETTER", "ESCAPE_SEQUENCE", 
 		"UNESCAPED_CHARS", "EXPONENT", "ASPERAND", "BACKQUOTE", "BACKQUOTE_BLOCK", 
-		"UNDERSCORE", "UNQUOTED_ID_BODY", "STRING", "INTEGER_LITERAL", "DECIMAL_LITERAL", 
-		"BY", "AND", "ASC", "ASSIGN", "COMMA", "DESC", "DOT", "FALSE", "FIRST", 
-		"LAST", "LP", "IN", "IS", "LIKE", "NOT", "NULL", "NULLS", "OR", "PARAM", 
-		"RLIKE", "RP", "TRUE", "EQ", "CIEQ", "NEQ", "LT", "LTE", "GT", "GTE", 
-		"PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", "OPENING_BRACKET", "CLOSING_BRACKET", 
-		"UNQUOTED_IDENTIFIER", "QUOTED_ID", "QUOTED_IDENTIFIER", "EXPR_LINE_COMMENT", 
-		"EXPR_MULTILINE_COMMENT", "EXPR_WS", "FROM_PIPE", "FROM_OPENING_BRACKET", 
-		"FROM_CLOSING_BRACKET", "FROM_COMMA", "FROM_ASSIGN", "METADATA", "FROM_UNQUOTED_IDENTIFIER_PART", 
+		"UNDERSCORE", "UNQUOTED_ID_BODY", "QUOTED_STRING", "INTEGER_LITERAL", 
+		"DECIMAL_LITERAL", "BY", "AND", "ASC", "ASSIGN", "COMMA", "DESC", "DOT", 
+		"FALSE", "FIRST", "LAST", "LP", "IN", "IS", "LIKE", "NOT", "NULL", "NULLS", 
+		"OR", "PARAM", "RLIKE", "RP", "TRUE", "EQ", "CIEQ", "NEQ", "LT", "LTE", 
+		"GT", "GTE", "PLUS", "MINUS", "ASTERISK", "SLASH", "PERCENT", "OPENING_BRACKET", 
+		"CLOSING_BRACKET", "UNQUOTED_IDENTIFIER", "QUOTED_ID", "QUOTED_IDENTIFIER", 
+		"EXPR_LINE_COMMENT", "EXPR_MULTILINE_COMMENT", "EXPR_WS", "FROM_PIPE", 
+		"FROM_OPENING_BRACKET", "FROM_CLOSING_BRACKET", "FROM_COMMA", "FROM_ASSIGN", 
+		"FROM_QUOTED_STRING", "OPTIONS", "METADATA", "FROM_UNQUOTED_IDENTIFIER_PART", 
 		"FROM_UNQUOTED_IDENTIFIER", "FROM_QUOTED_IDENTIFIER", "FROM_LINE_COMMENT", 
 		"FROM_MULTILINE_COMMENT", "FROM_WS", "PROJECT_PIPE", "PROJECT_DOT", "PROJECT_COMMA", 
 		"UNQUOTED_ID_BODY_WITH_PATTERN", "UNQUOTED_ID_PATTERN", "ID_PATTERN", 
@@ -325,7 +329,7 @@ export default class esql_lexer extends Lexer {
 
 	public get modeNames(): string[] { return esql_lexer.modeNames; }
 
-	public static readonly _serializedATN: number[] = [4,0,108,1182,6,-1,6,
+	public static readonly _serializedATN: number[] = [4,0,109,1198,6,-1,6,
 	-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,2,0,7,0,2,1,7,1,2,
 	2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,
 	2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,17,7,17,2,
@@ -349,99 +353,101 @@ export default class esql_lexer extends Lexer {
 	7,134,2,135,7,135,2,136,7,136,2,137,7,137,2,138,7,138,2,139,7,139,2,140,
 	7,140,2,141,7,141,2,142,7,142,2,143,7,143,2,144,7,144,2,145,7,145,2,146,
 	7,146,2,147,7,147,2,148,7,148,2,149,7,149,2,150,7,150,2,151,7,151,2,152,
-	7,152,2,153,7,153,2,154,7,154,2,155,7,155,2,156,7,156,1,0,1,0,1,0,1,0,1,
-	0,1,0,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,2,1,2,1,2,1,
-	2,1,2,1,2,1,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,
-	4,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,1,6,1,6,1,6,1,6,1,6,1,6,1,6,1,7,1,
-	7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,8,1,8,1,8,1,8,1,8,1,
-	8,1,8,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,10,1,10,1,10,1,10,1,10,1,10,1,10,
-	1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,12,1,12,1,
-	12,1,12,1,12,1,12,1,12,1,12,1,12,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,14,
-	1,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,1,15,1,15,1,15,1,15,1,16,1,16,1,
-	16,1,16,1,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,18,
-	4,18,478,8,18,11,18,12,18,479,1,18,1,18,1,19,1,19,1,19,1,19,5,19,488,8,
-	19,10,19,12,19,491,9,19,1,19,3,19,494,8,19,1,19,3,19,497,8,19,1,19,1,19,
-	1,20,1,20,1,20,1,20,1,20,5,20,506,8,20,10,20,12,20,509,9,20,1,20,1,20,1,
-	20,1,20,1,20,1,21,4,21,517,8,21,11,21,12,21,518,1,21,1,21,1,22,1,22,1,22,
-	1,22,1,22,1,23,1,23,1,23,1,23,1,23,1,24,1,24,1,24,1,24,1,25,1,25,1,25,1,
-	25,1,26,1,26,1,26,1,26,1,27,1,27,1,27,1,27,1,28,1,28,1,29,1,29,1,30,1,30,
-	1,30,1,31,1,31,1,32,1,32,3,32,560,8,32,1,32,4,32,563,8,32,11,32,12,32,564,
-	1,33,1,33,1,34,1,34,1,35,1,35,1,35,3,35,574,8,35,1,36,1,36,1,37,1,37,1,
-	37,3,37,581,8,37,1,38,1,38,1,38,5,38,586,8,38,10,38,12,38,589,9,38,1,38,
-	1,38,1,38,1,38,1,38,1,38,5,38,597,8,38,10,38,12,38,600,9,38,1,38,1,38,1,
-	38,1,38,1,38,3,38,607,8,38,1,38,3,38,610,8,38,3,38,612,8,38,1,39,4,39,615,
-	8,39,11,39,12,39,616,1,40,4,40,620,8,40,11,40,12,40,621,1,40,1,40,5,40,
-	626,8,40,10,40,12,40,629,9,40,1,40,1,40,4,40,633,8,40,11,40,12,40,634,1,
-	40,4,40,638,8,40,11,40,12,40,639,1,40,1,40,5,40,644,8,40,10,40,12,40,647,
-	9,40,3,40,649,8,40,1,40,1,40,1,40,1,40,4,40,655,8,40,11,40,12,40,656,1,
-	40,1,40,3,40,661,8,40,1,41,1,41,1,41,1,42,1,42,1,42,1,42,1,43,1,43,1,43,
-	1,43,1,44,1,44,1,45,1,45,1,46,1,46,1,46,1,46,1,46,1,47,1,47,1,48,1,48,1,
-	48,1,48,1,48,1,48,1,49,1,49,1,49,1,49,1,49,1,49,1,50,1,50,1,50,1,50,1,50,
-	1,51,1,51,1,52,1,52,1,52,1,53,1,53,1,53,1,54,1,54,1,54,1,54,1,54,1,55,1,
-	55,1,55,1,55,1,56,1,56,1,56,1,56,1,56,1,57,1,57,1,57,1,57,1,57,1,57,1,58,
-	1,58,1,58,1,59,1,59,1,60,1,60,1,60,1,60,1,60,1,60,1,61,1,61,1,62,1,62,1,
-	62,1,62,1,62,1,63,1,63,1,63,1,64,1,64,1,64,1,65,1,65,1,65,1,66,1,66,1,67,
-	1,67,1,67,1,68,1,68,1,69,1,69,1,69,1,70,1,70,1,71,1,71,1,72,1,72,1,73,1,
-	73,1,74,1,74,1,75,1,75,1,75,1,75,1,75,1,76,1,76,1,76,1,76,1,76,1,77,1,77,
-	5,77,789,8,77,10,77,12,77,792,9,77,1,77,1,77,3,77,796,8,77,1,77,4,77,799,
-	8,77,11,77,12,77,800,3,77,803,8,77,1,78,1,78,4,78,807,8,78,11,78,12,78,
-	808,1,78,1,78,1,79,1,79,1,80,1,80,1,80,1,80,1,81,1,81,1,81,1,81,1,82,1,
-	82,1,82,1,82,1,83,1,83,1,83,1,83,1,83,1,84,1,84,1,84,1,84,1,85,1,85,1,85,
-	1,85,1,86,1,86,1,86,1,86,1,87,1,87,1,87,1,87,1,88,1,88,1,88,1,88,1,88,1,
-	88,1,88,1,88,1,88,1,89,1,89,1,89,3,89,860,8,89,1,90,4,90,863,8,90,11,90,
-	12,90,864,1,91,1,91,1,91,1,91,1,92,1,92,1,92,1,92,1,93,1,93,1,93,1,93,1,
-	94,1,94,1,94,1,94,1,95,1,95,1,95,1,95,1,95,1,96,1,96,1,96,1,96,1,97,1,97,
-	1,97,1,97,1,98,1,98,1,98,1,98,3,98,900,8,98,1,99,1,99,3,99,904,8,99,1,99,
-	5,99,907,8,99,10,99,12,99,910,9,99,1,99,1,99,3,99,914,8,99,1,99,4,99,917,
-	8,99,11,99,12,99,918,3,99,921,8,99,1,100,1,100,4,100,925,8,100,11,100,12,
-	100,926,1,101,1,101,1,101,1,101,1,102,1,102,1,102,1,102,1,103,1,103,1,103,
-	1,103,1,104,1,104,1,104,1,104,1,104,1,105,1,105,1,105,1,105,1,106,1,106,
-	1,106,1,106,1,107,1,107,1,107,1,107,1,108,1,108,1,108,1,109,1,109,1,109,
-	1,109,1,110,1,110,1,110,1,110,1,111,1,111,1,111,1,111,1,112,1,112,1,112,
-	1,112,1,113,1,113,1,113,1,113,1,113,1,114,1,114,1,114,1,114,1,114,1,115,
-	1,115,1,115,1,115,1,115,1,116,1,116,1,116,1,116,1,116,1,116,1,116,1,117,
-	1,117,1,118,4,118,1002,8,118,11,118,12,118,1003,1,118,1,118,3,118,1008,
-	8,118,1,118,4,118,1011,8,118,11,118,12,118,1012,1,119,1,119,1,119,1,119,
-	1,120,1,120,1,120,1,120,1,121,1,121,1,121,1,121,1,122,1,122,1,122,1,122,
-	1,123,1,123,1,123,1,123,1,124,1,124,1,124,1,124,1,124,1,124,1,125,1,125,
-	1,125,1,125,1,126,1,126,1,126,1,126,1,127,1,127,1,127,1,127,1,128,1,128,
+	7,152,2,153,7,153,2,154,7,154,2,155,7,155,2,156,7,156,2,157,7,157,2,158,
+	7,158,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,
+	1,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,4,1,
+	4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,1,6,1,6,1,
+	6,1,6,1,6,1,6,1,6,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,
+	7,1,8,1,8,1,8,1,8,1,8,1,8,1,8,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,10,1,10,
+	1,10,1,10,1,10,1,10,1,10,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,11,1,
+	11,1,11,1,11,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,13,1,13,1,13,
+	1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,1,15,1,
+	15,1,15,1,15,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,
+	1,17,1,17,1,17,1,17,1,18,4,18,482,8,18,11,18,12,18,483,1,18,1,18,1,19,1,
+	19,1,19,1,19,5,19,492,8,19,10,19,12,19,495,9,19,1,19,3,19,498,8,19,1,19,
+	3,19,501,8,19,1,19,1,19,1,20,1,20,1,20,1,20,1,20,5,20,510,8,20,10,20,12,
+	20,513,9,20,1,20,1,20,1,20,1,20,1,20,1,21,4,21,521,8,21,11,21,12,21,522,
+	1,21,1,21,1,22,1,22,1,22,1,22,1,22,1,23,1,23,1,23,1,23,1,23,1,24,1,24,1,
+	24,1,24,1,25,1,25,1,25,1,25,1,26,1,26,1,26,1,26,1,27,1,27,1,27,1,27,1,28,
+	1,28,1,29,1,29,1,30,1,30,1,30,1,31,1,31,1,32,1,32,3,32,564,8,32,1,32,4,
+	32,567,8,32,11,32,12,32,568,1,33,1,33,1,34,1,34,1,35,1,35,1,35,3,35,578,
+	8,35,1,36,1,36,1,37,1,37,1,37,3,37,585,8,37,1,38,1,38,1,38,5,38,590,8,38,
+	10,38,12,38,593,9,38,1,38,1,38,1,38,1,38,1,38,1,38,5,38,601,8,38,10,38,
+	12,38,604,9,38,1,38,1,38,1,38,1,38,1,38,3,38,611,8,38,1,38,3,38,614,8,38,
+	3,38,616,8,38,1,39,4,39,619,8,39,11,39,12,39,620,1,40,4,40,624,8,40,11,
+	40,12,40,625,1,40,1,40,5,40,630,8,40,10,40,12,40,633,9,40,1,40,1,40,4,40,
+	637,8,40,11,40,12,40,638,1,40,4,40,642,8,40,11,40,12,40,643,1,40,1,40,5,
+	40,648,8,40,10,40,12,40,651,9,40,3,40,653,8,40,1,40,1,40,1,40,1,40,4,40,
+	659,8,40,11,40,12,40,660,1,40,1,40,3,40,665,8,40,1,41,1,41,1,41,1,42,1,
+	42,1,42,1,42,1,43,1,43,1,43,1,43,1,44,1,44,1,45,1,45,1,46,1,46,1,46,1,46,
+	1,46,1,47,1,47,1,48,1,48,1,48,1,48,1,48,1,48,1,49,1,49,1,49,1,49,1,49,1,
+	49,1,50,1,50,1,50,1,50,1,50,1,51,1,51,1,52,1,52,1,52,1,53,1,53,1,53,1,54,
+	1,54,1,54,1,54,1,54,1,55,1,55,1,55,1,55,1,56,1,56,1,56,1,56,1,56,1,57,1,
+	57,1,57,1,57,1,57,1,57,1,58,1,58,1,58,1,59,1,59,1,60,1,60,1,60,1,60,1,60,
+	1,60,1,61,1,61,1,62,1,62,1,62,1,62,1,62,1,63,1,63,1,63,1,64,1,64,1,64,1,
+	65,1,65,1,65,1,66,1,66,1,67,1,67,1,67,1,68,1,68,1,69,1,69,1,69,1,70,1,70,
+	1,71,1,71,1,72,1,72,1,73,1,73,1,74,1,74,1,75,1,75,1,75,1,75,1,75,1,76,1,
+	76,1,76,1,76,1,76,1,77,1,77,5,77,793,8,77,10,77,12,77,796,9,77,1,77,1,77,
+	3,77,800,8,77,1,77,4,77,803,8,77,11,77,12,77,804,3,77,807,8,77,1,78,1,78,
+	4,78,811,8,78,11,78,12,78,812,1,78,1,78,1,79,1,79,1,80,1,80,1,80,1,80,1,
+	81,1,81,1,81,1,81,1,82,1,82,1,82,1,82,1,83,1,83,1,83,1,83,1,83,1,84,1,84,
+	1,84,1,84,1,85,1,85,1,85,1,85,1,86,1,86,1,86,1,86,1,87,1,87,1,87,1,87,1,
+	88,1,88,1,88,1,88,1,89,1,89,1,89,1,89,1,89,1,89,1,89,1,89,1,90,1,90,1,90,
+	1,90,1,90,1,90,1,90,1,90,1,90,1,91,1,91,1,91,3,91,876,8,91,1,92,4,92,879,
+	8,92,11,92,12,92,880,1,93,1,93,1,93,1,93,1,94,1,94,1,94,1,94,1,95,1,95,
+	1,95,1,95,1,96,1,96,1,96,1,96,1,97,1,97,1,97,1,97,1,97,1,98,1,98,1,98,1,
+	98,1,99,1,99,1,99,1,99,1,100,1,100,1,100,1,100,3,100,916,8,100,1,101,1,
+	101,3,101,920,8,101,1,101,5,101,923,8,101,10,101,12,101,926,9,101,1,101,
+	1,101,3,101,930,8,101,1,101,4,101,933,8,101,11,101,12,101,934,3,101,937,
+	8,101,1,102,1,102,4,102,941,8,102,11,102,12,102,942,1,103,1,103,1,103,1,
+	103,1,104,1,104,1,104,1,104,1,105,1,105,1,105,1,105,1,106,1,106,1,106,1,
+	106,1,106,1,107,1,107,1,107,1,107,1,108,1,108,1,108,1,108,1,109,1,109,1,
+	109,1,109,1,110,1,110,1,110,1,111,1,111,1,111,1,111,1,112,1,112,1,112,1,
+	112,1,113,1,113,1,113,1,113,1,114,1,114,1,114,1,114,1,115,1,115,1,115,1,
+	115,1,115,1,116,1,116,1,116,1,116,1,116,1,117,1,117,1,117,1,117,1,117,1,
+	118,1,118,1,118,1,118,1,118,1,118,1,118,1,119,1,119,1,120,4,120,1018,8,
+	120,11,120,12,120,1019,1,120,1,120,3,120,1024,8,120,1,120,4,120,1027,8,
+	120,11,120,12,120,1028,1,121,1,121,1,121,1,121,1,122,1,122,1,122,1,122,
+	1,123,1,123,1,123,1,123,1,124,1,124,1,124,1,124,1,125,1,125,1,125,1,125,
+	1,126,1,126,1,126,1,126,1,126,1,126,1,127,1,127,1,127,1,127,1,128,1,128,
 	1,128,1,128,1,129,1,129,1,129,1,129,1,130,1,130,1,130,1,130,1,131,1,131,
 	1,131,1,131,1,132,1,132,1,132,1,132,1,133,1,133,1,133,1,133,1,134,1,134,
-	1,134,1,134,1,134,1,135,1,135,1,135,1,135,1,136,1,136,1,136,1,136,1,137,
+	1,134,1,134,1,135,1,135,1,135,1,135,1,136,1,136,1,136,1,136,1,136,1,137,
 	1,137,1,137,1,137,1,138,1,138,1,138,1,138,1,139,1,139,1,139,1,139,1,140,
-	1,140,1,140,1,140,1,141,1,141,1,141,1,141,1,141,1,142,1,142,1,142,1,142,
-	1,142,1,143,1,143,1,143,1,143,1,144,1,144,1,144,1,144,1,145,1,145,1,145,
-	1,145,1,146,1,146,1,146,1,146,1,146,1,147,1,147,1,147,1,147,1,147,1,147,
-	1,147,1,147,1,147,1,147,1,148,1,148,1,148,1,148,1,149,1,149,1,149,1,149,
-	1,150,1,150,1,150,1,150,1,151,1,151,1,151,1,151,1,151,1,152,1,152,1,153,
-	1,153,1,153,1,153,1,153,4,153,1167,8,153,11,153,12,153,1168,1,154,1,154,
-	1,154,1,154,1,155,1,155,1,155,1,155,1,156,1,156,1,156,1,156,2,507,598,0,
-	157,12,1,14,2,16,3,18,4,20,5,22,6,24,7,26,8,28,9,30,10,32,11,34,12,36,13,
-	38,14,40,15,42,16,44,17,46,18,48,19,50,20,52,21,54,22,56,0,58,0,60,23,62,
-	24,64,25,66,26,68,0,70,0,72,0,74,0,76,0,78,0,80,0,82,0,84,0,86,0,88,27,
-	90,28,92,29,94,30,96,31,98,32,100,33,102,34,104,35,106,36,108,37,110,38,
-	112,39,114,40,116,41,118,42,120,43,122,44,124,45,126,46,128,47,130,48,132,
-	49,134,50,136,51,138,52,140,53,142,54,144,55,146,56,148,57,150,58,152,59,
-	154,60,156,61,158,62,160,63,162,64,164,65,166,66,168,0,170,67,172,68,174,
-	69,176,70,178,0,180,0,182,0,184,0,186,0,188,71,190,0,192,72,194,0,196,73,
-	198,74,200,75,202,0,204,0,206,0,208,0,210,0,212,76,214,77,216,78,218,79,
-	220,0,222,0,224,0,226,0,228,80,230,0,232,81,234,82,236,83,238,0,240,0,242,
-	84,244,85,246,0,248,86,250,0,252,0,254,87,256,88,258,89,260,0,262,0,264,
-	0,266,0,268,0,270,0,272,0,274,90,276,91,278,92,280,0,282,0,284,0,286,0,
-	288,93,290,94,292,95,294,0,296,96,298,97,300,98,302,99,304,0,306,100,308,
-	101,310,102,312,103,314,0,316,104,318,105,320,106,322,107,324,108,12,0,
-	1,2,3,4,5,6,7,8,9,10,11,35,2,0,68,68,100,100,2,0,73,73,105,105,2,0,83,83,
-	115,115,2,0,69,69,101,101,2,0,67,67,99,99,2,0,84,84,116,116,2,0,82,82,114,
-	114,2,0,79,79,111,111,2,0,80,80,112,112,2,0,78,78,110,110,2,0,72,72,104,
-	104,2,0,86,86,118,118,2,0,65,65,97,97,2,0,76,76,108,108,2,0,88,88,120,120,
-	2,0,70,70,102,102,2,0,77,77,109,109,2,0,71,71,103,103,2,0,75,75,107,107,
-	2,0,87,87,119,119,6,0,9,10,13,13,32,32,47,47,91,91,93,93,2,0,10,10,13,13,
+	1,140,1,140,1,140,1,141,1,141,1,141,1,141,1,142,1,142,1,142,1,142,1,143,
+	1,143,1,143,1,143,1,143,1,144,1,144,1,144,1,144,1,144,1,145,1,145,1,145,
+	1,145,1,146,1,146,1,146,1,146,1,147,1,147,1,147,1,147,1,148,1,148,1,148,
+	1,148,1,148,1,149,1,149,1,149,1,149,1,149,1,149,1,149,1,149,1,149,1,149,
+	1,150,1,150,1,150,1,150,1,151,1,151,1,151,1,151,1,152,1,152,1,152,1,152,
+	1,153,1,153,1,153,1,153,1,153,1,154,1,154,1,155,1,155,1,155,1,155,1,155,
+	4,155,1183,8,155,11,155,12,155,1184,1,156,1,156,1,156,1,156,1,157,1,157,
+	1,157,1,157,1,158,1,158,1,158,1,158,2,511,602,0,159,12,1,14,2,16,3,18,4,
+	20,5,22,6,24,7,26,8,28,9,30,10,32,11,34,12,36,13,38,14,40,15,42,16,44,17,
+	46,18,48,19,50,20,52,21,54,22,56,0,58,0,60,23,62,24,64,25,66,26,68,0,70,
+	0,72,0,74,0,76,0,78,0,80,0,82,0,84,0,86,0,88,27,90,28,92,29,94,30,96,31,
+	98,32,100,33,102,34,104,35,106,36,108,37,110,38,112,39,114,40,116,41,118,
+	42,120,43,122,44,124,45,126,46,128,47,130,48,132,49,134,50,136,51,138,52,
+	140,53,142,54,144,55,146,56,148,57,150,58,152,59,154,60,156,61,158,62,160,
+	63,162,64,164,65,166,66,168,0,170,67,172,68,174,69,176,70,178,0,180,0,182,
+	0,184,0,186,0,188,0,190,71,192,72,194,0,196,73,198,0,200,74,202,75,204,
+	76,206,0,208,0,210,0,212,0,214,0,216,77,218,78,220,79,222,80,224,0,226,
+	0,228,0,230,0,232,81,234,0,236,82,238,83,240,84,242,0,244,0,246,85,248,
+	86,250,0,252,87,254,0,256,0,258,88,260,89,262,90,264,0,266,0,268,0,270,
+	0,272,0,274,0,276,0,278,91,280,92,282,93,284,0,286,0,288,0,290,0,292,94,
+	294,95,296,96,298,0,300,97,302,98,304,99,306,100,308,0,310,101,312,102,
+	314,103,316,104,318,0,320,105,322,106,324,107,326,108,328,109,12,0,1,2,
+	3,4,5,6,7,8,9,10,11,35,2,0,68,68,100,100,2,0,73,73,105,105,2,0,83,83,115,
+	115,2,0,69,69,101,101,2,0,67,67,99,99,2,0,84,84,116,116,2,0,82,82,114,114,
+	2,0,79,79,111,111,2,0,80,80,112,112,2,0,78,78,110,110,2,0,72,72,104,104,
+	2,0,86,86,118,118,2,0,65,65,97,97,2,0,76,76,108,108,2,0,88,88,120,120,2,
+	0,70,70,102,102,2,0,77,77,109,109,2,0,71,71,103,103,2,0,75,75,107,107,2,
+	0,87,87,119,119,6,0,9,10,13,13,32,32,47,47,91,91,93,93,2,0,10,10,13,13,
 	3,0,9,10,13,13,32,32,1,0,48,57,2,0,65,90,97,122,8,0,34,34,78,78,82,82,84,
 	84,92,92,110,110,114,114,116,116,4,0,10,10,13,13,34,34,92,92,2,0,43,43,
 	45,45,1,0,96,96,2,0,66,66,98,98,2,0,89,89,121,121,2,0,85,85,117,117,10,
 	0,9,10,13,13,32,32,44,44,47,47,61,61,91,91,93,93,96,96,124,124,2,0,42,42,
 	47,47,11,0,9,10,13,13,32,32,34,35,44,44,47,47,58,58,60,60,62,63,92,92,124,
-	124,1209,0,12,1,0,0,0,0,14,1,0,0,0,0,16,1,0,0,0,0,18,1,0,0,0,0,20,1,0,0,
+	124,1225,0,12,1,0,0,0,0,14,1,0,0,0,0,16,1,0,0,0,0,18,1,0,0,0,0,20,1,0,0,
 	0,0,22,1,0,0,0,0,24,1,0,0,0,0,26,1,0,0,0,0,28,1,0,0,0,0,30,1,0,0,0,0,32,
 	1,0,0,0,0,34,1,0,0,0,0,36,1,0,0,0,0,38,1,0,0,0,0,40,1,0,0,0,0,42,1,0,0,
 	0,0,44,1,0,0,0,0,46,1,0,0,0,0,48,1,0,0,0,0,50,1,0,0,0,0,52,1,0,0,0,0,54,
@@ -455,274 +461,279 @@ export default class esql_lexer extends Lexer {
 	148,1,0,0,0,2,150,1,0,0,0,2,152,1,0,0,0,2,154,1,0,0,0,2,156,1,0,0,0,2,158,
 	1,0,0,0,2,160,1,0,0,0,2,162,1,0,0,0,2,164,1,0,0,0,2,166,1,0,0,0,2,170,1,
 	0,0,0,2,172,1,0,0,0,2,174,1,0,0,0,2,176,1,0,0,0,3,178,1,0,0,0,3,180,1,0,
-	0,0,3,182,1,0,0,0,3,184,1,0,0,0,3,186,1,0,0,0,3,188,1,0,0,0,3,192,1,0,0,
-	0,3,194,1,0,0,0,3,196,1,0,0,0,3,198,1,0,0,0,3,200,1,0,0,0,4,202,1,0,0,0,
-	4,204,1,0,0,0,4,206,1,0,0,0,4,212,1,0,0,0,4,214,1,0,0,0,4,216,1,0,0,0,4,
-	218,1,0,0,0,5,220,1,0,0,0,5,222,1,0,0,0,5,224,1,0,0,0,5,226,1,0,0,0,5,228,
-	1,0,0,0,5,230,1,0,0,0,5,232,1,0,0,0,5,234,1,0,0,0,5,236,1,0,0,0,6,238,1,
-	0,0,0,6,240,1,0,0,0,6,242,1,0,0,0,6,244,1,0,0,0,6,248,1,0,0,0,6,250,1,0,
-	0,0,6,252,1,0,0,0,6,254,1,0,0,0,6,256,1,0,0,0,6,258,1,0,0,0,7,260,1,0,0,
-	0,7,262,1,0,0,0,7,264,1,0,0,0,7,266,1,0,0,0,7,268,1,0,0,0,7,270,1,0,0,0,
-	7,272,1,0,0,0,7,274,1,0,0,0,7,276,1,0,0,0,7,278,1,0,0,0,8,280,1,0,0,0,8,
+	0,0,3,182,1,0,0,0,3,184,1,0,0,0,3,186,1,0,0,0,3,188,1,0,0,0,3,190,1,0,0,
+	0,3,192,1,0,0,0,3,196,1,0,0,0,3,198,1,0,0,0,3,200,1,0,0,0,3,202,1,0,0,0,
+	3,204,1,0,0,0,4,206,1,0,0,0,4,208,1,0,0,0,4,210,1,0,0,0,4,216,1,0,0,0,4,
+	218,1,0,0,0,4,220,1,0,0,0,4,222,1,0,0,0,5,224,1,0,0,0,5,226,1,0,0,0,5,228,
+	1,0,0,0,5,230,1,0,0,0,5,232,1,0,0,0,5,234,1,0,0,0,5,236,1,0,0,0,5,238,1,
+	0,0,0,5,240,1,0,0,0,6,242,1,0,0,0,6,244,1,0,0,0,6,246,1,0,0,0,6,248,1,0,
+	0,0,6,252,1,0,0,0,6,254,1,0,0,0,6,256,1,0,0,0,6,258,1,0,0,0,6,260,1,0,0,
+	0,6,262,1,0,0,0,7,264,1,0,0,0,7,266,1,0,0,0,7,268,1,0,0,0,7,270,1,0,0,0,
+	7,272,1,0,0,0,7,274,1,0,0,0,7,276,1,0,0,0,7,278,1,0,0,0,7,280,1,0,0,0,7,
 	282,1,0,0,0,8,284,1,0,0,0,8,286,1,0,0,0,8,288,1,0,0,0,8,290,1,0,0,0,8,292,
-	1,0,0,0,9,294,1,0,0,0,9,296,1,0,0,0,9,298,1,0,0,0,9,300,1,0,0,0,9,302,1,
-	0,0,0,10,304,1,0,0,0,10,306,1,0,0,0,10,308,1,0,0,0,10,310,1,0,0,0,10,312,
-	1,0,0,0,11,314,1,0,0,0,11,316,1,0,0,0,11,318,1,0,0,0,11,320,1,0,0,0,11,
-	322,1,0,0,0,11,324,1,0,0,0,12,326,1,0,0,0,14,336,1,0,0,0,16,343,1,0,0,0,
-	18,352,1,0,0,0,20,359,1,0,0,0,22,369,1,0,0,0,24,376,1,0,0,0,26,383,1,0,
-	0,0,28,397,1,0,0,0,30,404,1,0,0,0,32,412,1,0,0,0,34,419,1,0,0,0,36,431,
-	1,0,0,0,38,440,1,0,0,0,40,446,1,0,0,0,42,453,1,0,0,0,44,460,1,0,0,0,46,
-	468,1,0,0,0,48,477,1,0,0,0,50,483,1,0,0,0,52,500,1,0,0,0,54,516,1,0,0,0,
-	56,522,1,0,0,0,58,527,1,0,0,0,60,532,1,0,0,0,62,536,1,0,0,0,64,540,1,0,
-	0,0,66,544,1,0,0,0,68,548,1,0,0,0,70,550,1,0,0,0,72,552,1,0,0,0,74,555,
-	1,0,0,0,76,557,1,0,0,0,78,566,1,0,0,0,80,568,1,0,0,0,82,573,1,0,0,0,84,
-	575,1,0,0,0,86,580,1,0,0,0,88,611,1,0,0,0,90,614,1,0,0,0,92,660,1,0,0,0,
-	94,662,1,0,0,0,96,665,1,0,0,0,98,669,1,0,0,0,100,673,1,0,0,0,102,675,1,
-	0,0,0,104,677,1,0,0,0,106,682,1,0,0,0,108,684,1,0,0,0,110,690,1,0,0,0,112,
-	696,1,0,0,0,114,701,1,0,0,0,116,703,1,0,0,0,118,706,1,0,0,0,120,709,1,0,
-	0,0,122,714,1,0,0,0,124,718,1,0,0,0,126,723,1,0,0,0,128,729,1,0,0,0,130,
-	732,1,0,0,0,132,734,1,0,0,0,134,740,1,0,0,0,136,742,1,0,0,0,138,747,1,0,
-	0,0,140,750,1,0,0,0,142,753,1,0,0,0,144,756,1,0,0,0,146,758,1,0,0,0,148,
-	761,1,0,0,0,150,763,1,0,0,0,152,766,1,0,0,0,154,768,1,0,0,0,156,770,1,0,
-	0,0,158,772,1,0,0,0,160,774,1,0,0,0,162,776,1,0,0,0,164,781,1,0,0,0,166,
-	802,1,0,0,0,168,804,1,0,0,0,170,812,1,0,0,0,172,814,1,0,0,0,174,818,1,0,
-	0,0,176,822,1,0,0,0,178,826,1,0,0,0,180,831,1,0,0,0,182,835,1,0,0,0,184,
-	839,1,0,0,0,186,843,1,0,0,0,188,847,1,0,0,0,190,859,1,0,0,0,192,862,1,0,
-	0,0,194,866,1,0,0,0,196,870,1,0,0,0,198,874,1,0,0,0,200,878,1,0,0,0,202,
-	882,1,0,0,0,204,887,1,0,0,0,206,891,1,0,0,0,208,899,1,0,0,0,210,920,1,0,
-	0,0,212,924,1,0,0,0,214,928,1,0,0,0,216,932,1,0,0,0,218,936,1,0,0,0,220,
-	940,1,0,0,0,222,945,1,0,0,0,224,949,1,0,0,0,226,953,1,0,0,0,228,957,1,0,
-	0,0,230,960,1,0,0,0,232,964,1,0,0,0,234,968,1,0,0,0,236,972,1,0,0,0,238,
-	976,1,0,0,0,240,981,1,0,0,0,242,986,1,0,0,0,244,991,1,0,0,0,246,998,1,0,
-	0,0,248,1007,1,0,0,0,250,1014,1,0,0,0,252,1018,1,0,0,0,254,1022,1,0,0,0,
-	256,1026,1,0,0,0,258,1030,1,0,0,0,260,1034,1,0,0,0,262,1040,1,0,0,0,264,
-	1044,1,0,0,0,266,1048,1,0,0,0,268,1052,1,0,0,0,270,1056,1,0,0,0,272,1060,
-	1,0,0,0,274,1064,1,0,0,0,276,1068,1,0,0,0,278,1072,1,0,0,0,280,1076,1,0,
-	0,0,282,1081,1,0,0,0,284,1085,1,0,0,0,286,1089,1,0,0,0,288,1093,1,0,0,0,
-	290,1097,1,0,0,0,292,1101,1,0,0,0,294,1105,1,0,0,0,296,1110,1,0,0,0,298,
-	1115,1,0,0,0,300,1119,1,0,0,0,302,1123,1,0,0,0,304,1127,1,0,0,0,306,1132,
-	1,0,0,0,308,1142,1,0,0,0,310,1146,1,0,0,0,312,1150,1,0,0,0,314,1154,1,0,
-	0,0,316,1159,1,0,0,0,318,1166,1,0,0,0,320,1170,1,0,0,0,322,1174,1,0,0,0,
-	324,1178,1,0,0,0,326,327,7,0,0,0,327,328,7,1,0,0,328,329,7,2,0,0,329,330,
-	7,2,0,0,330,331,7,3,0,0,331,332,7,4,0,0,332,333,7,5,0,0,333,334,1,0,0,0,
-	334,335,6,0,0,0,335,13,1,0,0,0,336,337,7,0,0,0,337,338,7,6,0,0,338,339,
-	7,7,0,0,339,340,7,8,0,0,340,341,1,0,0,0,341,342,6,1,1,0,342,15,1,0,0,0,
-	343,344,7,3,0,0,344,345,7,9,0,0,345,346,7,6,0,0,346,347,7,1,0,0,347,348,
-	7,4,0,0,348,349,7,10,0,0,349,350,1,0,0,0,350,351,6,2,2,0,351,17,1,0,0,0,
-	352,353,7,3,0,0,353,354,7,11,0,0,354,355,7,12,0,0,355,356,7,13,0,0,356,
-	357,1,0,0,0,357,358,6,3,0,0,358,19,1,0,0,0,359,360,7,3,0,0,360,361,7,14,
-	0,0,361,362,7,8,0,0,362,363,7,13,0,0,363,364,7,12,0,0,364,365,7,1,0,0,365,
-	366,7,9,0,0,366,367,1,0,0,0,367,368,6,4,3,0,368,21,1,0,0,0,369,370,7,15,
-	0,0,370,371,7,6,0,0,371,372,7,7,0,0,372,373,7,16,0,0,373,374,1,0,0,0,374,
-	375,6,5,4,0,375,23,1,0,0,0,376,377,7,17,0,0,377,378,7,6,0,0,378,379,7,7,
-	0,0,379,380,7,18,0,0,380,381,1,0,0,0,381,382,6,6,0,0,382,25,1,0,0,0,383,
-	384,7,1,0,0,384,385,7,9,0,0,385,386,7,13,0,0,386,387,7,1,0,0,387,388,7,
-	9,0,0,388,389,7,3,0,0,389,390,7,2,0,0,390,391,7,5,0,0,391,392,7,12,0,0,
-	392,393,7,5,0,0,393,394,7,2,0,0,394,395,1,0,0,0,395,396,6,7,0,0,396,27,
-	1,0,0,0,397,398,7,18,0,0,398,399,7,3,0,0,399,400,7,3,0,0,400,401,7,8,0,
-	0,401,402,1,0,0,0,402,403,6,8,1,0,403,29,1,0,0,0,404,405,7,13,0,0,405,406,
-	7,1,0,0,406,407,7,16,0,0,407,408,7,1,0,0,408,409,7,5,0,0,409,410,1,0,0,
-	0,410,411,6,9,0,0,411,31,1,0,0,0,412,413,7,16,0,0,413,414,7,3,0,0,414,415,
-	7,5,0,0,415,416,7,12,0,0,416,417,1,0,0,0,417,418,6,10,5,0,418,33,1,0,0,
-	0,419,420,7,16,0,0,420,421,7,11,0,0,421,422,5,95,0,0,422,423,7,3,0,0,423,
-	424,7,14,0,0,424,425,7,8,0,0,425,426,7,12,0,0,426,427,7,9,0,0,427,428,7,
-	0,0,0,428,429,1,0,0,0,429,430,6,11,6,0,430,35,1,0,0,0,431,432,7,6,0,0,432,
-	433,7,3,0,0,433,434,7,9,0,0,434,435,7,12,0,0,435,436,7,16,0,0,436,437,7,
-	3,0,0,437,438,1,0,0,0,438,439,6,12,7,0,439,37,1,0,0,0,440,441,7,6,0,0,441,
-	442,7,7,0,0,442,443,7,19,0,0,443,444,1,0,0,0,444,445,6,13,0,0,445,39,1,
-	0,0,0,446,447,7,2,0,0,447,448,7,10,0,0,448,449,7,7,0,0,449,450,7,19,0,0,
-	450,451,1,0,0,0,451,452,6,14,8,0,452,41,1,0,0,0,453,454,7,2,0,0,454,455,
-	7,7,0,0,455,456,7,6,0,0,456,457,7,5,0,0,457,458,1,0,0,0,458,459,6,15,0,
-	0,459,43,1,0,0,0,460,461,7,2,0,0,461,462,7,5,0,0,462,463,7,12,0,0,463,464,
-	7,5,0,0,464,465,7,2,0,0,465,466,1,0,0,0,466,467,6,16,0,0,467,45,1,0,0,0,
-	468,469,7,19,0,0,469,470,7,10,0,0,470,471,7,3,0,0,471,472,7,6,0,0,472,473,
-	7,3,0,0,473,474,1,0,0,0,474,475,6,17,0,0,475,47,1,0,0,0,476,478,8,20,0,
-	0,477,476,1,0,0,0,478,479,1,0,0,0,479,477,1,0,0,0,479,480,1,0,0,0,480,481,
-	1,0,0,0,481,482,6,18,0,0,482,49,1,0,0,0,483,484,5,47,0,0,484,485,5,47,0,
-	0,485,489,1,0,0,0,486,488,8,21,0,0,487,486,1,0,0,0,488,491,1,0,0,0,489,
-	487,1,0,0,0,489,490,1,0,0,0,490,493,1,0,0,0,491,489,1,0,0,0,492,494,5,13,
-	0,0,493,492,1,0,0,0,493,494,1,0,0,0,494,496,1,0,0,0,495,497,5,10,0,0,496,
-	495,1,0,0,0,496,497,1,0,0,0,497,498,1,0,0,0,498,499,6,19,9,0,499,51,1,0,
-	0,0,500,501,5,47,0,0,501,502,5,42,0,0,502,507,1,0,0,0,503,506,3,52,20,0,
-	504,506,9,0,0,0,505,503,1,0,0,0,505,504,1,0,0,0,506,509,1,0,0,0,507,508,
-	1,0,0,0,507,505,1,0,0,0,508,510,1,0,0,0,509,507,1,0,0,0,510,511,5,42,0,
-	0,511,512,5,47,0,0,512,513,1,0,0,0,513,514,6,20,9,0,514,53,1,0,0,0,515,
-	517,7,22,0,0,516,515,1,0,0,0,517,518,1,0,0,0,518,516,1,0,0,0,518,519,1,
-	0,0,0,519,520,1,0,0,0,520,521,6,21,9,0,521,55,1,0,0,0,522,523,3,162,75,
-	0,523,524,1,0,0,0,524,525,6,22,10,0,525,526,6,22,11,0,526,57,1,0,0,0,527,
-	528,3,66,27,0,528,529,1,0,0,0,529,530,6,23,12,0,530,531,6,23,13,0,531,59,
-	1,0,0,0,532,533,3,54,21,0,533,534,1,0,0,0,534,535,6,24,9,0,535,61,1,0,0,
-	0,536,537,3,50,19,0,537,538,1,0,0,0,538,539,6,25,9,0,539,63,1,0,0,0,540,
-	541,3,52,20,0,541,542,1,0,0,0,542,543,6,26,9,0,543,65,1,0,0,0,544,545,5,
-	124,0,0,545,546,1,0,0,0,546,547,6,27,13,0,547,67,1,0,0,0,548,549,7,23,0,
-	0,549,69,1,0,0,0,550,551,7,24,0,0,551,71,1,0,0,0,552,553,5,92,0,0,553,554,
-	7,25,0,0,554,73,1,0,0,0,555,556,8,26,0,0,556,75,1,0,0,0,557,559,7,3,0,0,
-	558,560,7,27,0,0,559,558,1,0,0,0,559,560,1,0,0,0,560,562,1,0,0,0,561,563,
-	3,68,28,0,562,561,1,0,0,0,563,564,1,0,0,0,564,562,1,0,0,0,564,565,1,0,0,
-	0,565,77,1,0,0,0,566,567,5,64,0,0,567,79,1,0,0,0,568,569,5,96,0,0,569,81,
-	1,0,0,0,570,574,8,28,0,0,571,572,5,96,0,0,572,574,5,96,0,0,573,570,1,0,
-	0,0,573,571,1,0,0,0,574,83,1,0,0,0,575,576,5,95,0,0,576,85,1,0,0,0,577,
-	581,3,70,29,0,578,581,3,68,28,0,579,581,3,84,36,0,580,577,1,0,0,0,580,578,
-	1,0,0,0,580,579,1,0,0,0,581,87,1,0,0,0,582,587,5,34,0,0,583,586,3,72,30,
-	0,584,586,3,74,31,0,585,583,1,0,0,0,585,584,1,0,0,0,586,589,1,0,0,0,587,
-	585,1,0,0,0,587,588,1,0,0,0,588,590,1,0,0,0,589,587,1,0,0,0,590,612,5,34,
-	0,0,591,592,5,34,0,0,592,593,5,34,0,0,593,594,5,34,0,0,594,598,1,0,0,0,
-	595,597,8,21,0,0,596,595,1,0,0,0,597,600,1,0,0,0,598,599,1,0,0,0,598,596,
-	1,0,0,0,599,601,1,0,0,0,600,598,1,0,0,0,601,602,5,34,0,0,602,603,5,34,0,
-	0,603,604,5,34,0,0,604,606,1,0,0,0,605,607,5,34,0,0,606,605,1,0,0,0,606,
-	607,1,0,0,0,607,609,1,0,0,0,608,610,5,34,0,0,609,608,1,0,0,0,609,610,1,
-	0,0,0,610,612,1,0,0,0,611,582,1,0,0,0,611,591,1,0,0,0,612,89,1,0,0,0,613,
-	615,3,68,28,0,614,613,1,0,0,0,615,616,1,0,0,0,616,614,1,0,0,0,616,617,1,
-	0,0,0,617,91,1,0,0,0,618,620,3,68,28,0,619,618,1,0,0,0,620,621,1,0,0,0,
-	621,619,1,0,0,0,621,622,1,0,0,0,622,623,1,0,0,0,623,627,3,106,47,0,624,
-	626,3,68,28,0,625,624,1,0,0,0,626,629,1,0,0,0,627,625,1,0,0,0,627,628,1,
-	0,0,0,628,661,1,0,0,0,629,627,1,0,0,0,630,632,3,106,47,0,631,633,3,68,28,
-	0,632,631,1,0,0,0,633,634,1,0,0,0,634,632,1,0,0,0,634,635,1,0,0,0,635,661,
-	1,0,0,0,636,638,3,68,28,0,637,636,1,0,0,0,638,639,1,0,0,0,639,637,1,0,0,
-	0,639,640,1,0,0,0,640,648,1,0,0,0,641,645,3,106,47,0,642,644,3,68,28,0,
-	643,642,1,0,0,0,644,647,1,0,0,0,645,643,1,0,0,0,645,646,1,0,0,0,646,649,
-	1,0,0,0,647,645,1,0,0,0,648,641,1,0,0,0,648,649,1,0,0,0,649,650,1,0,0,0,
-	650,651,3,76,32,0,651,661,1,0,0,0,652,654,3,106,47,0,653,655,3,68,28,0,
-	654,653,1,0,0,0,655,656,1,0,0,0,656,654,1,0,0,0,656,657,1,0,0,0,657,658,
-	1,0,0,0,658,659,3,76,32,0,659,661,1,0,0,0,660,619,1,0,0,0,660,630,1,0,0,
-	0,660,637,1,0,0,0,660,652,1,0,0,0,661,93,1,0,0,0,662,663,7,29,0,0,663,664,
-	7,30,0,0,664,95,1,0,0,0,665,666,7,12,0,0,666,667,7,9,0,0,667,668,7,0,0,
-	0,668,97,1,0,0,0,669,670,7,12,0,0,670,671,7,2,0,0,671,672,7,4,0,0,672,99,
-	1,0,0,0,673,674,5,61,0,0,674,101,1,0,0,0,675,676,5,44,0,0,676,103,1,0,0,
-	0,677,678,7,0,0,0,678,679,7,3,0,0,679,680,7,2,0,0,680,681,7,4,0,0,681,105,
-	1,0,0,0,682,683,5,46,0,0,683,107,1,0,0,0,684,685,7,15,0,0,685,686,7,12,
-	0,0,686,687,7,13,0,0,687,688,7,2,0,0,688,689,7,3,0,0,689,109,1,0,0,0,690,
-	691,7,15,0,0,691,692,7,1,0,0,692,693,7,6,0,0,693,694,7,2,0,0,694,695,7,
-	5,0,0,695,111,1,0,0,0,696,697,7,13,0,0,697,698,7,12,0,0,698,699,7,2,0,0,
-	699,700,7,5,0,0,700,113,1,0,0,0,701,702,5,40,0,0,702,115,1,0,0,0,703,704,
-	7,1,0,0,704,705,7,9,0,0,705,117,1,0,0,0,706,707,7,1,0,0,707,708,7,2,0,0,
-	708,119,1,0,0,0,709,710,7,13,0,0,710,711,7,1,0,0,711,712,7,18,0,0,712,713,
-	7,3,0,0,713,121,1,0,0,0,714,715,7,9,0,0,715,716,7,7,0,0,716,717,7,5,0,0,
-	717,123,1,0,0,0,718,719,7,9,0,0,719,720,7,31,0,0,720,721,7,13,0,0,721,722,
-	7,13,0,0,722,125,1,0,0,0,723,724,7,9,0,0,724,725,7,31,0,0,725,726,7,13,
-	0,0,726,727,7,13,0,0,727,728,7,2,0,0,728,127,1,0,0,0,729,730,7,7,0,0,730,
-	731,7,6,0,0,731,129,1,0,0,0,732,733,5,63,0,0,733,131,1,0,0,0,734,735,7,
-	6,0,0,735,736,7,13,0,0,736,737,7,1,0,0,737,738,7,18,0,0,738,739,7,3,0,0,
-	739,133,1,0,0,0,740,741,5,41,0,0,741,135,1,0,0,0,742,743,7,5,0,0,743,744,
-	7,6,0,0,744,745,7,31,0,0,745,746,7,3,0,0,746,137,1,0,0,0,747,748,5,61,0,
-	0,748,749,5,61,0,0,749,139,1,0,0,0,750,751,5,61,0,0,751,752,5,126,0,0,752,
-	141,1,0,0,0,753,754,5,33,0,0,754,755,5,61,0,0,755,143,1,0,0,0,756,757,5,
-	60,0,0,757,145,1,0,0,0,758,759,5,60,0,0,759,760,5,61,0,0,760,147,1,0,0,
-	0,761,762,5,62,0,0,762,149,1,0,0,0,763,764,5,62,0,0,764,765,5,61,0,0,765,
-	151,1,0,0,0,766,767,5,43,0,0,767,153,1,0,0,0,768,769,5,45,0,0,769,155,1,
-	0,0,0,770,771,5,42,0,0,771,157,1,0,0,0,772,773,5,47,0,0,773,159,1,0,0,0,
-	774,775,5,37,0,0,775,161,1,0,0,0,776,777,5,91,0,0,777,778,1,0,0,0,778,779,
-	6,75,0,0,779,780,6,75,0,0,780,163,1,0,0,0,781,782,5,93,0,0,782,783,1,0,
-	0,0,783,784,6,76,13,0,784,785,6,76,13,0,785,165,1,0,0,0,786,790,3,70,29,
-	0,787,789,3,86,37,0,788,787,1,0,0,0,789,792,1,0,0,0,790,788,1,0,0,0,790,
-	791,1,0,0,0,791,803,1,0,0,0,792,790,1,0,0,0,793,796,3,84,36,0,794,796,3,
-	78,33,0,795,793,1,0,0,0,795,794,1,0,0,0,796,798,1,0,0,0,797,799,3,86,37,
-	0,798,797,1,0,0,0,799,800,1,0,0,0,800,798,1,0,0,0,800,801,1,0,0,0,801,803,
-	1,0,0,0,802,786,1,0,0,0,802,795,1,0,0,0,803,167,1,0,0,0,804,806,3,80,34,
-	0,805,807,3,82,35,0,806,805,1,0,0,0,807,808,1,0,0,0,808,806,1,0,0,0,808,
-	809,1,0,0,0,809,810,1,0,0,0,810,811,3,80,34,0,811,169,1,0,0,0,812,813,3,
-	168,78,0,813,171,1,0,0,0,814,815,3,50,19,0,815,816,1,0,0,0,816,817,6,80,
-	9,0,817,173,1,0,0,0,818,819,3,52,20,0,819,820,1,0,0,0,820,821,6,81,9,0,
-	821,175,1,0,0,0,822,823,3,54,21,0,823,824,1,0,0,0,824,825,6,82,9,0,825,
-	177,1,0,0,0,826,827,3,66,27,0,827,828,1,0,0,0,828,829,6,83,12,0,829,830,
-	6,83,13,0,830,179,1,0,0,0,831,832,3,162,75,0,832,833,1,0,0,0,833,834,6,
-	84,10,0,834,181,1,0,0,0,835,836,3,164,76,0,836,837,1,0,0,0,837,838,6,85,
-	14,0,838,183,1,0,0,0,839,840,3,102,45,0,840,841,1,0,0,0,841,842,6,86,15,
-	0,842,185,1,0,0,0,843,844,3,100,44,0,844,845,1,0,0,0,845,846,6,87,16,0,
-	846,187,1,0,0,0,847,848,7,16,0,0,848,849,7,3,0,0,849,850,7,5,0,0,850,851,
-	7,12,0,0,851,852,7,0,0,0,852,853,7,12,0,0,853,854,7,5,0,0,854,855,7,12,
-	0,0,855,189,1,0,0,0,856,860,8,32,0,0,857,858,5,47,0,0,858,860,8,33,0,0,
-	859,856,1,0,0,0,859,857,1,0,0,0,860,191,1,0,0,0,861,863,3,190,89,0,862,
-	861,1,0,0,0,863,864,1,0,0,0,864,862,1,0,0,0,864,865,1,0,0,0,865,193,1,0,
-	0,0,866,867,3,170,79,0,867,868,1,0,0,0,868,869,6,91,17,0,869,195,1,0,0,
-	0,870,871,3,50,19,0,871,872,1,0,0,0,872,873,6,92,9,0,873,197,1,0,0,0,874,
-	875,3,52,20,0,875,876,1,0,0,0,876,877,6,93,9,0,877,199,1,0,0,0,878,879,
-	3,54,21,0,879,880,1,0,0,0,880,881,6,94,9,0,881,201,1,0,0,0,882,883,3,66,
-	27,0,883,884,1,0,0,0,884,885,6,95,12,0,885,886,6,95,13,0,886,203,1,0,0,
-	0,887,888,3,106,47,0,888,889,1,0,0,0,889,890,6,96,18,0,890,205,1,0,0,0,
-	891,892,3,102,45,0,892,893,1,0,0,0,893,894,6,97,15,0,894,207,1,0,0,0,895,
-	900,3,70,29,0,896,900,3,68,28,0,897,900,3,84,36,0,898,900,3,156,72,0,899,
-	895,1,0,0,0,899,896,1,0,0,0,899,897,1,0,0,0,899,898,1,0,0,0,900,209,1,0,
-	0,0,901,904,3,70,29,0,902,904,3,156,72,0,903,901,1,0,0,0,903,902,1,0,0,
-	0,904,908,1,0,0,0,905,907,3,208,98,0,906,905,1,0,0,0,907,910,1,0,0,0,908,
-	906,1,0,0,0,908,909,1,0,0,0,909,921,1,0,0,0,910,908,1,0,0,0,911,914,3,84,
-	36,0,912,914,3,78,33,0,913,911,1,0,0,0,913,912,1,0,0,0,914,916,1,0,0,0,
-	915,917,3,208,98,0,916,915,1,0,0,0,917,918,1,0,0,0,918,916,1,0,0,0,918,
-	919,1,0,0,0,919,921,1,0,0,0,920,903,1,0,0,0,920,913,1,0,0,0,921,211,1,0,
-	0,0,922,925,3,210,99,0,923,925,3,168,78,0,924,922,1,0,0,0,924,923,1,0,0,
-	0,925,926,1,0,0,0,926,924,1,0,0,0,926,927,1,0,0,0,927,213,1,0,0,0,928,929,
-	3,50,19,0,929,930,1,0,0,0,930,931,6,101,9,0,931,215,1,0,0,0,932,933,3,52,
-	20,0,933,934,1,0,0,0,934,935,6,102,9,0,935,217,1,0,0,0,936,937,3,54,21,
-	0,937,938,1,0,0,0,938,939,6,103,9,0,939,219,1,0,0,0,940,941,3,66,27,0,941,
-	942,1,0,0,0,942,943,6,104,12,0,943,944,6,104,13,0,944,221,1,0,0,0,945,946,
-	3,100,44,0,946,947,1,0,0,0,947,948,6,105,16,0,948,223,1,0,0,0,949,950,3,
-	102,45,0,950,951,1,0,0,0,951,952,6,106,15,0,952,225,1,0,0,0,953,954,3,106,
-	47,0,954,955,1,0,0,0,955,956,6,107,18,0,956,227,1,0,0,0,957,958,7,12,0,
-	0,958,959,7,2,0,0,959,229,1,0,0,0,960,961,3,212,100,0,961,962,1,0,0,0,962,
-	963,6,109,19,0,963,231,1,0,0,0,964,965,3,50,19,0,965,966,1,0,0,0,966,967,
-	6,110,9,0,967,233,1,0,0,0,968,969,3,52,20,0,969,970,1,0,0,0,970,971,6,111,
-	9,0,971,235,1,0,0,0,972,973,3,54,21,0,973,974,1,0,0,0,974,975,6,112,9,0,
-	975,237,1,0,0,0,976,977,3,66,27,0,977,978,1,0,0,0,978,979,6,113,12,0,979,
-	980,6,113,13,0,980,239,1,0,0,0,981,982,3,162,75,0,982,983,1,0,0,0,983,984,
-	6,114,10,0,984,985,6,114,20,0,985,241,1,0,0,0,986,987,7,7,0,0,987,988,7,
-	9,0,0,988,989,1,0,0,0,989,990,6,115,21,0,990,243,1,0,0,0,991,992,7,19,0,
-	0,992,993,7,1,0,0,993,994,7,5,0,0,994,995,7,10,0,0,995,996,1,0,0,0,996,
-	997,6,116,21,0,997,245,1,0,0,0,998,999,8,34,0,0,999,247,1,0,0,0,1000,1002,
-	3,246,117,0,1001,1000,1,0,0,0,1002,1003,1,0,0,0,1003,1001,1,0,0,0,1003,
-	1004,1,0,0,0,1004,1005,1,0,0,0,1005,1006,3,316,152,0,1006,1008,1,0,0,0,
-	1007,1001,1,0,0,0,1007,1008,1,0,0,0,1008,1010,1,0,0,0,1009,1011,3,246,117,
-	0,1010,1009,1,0,0,0,1011,1012,1,0,0,0,1012,1010,1,0,0,0,1012,1013,1,0,0,
-	0,1013,249,1,0,0,0,1014,1015,3,170,79,0,1015,1016,1,0,0,0,1016,1017,6,119,
-	17,0,1017,251,1,0,0,0,1018,1019,3,248,118,0,1019,1020,1,0,0,0,1020,1021,
-	6,120,22,0,1021,253,1,0,0,0,1022,1023,3,50,19,0,1023,1024,1,0,0,0,1024,
-	1025,6,121,9,0,1025,255,1,0,0,0,1026,1027,3,52,20,0,1027,1028,1,0,0,0,1028,
-	1029,6,122,9,0,1029,257,1,0,0,0,1030,1031,3,54,21,0,1031,1032,1,0,0,0,1032,
-	1033,6,123,9,0,1033,259,1,0,0,0,1034,1035,3,66,27,0,1035,1036,1,0,0,0,1036,
-	1037,6,124,12,0,1037,1038,6,124,13,0,1038,1039,6,124,13,0,1039,261,1,0,
-	0,0,1040,1041,3,100,44,0,1041,1042,1,0,0,0,1042,1043,6,125,16,0,1043,263,
-	1,0,0,0,1044,1045,3,102,45,0,1045,1046,1,0,0,0,1046,1047,6,126,15,0,1047,
-	265,1,0,0,0,1048,1049,3,106,47,0,1049,1050,1,0,0,0,1050,1051,6,127,18,0,
-	1051,267,1,0,0,0,1052,1053,3,244,116,0,1053,1054,1,0,0,0,1054,1055,6,128,
-	23,0,1055,269,1,0,0,0,1056,1057,3,212,100,0,1057,1058,1,0,0,0,1058,1059,
-	6,129,19,0,1059,271,1,0,0,0,1060,1061,3,170,79,0,1061,1062,1,0,0,0,1062,
-	1063,6,130,17,0,1063,273,1,0,0,0,1064,1065,3,50,19,0,1065,1066,1,0,0,0,
-	1066,1067,6,131,9,0,1067,275,1,0,0,0,1068,1069,3,52,20,0,1069,1070,1,0,
-	0,0,1070,1071,6,132,9,0,1071,277,1,0,0,0,1072,1073,3,54,21,0,1073,1074,
-	1,0,0,0,1074,1075,6,133,9,0,1075,279,1,0,0,0,1076,1077,3,66,27,0,1077,1078,
-	1,0,0,0,1078,1079,6,134,12,0,1079,1080,6,134,13,0,1080,281,1,0,0,0,1081,
-	1082,3,106,47,0,1082,1083,1,0,0,0,1083,1084,6,135,18,0,1084,283,1,0,0,0,
-	1085,1086,3,170,79,0,1086,1087,1,0,0,0,1087,1088,6,136,17,0,1088,285,1,
-	0,0,0,1089,1090,3,166,77,0,1090,1091,1,0,0,0,1091,1092,6,137,24,0,1092,
-	287,1,0,0,0,1093,1094,3,50,19,0,1094,1095,1,0,0,0,1095,1096,6,138,9,0,1096,
-	289,1,0,0,0,1097,1098,3,52,20,0,1098,1099,1,0,0,0,1099,1100,6,139,9,0,1100,
-	291,1,0,0,0,1101,1102,3,54,21,0,1102,1103,1,0,0,0,1103,1104,6,140,9,0,1104,
-	293,1,0,0,0,1105,1106,3,66,27,0,1106,1107,1,0,0,0,1107,1108,6,141,12,0,
-	1108,1109,6,141,13,0,1109,295,1,0,0,0,1110,1111,7,1,0,0,1111,1112,7,9,0,
-	0,1112,1113,7,15,0,0,1113,1114,7,7,0,0,1114,297,1,0,0,0,1115,1116,3,50,
-	19,0,1116,1117,1,0,0,0,1117,1118,6,143,9,0,1118,299,1,0,0,0,1119,1120,3,
-	52,20,0,1120,1121,1,0,0,0,1121,1122,6,144,9,0,1122,301,1,0,0,0,1123,1124,
-	3,54,21,0,1124,1125,1,0,0,0,1125,1126,6,145,9,0,1126,303,1,0,0,0,1127,1128,
-	3,66,27,0,1128,1129,1,0,0,0,1129,1130,6,146,12,0,1130,1131,6,146,13,0,1131,
-	305,1,0,0,0,1132,1133,7,15,0,0,1133,1134,7,31,0,0,1134,1135,7,9,0,0,1135,
-	1136,7,4,0,0,1136,1137,7,5,0,0,1137,1138,7,1,0,0,1138,1139,7,7,0,0,1139,
-	1140,7,9,0,0,1140,1141,7,2,0,0,1141,307,1,0,0,0,1142,1143,3,50,19,0,1143,
-	1144,1,0,0,0,1144,1145,6,148,9,0,1145,309,1,0,0,0,1146,1147,3,52,20,0,1147,
-	1148,1,0,0,0,1148,1149,6,149,9,0,1149,311,1,0,0,0,1150,1151,3,54,21,0,1151,
-	1152,1,0,0,0,1152,1153,6,150,9,0,1153,313,1,0,0,0,1154,1155,3,164,76,0,
-	1155,1156,1,0,0,0,1156,1157,6,151,14,0,1157,1158,6,151,13,0,1158,315,1,
-	0,0,0,1159,1160,5,58,0,0,1160,317,1,0,0,0,1161,1167,3,78,33,0,1162,1167,
-	3,68,28,0,1163,1167,3,106,47,0,1164,1167,3,70,29,0,1165,1167,3,84,36,0,
-	1166,1161,1,0,0,0,1166,1162,1,0,0,0,1166,1163,1,0,0,0,1166,1164,1,0,0,0,
-	1166,1165,1,0,0,0,1167,1168,1,0,0,0,1168,1166,1,0,0,0,1168,1169,1,0,0,0,
-	1169,319,1,0,0,0,1170,1171,3,50,19,0,1171,1172,1,0,0,0,1172,1173,6,154,
-	9,0,1173,321,1,0,0,0,1174,1175,3,52,20,0,1175,1176,1,0,0,0,1176,1177,6,
-	155,9,0,1177,323,1,0,0,0,1178,1179,3,54,21,0,1179,1180,1,0,0,0,1180,1181,
-	6,156,9,0,1181,325,1,0,0,0,58,0,1,2,3,4,5,6,7,8,9,10,11,479,489,493,496,
-	505,507,518,559,564,573,580,585,587,598,606,609,611,616,621,627,634,639,
-	645,648,656,660,790,795,800,802,808,859,864,899,903,908,913,918,920,924,
-	926,1003,1007,1012,1166,1168,25,5,2,0,5,4,0,5,6,0,5,1,0,5,3,0,5,10,0,5,
-	8,0,5,5,0,5,9,0,0,1,0,7,64,0,5,0,0,7,26,0,4,0,0,7,65,0,7,34,0,7,33,0,7,
-	67,0,7,36,0,7,76,0,5,11,0,5,7,0,7,86,0,7,85,0,7,66,0];
+	1,0,0,0,8,294,1,0,0,0,8,296,1,0,0,0,9,298,1,0,0,0,9,300,1,0,0,0,9,302,1,
+	0,0,0,9,304,1,0,0,0,9,306,1,0,0,0,10,308,1,0,0,0,10,310,1,0,0,0,10,312,
+	1,0,0,0,10,314,1,0,0,0,10,316,1,0,0,0,11,318,1,0,0,0,11,320,1,0,0,0,11,
+	322,1,0,0,0,11,324,1,0,0,0,11,326,1,0,0,0,11,328,1,0,0,0,12,330,1,0,0,0,
+	14,340,1,0,0,0,16,347,1,0,0,0,18,356,1,0,0,0,20,363,1,0,0,0,22,373,1,0,
+	0,0,24,380,1,0,0,0,26,387,1,0,0,0,28,401,1,0,0,0,30,408,1,0,0,0,32,416,
+	1,0,0,0,34,423,1,0,0,0,36,435,1,0,0,0,38,444,1,0,0,0,40,450,1,0,0,0,42,
+	457,1,0,0,0,44,464,1,0,0,0,46,472,1,0,0,0,48,481,1,0,0,0,50,487,1,0,0,0,
+	52,504,1,0,0,0,54,520,1,0,0,0,56,526,1,0,0,0,58,531,1,0,0,0,60,536,1,0,
+	0,0,62,540,1,0,0,0,64,544,1,0,0,0,66,548,1,0,0,0,68,552,1,0,0,0,70,554,
+	1,0,0,0,72,556,1,0,0,0,74,559,1,0,0,0,76,561,1,0,0,0,78,570,1,0,0,0,80,
+	572,1,0,0,0,82,577,1,0,0,0,84,579,1,0,0,0,86,584,1,0,0,0,88,615,1,0,0,0,
+	90,618,1,0,0,0,92,664,1,0,0,0,94,666,1,0,0,0,96,669,1,0,0,0,98,673,1,0,
+	0,0,100,677,1,0,0,0,102,679,1,0,0,0,104,681,1,0,0,0,106,686,1,0,0,0,108,
+	688,1,0,0,0,110,694,1,0,0,0,112,700,1,0,0,0,114,705,1,0,0,0,116,707,1,0,
+	0,0,118,710,1,0,0,0,120,713,1,0,0,0,122,718,1,0,0,0,124,722,1,0,0,0,126,
+	727,1,0,0,0,128,733,1,0,0,0,130,736,1,0,0,0,132,738,1,0,0,0,134,744,1,0,
+	0,0,136,746,1,0,0,0,138,751,1,0,0,0,140,754,1,0,0,0,142,757,1,0,0,0,144,
+	760,1,0,0,0,146,762,1,0,0,0,148,765,1,0,0,0,150,767,1,0,0,0,152,770,1,0,
+	0,0,154,772,1,0,0,0,156,774,1,0,0,0,158,776,1,0,0,0,160,778,1,0,0,0,162,
+	780,1,0,0,0,164,785,1,0,0,0,166,806,1,0,0,0,168,808,1,0,0,0,170,816,1,0,
+	0,0,172,818,1,0,0,0,174,822,1,0,0,0,176,826,1,0,0,0,178,830,1,0,0,0,180,
+	835,1,0,0,0,182,839,1,0,0,0,184,843,1,0,0,0,186,847,1,0,0,0,188,851,1,0,
+	0,0,190,855,1,0,0,0,192,863,1,0,0,0,194,875,1,0,0,0,196,878,1,0,0,0,198,
+	882,1,0,0,0,200,886,1,0,0,0,202,890,1,0,0,0,204,894,1,0,0,0,206,898,1,0,
+	0,0,208,903,1,0,0,0,210,907,1,0,0,0,212,915,1,0,0,0,214,936,1,0,0,0,216,
+	940,1,0,0,0,218,944,1,0,0,0,220,948,1,0,0,0,222,952,1,0,0,0,224,956,1,0,
+	0,0,226,961,1,0,0,0,228,965,1,0,0,0,230,969,1,0,0,0,232,973,1,0,0,0,234,
+	976,1,0,0,0,236,980,1,0,0,0,238,984,1,0,0,0,240,988,1,0,0,0,242,992,1,0,
+	0,0,244,997,1,0,0,0,246,1002,1,0,0,0,248,1007,1,0,0,0,250,1014,1,0,0,0,
+	252,1023,1,0,0,0,254,1030,1,0,0,0,256,1034,1,0,0,0,258,1038,1,0,0,0,260,
+	1042,1,0,0,0,262,1046,1,0,0,0,264,1050,1,0,0,0,266,1056,1,0,0,0,268,1060,
+	1,0,0,0,270,1064,1,0,0,0,272,1068,1,0,0,0,274,1072,1,0,0,0,276,1076,1,0,
+	0,0,278,1080,1,0,0,0,280,1084,1,0,0,0,282,1088,1,0,0,0,284,1092,1,0,0,0,
+	286,1097,1,0,0,0,288,1101,1,0,0,0,290,1105,1,0,0,0,292,1109,1,0,0,0,294,
+	1113,1,0,0,0,296,1117,1,0,0,0,298,1121,1,0,0,0,300,1126,1,0,0,0,302,1131,
+	1,0,0,0,304,1135,1,0,0,0,306,1139,1,0,0,0,308,1143,1,0,0,0,310,1148,1,0,
+	0,0,312,1158,1,0,0,0,314,1162,1,0,0,0,316,1166,1,0,0,0,318,1170,1,0,0,0,
+	320,1175,1,0,0,0,322,1182,1,0,0,0,324,1186,1,0,0,0,326,1190,1,0,0,0,328,
+	1194,1,0,0,0,330,331,7,0,0,0,331,332,7,1,0,0,332,333,7,2,0,0,333,334,7,
+	2,0,0,334,335,7,3,0,0,335,336,7,4,0,0,336,337,7,5,0,0,337,338,1,0,0,0,338,
+	339,6,0,0,0,339,13,1,0,0,0,340,341,7,0,0,0,341,342,7,6,0,0,342,343,7,7,
+	0,0,343,344,7,8,0,0,344,345,1,0,0,0,345,346,6,1,1,0,346,15,1,0,0,0,347,
+	348,7,3,0,0,348,349,7,9,0,0,349,350,7,6,0,0,350,351,7,1,0,0,351,352,7,4,
+	0,0,352,353,7,10,0,0,353,354,1,0,0,0,354,355,6,2,2,0,355,17,1,0,0,0,356,
+	357,7,3,0,0,357,358,7,11,0,0,358,359,7,12,0,0,359,360,7,13,0,0,360,361,
+	1,0,0,0,361,362,6,3,0,0,362,19,1,0,0,0,363,364,7,3,0,0,364,365,7,14,0,0,
+	365,366,7,8,0,0,366,367,7,13,0,0,367,368,7,12,0,0,368,369,7,1,0,0,369,370,
+	7,9,0,0,370,371,1,0,0,0,371,372,6,4,3,0,372,21,1,0,0,0,373,374,7,15,0,0,
+	374,375,7,6,0,0,375,376,7,7,0,0,376,377,7,16,0,0,377,378,1,0,0,0,378,379,
+	6,5,4,0,379,23,1,0,0,0,380,381,7,17,0,0,381,382,7,6,0,0,382,383,7,7,0,0,
+	383,384,7,18,0,0,384,385,1,0,0,0,385,386,6,6,0,0,386,25,1,0,0,0,387,388,
+	7,1,0,0,388,389,7,9,0,0,389,390,7,13,0,0,390,391,7,1,0,0,391,392,7,9,0,
+	0,392,393,7,3,0,0,393,394,7,2,0,0,394,395,7,5,0,0,395,396,7,12,0,0,396,
+	397,7,5,0,0,397,398,7,2,0,0,398,399,1,0,0,0,399,400,6,7,0,0,400,27,1,0,
+	0,0,401,402,7,18,0,0,402,403,7,3,0,0,403,404,7,3,0,0,404,405,7,8,0,0,405,
+	406,1,0,0,0,406,407,6,8,1,0,407,29,1,0,0,0,408,409,7,13,0,0,409,410,7,1,
+	0,0,410,411,7,16,0,0,411,412,7,1,0,0,412,413,7,5,0,0,413,414,1,0,0,0,414,
+	415,6,9,0,0,415,31,1,0,0,0,416,417,7,16,0,0,417,418,7,3,0,0,418,419,7,5,
+	0,0,419,420,7,12,0,0,420,421,1,0,0,0,421,422,6,10,5,0,422,33,1,0,0,0,423,
+	424,7,16,0,0,424,425,7,11,0,0,425,426,5,95,0,0,426,427,7,3,0,0,427,428,
+	7,14,0,0,428,429,7,8,0,0,429,430,7,12,0,0,430,431,7,9,0,0,431,432,7,0,0,
+	0,432,433,1,0,0,0,433,434,6,11,6,0,434,35,1,0,0,0,435,436,7,6,0,0,436,437,
+	7,3,0,0,437,438,7,9,0,0,438,439,7,12,0,0,439,440,7,16,0,0,440,441,7,3,0,
+	0,441,442,1,0,0,0,442,443,6,12,7,0,443,37,1,0,0,0,444,445,7,6,0,0,445,446,
+	7,7,0,0,446,447,7,19,0,0,447,448,1,0,0,0,448,449,6,13,0,0,449,39,1,0,0,
+	0,450,451,7,2,0,0,451,452,7,10,0,0,452,453,7,7,0,0,453,454,7,19,0,0,454,
+	455,1,0,0,0,455,456,6,14,8,0,456,41,1,0,0,0,457,458,7,2,0,0,458,459,7,7,
+	0,0,459,460,7,6,0,0,460,461,7,5,0,0,461,462,1,0,0,0,462,463,6,15,0,0,463,
+	43,1,0,0,0,464,465,7,2,0,0,465,466,7,5,0,0,466,467,7,12,0,0,467,468,7,5,
+	0,0,468,469,7,2,0,0,469,470,1,0,0,0,470,471,6,16,0,0,471,45,1,0,0,0,472,
+	473,7,19,0,0,473,474,7,10,0,0,474,475,7,3,0,0,475,476,7,6,0,0,476,477,7,
+	3,0,0,477,478,1,0,0,0,478,479,6,17,0,0,479,47,1,0,0,0,480,482,8,20,0,0,
+	481,480,1,0,0,0,482,483,1,0,0,0,483,481,1,0,0,0,483,484,1,0,0,0,484,485,
+	1,0,0,0,485,486,6,18,0,0,486,49,1,0,0,0,487,488,5,47,0,0,488,489,5,47,0,
+	0,489,493,1,0,0,0,490,492,8,21,0,0,491,490,1,0,0,0,492,495,1,0,0,0,493,
+	491,1,0,0,0,493,494,1,0,0,0,494,497,1,0,0,0,495,493,1,0,0,0,496,498,5,13,
+	0,0,497,496,1,0,0,0,497,498,1,0,0,0,498,500,1,0,0,0,499,501,5,10,0,0,500,
+	499,1,0,0,0,500,501,1,0,0,0,501,502,1,0,0,0,502,503,6,19,9,0,503,51,1,0,
+	0,0,504,505,5,47,0,0,505,506,5,42,0,0,506,511,1,0,0,0,507,510,3,52,20,0,
+	508,510,9,0,0,0,509,507,1,0,0,0,509,508,1,0,0,0,510,513,1,0,0,0,511,512,
+	1,0,0,0,511,509,1,0,0,0,512,514,1,0,0,0,513,511,1,0,0,0,514,515,5,42,0,
+	0,515,516,5,47,0,0,516,517,1,0,0,0,517,518,6,20,9,0,518,53,1,0,0,0,519,
+	521,7,22,0,0,520,519,1,0,0,0,521,522,1,0,0,0,522,520,1,0,0,0,522,523,1,
+	0,0,0,523,524,1,0,0,0,524,525,6,21,9,0,525,55,1,0,0,0,526,527,3,162,75,
+	0,527,528,1,0,0,0,528,529,6,22,10,0,529,530,6,22,11,0,530,57,1,0,0,0,531,
+	532,3,66,27,0,532,533,1,0,0,0,533,534,6,23,12,0,534,535,6,23,13,0,535,59,
+	1,0,0,0,536,537,3,54,21,0,537,538,1,0,0,0,538,539,6,24,9,0,539,61,1,0,0,
+	0,540,541,3,50,19,0,541,542,1,0,0,0,542,543,6,25,9,0,543,63,1,0,0,0,544,
+	545,3,52,20,0,545,546,1,0,0,0,546,547,6,26,9,0,547,65,1,0,0,0,548,549,5,
+	124,0,0,549,550,1,0,0,0,550,551,6,27,13,0,551,67,1,0,0,0,552,553,7,23,0,
+	0,553,69,1,0,0,0,554,555,7,24,0,0,555,71,1,0,0,0,556,557,5,92,0,0,557,558,
+	7,25,0,0,558,73,1,0,0,0,559,560,8,26,0,0,560,75,1,0,0,0,561,563,7,3,0,0,
+	562,564,7,27,0,0,563,562,1,0,0,0,563,564,1,0,0,0,564,566,1,0,0,0,565,567,
+	3,68,28,0,566,565,1,0,0,0,567,568,1,0,0,0,568,566,1,0,0,0,568,569,1,0,0,
+	0,569,77,1,0,0,0,570,571,5,64,0,0,571,79,1,0,0,0,572,573,5,96,0,0,573,81,
+	1,0,0,0,574,578,8,28,0,0,575,576,5,96,0,0,576,578,5,96,0,0,577,574,1,0,
+	0,0,577,575,1,0,0,0,578,83,1,0,0,0,579,580,5,95,0,0,580,85,1,0,0,0,581,
+	585,3,70,29,0,582,585,3,68,28,0,583,585,3,84,36,0,584,581,1,0,0,0,584,582,
+	1,0,0,0,584,583,1,0,0,0,585,87,1,0,0,0,586,591,5,34,0,0,587,590,3,72,30,
+	0,588,590,3,74,31,0,589,587,1,0,0,0,589,588,1,0,0,0,590,593,1,0,0,0,591,
+	589,1,0,0,0,591,592,1,0,0,0,592,594,1,0,0,0,593,591,1,0,0,0,594,616,5,34,
+	0,0,595,596,5,34,0,0,596,597,5,34,0,0,597,598,5,34,0,0,598,602,1,0,0,0,
+	599,601,8,21,0,0,600,599,1,0,0,0,601,604,1,0,0,0,602,603,1,0,0,0,602,600,
+	1,0,0,0,603,605,1,0,0,0,604,602,1,0,0,0,605,606,5,34,0,0,606,607,5,34,0,
+	0,607,608,5,34,0,0,608,610,1,0,0,0,609,611,5,34,0,0,610,609,1,0,0,0,610,
+	611,1,0,0,0,611,613,1,0,0,0,612,614,5,34,0,0,613,612,1,0,0,0,613,614,1,
+	0,0,0,614,616,1,0,0,0,615,586,1,0,0,0,615,595,1,0,0,0,616,89,1,0,0,0,617,
+	619,3,68,28,0,618,617,1,0,0,0,619,620,1,0,0,0,620,618,1,0,0,0,620,621,1,
+	0,0,0,621,91,1,0,0,0,622,624,3,68,28,0,623,622,1,0,0,0,624,625,1,0,0,0,
+	625,623,1,0,0,0,625,626,1,0,0,0,626,627,1,0,0,0,627,631,3,106,47,0,628,
+	630,3,68,28,0,629,628,1,0,0,0,630,633,1,0,0,0,631,629,1,0,0,0,631,632,1,
+	0,0,0,632,665,1,0,0,0,633,631,1,0,0,0,634,636,3,106,47,0,635,637,3,68,28,
+	0,636,635,1,0,0,0,637,638,1,0,0,0,638,636,1,0,0,0,638,639,1,0,0,0,639,665,
+	1,0,0,0,640,642,3,68,28,0,641,640,1,0,0,0,642,643,1,0,0,0,643,641,1,0,0,
+	0,643,644,1,0,0,0,644,652,1,0,0,0,645,649,3,106,47,0,646,648,3,68,28,0,
+	647,646,1,0,0,0,648,651,1,0,0,0,649,647,1,0,0,0,649,650,1,0,0,0,650,653,
+	1,0,0,0,651,649,1,0,0,0,652,645,1,0,0,0,652,653,1,0,0,0,653,654,1,0,0,0,
+	654,655,3,76,32,0,655,665,1,0,0,0,656,658,3,106,47,0,657,659,3,68,28,0,
+	658,657,1,0,0,0,659,660,1,0,0,0,660,658,1,0,0,0,660,661,1,0,0,0,661,662,
+	1,0,0,0,662,663,3,76,32,0,663,665,1,0,0,0,664,623,1,0,0,0,664,634,1,0,0,
+	0,664,641,1,0,0,0,664,656,1,0,0,0,665,93,1,0,0,0,666,667,7,29,0,0,667,668,
+	7,30,0,0,668,95,1,0,0,0,669,670,7,12,0,0,670,671,7,9,0,0,671,672,7,0,0,
+	0,672,97,1,0,0,0,673,674,7,12,0,0,674,675,7,2,0,0,675,676,7,4,0,0,676,99,
+	1,0,0,0,677,678,5,61,0,0,678,101,1,0,0,0,679,680,5,44,0,0,680,103,1,0,0,
+	0,681,682,7,0,0,0,682,683,7,3,0,0,683,684,7,2,0,0,684,685,7,4,0,0,685,105,
+	1,0,0,0,686,687,5,46,0,0,687,107,1,0,0,0,688,689,7,15,0,0,689,690,7,12,
+	0,0,690,691,7,13,0,0,691,692,7,2,0,0,692,693,7,3,0,0,693,109,1,0,0,0,694,
+	695,7,15,0,0,695,696,7,1,0,0,696,697,7,6,0,0,697,698,7,2,0,0,698,699,7,
+	5,0,0,699,111,1,0,0,0,700,701,7,13,0,0,701,702,7,12,0,0,702,703,7,2,0,0,
+	703,704,7,5,0,0,704,113,1,0,0,0,705,706,5,40,0,0,706,115,1,0,0,0,707,708,
+	7,1,0,0,708,709,7,9,0,0,709,117,1,0,0,0,710,711,7,1,0,0,711,712,7,2,0,0,
+	712,119,1,0,0,0,713,714,7,13,0,0,714,715,7,1,0,0,715,716,7,18,0,0,716,717,
+	7,3,0,0,717,121,1,0,0,0,718,719,7,9,0,0,719,720,7,7,0,0,720,721,7,5,0,0,
+	721,123,1,0,0,0,722,723,7,9,0,0,723,724,7,31,0,0,724,725,7,13,0,0,725,726,
+	7,13,0,0,726,125,1,0,0,0,727,728,7,9,0,0,728,729,7,31,0,0,729,730,7,13,
+	0,0,730,731,7,13,0,0,731,732,7,2,0,0,732,127,1,0,0,0,733,734,7,7,0,0,734,
+	735,7,6,0,0,735,129,1,0,0,0,736,737,5,63,0,0,737,131,1,0,0,0,738,739,7,
+	6,0,0,739,740,7,13,0,0,740,741,7,1,0,0,741,742,7,18,0,0,742,743,7,3,0,0,
+	743,133,1,0,0,0,744,745,5,41,0,0,745,135,1,0,0,0,746,747,7,5,0,0,747,748,
+	7,6,0,0,748,749,7,31,0,0,749,750,7,3,0,0,750,137,1,0,0,0,751,752,5,61,0,
+	0,752,753,5,61,0,0,753,139,1,0,0,0,754,755,5,61,0,0,755,756,5,126,0,0,756,
+	141,1,0,0,0,757,758,5,33,0,0,758,759,5,61,0,0,759,143,1,0,0,0,760,761,5,
+	60,0,0,761,145,1,0,0,0,762,763,5,60,0,0,763,764,5,61,0,0,764,147,1,0,0,
+	0,765,766,5,62,0,0,766,149,1,0,0,0,767,768,5,62,0,0,768,769,5,61,0,0,769,
+	151,1,0,0,0,770,771,5,43,0,0,771,153,1,0,0,0,772,773,5,45,0,0,773,155,1,
+	0,0,0,774,775,5,42,0,0,775,157,1,0,0,0,776,777,5,47,0,0,777,159,1,0,0,0,
+	778,779,5,37,0,0,779,161,1,0,0,0,780,781,5,91,0,0,781,782,1,0,0,0,782,783,
+	6,75,0,0,783,784,6,75,0,0,784,163,1,0,0,0,785,786,5,93,0,0,786,787,1,0,
+	0,0,787,788,6,76,13,0,788,789,6,76,13,0,789,165,1,0,0,0,790,794,3,70,29,
+	0,791,793,3,86,37,0,792,791,1,0,0,0,793,796,1,0,0,0,794,792,1,0,0,0,794,
+	795,1,0,0,0,795,807,1,0,0,0,796,794,1,0,0,0,797,800,3,84,36,0,798,800,3,
+	78,33,0,799,797,1,0,0,0,799,798,1,0,0,0,800,802,1,0,0,0,801,803,3,86,37,
+	0,802,801,1,0,0,0,803,804,1,0,0,0,804,802,1,0,0,0,804,805,1,0,0,0,805,807,
+	1,0,0,0,806,790,1,0,0,0,806,799,1,0,0,0,807,167,1,0,0,0,808,810,3,80,34,
+	0,809,811,3,82,35,0,810,809,1,0,0,0,811,812,1,0,0,0,812,810,1,0,0,0,812,
+	813,1,0,0,0,813,814,1,0,0,0,814,815,3,80,34,0,815,169,1,0,0,0,816,817,3,
+	168,78,0,817,171,1,0,0,0,818,819,3,50,19,0,819,820,1,0,0,0,820,821,6,80,
+	9,0,821,173,1,0,0,0,822,823,3,52,20,0,823,824,1,0,0,0,824,825,6,81,9,0,
+	825,175,1,0,0,0,826,827,3,54,21,0,827,828,1,0,0,0,828,829,6,82,9,0,829,
+	177,1,0,0,0,830,831,3,66,27,0,831,832,1,0,0,0,832,833,6,83,12,0,833,834,
+	6,83,13,0,834,179,1,0,0,0,835,836,3,162,75,0,836,837,1,0,0,0,837,838,6,
+	84,10,0,838,181,1,0,0,0,839,840,3,164,76,0,840,841,1,0,0,0,841,842,6,85,
+	14,0,842,183,1,0,0,0,843,844,3,102,45,0,844,845,1,0,0,0,845,846,6,86,15,
+	0,846,185,1,0,0,0,847,848,3,100,44,0,848,849,1,0,0,0,849,850,6,87,16,0,
+	850,187,1,0,0,0,851,852,3,88,38,0,852,853,1,0,0,0,853,854,6,88,17,0,854,
+	189,1,0,0,0,855,856,7,7,0,0,856,857,7,8,0,0,857,858,7,5,0,0,858,859,7,1,
+	0,0,859,860,7,7,0,0,860,861,7,9,0,0,861,862,7,2,0,0,862,191,1,0,0,0,863,
+	864,7,16,0,0,864,865,7,3,0,0,865,866,7,5,0,0,866,867,7,12,0,0,867,868,7,
+	0,0,0,868,869,7,12,0,0,869,870,7,5,0,0,870,871,7,12,0,0,871,193,1,0,0,0,
+	872,876,8,32,0,0,873,874,5,47,0,0,874,876,8,33,0,0,875,872,1,0,0,0,875,
+	873,1,0,0,0,876,195,1,0,0,0,877,879,3,194,91,0,878,877,1,0,0,0,879,880,
+	1,0,0,0,880,878,1,0,0,0,880,881,1,0,0,0,881,197,1,0,0,0,882,883,3,170,79,
+	0,883,884,1,0,0,0,884,885,6,93,18,0,885,199,1,0,0,0,886,887,3,50,19,0,887,
+	888,1,0,0,0,888,889,6,94,9,0,889,201,1,0,0,0,890,891,3,52,20,0,891,892,
+	1,0,0,0,892,893,6,95,9,0,893,203,1,0,0,0,894,895,3,54,21,0,895,896,1,0,
+	0,0,896,897,6,96,9,0,897,205,1,0,0,0,898,899,3,66,27,0,899,900,1,0,0,0,
+	900,901,6,97,12,0,901,902,6,97,13,0,902,207,1,0,0,0,903,904,3,106,47,0,
+	904,905,1,0,0,0,905,906,6,98,19,0,906,209,1,0,0,0,907,908,3,102,45,0,908,
+	909,1,0,0,0,909,910,6,99,15,0,910,211,1,0,0,0,911,916,3,70,29,0,912,916,
+	3,68,28,0,913,916,3,84,36,0,914,916,3,156,72,0,915,911,1,0,0,0,915,912,
+	1,0,0,0,915,913,1,0,0,0,915,914,1,0,0,0,916,213,1,0,0,0,917,920,3,70,29,
+	0,918,920,3,156,72,0,919,917,1,0,0,0,919,918,1,0,0,0,920,924,1,0,0,0,921,
+	923,3,212,100,0,922,921,1,0,0,0,923,926,1,0,0,0,924,922,1,0,0,0,924,925,
+	1,0,0,0,925,937,1,0,0,0,926,924,1,0,0,0,927,930,3,84,36,0,928,930,3,78,
+	33,0,929,927,1,0,0,0,929,928,1,0,0,0,930,932,1,0,0,0,931,933,3,212,100,
+	0,932,931,1,0,0,0,933,934,1,0,0,0,934,932,1,0,0,0,934,935,1,0,0,0,935,937,
+	1,0,0,0,936,919,1,0,0,0,936,929,1,0,0,0,937,215,1,0,0,0,938,941,3,214,101,
+	0,939,941,3,168,78,0,940,938,1,0,0,0,940,939,1,0,0,0,941,942,1,0,0,0,942,
+	940,1,0,0,0,942,943,1,0,0,0,943,217,1,0,0,0,944,945,3,50,19,0,945,946,1,
+	0,0,0,946,947,6,103,9,0,947,219,1,0,0,0,948,949,3,52,20,0,949,950,1,0,0,
+	0,950,951,6,104,9,0,951,221,1,0,0,0,952,953,3,54,21,0,953,954,1,0,0,0,954,
+	955,6,105,9,0,955,223,1,0,0,0,956,957,3,66,27,0,957,958,1,0,0,0,958,959,
+	6,106,12,0,959,960,6,106,13,0,960,225,1,0,0,0,961,962,3,100,44,0,962,963,
+	1,0,0,0,963,964,6,107,16,0,964,227,1,0,0,0,965,966,3,102,45,0,966,967,1,
+	0,0,0,967,968,6,108,15,0,968,229,1,0,0,0,969,970,3,106,47,0,970,971,1,0,
+	0,0,971,972,6,109,19,0,972,231,1,0,0,0,973,974,7,12,0,0,974,975,7,2,0,0,
+	975,233,1,0,0,0,976,977,3,216,102,0,977,978,1,0,0,0,978,979,6,111,20,0,
+	979,235,1,0,0,0,980,981,3,50,19,0,981,982,1,0,0,0,982,983,6,112,9,0,983,
+	237,1,0,0,0,984,985,3,52,20,0,985,986,1,0,0,0,986,987,6,113,9,0,987,239,
+	1,0,0,0,988,989,3,54,21,0,989,990,1,0,0,0,990,991,6,114,9,0,991,241,1,0,
+	0,0,992,993,3,66,27,0,993,994,1,0,0,0,994,995,6,115,12,0,995,996,6,115,
+	13,0,996,243,1,0,0,0,997,998,3,162,75,0,998,999,1,0,0,0,999,1000,6,116,
+	10,0,1000,1001,6,116,21,0,1001,245,1,0,0,0,1002,1003,7,7,0,0,1003,1004,
+	7,9,0,0,1004,1005,1,0,0,0,1005,1006,6,117,22,0,1006,247,1,0,0,0,1007,1008,
+	7,19,0,0,1008,1009,7,1,0,0,1009,1010,7,5,0,0,1010,1011,7,10,0,0,1011,1012,
+	1,0,0,0,1012,1013,6,118,22,0,1013,249,1,0,0,0,1014,1015,8,34,0,0,1015,251,
+	1,0,0,0,1016,1018,3,250,119,0,1017,1016,1,0,0,0,1018,1019,1,0,0,0,1019,
+	1017,1,0,0,0,1019,1020,1,0,0,0,1020,1021,1,0,0,0,1021,1022,3,320,154,0,
+	1022,1024,1,0,0,0,1023,1017,1,0,0,0,1023,1024,1,0,0,0,1024,1026,1,0,0,0,
+	1025,1027,3,250,119,0,1026,1025,1,0,0,0,1027,1028,1,0,0,0,1028,1026,1,0,
+	0,0,1028,1029,1,0,0,0,1029,253,1,0,0,0,1030,1031,3,170,79,0,1031,1032,1,
+	0,0,0,1032,1033,6,121,18,0,1033,255,1,0,0,0,1034,1035,3,252,120,0,1035,
+	1036,1,0,0,0,1036,1037,6,122,23,0,1037,257,1,0,0,0,1038,1039,3,50,19,0,
+	1039,1040,1,0,0,0,1040,1041,6,123,9,0,1041,259,1,0,0,0,1042,1043,3,52,20,
+	0,1043,1044,1,0,0,0,1044,1045,6,124,9,0,1045,261,1,0,0,0,1046,1047,3,54,
+	21,0,1047,1048,1,0,0,0,1048,1049,6,125,9,0,1049,263,1,0,0,0,1050,1051,3,
+	66,27,0,1051,1052,1,0,0,0,1052,1053,6,126,12,0,1053,1054,6,126,13,0,1054,
+	1055,6,126,13,0,1055,265,1,0,0,0,1056,1057,3,100,44,0,1057,1058,1,0,0,0,
+	1058,1059,6,127,16,0,1059,267,1,0,0,0,1060,1061,3,102,45,0,1061,1062,1,
+	0,0,0,1062,1063,6,128,15,0,1063,269,1,0,0,0,1064,1065,3,106,47,0,1065,1066,
+	1,0,0,0,1066,1067,6,129,19,0,1067,271,1,0,0,0,1068,1069,3,248,118,0,1069,
+	1070,1,0,0,0,1070,1071,6,130,24,0,1071,273,1,0,0,0,1072,1073,3,216,102,
+	0,1073,1074,1,0,0,0,1074,1075,6,131,20,0,1075,275,1,0,0,0,1076,1077,3,170,
+	79,0,1077,1078,1,0,0,0,1078,1079,6,132,18,0,1079,277,1,0,0,0,1080,1081,
+	3,50,19,0,1081,1082,1,0,0,0,1082,1083,6,133,9,0,1083,279,1,0,0,0,1084,1085,
+	3,52,20,0,1085,1086,1,0,0,0,1086,1087,6,134,9,0,1087,281,1,0,0,0,1088,1089,
+	3,54,21,0,1089,1090,1,0,0,0,1090,1091,6,135,9,0,1091,283,1,0,0,0,1092,1093,
+	3,66,27,0,1093,1094,1,0,0,0,1094,1095,6,136,12,0,1095,1096,6,136,13,0,1096,
+	285,1,0,0,0,1097,1098,3,106,47,0,1098,1099,1,0,0,0,1099,1100,6,137,19,0,
+	1100,287,1,0,0,0,1101,1102,3,170,79,0,1102,1103,1,0,0,0,1103,1104,6,138,
+	18,0,1104,289,1,0,0,0,1105,1106,3,166,77,0,1106,1107,1,0,0,0,1107,1108,
+	6,139,25,0,1108,291,1,0,0,0,1109,1110,3,50,19,0,1110,1111,1,0,0,0,1111,
+	1112,6,140,9,0,1112,293,1,0,0,0,1113,1114,3,52,20,0,1114,1115,1,0,0,0,1115,
+	1116,6,141,9,0,1116,295,1,0,0,0,1117,1118,3,54,21,0,1118,1119,1,0,0,0,1119,
+	1120,6,142,9,0,1120,297,1,0,0,0,1121,1122,3,66,27,0,1122,1123,1,0,0,0,1123,
+	1124,6,143,12,0,1124,1125,6,143,13,0,1125,299,1,0,0,0,1126,1127,7,1,0,0,
+	1127,1128,7,9,0,0,1128,1129,7,15,0,0,1129,1130,7,7,0,0,1130,301,1,0,0,0,
+	1131,1132,3,50,19,0,1132,1133,1,0,0,0,1133,1134,6,145,9,0,1134,303,1,0,
+	0,0,1135,1136,3,52,20,0,1136,1137,1,0,0,0,1137,1138,6,146,9,0,1138,305,
+	1,0,0,0,1139,1140,3,54,21,0,1140,1141,1,0,0,0,1141,1142,6,147,9,0,1142,
+	307,1,0,0,0,1143,1144,3,66,27,0,1144,1145,1,0,0,0,1145,1146,6,148,12,0,
+	1146,1147,6,148,13,0,1147,309,1,0,0,0,1148,1149,7,15,0,0,1149,1150,7,31,
+	0,0,1150,1151,7,9,0,0,1151,1152,7,4,0,0,1152,1153,7,5,0,0,1153,1154,7,1,
+	0,0,1154,1155,7,7,0,0,1155,1156,7,9,0,0,1156,1157,7,2,0,0,1157,311,1,0,
+	0,0,1158,1159,3,50,19,0,1159,1160,1,0,0,0,1160,1161,6,150,9,0,1161,313,
+	1,0,0,0,1162,1163,3,52,20,0,1163,1164,1,0,0,0,1164,1165,6,151,9,0,1165,
+	315,1,0,0,0,1166,1167,3,54,21,0,1167,1168,1,0,0,0,1168,1169,6,152,9,0,1169,
+	317,1,0,0,0,1170,1171,3,164,76,0,1171,1172,1,0,0,0,1172,1173,6,153,14,0,
+	1173,1174,6,153,13,0,1174,319,1,0,0,0,1175,1176,5,58,0,0,1176,321,1,0,0,
+	0,1177,1183,3,78,33,0,1178,1183,3,68,28,0,1179,1183,3,106,47,0,1180,1183,
+	3,70,29,0,1181,1183,3,84,36,0,1182,1177,1,0,0,0,1182,1178,1,0,0,0,1182,
+	1179,1,0,0,0,1182,1180,1,0,0,0,1182,1181,1,0,0,0,1183,1184,1,0,0,0,1184,
+	1182,1,0,0,0,1184,1185,1,0,0,0,1185,323,1,0,0,0,1186,1187,3,50,19,0,1187,
+	1188,1,0,0,0,1188,1189,6,156,9,0,1189,325,1,0,0,0,1190,1191,3,52,20,0,1191,
+	1192,1,0,0,0,1192,1193,6,157,9,0,1193,327,1,0,0,0,1194,1195,3,54,21,0,1195,
+	1196,1,0,0,0,1196,1197,6,158,9,0,1197,329,1,0,0,0,58,0,1,2,3,4,5,6,7,8,
+	9,10,11,483,493,497,500,509,511,522,563,568,577,584,589,591,602,610,613,
+	615,620,625,631,638,643,649,652,660,664,794,799,804,806,812,875,880,915,
+	919,924,929,934,936,940,942,1019,1023,1028,1182,1184,26,5,2,0,5,4,0,5,6,
+	0,5,1,0,5,3,0,5,10,0,5,8,0,5,5,0,5,9,0,0,1,0,7,64,0,5,0,0,7,26,0,4,0,0,
+	7,65,0,7,34,0,7,33,0,7,27,0,7,67,0,7,36,0,7,77,0,5,11,0,5,7,0,7,87,0,7,
+	86,0,7,66,0];
 
 	private static __ATN: ATN;
 	public static get _ATN(): ATN {
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.g4 b/packages/kbn-esql-ast/src/antlr/esql_parser.g4
index b79e6314eedda..429f8d72bacfb 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.g4
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.g4
@@ -108,7 +108,20 @@ field
     ;
 
 fromCommand
-    : FROM fromIdentifier (COMMA fromIdentifier)* metadata?
+    : FROM fromIdentifier (COMMA fromIdentifier)* fromOptions? metadata?
+    ;
+
+fromIdentifier
+    : FROM_UNQUOTED_IDENTIFIER
+    | QUOTED_IDENTIFIER
+    ;
+
+fromOptions
+    : OPTIONS configOption (COMMA configOption)*
+    ;
+
+configOption
+    : string ASSIGN string
     ;
 
 metadata
@@ -136,10 +149,6 @@ inlinestatsCommand
     : INLINESTATS stats=fields (BY grouping=fields)?
     ;
 
-fromIdentifier
-    : FROM_UNQUOTED_IDENTIFIER
-    | QUOTED_IDENTIFIER
-    ;
 
 qualifiedName
     : identifier (DOT identifier)*
@@ -237,7 +246,7 @@ integerValue
     ;
 
 string
-    : STRING
+    : QUOTED_STRING
     ;
 
 comparisonOperator
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.interp b/packages/kbn-esql-ast/src/antlr/esql_parser.interp
index b8c5f609e75e5..ff5de4e348db0 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.interp
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.interp
@@ -70,6 +70,7 @@ null
 null
 null
 null
+'options'
 'metadata'
 null
 null
@@ -137,7 +138,7 @@ EXPLAIN_WS
 EXPLAIN_LINE_COMMENT
 EXPLAIN_MULTILINE_COMMENT
 PIPE
-STRING
+QUOTED_STRING
 INTEGER_LITERAL
 DECIMAL_LITERAL
 BY
@@ -181,6 +182,7 @@ QUOTED_IDENTIFIER
 EXPR_LINE_COMMENT
 EXPR_MULTILINE_COMMENT
 EXPR_WS
+OPTIONS
 METADATA
 FROM_UNQUOTED_IDENTIFIER
 FROM_LINE_COMMENT
@@ -236,13 +238,15 @@ rowCommand
 fields
 field
 fromCommand
+fromIdentifier
+fromOptions
+configOption
 metadata
 metadataOption
 deprecated_metadata
 evalCommand
 statsCommand
 inlinestatsCommand
-fromIdentifier
 qualifiedName
 qualifiedNamePattern
 identifier
@@ -275,4 +279,4 @@ enrichWithClause
 
 
 atn:
-[4, 1, 108, 510, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 112, 8, 1, 10, 1, 12, 1, 115, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 122, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 137, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 149, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 156, 8, 5, 10, 5, 12, 5, 159, 9, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 166, 8, 5, 1, 5, 1, 5, 3, 5, 170, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 178, 8, 5, 10, 5, 12, 5, 181, 9, 5, 1, 6, 1, 6, 3, 6, 185, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 192, 8, 6, 1, 6, 1, 6, 1, 6, 3, 6, 197, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 204, 8, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 210, 8, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 218, 8, 8, 10, 8, 12, 8, 221, 9, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 230, 8, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 238, 8, 10, 10, 10, 12, 10, 241, 9, 10, 3, 10, 243, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 5, 12, 253, 8, 12, 10, 12, 12, 12, 256, 9, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 263, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 269, 8, 14, 10, 14, 12, 14, 272, 9, 14, 1, 14, 3, 14, 275, 8, 14, 1, 15, 1, 15, 3, 15, 279, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 285, 8, 16, 10, 16, 12, 16, 288, 9, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 299, 8, 19, 1, 19, 1, 19, 3, 19, 303, 8, 19, 1, 20, 1, 20, 1, 20, 1, 20, 3, 20, 309, 8, 20, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 5, 22, 316, 8, 22, 10, 22, 12, 22, 319, 9, 22, 1, 23, 1, 23, 1, 23, 5, 23, 324, 8, 23, 10, 23, 12, 23, 327, 9, 23, 1, 24, 1, 24, 1, 25, 1, 25, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 346, 8, 26, 10, 26, 12, 26, 349, 9, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 357, 8, 26, 10, 26, 12, 26, 360, 9, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 368, 8, 26, 10, 26, 12, 26, 371, 9, 26, 1, 26, 1, 26, 3, 26, 375, 8, 26, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 28, 5, 28, 384, 8, 28, 10, 28, 12, 28, 387, 9, 28, 1, 29, 1, 29, 3, 29, 391, 8, 29, 1, 29, 1, 29, 3, 29, 395, 8, 29, 1, 30, 1, 30, 1, 30, 1, 30, 5, 30, 401, 8, 30, 10, 30, 12, 30, 404, 9, 30, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 410, 8, 31, 10, 31, 12, 31, 413, 9, 31, 1, 32, 1, 32, 1, 32, 1, 32, 5, 32, 419, 8, 32, 10, 32, 12, 32, 422, 9, 32, 1, 33, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 3, 34, 432, 8, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 5, 37, 444, 8, 37, 10, 37, 12, 37, 447, 9, 37, 1, 38, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 40, 1, 40, 3, 40, 457, 8, 40, 1, 41, 3, 41, 460, 8, 41, 1, 41, 1, 41, 1, 42, 3, 42, 465, 8, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 44, 1, 44, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 49, 3, 49, 490, 8, 49, 1, 49, 1, 49, 1, 49, 1, 49, 5, 49, 496, 8, 49, 10, 49, 12, 49, 499, 9, 49, 3, 49, 501, 8, 49, 1, 50, 1, 50, 1, 50, 3, 50, 506, 8, 50, 1, 50, 1, 50, 1, 50, 0, 3, 2, 10, 16, 51, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 0, 8, 1, 0, 59, 60, 1, 0, 61, 63, 2, 0, 67, 67, 72, 72, 1, 0, 66, 67, 2, 0, 32, 32, 35, 35, 1, 0, 38, 39, 2, 0, 37, 37, 51, 51, 2, 0, 52, 52, 54, 58, 535, 0, 102, 1, 0, 0, 0, 2, 105, 1, 0, 0, 0, 4, 121, 1, 0, 0, 0, 6, 136, 1, 0, 0, 0, 8, 138, 1, 0, 0, 0, 10, 169, 1, 0, 0, 0, 12, 196, 1, 0, 0, 0, 14, 203, 1, 0, 0, 0, 16, 209, 1, 0, 0, 0, 18, 229, 1, 0, 0, 0, 20, 231, 1, 0, 0, 0, 22, 246, 1, 0, 0, 0, 24, 249, 1, 0, 0, 0, 26, 262, 1, 0, 0, 0, 28, 264, 1, 0, 0, 0, 30, 278, 1, 0, 0, 0, 32, 280, 1, 0, 0, 0, 34, 289, 1, 0, 0, 0, 36, 293, 1, 0, 0, 0, 38, 296, 1, 0, 0, 0, 40, 304, 1, 0, 0, 0, 42, 310, 1, 0, 0, 0, 44, 312, 1, 0, 0, 0, 46, 320, 1, 0, 0, 0, 48, 328, 1, 0, 0, 0, 50, 330, 1, 0, 0, 0, 52, 374, 1, 0, 0, 0, 54, 376, 1, 0, 0, 0, 56, 379, 1, 0, 0, 0, 58, 388, 1, 0, 0, 0, 60, 396, 1, 0, 0, 0, 62, 405, 1, 0, 0, 0, 64, 414, 1, 0, 0, 0, 66, 423, 1, 0, 0, 0, 68, 427, 1, 0, 0, 0, 70, 433, 1, 0, 0, 0, 72, 437, 1, 0, 0, 0, 74, 440, 1, 0, 0, 0, 76, 448, 1, 0, 0, 0, 78, 452, 1, 0, 0, 0, 80, 456, 1, 0, 0, 0, 82, 459, 1, 0, 0, 0, 84, 464, 1, 0, 0, 0, 86, 468, 1, 0, 0, 0, 88, 470, 1, 0, 0, 0, 90, 472, 1, 0, 0, 0, 92, 475, 1, 0, 0, 0, 94, 479, 1, 0, 0, 0, 96, 482, 1, 0, 0, 0, 98, 485, 1, 0, 0, 0, 100, 505, 1, 0, 0, 0, 102, 103, 3, 2, 1, 0, 103, 104, 5, 0, 0, 1, 104, 1, 1, 0, 0, 0, 105, 106, 6, 1, -1, 0, 106, 107, 3, 4, 2, 0, 107, 113, 1, 0, 0, 0, 108, 109, 10, 1, 0, 0, 109, 110, 5, 26, 0, 0, 110, 112, 3, 6, 3, 0, 111, 108, 1, 0, 0, 0, 112, 115, 1, 0, 0, 0, 113, 111, 1, 0, 0, 0, 113, 114, 1, 0, 0, 0, 114, 3, 1, 0, 0, 0, 115, 113, 1, 0, 0, 0, 116, 122, 3, 90, 45, 0, 117, 122, 3, 28, 14, 0, 118, 122, 3, 22, 11, 0, 119, 122, 3, 94, 47, 0, 120, 122, 3, 96, 48, 0, 121, 116, 1, 0, 0, 0, 121, 117, 1, 0, 0, 0, 121, 118, 1, 0, 0, 0, 121, 119, 1, 0, 0, 0, 121, 120, 1, 0, 0, 0, 122, 5, 1, 0, 0, 0, 123, 137, 3, 36, 18, 0, 124, 137, 3, 40, 20, 0, 125, 137, 3, 54, 27, 0, 126, 137, 3, 60, 30, 0, 127, 137, 3, 56, 28, 0, 128, 137, 3, 38, 19, 0, 129, 137, 3, 8, 4, 0, 130, 137, 3, 62, 31, 0, 131, 137, 3, 64, 32, 0, 132, 137, 3, 68, 34, 0, 133, 137, 3, 70, 35, 0, 134, 137, 3, 98, 49, 0, 135, 137, 3, 72, 36, 0, 136, 123, 1, 0, 0, 0, 136, 124, 1, 0, 0, 0, 136, 125, 1, 0, 0, 0, 136, 126, 1, 0, 0, 0, 136, 127, 1, 0, 0, 0, 136, 128, 1, 0, 0, 0, 136, 129, 1, 0, 0, 0, 136, 130, 1, 0, 0, 0, 136, 131, 1, 0, 0, 0, 136, 132, 1, 0, 0, 0, 136, 133, 1, 0, 0, 0, 136, 134, 1, 0, 0, 0, 136, 135, 1, 0, 0, 0, 137, 7, 1, 0, 0, 0, 138, 139, 5, 18, 0, 0, 139, 140, 3, 10, 5, 0, 140, 9, 1, 0, 0, 0, 141, 142, 6, 5, -1, 0, 142, 143, 5, 44, 0, 0, 143, 170, 3, 10, 5, 7, 144, 170, 3, 14, 7, 0, 145, 170, 3, 12, 6, 0, 146, 148, 3, 14, 7, 0, 147, 149, 5, 44, 0, 0, 148, 147, 1, 0, 0, 0, 148, 149, 1, 0, 0, 0, 149, 150, 1, 0, 0, 0, 150, 151, 5, 41, 0, 0, 151, 152, 5, 40, 0, 0, 152, 157, 3, 14, 7, 0, 153, 154, 5, 34, 0, 0, 154, 156, 3, 14, 7, 0, 155, 153, 1, 0, 0, 0, 156, 159, 1, 0, 0, 0, 157, 155, 1, 0, 0, 0, 157, 158, 1, 0, 0, 0, 158, 160, 1, 0, 0, 0, 159, 157, 1, 0, 0, 0, 160, 161, 5, 50, 0, 0, 161, 170, 1, 0, 0, 0, 162, 163, 3, 14, 7, 0, 163, 165, 5, 42, 0, 0, 164, 166, 5, 44, 0, 0, 165, 164, 1, 0, 0, 0, 165, 166, 1, 0, 0, 0, 166, 167, 1, 0, 0, 0, 167, 168, 5, 45, 0, 0, 168, 170, 1, 0, 0, 0, 169, 141, 1, 0, 0, 0, 169, 144, 1, 0, 0, 0, 169, 145, 1, 0, 0, 0, 169, 146, 1, 0, 0, 0, 169, 162, 1, 0, 0, 0, 170, 179, 1, 0, 0, 0, 171, 172, 10, 4, 0, 0, 172, 173, 5, 31, 0, 0, 173, 178, 3, 10, 5, 5, 174, 175, 10, 3, 0, 0, 175, 176, 5, 47, 0, 0, 176, 178, 3, 10, 5, 4, 177, 171, 1, 0, 0, 0, 177, 174, 1, 0, 0, 0, 178, 181, 1, 0, 0, 0, 179, 177, 1, 0, 0, 0, 179, 180, 1, 0, 0, 0, 180, 11, 1, 0, 0, 0, 181, 179, 1, 0, 0, 0, 182, 184, 3, 14, 7, 0, 183, 185, 5, 44, 0, 0, 184, 183, 1, 0, 0, 0, 184, 185, 1, 0, 0, 0, 185, 186, 1, 0, 0, 0, 186, 187, 5, 43, 0, 0, 187, 188, 3, 86, 43, 0, 188, 197, 1, 0, 0, 0, 189, 191, 3, 14, 7, 0, 190, 192, 5, 44, 0, 0, 191, 190, 1, 0, 0, 0, 191, 192, 1, 0, 0, 0, 192, 193, 1, 0, 0, 0, 193, 194, 5, 49, 0, 0, 194, 195, 3, 86, 43, 0, 195, 197, 1, 0, 0, 0, 196, 182, 1, 0, 0, 0, 196, 189, 1, 0, 0, 0, 197, 13, 1, 0, 0, 0, 198, 204, 3, 16, 8, 0, 199, 200, 3, 16, 8, 0, 200, 201, 3, 88, 44, 0, 201, 202, 3, 16, 8, 0, 202, 204, 1, 0, 0, 0, 203, 198, 1, 0, 0, 0, 203, 199, 1, 0, 0, 0, 204, 15, 1, 0, 0, 0, 205, 206, 6, 8, -1, 0, 206, 210, 3, 18, 9, 0, 207, 208, 7, 0, 0, 0, 208, 210, 3, 16, 8, 3, 209, 205, 1, 0, 0, 0, 209, 207, 1, 0, 0, 0, 210, 219, 1, 0, 0, 0, 211, 212, 10, 2, 0, 0, 212, 213, 7, 1, 0, 0, 213, 218, 3, 16, 8, 3, 214, 215, 10, 1, 0, 0, 215, 216, 7, 0, 0, 0, 216, 218, 3, 16, 8, 2, 217, 211, 1, 0, 0, 0, 217, 214, 1, 0, 0, 0, 218, 221, 1, 0, 0, 0, 219, 217, 1, 0, 0, 0, 219, 220, 1, 0, 0, 0, 220, 17, 1, 0, 0, 0, 221, 219, 1, 0, 0, 0, 222, 230, 3, 52, 26, 0, 223, 230, 3, 44, 22, 0, 224, 230, 3, 20, 10, 0, 225, 226, 5, 40, 0, 0, 226, 227, 3, 10, 5, 0, 227, 228, 5, 50, 0, 0, 228, 230, 1, 0, 0, 0, 229, 222, 1, 0, 0, 0, 229, 223, 1, 0, 0, 0, 229, 224, 1, 0, 0, 0, 229, 225, 1, 0, 0, 0, 230, 19, 1, 0, 0, 0, 231, 232, 3, 48, 24, 0, 232, 242, 5, 40, 0, 0, 233, 243, 5, 61, 0, 0, 234, 239, 3, 10, 5, 0, 235, 236, 5, 34, 0, 0, 236, 238, 3, 10, 5, 0, 237, 235, 1, 0, 0, 0, 238, 241, 1, 0, 0, 0, 239, 237, 1, 0, 0, 0, 239, 240, 1, 0, 0, 0, 240, 243, 1, 0, 0, 0, 241, 239, 1, 0, 0, 0, 242, 233, 1, 0, 0, 0, 242, 234, 1, 0, 0, 0, 242, 243, 1, 0, 0, 0, 243, 244, 1, 0, 0, 0, 244, 245, 5, 50, 0, 0, 245, 21, 1, 0, 0, 0, 246, 247, 5, 14, 0, 0, 247, 248, 3, 24, 12, 0, 248, 23, 1, 0, 0, 0, 249, 254, 3, 26, 13, 0, 250, 251, 5, 34, 0, 0, 251, 253, 3, 26, 13, 0, 252, 250, 1, 0, 0, 0, 253, 256, 1, 0, 0, 0, 254, 252, 1, 0, 0, 0, 254, 255, 1, 0, 0, 0, 255, 25, 1, 0, 0, 0, 256, 254, 1, 0, 0, 0, 257, 263, 3, 10, 5, 0, 258, 259, 3, 44, 22, 0, 259, 260, 5, 33, 0, 0, 260, 261, 3, 10, 5, 0, 261, 263, 1, 0, 0, 0, 262, 257, 1, 0, 0, 0, 262, 258, 1, 0, 0, 0, 263, 27, 1, 0, 0, 0, 264, 265, 5, 6, 0, 0, 265, 270, 3, 42, 21, 0, 266, 267, 5, 34, 0, 0, 267, 269, 3, 42, 21, 0, 268, 266, 1, 0, 0, 0, 269, 272, 1, 0, 0, 0, 270, 268, 1, 0, 0, 0, 270, 271, 1, 0, 0, 0, 271, 274, 1, 0, 0, 0, 272, 270, 1, 0, 0, 0, 273, 275, 3, 30, 15, 0, 274, 273, 1, 0, 0, 0, 274, 275, 1, 0, 0, 0, 275, 29, 1, 0, 0, 0, 276, 279, 3, 32, 16, 0, 277, 279, 3, 34, 17, 0, 278, 276, 1, 0, 0, 0, 278, 277, 1, 0, 0, 0, 279, 31, 1, 0, 0, 0, 280, 281, 5, 71, 0, 0, 281, 286, 3, 42, 21, 0, 282, 283, 5, 34, 0, 0, 283, 285, 3, 42, 21, 0, 284, 282, 1, 0, 0, 0, 285, 288, 1, 0, 0, 0, 286, 284, 1, 0, 0, 0, 286, 287, 1, 0, 0, 0, 287, 33, 1, 0, 0, 0, 288, 286, 1, 0, 0, 0, 289, 290, 5, 64, 0, 0, 290, 291, 3, 32, 16, 0, 291, 292, 5, 65, 0, 0, 292, 35, 1, 0, 0, 0, 293, 294, 5, 4, 0, 0, 294, 295, 3, 24, 12, 0, 295, 37, 1, 0, 0, 0, 296, 298, 5, 17, 0, 0, 297, 299, 3, 24, 12, 0, 298, 297, 1, 0, 0, 0, 298, 299, 1, 0, 0, 0, 299, 302, 1, 0, 0, 0, 300, 301, 5, 30, 0, 0, 301, 303, 3, 24, 12, 0, 302, 300, 1, 0, 0, 0, 302, 303, 1, 0, 0, 0, 303, 39, 1, 0, 0, 0, 304, 305, 5, 8, 0, 0, 305, 308, 3, 24, 12, 0, 306, 307, 5, 30, 0, 0, 307, 309, 3, 24, 12, 0, 308, 306, 1, 0, 0, 0, 308, 309, 1, 0, 0, 0, 309, 41, 1, 0, 0, 0, 310, 311, 7, 2, 0, 0, 311, 43, 1, 0, 0, 0, 312, 317, 3, 48, 24, 0, 313, 314, 5, 36, 0, 0, 314, 316, 3, 48, 24, 0, 315, 313, 1, 0, 0, 0, 316, 319, 1, 0, 0, 0, 317, 315, 1, 0, 0, 0, 317, 318, 1, 0, 0, 0, 318, 45, 1, 0, 0, 0, 319, 317, 1, 0, 0, 0, 320, 325, 3, 50, 25, 0, 321, 322, 5, 36, 0, 0, 322, 324, 3, 50, 25, 0, 323, 321, 1, 0, 0, 0, 324, 327, 1, 0, 0, 0, 325, 323, 1, 0, 0, 0, 325, 326, 1, 0, 0, 0, 326, 47, 1, 0, 0, 0, 327, 325, 1, 0, 0, 0, 328, 329, 7, 3, 0, 0, 329, 49, 1, 0, 0, 0, 330, 331, 5, 76, 0, 0, 331, 51, 1, 0, 0, 0, 332, 375, 5, 45, 0, 0, 333, 334, 3, 84, 42, 0, 334, 335, 5, 66, 0, 0, 335, 375, 1, 0, 0, 0, 336, 375, 3, 82, 41, 0, 337, 375, 3, 84, 42, 0, 338, 375, 3, 78, 39, 0, 339, 375, 5, 48, 0, 0, 340, 375, 3, 86, 43, 0, 341, 342, 5, 64, 0, 0, 342, 347, 3, 80, 40, 0, 343, 344, 5, 34, 0, 0, 344, 346, 3, 80, 40, 0, 345, 343, 1, 0, 0, 0, 346, 349, 1, 0, 0, 0, 347, 345, 1, 0, 0, 0, 347, 348, 1, 0, 0, 0, 348, 350, 1, 0, 0, 0, 349, 347, 1, 0, 0, 0, 350, 351, 5, 65, 0, 0, 351, 375, 1, 0, 0, 0, 352, 353, 5, 64, 0, 0, 353, 358, 3, 78, 39, 0, 354, 355, 5, 34, 0, 0, 355, 357, 3, 78, 39, 0, 356, 354, 1, 0, 0, 0, 357, 360, 1, 0, 0, 0, 358, 356, 1, 0, 0, 0, 358, 359, 1, 0, 0, 0, 359, 361, 1, 0, 0, 0, 360, 358, 1, 0, 0, 0, 361, 362, 5, 65, 0, 0, 362, 375, 1, 0, 0, 0, 363, 364, 5, 64, 0, 0, 364, 369, 3, 86, 43, 0, 365, 366, 5, 34, 0, 0, 366, 368, 3, 86, 43, 0, 367, 365, 1, 0, 0, 0, 368, 371, 1, 0, 0, 0, 369, 367, 1, 0, 0, 0, 369, 370, 1, 0, 0, 0, 370, 372, 1, 0, 0, 0, 371, 369, 1, 0, 0, 0, 372, 373, 5, 65, 0, 0, 373, 375, 1, 0, 0, 0, 374, 332, 1, 0, 0, 0, 374, 333, 1, 0, 0, 0, 374, 336, 1, 0, 0, 0, 374, 337, 1, 0, 0, 0, 374, 338, 1, 0, 0, 0, 374, 339, 1, 0, 0, 0, 374, 340, 1, 0, 0, 0, 374, 341, 1, 0, 0, 0, 374, 352, 1, 0, 0, 0, 374, 363, 1, 0, 0, 0, 375, 53, 1, 0, 0, 0, 376, 377, 5, 10, 0, 0, 377, 378, 5, 28, 0, 0, 378, 55, 1, 0, 0, 0, 379, 380, 5, 16, 0, 0, 380, 385, 3, 58, 29, 0, 381, 382, 5, 34, 0, 0, 382, 384, 3, 58, 29, 0, 383, 381, 1, 0, 0, 0, 384, 387, 1, 0, 0, 0, 385, 383, 1, 0, 0, 0, 385, 386, 1, 0, 0, 0, 386, 57, 1, 0, 0, 0, 387, 385, 1, 0, 0, 0, 388, 390, 3, 10, 5, 0, 389, 391, 7, 4, 0, 0, 390, 389, 1, 0, 0, 0, 390, 391, 1, 0, 0, 0, 391, 394, 1, 0, 0, 0, 392, 393, 5, 46, 0, 0, 393, 395, 7, 5, 0, 0, 394, 392, 1, 0, 0, 0, 394, 395, 1, 0, 0, 0, 395, 59, 1, 0, 0, 0, 396, 397, 5, 9, 0, 0, 397, 402, 3, 46, 23, 0, 398, 399, 5, 34, 0, 0, 399, 401, 3, 46, 23, 0, 400, 398, 1, 0, 0, 0, 401, 404, 1, 0, 0, 0, 402, 400, 1, 0, 0, 0, 402, 403, 1, 0, 0, 0, 403, 61, 1, 0, 0, 0, 404, 402, 1, 0, 0, 0, 405, 406, 5, 2, 0, 0, 406, 411, 3, 46, 23, 0, 407, 408, 5, 34, 0, 0, 408, 410, 3, 46, 23, 0, 409, 407, 1, 0, 0, 0, 410, 413, 1, 0, 0, 0, 411, 409, 1, 0, 0, 0, 411, 412, 1, 0, 0, 0, 412, 63, 1, 0, 0, 0, 413, 411, 1, 0, 0, 0, 414, 415, 5, 13, 0, 0, 415, 420, 3, 66, 33, 0, 416, 417, 5, 34, 0, 0, 417, 419, 3, 66, 33, 0, 418, 416, 1, 0, 0, 0, 419, 422, 1, 0, 0, 0, 420, 418, 1, 0, 0, 0, 420, 421, 1, 0, 0, 0, 421, 65, 1, 0, 0, 0, 422, 420, 1, 0, 0, 0, 423, 424, 3, 46, 23, 0, 424, 425, 5, 80, 0, 0, 425, 426, 3, 46, 23, 0, 426, 67, 1, 0, 0, 0, 427, 428, 5, 1, 0, 0, 428, 429, 3, 18, 9, 0, 429, 431, 3, 86, 43, 0, 430, 432, 3, 74, 37, 0, 431, 430, 1, 0, 0, 0, 431, 432, 1, 0, 0, 0, 432, 69, 1, 0, 0, 0, 433, 434, 5, 7, 0, 0, 434, 435, 3, 18, 9, 0, 435, 436, 3, 86, 43, 0, 436, 71, 1, 0, 0, 0, 437, 438, 5, 12, 0, 0, 438, 439, 3, 44, 22, 0, 439, 73, 1, 0, 0, 0, 440, 445, 3, 76, 38, 0, 441, 442, 5, 34, 0, 0, 442, 444, 3, 76, 38, 0, 443, 441, 1, 0, 0, 0, 444, 447, 1, 0, 0, 0, 445, 443, 1, 0, 0, 0, 445, 446, 1, 0, 0, 0, 446, 75, 1, 0, 0, 0, 447, 445, 1, 0, 0, 0, 448, 449, 3, 48, 24, 0, 449, 450, 5, 33, 0, 0, 450, 451, 3, 52, 26, 0, 451, 77, 1, 0, 0, 0, 452, 453, 7, 6, 0, 0, 453, 79, 1, 0, 0, 0, 454, 457, 3, 82, 41, 0, 455, 457, 3, 84, 42, 0, 456, 454, 1, 0, 0, 0, 456, 455, 1, 0, 0, 0, 457, 81, 1, 0, 0, 0, 458, 460, 7, 0, 0, 0, 459, 458, 1, 0, 0, 0, 459, 460, 1, 0, 0, 0, 460, 461, 1, 0, 0, 0, 461, 462, 5, 29, 0, 0, 462, 83, 1, 0, 0, 0, 463, 465, 7, 0, 0, 0, 464, 463, 1, 0, 0, 0, 464, 465, 1, 0, 0, 0, 465, 466, 1, 0, 0, 0, 466, 467, 5, 28, 0, 0, 467, 85, 1, 0, 0, 0, 468, 469, 5, 27, 0, 0, 469, 87, 1, 0, 0, 0, 470, 471, 7, 7, 0, 0, 471, 89, 1, 0, 0, 0, 472, 473, 5, 5, 0, 0, 473, 474, 3, 92, 46, 0, 474, 91, 1, 0, 0, 0, 475, 476, 5, 64, 0, 0, 476, 477, 3, 2, 1, 0, 477, 478, 5, 65, 0, 0, 478, 93, 1, 0, 0, 0, 479, 480, 5, 15, 0, 0, 480, 481, 5, 96, 0, 0, 481, 95, 1, 0, 0, 0, 482, 483, 5, 11, 0, 0, 483, 484, 5, 100, 0, 0, 484, 97, 1, 0, 0, 0, 485, 486, 5, 3, 0, 0, 486, 489, 5, 86, 0, 0, 487, 488, 5, 84, 0, 0, 488, 490, 3, 46, 23, 0, 489, 487, 1, 0, 0, 0, 489, 490, 1, 0, 0, 0, 490, 500, 1, 0, 0, 0, 491, 492, 5, 85, 0, 0, 492, 497, 3, 100, 50, 0, 493, 494, 5, 34, 0, 0, 494, 496, 3, 100, 50, 0, 495, 493, 1, 0, 0, 0, 496, 499, 1, 0, 0, 0, 497, 495, 1, 0, 0, 0, 497, 498, 1, 0, 0, 0, 498, 501, 1, 0, 0, 0, 499, 497, 1, 0, 0, 0, 500, 491, 1, 0, 0, 0, 500, 501, 1, 0, 0, 0, 501, 99, 1, 0, 0, 0, 502, 503, 3, 46, 23, 0, 503, 504, 5, 33, 0, 0, 504, 506, 1, 0, 0, 0, 505, 502, 1, 0, 0, 0, 505, 506, 1, 0, 0, 0, 506, 507, 1, 0, 0, 0, 507, 508, 3, 46, 23, 0, 508, 101, 1, 0, 0, 0, 49, 113, 121, 136, 148, 157, 165, 169, 177, 179, 184, 191, 196, 203, 209, 217, 219, 229, 239, 242, 254, 262, 270, 274, 278, 286, 298, 302, 308, 317, 325, 347, 358, 369, 374, 385, 390, 394, 402, 411, 420, 431, 445, 456, 459, 464, 489, 497, 500, 505]
\ No newline at end of file
+[4, 1, 109, 530, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 116, 8, 1, 10, 1, 12, 1, 119, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 126, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 141, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 153, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 160, 8, 5, 10, 5, 12, 5, 163, 9, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 170, 8, 5, 1, 5, 1, 5, 3, 5, 174, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 182, 8, 5, 10, 5, 12, 5, 185, 9, 5, 1, 6, 1, 6, 3, 6, 189, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 196, 8, 6, 1, 6, 1, 6, 1, 6, 3, 6, 201, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 208, 8, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 214, 8, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 222, 8, 8, 10, 8, 12, 8, 225, 9, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 234, 8, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 242, 8, 10, 10, 10, 12, 10, 245, 9, 10, 3, 10, 247, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 5, 12, 257, 8, 12, 10, 12, 12, 12, 260, 9, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 3, 13, 267, 8, 13, 1, 14, 1, 14, 1, 14, 1, 14, 5, 14, 273, 8, 14, 10, 14, 12, 14, 276, 9, 14, 1, 14, 3, 14, 279, 8, 14, 1, 14, 3, 14, 282, 8, 14, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 5, 16, 290, 8, 16, 10, 16, 12, 16, 293, 9, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 3, 18, 301, 8, 18, 1, 19, 1, 19, 1, 19, 1, 19, 5, 19, 307, 8, 19, 10, 19, 12, 19, 310, 9, 19, 1, 20, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 3, 22, 321, 8, 22, 1, 22, 1, 22, 3, 22, 325, 8, 22, 1, 23, 1, 23, 1, 23, 1, 23, 3, 23, 331, 8, 23, 1, 24, 1, 24, 1, 24, 5, 24, 336, 8, 24, 10, 24, 12, 24, 339, 9, 24, 1, 25, 1, 25, 1, 25, 5, 25, 344, 8, 25, 10, 25, 12, 25, 347, 9, 25, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 5, 28, 366, 8, 28, 10, 28, 12, 28, 369, 9, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 5, 28, 377, 8, 28, 10, 28, 12, 28, 380, 9, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 1, 28, 5, 28, 388, 8, 28, 10, 28, 12, 28, 391, 9, 28, 1, 28, 1, 28, 3, 28, 395, 8, 28, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 5, 30, 404, 8, 30, 10, 30, 12, 30, 407, 9, 30, 1, 31, 1, 31, 3, 31, 411, 8, 31, 1, 31, 1, 31, 3, 31, 415, 8, 31, 1, 32, 1, 32, 1, 32, 1, 32, 5, 32, 421, 8, 32, 10, 32, 12, 32, 424, 9, 32, 1, 33, 1, 33, 1, 33, 1, 33, 5, 33, 430, 8, 33, 10, 33, 12, 33, 433, 9, 33, 1, 34, 1, 34, 1, 34, 1, 34, 5, 34, 439, 8, 34, 10, 34, 12, 34, 442, 9, 34, 1, 35, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 36, 3, 36, 452, 8, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 5, 39, 464, 8, 39, 10, 39, 12, 39, 467, 9, 39, 1, 40, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 42, 1, 42, 3, 42, 477, 8, 42, 1, 43, 3, 43, 480, 8, 43, 1, 43, 1, 43, 1, 44, 3, 44, 485, 8, 44, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 51, 3, 51, 510, 8, 51, 1, 51, 1, 51, 1, 51, 1, 51, 5, 51, 516, 8, 51, 10, 51, 12, 51, 519, 9, 51, 3, 51, 521, 8, 51, 1, 52, 1, 52, 1, 52, 3, 52, 526, 8, 52, 1, 52, 1, 52, 1, 52, 0, 3, 2, 10, 16, 53, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 0, 8, 1, 0, 59, 60, 1, 0, 61, 63, 2, 0, 67, 67, 73, 73, 1, 0, 66, 67, 2, 0, 32, 32, 35, 35, 1, 0, 38, 39, 2, 0, 37, 37, 51, 51, 2, 0, 52, 52, 54, 58, 555, 0, 106, 1, 0, 0, 0, 2, 109, 1, 0, 0, 0, 4, 125, 1, 0, 0, 0, 6, 140, 1, 0, 0, 0, 8, 142, 1, 0, 0, 0, 10, 173, 1, 0, 0, 0, 12, 200, 1, 0, 0, 0, 14, 207, 1, 0, 0, 0, 16, 213, 1, 0, 0, 0, 18, 233, 1, 0, 0, 0, 20, 235, 1, 0, 0, 0, 22, 250, 1, 0, 0, 0, 24, 253, 1, 0, 0, 0, 26, 266, 1, 0, 0, 0, 28, 268, 1, 0, 0, 0, 30, 283, 1, 0, 0, 0, 32, 285, 1, 0, 0, 0, 34, 294, 1, 0, 0, 0, 36, 300, 1, 0, 0, 0, 38, 302, 1, 0, 0, 0, 40, 311, 1, 0, 0, 0, 42, 315, 1, 0, 0, 0, 44, 318, 1, 0, 0, 0, 46, 326, 1, 0, 0, 0, 48, 332, 1, 0, 0, 0, 50, 340, 1, 0, 0, 0, 52, 348, 1, 0, 0, 0, 54, 350, 1, 0, 0, 0, 56, 394, 1, 0, 0, 0, 58, 396, 1, 0, 0, 0, 60, 399, 1, 0, 0, 0, 62, 408, 1, 0, 0, 0, 64, 416, 1, 0, 0, 0, 66, 425, 1, 0, 0, 0, 68, 434, 1, 0, 0, 0, 70, 443, 1, 0, 0, 0, 72, 447, 1, 0, 0, 0, 74, 453, 1, 0, 0, 0, 76, 457, 1, 0, 0, 0, 78, 460, 1, 0, 0, 0, 80, 468, 1, 0, 0, 0, 82, 472, 1, 0, 0, 0, 84, 476, 1, 0, 0, 0, 86, 479, 1, 0, 0, 0, 88, 484, 1, 0, 0, 0, 90, 488, 1, 0, 0, 0, 92, 490, 1, 0, 0, 0, 94, 492, 1, 0, 0, 0, 96, 495, 1, 0, 0, 0, 98, 499, 1, 0, 0, 0, 100, 502, 1, 0, 0, 0, 102, 505, 1, 0, 0, 0, 104, 525, 1, 0, 0, 0, 106, 107, 3, 2, 1, 0, 107, 108, 5, 0, 0, 1, 108, 1, 1, 0, 0, 0, 109, 110, 6, 1, -1, 0, 110, 111, 3, 4, 2, 0, 111, 117, 1, 0, 0, 0, 112, 113, 10, 1, 0, 0, 113, 114, 5, 26, 0, 0, 114, 116, 3, 6, 3, 0, 115, 112, 1, 0, 0, 0, 116, 119, 1, 0, 0, 0, 117, 115, 1, 0, 0, 0, 117, 118, 1, 0, 0, 0, 118, 3, 1, 0, 0, 0, 119, 117, 1, 0, 0, 0, 120, 126, 3, 94, 47, 0, 121, 126, 3, 28, 14, 0, 122, 126, 3, 22, 11, 0, 123, 126, 3, 98, 49, 0, 124, 126, 3, 100, 50, 0, 125, 120, 1, 0, 0, 0, 125, 121, 1, 0, 0, 0, 125, 122, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 125, 124, 1, 0, 0, 0, 126, 5, 1, 0, 0, 0, 127, 141, 3, 42, 21, 0, 128, 141, 3, 46, 23, 0, 129, 141, 3, 58, 29, 0, 130, 141, 3, 64, 32, 0, 131, 141, 3, 60, 30, 0, 132, 141, 3, 44, 22, 0, 133, 141, 3, 8, 4, 0, 134, 141, 3, 66, 33, 0, 135, 141, 3, 68, 34, 0, 136, 141, 3, 72, 36, 0, 137, 141, 3, 74, 37, 0, 138, 141, 3, 102, 51, 0, 139, 141, 3, 76, 38, 0, 140, 127, 1, 0, 0, 0, 140, 128, 1, 0, 0, 0, 140, 129, 1, 0, 0, 0, 140, 130, 1, 0, 0, 0, 140, 131, 1, 0, 0, 0, 140, 132, 1, 0, 0, 0, 140, 133, 1, 0, 0, 0, 140, 134, 1, 0, 0, 0, 140, 135, 1, 0, 0, 0, 140, 136, 1, 0, 0, 0, 140, 137, 1, 0, 0, 0, 140, 138, 1, 0, 0, 0, 140, 139, 1, 0, 0, 0, 141, 7, 1, 0, 0, 0, 142, 143, 5, 18, 0, 0, 143, 144, 3, 10, 5, 0, 144, 9, 1, 0, 0, 0, 145, 146, 6, 5, -1, 0, 146, 147, 5, 44, 0, 0, 147, 174, 3, 10, 5, 7, 148, 174, 3, 14, 7, 0, 149, 174, 3, 12, 6, 0, 150, 152, 3, 14, 7, 0, 151, 153, 5, 44, 0, 0, 152, 151, 1, 0, 0, 0, 152, 153, 1, 0, 0, 0, 153, 154, 1, 0, 0, 0, 154, 155, 5, 41, 0, 0, 155, 156, 5, 40, 0, 0, 156, 161, 3, 14, 7, 0, 157, 158, 5, 34, 0, 0, 158, 160, 3, 14, 7, 0, 159, 157, 1, 0, 0, 0, 160, 163, 1, 0, 0, 0, 161, 159, 1, 0, 0, 0, 161, 162, 1, 0, 0, 0, 162, 164, 1, 0, 0, 0, 163, 161, 1, 0, 0, 0, 164, 165, 5, 50, 0, 0, 165, 174, 1, 0, 0, 0, 166, 167, 3, 14, 7, 0, 167, 169, 5, 42, 0, 0, 168, 170, 5, 44, 0, 0, 169, 168, 1, 0, 0, 0, 169, 170, 1, 0, 0, 0, 170, 171, 1, 0, 0, 0, 171, 172, 5, 45, 0, 0, 172, 174, 1, 0, 0, 0, 173, 145, 1, 0, 0, 0, 173, 148, 1, 0, 0, 0, 173, 149, 1, 0, 0, 0, 173, 150, 1, 0, 0, 0, 173, 166, 1, 0, 0, 0, 174, 183, 1, 0, 0, 0, 175, 176, 10, 4, 0, 0, 176, 177, 5, 31, 0, 0, 177, 182, 3, 10, 5, 5, 178, 179, 10, 3, 0, 0, 179, 180, 5, 47, 0, 0, 180, 182, 3, 10, 5, 4, 181, 175, 1, 0, 0, 0, 181, 178, 1, 0, 0, 0, 182, 185, 1, 0, 0, 0, 183, 181, 1, 0, 0, 0, 183, 184, 1, 0, 0, 0, 184, 11, 1, 0, 0, 0, 185, 183, 1, 0, 0, 0, 186, 188, 3, 14, 7, 0, 187, 189, 5, 44, 0, 0, 188, 187, 1, 0, 0, 0, 188, 189, 1, 0, 0, 0, 189, 190, 1, 0, 0, 0, 190, 191, 5, 43, 0, 0, 191, 192, 3, 90, 45, 0, 192, 201, 1, 0, 0, 0, 193, 195, 3, 14, 7, 0, 194, 196, 5, 44, 0, 0, 195, 194, 1, 0, 0, 0, 195, 196, 1, 0, 0, 0, 196, 197, 1, 0, 0, 0, 197, 198, 5, 49, 0, 0, 198, 199, 3, 90, 45, 0, 199, 201, 1, 0, 0, 0, 200, 186, 1, 0, 0, 0, 200, 193, 1, 0, 0, 0, 201, 13, 1, 0, 0, 0, 202, 208, 3, 16, 8, 0, 203, 204, 3, 16, 8, 0, 204, 205, 3, 92, 46, 0, 205, 206, 3, 16, 8, 0, 206, 208, 1, 0, 0, 0, 207, 202, 1, 0, 0, 0, 207, 203, 1, 0, 0, 0, 208, 15, 1, 0, 0, 0, 209, 210, 6, 8, -1, 0, 210, 214, 3, 18, 9, 0, 211, 212, 7, 0, 0, 0, 212, 214, 3, 16, 8, 3, 213, 209, 1, 0, 0, 0, 213, 211, 1, 0, 0, 0, 214, 223, 1, 0, 0, 0, 215, 216, 10, 2, 0, 0, 216, 217, 7, 1, 0, 0, 217, 222, 3, 16, 8, 3, 218, 219, 10, 1, 0, 0, 219, 220, 7, 0, 0, 0, 220, 222, 3, 16, 8, 2, 221, 215, 1, 0, 0, 0, 221, 218, 1, 0, 0, 0, 222, 225, 1, 0, 0, 0, 223, 221, 1, 0, 0, 0, 223, 224, 1, 0, 0, 0, 224, 17, 1, 0, 0, 0, 225, 223, 1, 0, 0, 0, 226, 234, 3, 56, 28, 0, 227, 234, 3, 48, 24, 0, 228, 234, 3, 20, 10, 0, 229, 230, 5, 40, 0, 0, 230, 231, 3, 10, 5, 0, 231, 232, 5, 50, 0, 0, 232, 234, 1, 0, 0, 0, 233, 226, 1, 0, 0, 0, 233, 227, 1, 0, 0, 0, 233, 228, 1, 0, 0, 0, 233, 229, 1, 0, 0, 0, 234, 19, 1, 0, 0, 0, 235, 236, 3, 52, 26, 0, 236, 246, 5, 40, 0, 0, 237, 247, 5, 61, 0, 0, 238, 243, 3, 10, 5, 0, 239, 240, 5, 34, 0, 0, 240, 242, 3, 10, 5, 0, 241, 239, 1, 0, 0, 0, 242, 245, 1, 0, 0, 0, 243, 241, 1, 0, 0, 0, 243, 244, 1, 0, 0, 0, 244, 247, 1, 0, 0, 0, 245, 243, 1, 0, 0, 0, 246, 237, 1, 0, 0, 0, 246, 238, 1, 0, 0, 0, 246, 247, 1, 0, 0, 0, 247, 248, 1, 0, 0, 0, 248, 249, 5, 50, 0, 0, 249, 21, 1, 0, 0, 0, 250, 251, 5, 14, 0, 0, 251, 252, 3, 24, 12, 0, 252, 23, 1, 0, 0, 0, 253, 258, 3, 26, 13, 0, 254, 255, 5, 34, 0, 0, 255, 257, 3, 26, 13, 0, 256, 254, 1, 0, 0, 0, 257, 260, 1, 0, 0, 0, 258, 256, 1, 0, 0, 0, 258, 259, 1, 0, 0, 0, 259, 25, 1, 0, 0, 0, 260, 258, 1, 0, 0, 0, 261, 267, 3, 10, 5, 0, 262, 263, 3, 48, 24, 0, 263, 264, 5, 33, 0, 0, 264, 265, 3, 10, 5, 0, 265, 267, 1, 0, 0, 0, 266, 261, 1, 0, 0, 0, 266, 262, 1, 0, 0, 0, 267, 27, 1, 0, 0, 0, 268, 269, 5, 6, 0, 0, 269, 274, 3, 30, 15, 0, 270, 271, 5, 34, 0, 0, 271, 273, 3, 30, 15, 0, 272, 270, 1, 0, 0, 0, 273, 276, 1, 0, 0, 0, 274, 272, 1, 0, 0, 0, 274, 275, 1, 0, 0, 0, 275, 278, 1, 0, 0, 0, 276, 274, 1, 0, 0, 0, 277, 279, 3, 32, 16, 0, 278, 277, 1, 0, 0, 0, 278, 279, 1, 0, 0, 0, 279, 281, 1, 0, 0, 0, 280, 282, 3, 36, 18, 0, 281, 280, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 29, 1, 0, 0, 0, 283, 284, 7, 2, 0, 0, 284, 31, 1, 0, 0, 0, 285, 286, 5, 71, 0, 0, 286, 291, 3, 34, 17, 0, 287, 288, 5, 34, 0, 0, 288, 290, 3, 34, 17, 0, 289, 287, 1, 0, 0, 0, 290, 293, 1, 0, 0, 0, 291, 289, 1, 0, 0, 0, 291, 292, 1, 0, 0, 0, 292, 33, 1, 0, 0, 0, 293, 291, 1, 0, 0, 0, 294, 295, 3, 90, 45, 0, 295, 296, 5, 33, 0, 0, 296, 297, 3, 90, 45, 0, 297, 35, 1, 0, 0, 0, 298, 301, 3, 38, 19, 0, 299, 301, 3, 40, 20, 0, 300, 298, 1, 0, 0, 0, 300, 299, 1, 0, 0, 0, 301, 37, 1, 0, 0, 0, 302, 303, 5, 72, 0, 0, 303, 308, 3, 30, 15, 0, 304, 305, 5, 34, 0, 0, 305, 307, 3, 30, 15, 0, 306, 304, 1, 0, 0, 0, 307, 310, 1, 0, 0, 0, 308, 306, 1, 0, 0, 0, 308, 309, 1, 0, 0, 0, 309, 39, 1, 0, 0, 0, 310, 308, 1, 0, 0, 0, 311, 312, 5, 64, 0, 0, 312, 313, 3, 38, 19, 0, 313, 314, 5, 65, 0, 0, 314, 41, 1, 0, 0, 0, 315, 316, 5, 4, 0, 0, 316, 317, 3, 24, 12, 0, 317, 43, 1, 0, 0, 0, 318, 320, 5, 17, 0, 0, 319, 321, 3, 24, 12, 0, 320, 319, 1, 0, 0, 0, 320, 321, 1, 0, 0, 0, 321, 324, 1, 0, 0, 0, 322, 323, 5, 30, 0, 0, 323, 325, 3, 24, 12, 0, 324, 322, 1, 0, 0, 0, 324, 325, 1, 0, 0, 0, 325, 45, 1, 0, 0, 0, 326, 327, 5, 8, 0, 0, 327, 330, 3, 24, 12, 0, 328, 329, 5, 30, 0, 0, 329, 331, 3, 24, 12, 0, 330, 328, 1, 0, 0, 0, 330, 331, 1, 0, 0, 0, 331, 47, 1, 0, 0, 0, 332, 337, 3, 52, 26, 0, 333, 334, 5, 36, 0, 0, 334, 336, 3, 52, 26, 0, 335, 333, 1, 0, 0, 0, 336, 339, 1, 0, 0, 0, 337, 335, 1, 0, 0, 0, 337, 338, 1, 0, 0, 0, 338, 49, 1, 0, 0, 0, 339, 337, 1, 0, 0, 0, 340, 345, 3, 54, 27, 0, 341, 342, 5, 36, 0, 0, 342, 344, 3, 54, 27, 0, 343, 341, 1, 0, 0, 0, 344, 347, 1, 0, 0, 0, 345, 343, 1, 0, 0, 0, 345, 346, 1, 0, 0, 0, 346, 51, 1, 0, 0, 0, 347, 345, 1, 0, 0, 0, 348, 349, 7, 3, 0, 0, 349, 53, 1, 0, 0, 0, 350, 351, 5, 77, 0, 0, 351, 55, 1, 0, 0, 0, 352, 395, 5, 45, 0, 0, 353, 354, 3, 88, 44, 0, 354, 355, 5, 66, 0, 0, 355, 395, 1, 0, 0, 0, 356, 395, 3, 86, 43, 0, 357, 395, 3, 88, 44, 0, 358, 395, 3, 82, 41, 0, 359, 395, 5, 48, 0, 0, 360, 395, 3, 90, 45, 0, 361, 362, 5, 64, 0, 0, 362, 367, 3, 84, 42, 0, 363, 364, 5, 34, 0, 0, 364, 366, 3, 84, 42, 0, 365, 363, 1, 0, 0, 0, 366, 369, 1, 0, 0, 0, 367, 365, 1, 0, 0, 0, 367, 368, 1, 0, 0, 0, 368, 370, 1, 0, 0, 0, 369, 367, 1, 0, 0, 0, 370, 371, 5, 65, 0, 0, 371, 395, 1, 0, 0, 0, 372, 373, 5, 64, 0, 0, 373, 378, 3, 82, 41, 0, 374, 375, 5, 34, 0, 0, 375, 377, 3, 82, 41, 0, 376, 374, 1, 0, 0, 0, 377, 380, 1, 0, 0, 0, 378, 376, 1, 0, 0, 0, 378, 379, 1, 0, 0, 0, 379, 381, 1, 0, 0, 0, 380, 378, 1, 0, 0, 0, 381, 382, 5, 65, 0, 0, 382, 395, 1, 0, 0, 0, 383, 384, 5, 64, 0, 0, 384, 389, 3, 90, 45, 0, 385, 386, 5, 34, 0, 0, 386, 388, 3, 90, 45, 0, 387, 385, 1, 0, 0, 0, 388, 391, 1, 0, 0, 0, 389, 387, 1, 0, 0, 0, 389, 390, 1, 0, 0, 0, 390, 392, 1, 0, 0, 0, 391, 389, 1, 0, 0, 0, 392, 393, 5, 65, 0, 0, 393, 395, 1, 0, 0, 0, 394, 352, 1, 0, 0, 0, 394, 353, 1, 0, 0, 0, 394, 356, 1, 0, 0, 0, 394, 357, 1, 0, 0, 0, 394, 358, 1, 0, 0, 0, 394, 359, 1, 0, 0, 0, 394, 360, 1, 0, 0, 0, 394, 361, 1, 0, 0, 0, 394, 372, 1, 0, 0, 0, 394, 383, 1, 0, 0, 0, 395, 57, 1, 0, 0, 0, 396, 397, 5, 10, 0, 0, 397, 398, 5, 28, 0, 0, 398, 59, 1, 0, 0, 0, 399, 400, 5, 16, 0, 0, 400, 405, 3, 62, 31, 0, 401, 402, 5, 34, 0, 0, 402, 404, 3, 62, 31, 0, 403, 401, 1, 0, 0, 0, 404, 407, 1, 0, 0, 0, 405, 403, 1, 0, 0, 0, 405, 406, 1, 0, 0, 0, 406, 61, 1, 0, 0, 0, 407, 405, 1, 0, 0, 0, 408, 410, 3, 10, 5, 0, 409, 411, 7, 4, 0, 0, 410, 409, 1, 0, 0, 0, 410, 411, 1, 0, 0, 0, 411, 414, 1, 0, 0, 0, 412, 413, 5, 46, 0, 0, 413, 415, 7, 5, 0, 0, 414, 412, 1, 0, 0, 0, 414, 415, 1, 0, 0, 0, 415, 63, 1, 0, 0, 0, 416, 417, 5, 9, 0, 0, 417, 422, 3, 50, 25, 0, 418, 419, 5, 34, 0, 0, 419, 421, 3, 50, 25, 0, 420, 418, 1, 0, 0, 0, 421, 424, 1, 0, 0, 0, 422, 420, 1, 0, 0, 0, 422, 423, 1, 0, 0, 0, 423, 65, 1, 0, 0, 0, 424, 422, 1, 0, 0, 0, 425, 426, 5, 2, 0, 0, 426, 431, 3, 50, 25, 0, 427, 428, 5, 34, 0, 0, 428, 430, 3, 50, 25, 0, 429, 427, 1, 0, 0, 0, 430, 433, 1, 0, 0, 0, 431, 429, 1, 0, 0, 0, 431, 432, 1, 0, 0, 0, 432, 67, 1, 0, 0, 0, 433, 431, 1, 0, 0, 0, 434, 435, 5, 13, 0, 0, 435, 440, 3, 70, 35, 0, 436, 437, 5, 34, 0, 0, 437, 439, 3, 70, 35, 0, 438, 436, 1, 0, 0, 0, 439, 442, 1, 0, 0, 0, 440, 438, 1, 0, 0, 0, 440, 441, 1, 0, 0, 0, 441, 69, 1, 0, 0, 0, 442, 440, 1, 0, 0, 0, 443, 444, 3, 50, 25, 0, 444, 445, 5, 81, 0, 0, 445, 446, 3, 50, 25, 0, 446, 71, 1, 0, 0, 0, 447, 448, 5, 1, 0, 0, 448, 449, 3, 18, 9, 0, 449, 451, 3, 90, 45, 0, 450, 452, 3, 78, 39, 0, 451, 450, 1, 0, 0, 0, 451, 452, 1, 0, 0, 0, 452, 73, 1, 0, 0, 0, 453, 454, 5, 7, 0, 0, 454, 455, 3, 18, 9, 0, 455, 456, 3, 90, 45, 0, 456, 75, 1, 0, 0, 0, 457, 458, 5, 12, 0, 0, 458, 459, 3, 48, 24, 0, 459, 77, 1, 0, 0, 0, 460, 465, 3, 80, 40, 0, 461, 462, 5, 34, 0, 0, 462, 464, 3, 80, 40, 0, 463, 461, 1, 0, 0, 0, 464, 467, 1, 0, 0, 0, 465, 463, 1, 0, 0, 0, 465, 466, 1, 0, 0, 0, 466, 79, 1, 0, 0, 0, 467, 465, 1, 0, 0, 0, 468, 469, 3, 52, 26, 0, 469, 470, 5, 33, 0, 0, 470, 471, 3, 56, 28, 0, 471, 81, 1, 0, 0, 0, 472, 473, 7, 6, 0, 0, 473, 83, 1, 0, 0, 0, 474, 477, 3, 86, 43, 0, 475, 477, 3, 88, 44, 0, 476, 474, 1, 0, 0, 0, 476, 475, 1, 0, 0, 0, 477, 85, 1, 0, 0, 0, 478, 480, 7, 0, 0, 0, 479, 478, 1, 0, 0, 0, 479, 480, 1, 0, 0, 0, 480, 481, 1, 0, 0, 0, 481, 482, 5, 29, 0, 0, 482, 87, 1, 0, 0, 0, 483, 485, 7, 0, 0, 0, 484, 483, 1, 0, 0, 0, 484, 485, 1, 0, 0, 0, 485, 486, 1, 0, 0, 0, 486, 487, 5, 28, 0, 0, 487, 89, 1, 0, 0, 0, 488, 489, 5, 27, 0, 0, 489, 91, 1, 0, 0, 0, 490, 491, 7, 7, 0, 0, 491, 93, 1, 0, 0, 0, 492, 493, 5, 5, 0, 0, 493, 494, 3, 96, 48, 0, 494, 95, 1, 0, 0, 0, 495, 496, 5, 64, 0, 0, 496, 497, 3, 2, 1, 0, 497, 498, 5, 65, 0, 0, 498, 97, 1, 0, 0, 0, 499, 500, 5, 15, 0, 0, 500, 501, 5, 97, 0, 0, 501, 99, 1, 0, 0, 0, 502, 503, 5, 11, 0, 0, 503, 504, 5, 101, 0, 0, 504, 101, 1, 0, 0, 0, 505, 506, 5, 3, 0, 0, 506, 509, 5, 87, 0, 0, 507, 508, 5, 85, 0, 0, 508, 510, 3, 50, 25, 0, 509, 507, 1, 0, 0, 0, 509, 510, 1, 0, 0, 0, 510, 520, 1, 0, 0, 0, 511, 512, 5, 86, 0, 0, 512, 517, 3, 104, 52, 0, 513, 514, 5, 34, 0, 0, 514, 516, 3, 104, 52, 0, 515, 513, 1, 0, 0, 0, 516, 519, 1, 0, 0, 0, 517, 515, 1, 0, 0, 0, 517, 518, 1, 0, 0, 0, 518, 521, 1, 0, 0, 0, 519, 517, 1, 0, 0, 0, 520, 511, 1, 0, 0, 0, 520, 521, 1, 0, 0, 0, 521, 103, 1, 0, 0, 0, 522, 523, 3, 50, 25, 0, 523, 524, 5, 33, 0, 0, 524, 526, 1, 0, 0, 0, 525, 522, 1, 0, 0, 0, 525, 526, 1, 0, 0, 0, 526, 527, 1, 0, 0, 0, 527, 528, 3, 50, 25, 0, 528, 105, 1, 0, 0, 0, 51, 117, 125, 140, 152, 161, 169, 173, 181, 183, 188, 195, 200, 207, 213, 221, 223, 233, 243, 246, 258, 266, 274, 278, 281, 291, 300, 308, 320, 324, 330, 337, 345, 367, 378, 389, 394, 405, 410, 414, 422, 431, 440, 451, 465, 476, 479, 484, 509, 517, 520, 525]
\ No newline at end of file
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.tokens b/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
index 5edc646fad10e..fc02831fc219f 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
@@ -24,7 +24,7 @@ EXPLAIN_WS=23
 EXPLAIN_LINE_COMMENT=24
 EXPLAIN_MULTILINE_COMMENT=25
 PIPE=26
-STRING=27
+QUOTED_STRING=27
 INTEGER_LITERAL=28
 DECIMAL_LITERAL=29
 BY=30
@@ -68,44 +68,45 @@ QUOTED_IDENTIFIER=67
 EXPR_LINE_COMMENT=68
 EXPR_MULTILINE_COMMENT=69
 EXPR_WS=70
-METADATA=71
-FROM_UNQUOTED_IDENTIFIER=72
-FROM_LINE_COMMENT=73
-FROM_MULTILINE_COMMENT=74
-FROM_WS=75
-ID_PATTERN=76
-PROJECT_LINE_COMMENT=77
-PROJECT_MULTILINE_COMMENT=78
-PROJECT_WS=79
-AS=80
-RENAME_LINE_COMMENT=81
-RENAME_MULTILINE_COMMENT=82
-RENAME_WS=83
-ON=84
-WITH=85
-ENRICH_POLICY_NAME=86
-ENRICH_LINE_COMMENT=87
-ENRICH_MULTILINE_COMMENT=88
-ENRICH_WS=89
-ENRICH_FIELD_LINE_COMMENT=90
-ENRICH_FIELD_MULTILINE_COMMENT=91
-ENRICH_FIELD_WS=92
-MVEXPAND_LINE_COMMENT=93
-MVEXPAND_MULTILINE_COMMENT=94
-MVEXPAND_WS=95
-INFO=96
-SHOW_LINE_COMMENT=97
-SHOW_MULTILINE_COMMENT=98
-SHOW_WS=99
-FUNCTIONS=100
-META_LINE_COMMENT=101
-META_MULTILINE_COMMENT=102
-META_WS=103
-COLON=104
-SETTING=105
-SETTING_LINE_COMMENT=106
-SETTTING_MULTILINE_COMMENT=107
-SETTING_WS=108
+OPTIONS=71
+METADATA=72
+FROM_UNQUOTED_IDENTIFIER=73
+FROM_LINE_COMMENT=74
+FROM_MULTILINE_COMMENT=75
+FROM_WS=76
+ID_PATTERN=77
+PROJECT_LINE_COMMENT=78
+PROJECT_MULTILINE_COMMENT=79
+PROJECT_WS=80
+AS=81
+RENAME_LINE_COMMENT=82
+RENAME_MULTILINE_COMMENT=83
+RENAME_WS=84
+ON=85
+WITH=86
+ENRICH_POLICY_NAME=87
+ENRICH_LINE_COMMENT=88
+ENRICH_MULTILINE_COMMENT=89
+ENRICH_WS=90
+ENRICH_FIELD_LINE_COMMENT=91
+ENRICH_FIELD_MULTILINE_COMMENT=92
+ENRICH_FIELD_WS=93
+MVEXPAND_LINE_COMMENT=94
+MVEXPAND_MULTILINE_COMMENT=95
+MVEXPAND_WS=96
+INFO=97
+SHOW_LINE_COMMENT=98
+SHOW_MULTILINE_COMMENT=99
+SHOW_WS=100
+FUNCTIONS=101
+META_LINE_COMMENT=102
+META_MULTILINE_COMMENT=103
+META_WS=104
+COLON=105
+SETTING=106
+SETTING_LINE_COMMENT=107
+SETTTING_MULTILINE_COMMENT=108
+SETTING_WS=109
 'dissect'=1
 'drop'=2
 'enrich'=3
@@ -160,10 +161,11 @@ SETTING_WS=108
 '/'=62
 '%'=63
 ']'=65
-'metadata'=71
-'as'=80
-'on'=84
-'with'=85
-'info'=96
-'functions'=100
-':'=104
+'options'=71
+'metadata'=72
+'as'=81
+'on'=85
+'with'=86
+'info'=97
+'functions'=101
+':'=105
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.ts b/packages/kbn-esql-ast/src/antlr/esql_parser.ts
index 40f3843403617..1300814b5fddd 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.ts
@@ -44,7 +44,7 @@ export default class esql_parser extends Parser {
 	public static readonly EXPLAIN_LINE_COMMENT = 24;
 	public static readonly EXPLAIN_MULTILINE_COMMENT = 25;
 	public static readonly PIPE = 26;
-	public static readonly STRING = 27;
+	public static readonly QUOTED_STRING = 27;
 	public static readonly INTEGER_LITERAL = 28;
 	public static readonly DECIMAL_LITERAL = 29;
 	public static readonly BY = 30;
@@ -88,44 +88,45 @@ export default class esql_parser extends Parser {
 	public static readonly EXPR_LINE_COMMENT = 68;
 	public static readonly EXPR_MULTILINE_COMMENT = 69;
 	public static readonly EXPR_WS = 70;
-	public static readonly METADATA = 71;
-	public static readonly FROM_UNQUOTED_IDENTIFIER = 72;
-	public static readonly FROM_LINE_COMMENT = 73;
-	public static readonly FROM_MULTILINE_COMMENT = 74;
-	public static readonly FROM_WS = 75;
-	public static readonly ID_PATTERN = 76;
-	public static readonly PROJECT_LINE_COMMENT = 77;
-	public static readonly PROJECT_MULTILINE_COMMENT = 78;
-	public static readonly PROJECT_WS = 79;
-	public static readonly AS = 80;
-	public static readonly RENAME_LINE_COMMENT = 81;
-	public static readonly RENAME_MULTILINE_COMMENT = 82;
-	public static readonly RENAME_WS = 83;
-	public static readonly ON = 84;
-	public static readonly WITH = 85;
-	public static readonly ENRICH_POLICY_NAME = 86;
-	public static readonly ENRICH_LINE_COMMENT = 87;
-	public static readonly ENRICH_MULTILINE_COMMENT = 88;
-	public static readonly ENRICH_WS = 89;
-	public static readonly ENRICH_FIELD_LINE_COMMENT = 90;
-	public static readonly ENRICH_FIELD_MULTILINE_COMMENT = 91;
-	public static readonly ENRICH_FIELD_WS = 92;
-	public static readonly MVEXPAND_LINE_COMMENT = 93;
-	public static readonly MVEXPAND_MULTILINE_COMMENT = 94;
-	public static readonly MVEXPAND_WS = 95;
-	public static readonly INFO = 96;
-	public static readonly SHOW_LINE_COMMENT = 97;
-	public static readonly SHOW_MULTILINE_COMMENT = 98;
-	public static readonly SHOW_WS = 99;
-	public static readonly FUNCTIONS = 100;
-	public static readonly META_LINE_COMMENT = 101;
-	public static readonly META_MULTILINE_COMMENT = 102;
-	public static readonly META_WS = 103;
-	public static readonly COLON = 104;
-	public static readonly SETTING = 105;
-	public static readonly SETTING_LINE_COMMENT = 106;
-	public static readonly SETTTING_MULTILINE_COMMENT = 107;
-	public static readonly SETTING_WS = 108;
+	public static readonly OPTIONS = 71;
+	public static readonly METADATA = 72;
+	public static readonly FROM_UNQUOTED_IDENTIFIER = 73;
+	public static readonly FROM_LINE_COMMENT = 74;
+	public static readonly FROM_MULTILINE_COMMENT = 75;
+	public static readonly FROM_WS = 76;
+	public static readonly ID_PATTERN = 77;
+	public static readonly PROJECT_LINE_COMMENT = 78;
+	public static readonly PROJECT_MULTILINE_COMMENT = 79;
+	public static readonly PROJECT_WS = 80;
+	public static readonly AS = 81;
+	public static readonly RENAME_LINE_COMMENT = 82;
+	public static readonly RENAME_MULTILINE_COMMENT = 83;
+	public static readonly RENAME_WS = 84;
+	public static readonly ON = 85;
+	public static readonly WITH = 86;
+	public static readonly ENRICH_POLICY_NAME = 87;
+	public static readonly ENRICH_LINE_COMMENT = 88;
+	public static readonly ENRICH_MULTILINE_COMMENT = 89;
+	public static readonly ENRICH_WS = 90;
+	public static readonly ENRICH_FIELD_LINE_COMMENT = 91;
+	public static readonly ENRICH_FIELD_MULTILINE_COMMENT = 92;
+	public static readonly ENRICH_FIELD_WS = 93;
+	public static readonly MVEXPAND_LINE_COMMENT = 94;
+	public static readonly MVEXPAND_MULTILINE_COMMENT = 95;
+	public static readonly MVEXPAND_WS = 96;
+	public static readonly INFO = 97;
+	public static readonly SHOW_LINE_COMMENT = 98;
+	public static readonly SHOW_MULTILINE_COMMENT = 99;
+	public static readonly SHOW_WS = 100;
+	public static readonly FUNCTIONS = 101;
+	public static readonly META_LINE_COMMENT = 102;
+	public static readonly META_MULTILINE_COMMENT = 103;
+	public static readonly META_WS = 104;
+	public static readonly COLON = 105;
+	public static readonly SETTING = 106;
+	public static readonly SETTING_LINE_COMMENT = 107;
+	public static readonly SETTTING_MULTILINE_COMMENT = 108;
+	public static readonly SETTING_WS = 109;
 	public static readonly EOF = Token.EOF;
 	public static readonly RULE_singleStatement = 0;
 	public static readonly RULE_query = 1;
@@ -142,42 +143,44 @@ export default class esql_parser extends Parser {
 	public static readonly RULE_fields = 12;
 	public static readonly RULE_field = 13;
 	public static readonly RULE_fromCommand = 14;
-	public static readonly RULE_metadata = 15;
-	public static readonly RULE_metadataOption = 16;
-	public static readonly RULE_deprecated_metadata = 17;
-	public static readonly RULE_evalCommand = 18;
-	public static readonly RULE_statsCommand = 19;
-	public static readonly RULE_inlinestatsCommand = 20;
-	public static readonly RULE_fromIdentifier = 21;
-	public static readonly RULE_qualifiedName = 22;
-	public static readonly RULE_qualifiedNamePattern = 23;
-	public static readonly RULE_identifier = 24;
-	public static readonly RULE_identifierPattern = 25;
-	public static readonly RULE_constant = 26;
-	public static readonly RULE_limitCommand = 27;
-	public static readonly RULE_sortCommand = 28;
-	public static readonly RULE_orderExpression = 29;
-	public static readonly RULE_keepCommand = 30;
-	public static readonly RULE_dropCommand = 31;
-	public static readonly RULE_renameCommand = 32;
-	public static readonly RULE_renameClause = 33;
-	public static readonly RULE_dissectCommand = 34;
-	public static readonly RULE_grokCommand = 35;
-	public static readonly RULE_mvExpandCommand = 36;
-	public static readonly RULE_commandOptions = 37;
-	public static readonly RULE_commandOption = 38;
-	public static readonly RULE_booleanValue = 39;
-	public static readonly RULE_numericValue = 40;
-	public static readonly RULE_decimalValue = 41;
-	public static readonly RULE_integerValue = 42;
-	public static readonly RULE_string = 43;
-	public static readonly RULE_comparisonOperator = 44;
-	public static readonly RULE_explainCommand = 45;
-	public static readonly RULE_subqueryExpression = 46;
-	public static readonly RULE_showCommand = 47;
-	public static readonly RULE_metaCommand = 48;
-	public static readonly RULE_enrichCommand = 49;
-	public static readonly RULE_enrichWithClause = 50;
+	public static readonly RULE_fromIdentifier = 15;
+	public static readonly RULE_fromOptions = 16;
+	public static readonly RULE_configOption = 17;
+	public static readonly RULE_metadata = 18;
+	public static readonly RULE_metadataOption = 19;
+	public static readonly RULE_deprecated_metadata = 20;
+	public static readonly RULE_evalCommand = 21;
+	public static readonly RULE_statsCommand = 22;
+	public static readonly RULE_inlinestatsCommand = 23;
+	public static readonly RULE_qualifiedName = 24;
+	public static readonly RULE_qualifiedNamePattern = 25;
+	public static readonly RULE_identifier = 26;
+	public static readonly RULE_identifierPattern = 27;
+	public static readonly RULE_constant = 28;
+	public static readonly RULE_limitCommand = 29;
+	public static readonly RULE_sortCommand = 30;
+	public static readonly RULE_orderExpression = 31;
+	public static readonly RULE_keepCommand = 32;
+	public static readonly RULE_dropCommand = 33;
+	public static readonly RULE_renameCommand = 34;
+	public static readonly RULE_renameClause = 35;
+	public static readonly RULE_dissectCommand = 36;
+	public static readonly RULE_grokCommand = 37;
+	public static readonly RULE_mvExpandCommand = 38;
+	public static readonly RULE_commandOptions = 39;
+	public static readonly RULE_commandOption = 40;
+	public static readonly RULE_booleanValue = 41;
+	public static readonly RULE_numericValue = 42;
+	public static readonly RULE_decimalValue = 43;
+	public static readonly RULE_integerValue = 44;
+	public static readonly RULE_string = 45;
+	public static readonly RULE_comparisonOperator = 46;
+	public static readonly RULE_explainCommand = 47;
+	public static readonly RULE_subqueryExpression = 48;
+	public static readonly RULE_showCommand = 49;
+	public static readonly RULE_metaCommand = 50;
+	public static readonly RULE_enrichCommand = 51;
+	public static readonly RULE_enrichWithClause = 52;
 	public static readonly literalNames: (string | null)[] = [ null, "'dissect'", 
                                                             "'drop'", "'enrich'", 
                                                             "'eval'", "'explain'", 
@@ -214,7 +217,8 @@ export default class esql_parser extends Parser {
                                                             null, "']'", 
                                                             null, null, 
                                                             null, null, 
-                                                            null, "'metadata'", 
+                                                            null, "'options'", 
+                                                            "'metadata'", 
                                                             null, null, 
                                                             null, null, 
                                                             null, null, 
@@ -248,7 +252,7 @@ export default class esql_parser extends Parser {
                                                              "WS", "EXPLAIN_WS", 
                                                              "EXPLAIN_LINE_COMMENT", 
                                                              "EXPLAIN_MULTILINE_COMMENT", 
-                                                             "PIPE", "STRING", 
+                                                             "PIPE", "QUOTED_STRING", 
                                                              "INTEGER_LITERAL", 
                                                              "DECIMAL_LITERAL", 
                                                              "BY", "AND", 
@@ -275,6 +279,7 @@ export default class esql_parser extends Parser {
                                                              "EXPR_LINE_COMMENT", 
                                                              "EXPR_MULTILINE_COMMENT", 
                                                              "EXPR_WS", 
+                                                             "OPTIONS", 
                                                              "METADATA", 
                                                              "FROM_UNQUOTED_IDENTIFIER", 
                                                              "FROM_LINE_COMMENT", 
@@ -314,14 +319,15 @@ export default class esql_parser extends Parser {
 		"singleStatement", "query", "sourceCommand", "processingCommand", "whereCommand", 
 		"booleanExpression", "regexBooleanExpression", "valueExpression", "operatorExpression", 
 		"primaryExpression", "functionExpression", "rowCommand", "fields", "field", 
-		"fromCommand", "metadata", "metadataOption", "deprecated_metadata", "evalCommand", 
-		"statsCommand", "inlinestatsCommand", "fromIdentifier", "qualifiedName", 
-		"qualifiedNamePattern", "identifier", "identifierPattern", "constant", 
-		"limitCommand", "sortCommand", "orderExpression", "keepCommand", "dropCommand", 
-		"renameCommand", "renameClause", "dissectCommand", "grokCommand", "mvExpandCommand", 
-		"commandOptions", "commandOption", "booleanValue", "numericValue", "decimalValue", 
-		"integerValue", "string", "comparisonOperator", "explainCommand", "subqueryExpression", 
-		"showCommand", "metaCommand", "enrichCommand", "enrichWithClause",
+		"fromCommand", "fromIdentifier", "fromOptions", "configOption", "metadata", 
+		"metadataOption", "deprecated_metadata", "evalCommand", "statsCommand", 
+		"inlinestatsCommand", "qualifiedName", "qualifiedNamePattern", "identifier", 
+		"identifierPattern", "constant", "limitCommand", "sortCommand", "orderExpression", 
+		"keepCommand", "dropCommand", "renameCommand", "renameClause", "dissectCommand", 
+		"grokCommand", "mvExpandCommand", "commandOptions", "commandOption", "booleanValue", 
+		"numericValue", "decimalValue", "integerValue", "string", "comparisonOperator", 
+		"explainCommand", "subqueryExpression", "showCommand", "metaCommand", 
+		"enrichCommand", "enrichWithClause",
 	];
 	public get grammarFileName(): string { return "esql_parser.g4"; }
 	public get literalNames(): (string | null)[] { return esql_parser.literalNames; }
@@ -344,9 +350,9 @@ export default class esql_parser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 102;
+			this.state = 106;
 			this.query(0);
-			this.state = 103;
+			this.state = 107;
 			this.match(esql_parser.EOF);
 			}
 		}
@@ -388,11 +394,11 @@ export default class esql_parser extends Parser {
 			this._ctx = localctx;
 			_prevctx = localctx;
 
-			this.state = 106;
+			this.state = 110;
 			this.sourceCommand();
 			}
 			this._ctx.stop = this._input.LT(-1);
-			this.state = 113;
+			this.state = 117;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 0, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -405,18 +411,18 @@ export default class esql_parser extends Parser {
 					{
 					localctx = new CompositeQueryContext(this, new QueryContext(this, _parentctx, _parentState));
 					this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_query);
-					this.state = 108;
+					this.state = 112;
 					if (!(this.precpred(this._ctx, 1))) {
 						throw this.createFailedPredicateException("this.precpred(this._ctx, 1)");
 					}
-					this.state = 109;
+					this.state = 113;
 					this.match(esql_parser.PIPE);
-					this.state = 110;
+					this.state = 114;
 					this.processingCommand();
 					}
 					}
 				}
-				this.state = 115;
+				this.state = 119;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 0, this._ctx);
 			}
@@ -441,41 +447,41 @@ export default class esql_parser extends Parser {
 		let localctx: SourceCommandContext = new SourceCommandContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 4, esql_parser.RULE_sourceCommand);
 		try {
-			this.state = 121;
+			this.state = 125;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 5:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 116;
+				this.state = 120;
 				this.explainCommand();
 				}
 				break;
 			case 6:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 117;
+				this.state = 121;
 				this.fromCommand();
 				}
 				break;
 			case 14:
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 118;
+				this.state = 122;
 				this.rowCommand();
 				}
 				break;
 			case 15:
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 119;
+				this.state = 123;
 				this.showCommand();
 				}
 				break;
 			case 11:
 				this.enterOuterAlt(localctx, 5);
 				{
-				this.state = 120;
+				this.state = 124;
 				this.metaCommand();
 				}
 				break;
@@ -502,97 +508,97 @@ export default class esql_parser extends Parser {
 		let localctx: ProcessingCommandContext = new ProcessingCommandContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 6, esql_parser.RULE_processingCommand);
 		try {
-			this.state = 136;
+			this.state = 140;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 4:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 123;
+				this.state = 127;
 				this.evalCommand();
 				}
 				break;
 			case 8:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 124;
+				this.state = 128;
 				this.inlinestatsCommand();
 				}
 				break;
 			case 10:
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 125;
+				this.state = 129;
 				this.limitCommand();
 				}
 				break;
 			case 9:
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 126;
+				this.state = 130;
 				this.keepCommand();
 				}
 				break;
 			case 16:
 				this.enterOuterAlt(localctx, 5);
 				{
-				this.state = 127;
+				this.state = 131;
 				this.sortCommand();
 				}
 				break;
 			case 17:
 				this.enterOuterAlt(localctx, 6);
 				{
-				this.state = 128;
+				this.state = 132;
 				this.statsCommand();
 				}
 				break;
 			case 18:
 				this.enterOuterAlt(localctx, 7);
 				{
-				this.state = 129;
+				this.state = 133;
 				this.whereCommand();
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 8);
 				{
-				this.state = 130;
+				this.state = 134;
 				this.dropCommand();
 				}
 				break;
 			case 13:
 				this.enterOuterAlt(localctx, 9);
 				{
-				this.state = 131;
+				this.state = 135;
 				this.renameCommand();
 				}
 				break;
 			case 1:
 				this.enterOuterAlt(localctx, 10);
 				{
-				this.state = 132;
+				this.state = 136;
 				this.dissectCommand();
 				}
 				break;
 			case 7:
 				this.enterOuterAlt(localctx, 11);
 				{
-				this.state = 133;
+				this.state = 137;
 				this.grokCommand();
 				}
 				break;
 			case 3:
 				this.enterOuterAlt(localctx, 12);
 				{
-				this.state = 134;
+				this.state = 138;
 				this.enrichCommand();
 				}
 				break;
 			case 12:
 				this.enterOuterAlt(localctx, 13);
 				{
-				this.state = 135;
+				this.state = 139;
 				this.mvExpandCommand();
 				}
 				break;
@@ -621,9 +627,9 @@ export default class esql_parser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 138;
+			this.state = 142;
 			this.match(esql_parser.WHERE);
-			this.state = 139;
+			this.state = 143;
 			this.booleanExpression(0);
 			}
 		}
@@ -661,7 +667,7 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 169;
+			this.state = 173;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 6, this._ctx) ) {
 			case 1:
@@ -670,9 +676,9 @@ export default class esql_parser extends Parser {
 				this._ctx = localctx;
 				_prevctx = localctx;
 
-				this.state = 142;
+				this.state = 146;
 				this.match(esql_parser.NOT);
-				this.state = 143;
+				this.state = 147;
 				this.booleanExpression(7);
 				}
 				break;
@@ -681,7 +687,7 @@ export default class esql_parser extends Parser {
 				localctx = new BooleanDefaultContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 144;
+				this.state = 148;
 				this.valueExpression();
 				}
 				break;
@@ -690,7 +696,7 @@ export default class esql_parser extends Parser {
 				localctx = new RegexExpressionContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 145;
+				this.state = 149;
 				this.regexBooleanExpression();
 				}
 				break;
@@ -699,41 +705,41 @@ export default class esql_parser extends Parser {
 				localctx = new LogicalInContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 146;
+				this.state = 150;
 				this.valueExpression();
-				this.state = 148;
+				this.state = 152;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===44) {
 					{
-					this.state = 147;
+					this.state = 151;
 					this.match(esql_parser.NOT);
 					}
 				}
 
-				this.state = 150;
+				this.state = 154;
 				this.match(esql_parser.IN);
-				this.state = 151;
+				this.state = 155;
 				this.match(esql_parser.LP);
-				this.state = 152;
+				this.state = 156;
 				this.valueExpression();
-				this.state = 157;
+				this.state = 161;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===34) {
 					{
 					{
-					this.state = 153;
+					this.state = 157;
 					this.match(esql_parser.COMMA);
-					this.state = 154;
+					this.state = 158;
 					this.valueExpression();
 					}
 					}
-					this.state = 159;
+					this.state = 163;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 160;
+				this.state = 164;
 				this.match(esql_parser.RP);
 				}
 				break;
@@ -742,27 +748,27 @@ export default class esql_parser extends Parser {
 				localctx = new IsNullContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 162;
+				this.state = 166;
 				this.valueExpression();
-				this.state = 163;
+				this.state = 167;
 				this.match(esql_parser.IS);
-				this.state = 165;
+				this.state = 169;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===44) {
 					{
-					this.state = 164;
+					this.state = 168;
 					this.match(esql_parser.NOT);
 					}
 				}
 
-				this.state = 167;
+				this.state = 171;
 				this.match(esql_parser.NULL);
 				}
 				break;
 			}
 			this._ctx.stop = this._input.LT(-1);
-			this.state = 179;
+			this.state = 183;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 8, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -772,7 +778,7 @@ export default class esql_parser extends Parser {
 					}
 					_prevctx = localctx;
 					{
-					this.state = 177;
+					this.state = 181;
 					this._errHandler.sync(this);
 					switch ( this._interp.adaptivePredict(this._input, 7, this._ctx) ) {
 					case 1:
@@ -780,13 +786,13 @@ export default class esql_parser extends Parser {
 						localctx = new LogicalBinaryContext(this, new BooleanExpressionContext(this, _parentctx, _parentState));
 						(localctx as LogicalBinaryContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_booleanExpression);
-						this.state = 171;
+						this.state = 175;
 						if (!(this.precpred(this._ctx, 4))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 4)");
 						}
-						this.state = 172;
+						this.state = 176;
 						(localctx as LogicalBinaryContext)._operator = this.match(esql_parser.AND);
-						this.state = 173;
+						this.state = 177;
 						(localctx as LogicalBinaryContext)._right = this.booleanExpression(5);
 						}
 						break;
@@ -795,20 +801,20 @@ export default class esql_parser extends Parser {
 						localctx = new LogicalBinaryContext(this, new BooleanExpressionContext(this, _parentctx, _parentState));
 						(localctx as LogicalBinaryContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_booleanExpression);
-						this.state = 174;
+						this.state = 178;
 						if (!(this.precpred(this._ctx, 3))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 3)");
 						}
-						this.state = 175;
+						this.state = 179;
 						(localctx as LogicalBinaryContext)._operator = this.match(esql_parser.OR);
-						this.state = 176;
+						this.state = 180;
 						(localctx as LogicalBinaryContext)._right = this.booleanExpression(4);
 						}
 						break;
 					}
 					}
 				}
-				this.state = 181;
+				this.state = 185;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 8, this._ctx);
 			}
@@ -834,48 +840,48 @@ export default class esql_parser extends Parser {
 		this.enterRule(localctx, 12, esql_parser.RULE_regexBooleanExpression);
 		let _la: number;
 		try {
-			this.state = 196;
+			this.state = 200;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 11, this._ctx) ) {
 			case 1:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 182;
+				this.state = 186;
 				this.valueExpression();
-				this.state = 184;
+				this.state = 188;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===44) {
 					{
-					this.state = 183;
+					this.state = 187;
 					this.match(esql_parser.NOT);
 					}
 				}
 
-				this.state = 186;
+				this.state = 190;
 				localctx._kind = this.match(esql_parser.LIKE);
-				this.state = 187;
+				this.state = 191;
 				localctx._pattern = this.string_();
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 189;
+				this.state = 193;
 				this.valueExpression();
-				this.state = 191;
+				this.state = 195;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===44) {
 					{
-					this.state = 190;
+					this.state = 194;
 					this.match(esql_parser.NOT);
 					}
 				}
 
-				this.state = 193;
+				this.state = 197;
 				localctx._kind = this.match(esql_parser.RLIKE);
-				this.state = 194;
+				this.state = 198;
 				localctx._pattern = this.string_();
 				}
 				break;
@@ -900,14 +906,14 @@ export default class esql_parser extends Parser {
 		let localctx: ValueExpressionContext = new ValueExpressionContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 14, esql_parser.RULE_valueExpression);
 		try {
-			this.state = 203;
+			this.state = 207;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 12, this._ctx) ) {
 			case 1:
 				localctx = new ValueExpressionDefaultContext(this, localctx);
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 198;
+				this.state = 202;
 				this.operatorExpression(0);
 				}
 				break;
@@ -915,11 +921,11 @@ export default class esql_parser extends Parser {
 				localctx = new ComparisonContext(this, localctx);
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 199;
+				this.state = 203;
 				(localctx as ComparisonContext)._left = this.operatorExpression(0);
-				this.state = 200;
+				this.state = 204;
 				this.comparisonOperator();
-				this.state = 201;
+				this.state = 205;
 				(localctx as ComparisonContext)._right = this.operatorExpression(0);
 				}
 				break;
@@ -959,7 +965,7 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 209;
+			this.state = 213;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 13, this._ctx) ) {
 			case 1:
@@ -968,7 +974,7 @@ export default class esql_parser extends Parser {
 				this._ctx = localctx;
 				_prevctx = localctx;
 
-				this.state = 206;
+				this.state = 210;
 				this.primaryExpression();
 				}
 				break;
@@ -977,7 +983,7 @@ export default class esql_parser extends Parser {
 				localctx = new ArithmeticUnaryContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 207;
+				this.state = 211;
 				(localctx as ArithmeticUnaryContext)._operator = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!(_la===59 || _la===60)) {
@@ -987,13 +993,13 @@ export default class esql_parser extends Parser {
 					this._errHandler.reportMatch(this);
 				    this.consume();
 				}
-				this.state = 208;
+				this.state = 212;
 				this.operatorExpression(3);
 				}
 				break;
 			}
 			this._ctx.stop = this._input.LT(-1);
-			this.state = 219;
+			this.state = 223;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 15, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -1003,7 +1009,7 @@ export default class esql_parser extends Parser {
 					}
 					_prevctx = localctx;
 					{
-					this.state = 217;
+					this.state = 221;
 					this._errHandler.sync(this);
 					switch ( this._interp.adaptivePredict(this._input, 14, this._ctx) ) {
 					case 1:
@@ -1011,11 +1017,11 @@ export default class esql_parser extends Parser {
 						localctx = new ArithmeticBinaryContext(this, new OperatorExpressionContext(this, _parentctx, _parentState));
 						(localctx as ArithmeticBinaryContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_operatorExpression);
-						this.state = 211;
+						this.state = 215;
 						if (!(this.precpred(this._ctx, 2))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 2)");
 						}
-						this.state = 212;
+						this.state = 216;
 						(localctx as ArithmeticBinaryContext)._operator = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!(((((_la - 61)) & ~0x1F) === 0 && ((1 << (_la - 61)) & 7) !== 0))) {
@@ -1025,7 +1031,7 @@ export default class esql_parser extends Parser {
 							this._errHandler.reportMatch(this);
 						    this.consume();
 						}
-						this.state = 213;
+						this.state = 217;
 						(localctx as ArithmeticBinaryContext)._right = this.operatorExpression(3);
 						}
 						break;
@@ -1034,11 +1040,11 @@ export default class esql_parser extends Parser {
 						localctx = new ArithmeticBinaryContext(this, new OperatorExpressionContext(this, _parentctx, _parentState));
 						(localctx as ArithmeticBinaryContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_operatorExpression);
-						this.state = 214;
+						this.state = 218;
 						if (!(this.precpred(this._ctx, 1))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 1)");
 						}
-						this.state = 215;
+						this.state = 219;
 						(localctx as ArithmeticBinaryContext)._operator = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!(_la===59 || _la===60)) {
@@ -1048,14 +1054,14 @@ export default class esql_parser extends Parser {
 							this._errHandler.reportMatch(this);
 						    this.consume();
 						}
-						this.state = 216;
+						this.state = 220;
 						(localctx as ArithmeticBinaryContext)._right = this.operatorExpression(2);
 						}
 						break;
 					}
 					}
 				}
-				this.state = 221;
+				this.state = 225;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 15, this._ctx);
 			}
@@ -1080,14 +1086,14 @@ export default class esql_parser extends Parser {
 		let localctx: PrimaryExpressionContext = new PrimaryExpressionContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 18, esql_parser.RULE_primaryExpression);
 		try {
-			this.state = 229;
+			this.state = 233;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 16, this._ctx) ) {
 			case 1:
 				localctx = new ConstantDefaultContext(this, localctx);
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 222;
+				this.state = 226;
 				this.constant();
 				}
 				break;
@@ -1095,7 +1101,7 @@ export default class esql_parser extends Parser {
 				localctx = new DereferenceContext(this, localctx);
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 223;
+				this.state = 227;
 				this.qualifiedName();
 				}
 				break;
@@ -1103,7 +1109,7 @@ export default class esql_parser extends Parser {
 				localctx = new FunctionContext(this, localctx);
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 224;
+				this.state = 228;
 				this.functionExpression();
 				}
 				break;
@@ -1111,11 +1117,11 @@ export default class esql_parser extends Parser {
 				localctx = new ParenthesizedExpressionContext(this, localctx);
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 225;
+				this.state = 229;
 				this.match(esql_parser.LP);
-				this.state = 226;
+				this.state = 230;
 				this.booleanExpression(0);
-				this.state = 227;
+				this.state = 231;
 				this.match(esql_parser.RP);
 				}
 				break;
@@ -1143,16 +1149,16 @@ export default class esql_parser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 231;
+			this.state = 235;
 			this.identifier();
-			this.state = 232;
+			this.state = 236;
 			this.match(esql_parser.LP);
-			this.state = 242;
+			this.state = 246;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 61:
 				{
-				this.state = 233;
+				this.state = 237;
 				this.match(esql_parser.ASTERISK);
 				}
 				break;
@@ -1172,21 +1178,21 @@ export default class esql_parser extends Parser {
 			case 67:
 				{
 				{
-				this.state = 234;
+				this.state = 238;
 				this.booleanExpression(0);
-				this.state = 239;
+				this.state = 243;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===34) {
 					{
 					{
-					this.state = 235;
+					this.state = 239;
 					this.match(esql_parser.COMMA);
-					this.state = 236;
+					this.state = 240;
 					this.booleanExpression(0);
 					}
 					}
-					this.state = 241;
+					this.state = 245;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
@@ -1198,7 +1204,7 @@ export default class esql_parser extends Parser {
 			default:
 				break;
 			}
-			this.state = 244;
+			this.state = 248;
 			this.match(esql_parser.RP);
 			}
 		}
@@ -1223,9 +1229,9 @@ export default class esql_parser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 246;
+			this.state = 250;
 			this.match(esql_parser.ROW);
-			this.state = 247;
+			this.state = 251;
 			this.fields();
 			}
 		}
@@ -1251,23 +1257,23 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 249;
+			this.state = 253;
 			this.field();
-			this.state = 254;
+			this.state = 258;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 19, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 250;
+					this.state = 254;
 					this.match(esql_parser.COMMA);
-					this.state = 251;
+					this.state = 255;
 					this.field();
 					}
 					}
 				}
-				this.state = 256;
+				this.state = 260;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 19, this._ctx);
 			}
@@ -1292,24 +1298,24 @@ export default class esql_parser extends Parser {
 		let localctx: FieldContext = new FieldContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 26, esql_parser.RULE_field);
 		try {
-			this.state = 262;
+			this.state = 266;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 20, this._ctx) ) {
 			case 1:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 257;
+				this.state = 261;
 				this.booleanExpression(0);
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 258;
+				this.state = 262;
 				this.qualifiedName();
-				this.state = 259;
+				this.state = 263;
 				this.match(esql_parser.ASSIGN);
-				this.state = 260;
+				this.state = 264;
 				this.booleanExpression(0);
 				}
 				break;
@@ -1337,34 +1343,44 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 264;
+			this.state = 268;
 			this.match(esql_parser.FROM);
-			this.state = 265;
+			this.state = 269;
 			this.fromIdentifier();
-			this.state = 270;
+			this.state = 274;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 21, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 266;
+					this.state = 270;
 					this.match(esql_parser.COMMA);
-					this.state = 267;
+					this.state = 271;
 					this.fromIdentifier();
 					}
 					}
 				}
-				this.state = 272;
+				this.state = 276;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 21, this._ctx);
 			}
-			this.state = 274;
+			this.state = 278;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 22, this._ctx) ) {
 			case 1:
 				{
-				this.state = 273;
+				this.state = 277;
+				this.fromOptions();
+				}
+				break;
+			}
+			this.state = 281;
+			this._errHandler.sync(this);
+			switch ( this._interp.adaptivePredict(this._input, 23, this._ctx) ) {
+			case 1:
+				{
+				this.state = 280;
 				this.metadata();
 				}
 				break;
@@ -1386,24 +1402,132 @@ export default class esql_parser extends Parser {
 		return localctx;
 	}
 	// @RuleVersion(0)
+	public fromIdentifier(): FromIdentifierContext {
+		let localctx: FromIdentifierContext = new FromIdentifierContext(this, this._ctx, this.state);
+		this.enterRule(localctx, 30, esql_parser.RULE_fromIdentifier);
+		let _la: number;
+		try {
+			this.enterOuterAlt(localctx, 1);
+			{
+			this.state = 283;
+			_la = this._input.LA(1);
+			if(!(_la===67 || _la===73)) {
+			this._errHandler.recoverInline(this);
+			}
+			else {
+				this._errHandler.reportMatch(this);
+			    this.consume();
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return localctx;
+	}
+	// @RuleVersion(0)
+	public fromOptions(): FromOptionsContext {
+		let localctx: FromOptionsContext = new FromOptionsContext(this, this._ctx, this.state);
+		this.enterRule(localctx, 32, esql_parser.RULE_fromOptions);
+		try {
+			let _alt: number;
+			this.enterOuterAlt(localctx, 1);
+			{
+			this.state = 285;
+			this.match(esql_parser.OPTIONS);
+			this.state = 286;
+			this.configOption();
+			this.state = 291;
+			this._errHandler.sync(this);
+			_alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
+			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
+				if (_alt === 1) {
+					{
+					{
+					this.state = 287;
+					this.match(esql_parser.COMMA);
+					this.state = 288;
+					this.configOption();
+					}
+					}
+				}
+				this.state = 293;
+				this._errHandler.sync(this);
+				_alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
+			}
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return localctx;
+	}
+	// @RuleVersion(0)
+	public configOption(): ConfigOptionContext {
+		let localctx: ConfigOptionContext = new ConfigOptionContext(this, this._ctx, this.state);
+		this.enterRule(localctx, 34, esql_parser.RULE_configOption);
+		try {
+			this.enterOuterAlt(localctx, 1);
+			{
+			this.state = 294;
+			this.string_();
+			this.state = 295;
+			this.match(esql_parser.ASSIGN);
+			this.state = 296;
+			this.string_();
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return localctx;
+	}
+	// @RuleVersion(0)
 	public metadata(): MetadataContext {
 		let localctx: MetadataContext = new MetadataContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 30, esql_parser.RULE_metadata);
+		this.enterRule(localctx, 36, esql_parser.RULE_metadata);
 		try {
-			this.state = 278;
+			this.state = 300;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
-			case 71:
+			case 72:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 276;
+				this.state = 298;
 				this.metadataOption();
 				}
 				break;
 			case 64:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 277;
+				this.state = 299;
 				this.deprecated_metadata();
 				}
 				break;
@@ -1428,32 +1552,32 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public metadataOption(): MetadataOptionContext {
 		let localctx: MetadataOptionContext = new MetadataOptionContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 32, esql_parser.RULE_metadataOption);
+		this.enterRule(localctx, 38, esql_parser.RULE_metadataOption);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 280;
+			this.state = 302;
 			this.match(esql_parser.METADATA);
-			this.state = 281;
+			this.state = 303;
 			this.fromIdentifier();
-			this.state = 286;
+			this.state = 308;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 282;
+					this.state = 304;
 					this.match(esql_parser.COMMA);
-					this.state = 283;
+					this.state = 305;
 					this.fromIdentifier();
 					}
 					}
 				}
-				this.state = 288;
+				this.state = 310;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 24, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
 			}
 			}
 		}
@@ -1474,15 +1598,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public deprecated_metadata(): Deprecated_metadataContext {
 		let localctx: Deprecated_metadataContext = new Deprecated_metadataContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 34, esql_parser.RULE_deprecated_metadata);
+		this.enterRule(localctx, 40, esql_parser.RULE_deprecated_metadata);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 289;
+			this.state = 311;
 			this.match(esql_parser.OPENING_BRACKET);
-			this.state = 290;
+			this.state = 312;
 			this.metadataOption();
-			this.state = 291;
+			this.state = 313;
 			this.match(esql_parser.CLOSING_BRACKET);
 			}
 		}
@@ -1503,13 +1627,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public evalCommand(): EvalCommandContext {
 		let localctx: EvalCommandContext = new EvalCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 36, esql_parser.RULE_evalCommand);
+		this.enterRule(localctx, 42, esql_parser.RULE_evalCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 293;
+			this.state = 315;
 			this.match(esql_parser.EVAL);
-			this.state = 294;
+			this.state = 316;
 			this.fields();
 			}
 		}
@@ -1530,30 +1654,30 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public statsCommand(): StatsCommandContext {
 		let localctx: StatsCommandContext = new StatsCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 38, esql_parser.RULE_statsCommand);
+		this.enterRule(localctx, 44, esql_parser.RULE_statsCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 296;
+			this.state = 318;
 			this.match(esql_parser.STATS);
-			this.state = 298;
+			this.state = 320;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 25, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 27, this._ctx) ) {
 			case 1:
 				{
-				this.state = 297;
+				this.state = 319;
 				localctx._stats = this.fields();
 				}
 				break;
 			}
-			this.state = 302;
+			this.state = 324;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 26, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 28, this._ctx) ) {
 			case 1:
 				{
-				this.state = 300;
+				this.state = 322;
 				this.match(esql_parser.BY);
-				this.state = 301;
+				this.state = 323;
 				localctx._grouping = this.fields();
 				}
 				break;
@@ -1577,22 +1701,22 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public inlinestatsCommand(): InlinestatsCommandContext {
 		let localctx: InlinestatsCommandContext = new InlinestatsCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 40, esql_parser.RULE_inlinestatsCommand);
+		this.enterRule(localctx, 46, esql_parser.RULE_inlinestatsCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 304;
+			this.state = 326;
 			this.match(esql_parser.INLINESTATS);
-			this.state = 305;
+			this.state = 327;
 			localctx._stats = this.fields();
-			this.state = 308;
+			this.state = 330;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 27, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 29, this._ctx) ) {
 			case 1:
 				{
-				this.state = 306;
+				this.state = 328;
 				this.match(esql_parser.BY);
-				this.state = 307;
+				this.state = 329;
 				localctx._grouping = this.fields();
 				}
 				break;
@@ -1614,65 +1738,32 @@ export default class esql_parser extends Parser {
 		return localctx;
 	}
 	// @RuleVersion(0)
-	public fromIdentifier(): FromIdentifierContext {
-		let localctx: FromIdentifierContext = new FromIdentifierContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 42, esql_parser.RULE_fromIdentifier);
-		let _la: number;
-		try {
-			this.enterOuterAlt(localctx, 1);
-			{
-			this.state = 310;
-			_la = this._input.LA(1);
-			if(!(_la===67 || _la===72)) {
-			this._errHandler.recoverInline(this);
-			}
-			else {
-				this._errHandler.reportMatch(this);
-			    this.consume();
-			}
-			}
-		}
-		catch (re) {
-			if (re instanceof RecognitionException) {
-				localctx.exception = re;
-				this._errHandler.reportError(this, re);
-				this._errHandler.recover(this, re);
-			} else {
-				throw re;
-			}
-		}
-		finally {
-			this.exitRule();
-		}
-		return localctx;
-	}
-	// @RuleVersion(0)
 	public qualifiedName(): QualifiedNameContext {
 		let localctx: QualifiedNameContext = new QualifiedNameContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 44, esql_parser.RULE_qualifiedName);
+		this.enterRule(localctx, 48, esql_parser.RULE_qualifiedName);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 312;
+			this.state = 332;
 			this.identifier();
-			this.state = 317;
+			this.state = 337;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 28, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 30, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 313;
+					this.state = 333;
 					this.match(esql_parser.DOT);
-					this.state = 314;
+					this.state = 334;
 					this.identifier();
 					}
 					}
 				}
-				this.state = 319;
+				this.state = 339;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 28, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 30, this._ctx);
 			}
 			}
 		}
@@ -1693,30 +1784,30 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public qualifiedNamePattern(): QualifiedNamePatternContext {
 		let localctx: QualifiedNamePatternContext = new QualifiedNamePatternContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 46, esql_parser.RULE_qualifiedNamePattern);
+		this.enterRule(localctx, 50, esql_parser.RULE_qualifiedNamePattern);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 320;
+			this.state = 340;
 			this.identifierPattern();
-			this.state = 325;
+			this.state = 345;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 29, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 31, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 321;
+					this.state = 341;
 					this.match(esql_parser.DOT);
-					this.state = 322;
+					this.state = 342;
 					this.identifierPattern();
 					}
 					}
 				}
-				this.state = 327;
+				this.state = 347;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 29, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 31, this._ctx);
 			}
 			}
 		}
@@ -1737,12 +1828,12 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public identifier(): IdentifierContext {
 		let localctx: IdentifierContext = new IdentifierContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 48, esql_parser.RULE_identifier);
+		this.enterRule(localctx, 52, esql_parser.RULE_identifier);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 328;
+			this.state = 348;
 			_la = this._input.LA(1);
 			if(!(_la===66 || _la===67)) {
 			this._errHandler.recoverInline(this);
@@ -1770,11 +1861,11 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public identifierPattern(): IdentifierPatternContext {
 		let localctx: IdentifierPatternContext = new IdentifierPatternContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 50, esql_parser.RULE_identifierPattern);
+		this.enterRule(localctx, 54, esql_parser.RULE_identifierPattern);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 330;
+			this.state = 350;
 			this.match(esql_parser.ID_PATTERN);
 			}
 		}
@@ -1795,17 +1886,17 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public constant(): ConstantContext {
 		let localctx: ConstantContext = new ConstantContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 52, esql_parser.RULE_constant);
+		this.enterRule(localctx, 56, esql_parser.RULE_constant);
 		let _la: number;
 		try {
-			this.state = 374;
+			this.state = 394;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 33, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 35, this._ctx) ) {
 			case 1:
 				localctx = new NullLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 332;
+				this.state = 352;
 				this.match(esql_parser.NULL);
 				}
 				break;
@@ -1813,9 +1904,9 @@ export default class esql_parser extends Parser {
 				localctx = new QualifiedIntegerLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 333;
+				this.state = 353;
 				this.integerValue();
-				this.state = 334;
+				this.state = 354;
 				this.match(esql_parser.UNQUOTED_IDENTIFIER);
 				}
 				break;
@@ -1823,7 +1914,7 @@ export default class esql_parser extends Parser {
 				localctx = new DecimalLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 336;
+				this.state = 356;
 				this.decimalValue();
 				}
 				break;
@@ -1831,7 +1922,7 @@ export default class esql_parser extends Parser {
 				localctx = new IntegerLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 337;
+				this.state = 357;
 				this.integerValue();
 				}
 				break;
@@ -1839,7 +1930,7 @@ export default class esql_parser extends Parser {
 				localctx = new BooleanLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 5);
 				{
-				this.state = 338;
+				this.state = 358;
 				this.booleanValue();
 				}
 				break;
@@ -1847,7 +1938,7 @@ export default class esql_parser extends Parser {
 				localctx = new InputParamContext(this, localctx);
 				this.enterOuterAlt(localctx, 6);
 				{
-				this.state = 339;
+				this.state = 359;
 				this.match(esql_parser.PARAM);
 				}
 				break;
@@ -1855,7 +1946,7 @@ export default class esql_parser extends Parser {
 				localctx = new StringLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 7);
 				{
-				this.state = 340;
+				this.state = 360;
 				this.string_();
 				}
 				break;
@@ -1863,27 +1954,27 @@ export default class esql_parser extends Parser {
 				localctx = new NumericArrayLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 8);
 				{
-				this.state = 341;
+				this.state = 361;
 				this.match(esql_parser.OPENING_BRACKET);
-				this.state = 342;
+				this.state = 362;
 				this.numericValue();
-				this.state = 347;
+				this.state = 367;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===34) {
 					{
 					{
-					this.state = 343;
+					this.state = 363;
 					this.match(esql_parser.COMMA);
-					this.state = 344;
+					this.state = 364;
 					this.numericValue();
 					}
 					}
-					this.state = 349;
+					this.state = 369;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 350;
+				this.state = 370;
 				this.match(esql_parser.CLOSING_BRACKET);
 				}
 				break;
@@ -1891,27 +1982,27 @@ export default class esql_parser extends Parser {
 				localctx = new BooleanArrayLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 9);
 				{
-				this.state = 352;
+				this.state = 372;
 				this.match(esql_parser.OPENING_BRACKET);
-				this.state = 353;
+				this.state = 373;
 				this.booleanValue();
-				this.state = 358;
+				this.state = 378;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===34) {
 					{
 					{
-					this.state = 354;
+					this.state = 374;
 					this.match(esql_parser.COMMA);
-					this.state = 355;
+					this.state = 375;
 					this.booleanValue();
 					}
 					}
-					this.state = 360;
+					this.state = 380;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 361;
+				this.state = 381;
 				this.match(esql_parser.CLOSING_BRACKET);
 				}
 				break;
@@ -1919,27 +2010,27 @@ export default class esql_parser extends Parser {
 				localctx = new StringArrayLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 10);
 				{
-				this.state = 363;
+				this.state = 383;
 				this.match(esql_parser.OPENING_BRACKET);
-				this.state = 364;
+				this.state = 384;
 				this.string_();
-				this.state = 369;
+				this.state = 389;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===34) {
 					{
 					{
-					this.state = 365;
+					this.state = 385;
 					this.match(esql_parser.COMMA);
-					this.state = 366;
+					this.state = 386;
 					this.string_();
 					}
 					}
-					this.state = 371;
+					this.state = 391;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 372;
+				this.state = 392;
 				this.match(esql_parser.CLOSING_BRACKET);
 				}
 				break;
@@ -1962,13 +2053,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public limitCommand(): LimitCommandContext {
 		let localctx: LimitCommandContext = new LimitCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 54, esql_parser.RULE_limitCommand);
+		this.enterRule(localctx, 58, esql_parser.RULE_limitCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 376;
+			this.state = 396;
 			this.match(esql_parser.LIMIT);
-			this.state = 377;
+			this.state = 397;
 			this.match(esql_parser.INTEGER_LITERAL);
 			}
 		}
@@ -1989,32 +2080,32 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public sortCommand(): SortCommandContext {
 		let localctx: SortCommandContext = new SortCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 56, esql_parser.RULE_sortCommand);
+		this.enterRule(localctx, 60, esql_parser.RULE_sortCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 379;
+			this.state = 399;
 			this.match(esql_parser.SORT);
-			this.state = 380;
+			this.state = 400;
 			this.orderExpression();
-			this.state = 385;
+			this.state = 405;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 34, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 36, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 381;
+					this.state = 401;
 					this.match(esql_parser.COMMA);
-					this.state = 382;
+					this.state = 402;
 					this.orderExpression();
 					}
 					}
 				}
-				this.state = 387;
+				this.state = 407;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 34, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 36, this._ctx);
 			}
 			}
 		}
@@ -2035,19 +2126,19 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public orderExpression(): OrderExpressionContext {
 		let localctx: OrderExpressionContext = new OrderExpressionContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 58, esql_parser.RULE_orderExpression);
+		this.enterRule(localctx, 62, esql_parser.RULE_orderExpression);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 388;
+			this.state = 408;
 			this.booleanExpression(0);
-			this.state = 390;
+			this.state = 410;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 35, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 37, this._ctx) ) {
 			case 1:
 				{
-				this.state = 389;
+				this.state = 409;
 				localctx._ordering = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!(_la===32 || _la===35)) {
@@ -2060,14 +2151,14 @@ export default class esql_parser extends Parser {
 				}
 				break;
 			}
-			this.state = 394;
+			this.state = 414;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 36, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 38, this._ctx) ) {
 			case 1:
 				{
-				this.state = 392;
+				this.state = 412;
 				this.match(esql_parser.NULLS);
-				this.state = 393;
+				this.state = 413;
 				localctx._nullOrdering = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!(_la===38 || _la===39)) {
@@ -2099,32 +2190,32 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public keepCommand(): KeepCommandContext {
 		let localctx: KeepCommandContext = new KeepCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 60, esql_parser.RULE_keepCommand);
+		this.enterRule(localctx, 64, esql_parser.RULE_keepCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 396;
+			this.state = 416;
 			this.match(esql_parser.KEEP);
-			this.state = 397;
+			this.state = 417;
 			this.qualifiedNamePattern();
-			this.state = 402;
+			this.state = 422;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 37, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 39, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 398;
+					this.state = 418;
 					this.match(esql_parser.COMMA);
-					this.state = 399;
+					this.state = 419;
 					this.qualifiedNamePattern();
 					}
 					}
 				}
-				this.state = 404;
+				this.state = 424;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 37, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 39, this._ctx);
 			}
 			}
 		}
@@ -2145,32 +2236,32 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public dropCommand(): DropCommandContext {
 		let localctx: DropCommandContext = new DropCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 62, esql_parser.RULE_dropCommand);
+		this.enterRule(localctx, 66, esql_parser.RULE_dropCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 405;
+			this.state = 425;
 			this.match(esql_parser.DROP);
-			this.state = 406;
+			this.state = 426;
 			this.qualifiedNamePattern();
-			this.state = 411;
+			this.state = 431;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 38, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 40, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 407;
+					this.state = 427;
 					this.match(esql_parser.COMMA);
-					this.state = 408;
+					this.state = 428;
 					this.qualifiedNamePattern();
 					}
 					}
 				}
-				this.state = 413;
+				this.state = 433;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 38, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 40, this._ctx);
 			}
 			}
 		}
@@ -2191,32 +2282,32 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public renameCommand(): RenameCommandContext {
 		let localctx: RenameCommandContext = new RenameCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 64, esql_parser.RULE_renameCommand);
+		this.enterRule(localctx, 68, esql_parser.RULE_renameCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 414;
+			this.state = 434;
 			this.match(esql_parser.RENAME);
-			this.state = 415;
+			this.state = 435;
 			this.renameClause();
-			this.state = 420;
+			this.state = 440;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 39, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 41, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 416;
+					this.state = 436;
 					this.match(esql_parser.COMMA);
-					this.state = 417;
+					this.state = 437;
 					this.renameClause();
 					}
 					}
 				}
-				this.state = 422;
+				this.state = 442;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 39, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 41, this._ctx);
 			}
 			}
 		}
@@ -2237,15 +2328,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public renameClause(): RenameClauseContext {
 		let localctx: RenameClauseContext = new RenameClauseContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 66, esql_parser.RULE_renameClause);
+		this.enterRule(localctx, 70, esql_parser.RULE_renameClause);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 423;
+			this.state = 443;
 			localctx._oldName = this.qualifiedNamePattern();
-			this.state = 424;
+			this.state = 444;
 			this.match(esql_parser.AS);
-			this.state = 425;
+			this.state = 445;
 			localctx._newName = this.qualifiedNamePattern();
 			}
 		}
@@ -2266,22 +2357,22 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public dissectCommand(): DissectCommandContext {
 		let localctx: DissectCommandContext = new DissectCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 68, esql_parser.RULE_dissectCommand);
+		this.enterRule(localctx, 72, esql_parser.RULE_dissectCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 427;
+			this.state = 447;
 			this.match(esql_parser.DISSECT);
-			this.state = 428;
+			this.state = 448;
 			this.primaryExpression();
-			this.state = 429;
+			this.state = 449;
 			this.string_();
-			this.state = 431;
+			this.state = 451;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 40, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 42, this._ctx) ) {
 			case 1:
 				{
-				this.state = 430;
+				this.state = 450;
 				this.commandOptions();
 				}
 				break;
@@ -2305,15 +2396,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public grokCommand(): GrokCommandContext {
 		let localctx: GrokCommandContext = new GrokCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 70, esql_parser.RULE_grokCommand);
+		this.enterRule(localctx, 74, esql_parser.RULE_grokCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 433;
+			this.state = 453;
 			this.match(esql_parser.GROK);
-			this.state = 434;
+			this.state = 454;
 			this.primaryExpression();
-			this.state = 435;
+			this.state = 455;
 			this.string_();
 			}
 		}
@@ -2334,13 +2425,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public mvExpandCommand(): MvExpandCommandContext {
 		let localctx: MvExpandCommandContext = new MvExpandCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 72, esql_parser.RULE_mvExpandCommand);
+		this.enterRule(localctx, 76, esql_parser.RULE_mvExpandCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 437;
+			this.state = 457;
 			this.match(esql_parser.MV_EXPAND);
-			this.state = 438;
+			this.state = 458;
 			this.qualifiedName();
 			}
 		}
@@ -2361,30 +2452,30 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public commandOptions(): CommandOptionsContext {
 		let localctx: CommandOptionsContext = new CommandOptionsContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 74, esql_parser.RULE_commandOptions);
+		this.enterRule(localctx, 78, esql_parser.RULE_commandOptions);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 440;
+			this.state = 460;
 			this.commandOption();
-			this.state = 445;
+			this.state = 465;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 41, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 43, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 441;
+					this.state = 461;
 					this.match(esql_parser.COMMA);
-					this.state = 442;
+					this.state = 462;
 					this.commandOption();
 					}
 					}
 				}
-				this.state = 447;
+				this.state = 467;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 41, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 43, this._ctx);
 			}
 			}
 		}
@@ -2405,15 +2496,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public commandOption(): CommandOptionContext {
 		let localctx: CommandOptionContext = new CommandOptionContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 76, esql_parser.RULE_commandOption);
+		this.enterRule(localctx, 80, esql_parser.RULE_commandOption);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 448;
+			this.state = 468;
 			this.identifier();
-			this.state = 449;
+			this.state = 469;
 			this.match(esql_parser.ASSIGN);
-			this.state = 450;
+			this.state = 470;
 			this.constant();
 			}
 		}
@@ -2434,12 +2525,12 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public booleanValue(): BooleanValueContext {
 		let localctx: BooleanValueContext = new BooleanValueContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 78, esql_parser.RULE_booleanValue);
+		this.enterRule(localctx, 82, esql_parser.RULE_booleanValue);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 452;
+			this.state = 472;
 			_la = this._input.LA(1);
 			if(!(_la===37 || _la===51)) {
 			this._errHandler.recoverInline(this);
@@ -2467,22 +2558,22 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public numericValue(): NumericValueContext {
 		let localctx: NumericValueContext = new NumericValueContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 80, esql_parser.RULE_numericValue);
+		this.enterRule(localctx, 84, esql_parser.RULE_numericValue);
 		try {
-			this.state = 456;
+			this.state = 476;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 42, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 44, this._ctx) ) {
 			case 1:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 454;
+				this.state = 474;
 				this.decimalValue();
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 455;
+				this.state = 475;
 				this.integerValue();
 				}
 				break;
@@ -2505,17 +2596,17 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public decimalValue(): DecimalValueContext {
 		let localctx: DecimalValueContext = new DecimalValueContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 82, esql_parser.RULE_decimalValue);
+		this.enterRule(localctx, 86, esql_parser.RULE_decimalValue);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 459;
+			this.state = 479;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if (_la===59 || _la===60) {
 				{
-				this.state = 458;
+				this.state = 478;
 				_la = this._input.LA(1);
 				if(!(_la===59 || _la===60)) {
 				this._errHandler.recoverInline(this);
@@ -2527,7 +2618,7 @@ export default class esql_parser extends Parser {
 				}
 			}
 
-			this.state = 461;
+			this.state = 481;
 			this.match(esql_parser.DECIMAL_LITERAL);
 			}
 		}
@@ -2548,17 +2639,17 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public integerValue(): IntegerValueContext {
 		let localctx: IntegerValueContext = new IntegerValueContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 84, esql_parser.RULE_integerValue);
+		this.enterRule(localctx, 88, esql_parser.RULE_integerValue);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 464;
+			this.state = 484;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if (_la===59 || _la===60) {
 				{
-				this.state = 463;
+				this.state = 483;
 				_la = this._input.LA(1);
 				if(!(_la===59 || _la===60)) {
 				this._errHandler.recoverInline(this);
@@ -2570,7 +2661,7 @@ export default class esql_parser extends Parser {
 				}
 			}
 
-			this.state = 466;
+			this.state = 486;
 			this.match(esql_parser.INTEGER_LITERAL);
 			}
 		}
@@ -2591,12 +2682,12 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public string_(): StringContext {
 		let localctx: StringContext = new StringContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 86, esql_parser.RULE_string);
+		this.enterRule(localctx, 90, esql_parser.RULE_string);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 468;
-			this.match(esql_parser.STRING);
+			this.state = 488;
+			this.match(esql_parser.QUOTED_STRING);
 			}
 		}
 		catch (re) {
@@ -2616,12 +2707,12 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public comparisonOperator(): ComparisonOperatorContext {
 		let localctx: ComparisonOperatorContext = new ComparisonOperatorContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 88, esql_parser.RULE_comparisonOperator);
+		this.enterRule(localctx, 92, esql_parser.RULE_comparisonOperator);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 470;
+			this.state = 490;
 			_la = this._input.LA(1);
 			if(!(((((_la - 52)) & ~0x1F) === 0 && ((1 << (_la - 52)) & 125) !== 0))) {
 			this._errHandler.recoverInline(this);
@@ -2649,13 +2740,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public explainCommand(): ExplainCommandContext {
 		let localctx: ExplainCommandContext = new ExplainCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 90, esql_parser.RULE_explainCommand);
+		this.enterRule(localctx, 94, esql_parser.RULE_explainCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 472;
+			this.state = 492;
 			this.match(esql_parser.EXPLAIN);
-			this.state = 473;
+			this.state = 493;
 			this.subqueryExpression();
 			}
 		}
@@ -2676,15 +2767,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public subqueryExpression(): SubqueryExpressionContext {
 		let localctx: SubqueryExpressionContext = new SubqueryExpressionContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 92, esql_parser.RULE_subqueryExpression);
+		this.enterRule(localctx, 96, esql_parser.RULE_subqueryExpression);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 475;
+			this.state = 495;
 			this.match(esql_parser.OPENING_BRACKET);
-			this.state = 476;
+			this.state = 496;
 			this.query(0);
-			this.state = 477;
+			this.state = 497;
 			this.match(esql_parser.CLOSING_BRACKET);
 			}
 		}
@@ -2705,14 +2796,14 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public showCommand(): ShowCommandContext {
 		let localctx: ShowCommandContext = new ShowCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 94, esql_parser.RULE_showCommand);
+		this.enterRule(localctx, 98, esql_parser.RULE_showCommand);
 		try {
 			localctx = new ShowInfoContext(this, localctx);
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 479;
+			this.state = 499;
 			this.match(esql_parser.SHOW);
-			this.state = 480;
+			this.state = 500;
 			this.match(esql_parser.INFO);
 			}
 		}
@@ -2733,14 +2824,14 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public metaCommand(): MetaCommandContext {
 		let localctx: MetaCommandContext = new MetaCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 96, esql_parser.RULE_metaCommand);
+		this.enterRule(localctx, 100, esql_parser.RULE_metaCommand);
 		try {
 			localctx = new MetaFunctionsContext(this, localctx);
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 482;
+			this.state = 502;
 			this.match(esql_parser.META);
-			this.state = 483;
+			this.state = 503;
 			this.match(esql_parser.FUNCTIONS);
 			}
 		}
@@ -2761,53 +2852,53 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public enrichCommand(): EnrichCommandContext {
 		let localctx: EnrichCommandContext = new EnrichCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 98, esql_parser.RULE_enrichCommand);
+		this.enterRule(localctx, 102, esql_parser.RULE_enrichCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 485;
+			this.state = 505;
 			this.match(esql_parser.ENRICH);
-			this.state = 486;
+			this.state = 506;
 			localctx._policyName = this.match(esql_parser.ENRICH_POLICY_NAME);
-			this.state = 489;
+			this.state = 509;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 45, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 47, this._ctx) ) {
 			case 1:
 				{
-				this.state = 487;
+				this.state = 507;
 				this.match(esql_parser.ON);
-				this.state = 488;
+				this.state = 508;
 				localctx._matchField = this.qualifiedNamePattern();
 				}
 				break;
 			}
-			this.state = 500;
+			this.state = 520;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 47, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 49, this._ctx) ) {
 			case 1:
 				{
-				this.state = 491;
+				this.state = 511;
 				this.match(esql_parser.WITH);
-				this.state = 492;
+				this.state = 512;
 				this.enrichWithClause();
-				this.state = 497;
+				this.state = 517;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 46, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 48, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 493;
+						this.state = 513;
 						this.match(esql_parser.COMMA);
-						this.state = 494;
+						this.state = 514;
 						this.enrichWithClause();
 						}
 						}
 					}
-					this.state = 499;
+					this.state = 519;
 					this._errHandler.sync(this);
-					_alt = this._interp.adaptivePredict(this._input, 46, this._ctx);
+					_alt = this._interp.adaptivePredict(this._input, 48, this._ctx);
 				}
 				}
 				break;
@@ -2831,23 +2922,23 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public enrichWithClause(): EnrichWithClauseContext {
 		let localctx: EnrichWithClauseContext = new EnrichWithClauseContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 100, esql_parser.RULE_enrichWithClause);
+		this.enterRule(localctx, 104, esql_parser.RULE_enrichWithClause);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 505;
+			this.state = 525;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 48, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 50, this._ctx) ) {
 			case 1:
 				{
-				this.state = 502;
+				this.state = 522;
 				localctx._newName = this.qualifiedNamePattern();
-				this.state = 503;
+				this.state = 523;
 				this.match(esql_parser.ASSIGN);
 				}
 				break;
 			}
-			this.state = 507;
+			this.state = 527;
 			localctx._enrichField = this.qualifiedNamePattern();
 			}
 		}
@@ -2903,173 +2994,179 @@ export default class esql_parser extends Parser {
 		return true;
 	}
 
-	public static readonly _serializedATN: number[] = [4,1,108,510,2,0,7,0,
+	public static readonly _serializedATN: number[] = [4,1,109,530,2,0,7,0,
 	2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,
 	2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,
 	17,7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,
 	7,24,2,25,7,25,2,26,7,26,2,27,7,27,2,28,7,28,2,29,7,29,2,30,7,30,2,31,7,
 	31,2,32,7,32,2,33,7,33,2,34,7,34,2,35,7,35,2,36,7,36,2,37,7,37,2,38,7,38,
 	2,39,7,39,2,40,7,40,2,41,7,41,2,42,7,42,2,43,7,43,2,44,7,44,2,45,7,45,2,
-	46,7,46,2,47,7,47,2,48,7,48,2,49,7,49,2,50,7,50,1,0,1,0,1,0,1,1,1,1,1,1,
-	1,1,1,1,1,1,5,1,112,8,1,10,1,12,1,115,9,1,1,2,1,2,1,2,1,2,1,2,3,2,122,8,
-	2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,3,3,137,8,3,1,4,1,
-	4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,3,5,149,8,5,1,5,1,5,1,5,1,5,1,5,5,5,156,
-	8,5,10,5,12,5,159,9,5,1,5,1,5,1,5,1,5,1,5,3,5,166,8,5,1,5,1,5,3,5,170,8,
-	5,1,5,1,5,1,5,1,5,1,5,1,5,5,5,178,8,5,10,5,12,5,181,9,5,1,6,1,6,3,6,185,
-	8,6,1,6,1,6,1,6,1,6,1,6,3,6,192,8,6,1,6,1,6,1,6,3,6,197,8,6,1,7,1,7,1,7,
-	1,7,1,7,3,7,204,8,7,1,8,1,8,1,8,1,8,3,8,210,8,8,1,8,1,8,1,8,1,8,1,8,1,8,
-	5,8,218,8,8,10,8,12,8,221,9,8,1,9,1,9,1,9,1,9,1,9,1,9,1,9,3,9,230,8,9,1,
-	10,1,10,1,10,1,10,1,10,1,10,5,10,238,8,10,10,10,12,10,241,9,10,3,10,243,
-	8,10,1,10,1,10,1,11,1,11,1,11,1,12,1,12,1,12,5,12,253,8,12,10,12,12,12,
-	256,9,12,1,13,1,13,1,13,1,13,1,13,3,13,263,8,13,1,14,1,14,1,14,1,14,5,14,
-	269,8,14,10,14,12,14,272,9,14,1,14,3,14,275,8,14,1,15,1,15,3,15,279,8,15,
-	1,16,1,16,1,16,1,16,5,16,285,8,16,10,16,12,16,288,9,16,1,17,1,17,1,17,1,
-	17,1,18,1,18,1,18,1,19,1,19,3,19,299,8,19,1,19,1,19,3,19,303,8,19,1,20,
-	1,20,1,20,1,20,3,20,309,8,20,1,21,1,21,1,22,1,22,1,22,5,22,316,8,22,10,
-	22,12,22,319,9,22,1,23,1,23,1,23,5,23,324,8,23,10,23,12,23,327,9,23,1,24,
-	1,24,1,25,1,25,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,26,1,
-	26,1,26,5,26,346,8,26,10,26,12,26,349,9,26,1,26,1,26,1,26,1,26,1,26,1,26,
-	5,26,357,8,26,10,26,12,26,360,9,26,1,26,1,26,1,26,1,26,1,26,1,26,5,26,368,
-	8,26,10,26,12,26,371,9,26,1,26,1,26,3,26,375,8,26,1,27,1,27,1,27,1,28,1,
-	28,1,28,1,28,5,28,384,8,28,10,28,12,28,387,9,28,1,29,1,29,3,29,391,8,29,
-	1,29,1,29,3,29,395,8,29,1,30,1,30,1,30,1,30,5,30,401,8,30,10,30,12,30,404,
-	9,30,1,31,1,31,1,31,1,31,5,31,410,8,31,10,31,12,31,413,9,31,1,32,1,32,1,
-	32,1,32,5,32,419,8,32,10,32,12,32,422,9,32,1,33,1,33,1,33,1,33,1,34,1,34,
-	1,34,1,34,3,34,432,8,34,1,35,1,35,1,35,1,35,1,36,1,36,1,36,1,37,1,37,1,
-	37,5,37,444,8,37,10,37,12,37,447,9,37,1,38,1,38,1,38,1,38,1,39,1,39,1,40,
-	1,40,3,40,457,8,40,1,41,3,41,460,8,41,1,41,1,41,1,42,3,42,465,8,42,1,42,
-	1,42,1,43,1,43,1,44,1,44,1,45,1,45,1,45,1,46,1,46,1,46,1,46,1,47,1,47,1,
-	47,1,48,1,48,1,48,1,49,1,49,1,49,1,49,3,49,490,8,49,1,49,1,49,1,49,1,49,
-	5,49,496,8,49,10,49,12,49,499,9,49,3,49,501,8,49,1,50,1,50,1,50,3,50,506,
-	8,50,1,50,1,50,1,50,0,3,2,10,16,51,0,2,4,6,8,10,12,14,16,18,20,22,24,26,
-	28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,
-	76,78,80,82,84,86,88,90,92,94,96,98,100,0,8,1,0,59,60,1,0,61,63,2,0,67,
-	67,72,72,1,0,66,67,2,0,32,32,35,35,1,0,38,39,2,0,37,37,51,51,2,0,52,52,
-	54,58,535,0,102,1,0,0,0,2,105,1,0,0,0,4,121,1,0,0,0,6,136,1,0,0,0,8,138,
-	1,0,0,0,10,169,1,0,0,0,12,196,1,0,0,0,14,203,1,0,0,0,16,209,1,0,0,0,18,
-	229,1,0,0,0,20,231,1,0,0,0,22,246,1,0,0,0,24,249,1,0,0,0,26,262,1,0,0,0,
-	28,264,1,0,0,0,30,278,1,0,0,0,32,280,1,0,0,0,34,289,1,0,0,0,36,293,1,0,
-	0,0,38,296,1,0,0,0,40,304,1,0,0,0,42,310,1,0,0,0,44,312,1,0,0,0,46,320,
-	1,0,0,0,48,328,1,0,0,0,50,330,1,0,0,0,52,374,1,0,0,0,54,376,1,0,0,0,56,
-	379,1,0,0,0,58,388,1,0,0,0,60,396,1,0,0,0,62,405,1,0,0,0,64,414,1,0,0,0,
-	66,423,1,0,0,0,68,427,1,0,0,0,70,433,1,0,0,0,72,437,1,0,0,0,74,440,1,0,
-	0,0,76,448,1,0,0,0,78,452,1,0,0,0,80,456,1,0,0,0,82,459,1,0,0,0,84,464,
-	1,0,0,0,86,468,1,0,0,0,88,470,1,0,0,0,90,472,1,0,0,0,92,475,1,0,0,0,94,
-	479,1,0,0,0,96,482,1,0,0,0,98,485,1,0,0,0,100,505,1,0,0,0,102,103,3,2,1,
-	0,103,104,5,0,0,1,104,1,1,0,0,0,105,106,6,1,-1,0,106,107,3,4,2,0,107,113,
-	1,0,0,0,108,109,10,1,0,0,109,110,5,26,0,0,110,112,3,6,3,0,111,108,1,0,0,
-	0,112,115,1,0,0,0,113,111,1,0,0,0,113,114,1,0,0,0,114,3,1,0,0,0,115,113,
-	1,0,0,0,116,122,3,90,45,0,117,122,3,28,14,0,118,122,3,22,11,0,119,122,3,
-	94,47,0,120,122,3,96,48,0,121,116,1,0,0,0,121,117,1,0,0,0,121,118,1,0,0,
-	0,121,119,1,0,0,0,121,120,1,0,0,0,122,5,1,0,0,0,123,137,3,36,18,0,124,137,
-	3,40,20,0,125,137,3,54,27,0,126,137,3,60,30,0,127,137,3,56,28,0,128,137,
-	3,38,19,0,129,137,3,8,4,0,130,137,3,62,31,0,131,137,3,64,32,0,132,137,3,
-	68,34,0,133,137,3,70,35,0,134,137,3,98,49,0,135,137,3,72,36,0,136,123,1,
-	0,0,0,136,124,1,0,0,0,136,125,1,0,0,0,136,126,1,0,0,0,136,127,1,0,0,0,136,
-	128,1,0,0,0,136,129,1,0,0,0,136,130,1,0,0,0,136,131,1,0,0,0,136,132,1,0,
-	0,0,136,133,1,0,0,0,136,134,1,0,0,0,136,135,1,0,0,0,137,7,1,0,0,0,138,139,
-	5,18,0,0,139,140,3,10,5,0,140,9,1,0,0,0,141,142,6,5,-1,0,142,143,5,44,0,
-	0,143,170,3,10,5,7,144,170,3,14,7,0,145,170,3,12,6,0,146,148,3,14,7,0,147,
-	149,5,44,0,0,148,147,1,0,0,0,148,149,1,0,0,0,149,150,1,0,0,0,150,151,5,
-	41,0,0,151,152,5,40,0,0,152,157,3,14,7,0,153,154,5,34,0,0,154,156,3,14,
-	7,0,155,153,1,0,0,0,156,159,1,0,0,0,157,155,1,0,0,0,157,158,1,0,0,0,158,
-	160,1,0,0,0,159,157,1,0,0,0,160,161,5,50,0,0,161,170,1,0,0,0,162,163,3,
-	14,7,0,163,165,5,42,0,0,164,166,5,44,0,0,165,164,1,0,0,0,165,166,1,0,0,
-	0,166,167,1,0,0,0,167,168,5,45,0,0,168,170,1,0,0,0,169,141,1,0,0,0,169,
-	144,1,0,0,0,169,145,1,0,0,0,169,146,1,0,0,0,169,162,1,0,0,0,170,179,1,0,
-	0,0,171,172,10,4,0,0,172,173,5,31,0,0,173,178,3,10,5,5,174,175,10,3,0,0,
-	175,176,5,47,0,0,176,178,3,10,5,4,177,171,1,0,0,0,177,174,1,0,0,0,178,181,
-	1,0,0,0,179,177,1,0,0,0,179,180,1,0,0,0,180,11,1,0,0,0,181,179,1,0,0,0,
-	182,184,3,14,7,0,183,185,5,44,0,0,184,183,1,0,0,0,184,185,1,0,0,0,185,186,
-	1,0,0,0,186,187,5,43,0,0,187,188,3,86,43,0,188,197,1,0,0,0,189,191,3,14,
-	7,0,190,192,5,44,0,0,191,190,1,0,0,0,191,192,1,0,0,0,192,193,1,0,0,0,193,
-	194,5,49,0,0,194,195,3,86,43,0,195,197,1,0,0,0,196,182,1,0,0,0,196,189,
-	1,0,0,0,197,13,1,0,0,0,198,204,3,16,8,0,199,200,3,16,8,0,200,201,3,88,44,
-	0,201,202,3,16,8,0,202,204,1,0,0,0,203,198,1,0,0,0,203,199,1,0,0,0,204,
-	15,1,0,0,0,205,206,6,8,-1,0,206,210,3,18,9,0,207,208,7,0,0,0,208,210,3,
-	16,8,3,209,205,1,0,0,0,209,207,1,0,0,0,210,219,1,0,0,0,211,212,10,2,0,0,
-	212,213,7,1,0,0,213,218,3,16,8,3,214,215,10,1,0,0,215,216,7,0,0,0,216,218,
-	3,16,8,2,217,211,1,0,0,0,217,214,1,0,0,0,218,221,1,0,0,0,219,217,1,0,0,
-	0,219,220,1,0,0,0,220,17,1,0,0,0,221,219,1,0,0,0,222,230,3,52,26,0,223,
-	230,3,44,22,0,224,230,3,20,10,0,225,226,5,40,0,0,226,227,3,10,5,0,227,228,
-	5,50,0,0,228,230,1,0,0,0,229,222,1,0,0,0,229,223,1,0,0,0,229,224,1,0,0,
-	0,229,225,1,0,0,0,230,19,1,0,0,0,231,232,3,48,24,0,232,242,5,40,0,0,233,
-	243,5,61,0,0,234,239,3,10,5,0,235,236,5,34,0,0,236,238,3,10,5,0,237,235,
-	1,0,0,0,238,241,1,0,0,0,239,237,1,0,0,0,239,240,1,0,0,0,240,243,1,0,0,0,
-	241,239,1,0,0,0,242,233,1,0,0,0,242,234,1,0,0,0,242,243,1,0,0,0,243,244,
-	1,0,0,0,244,245,5,50,0,0,245,21,1,0,0,0,246,247,5,14,0,0,247,248,3,24,12,
-	0,248,23,1,0,0,0,249,254,3,26,13,0,250,251,5,34,0,0,251,253,3,26,13,0,252,
-	250,1,0,0,0,253,256,1,0,0,0,254,252,1,0,0,0,254,255,1,0,0,0,255,25,1,0,
-	0,0,256,254,1,0,0,0,257,263,3,10,5,0,258,259,3,44,22,0,259,260,5,33,0,0,
-	260,261,3,10,5,0,261,263,1,0,0,0,262,257,1,0,0,0,262,258,1,0,0,0,263,27,
-	1,0,0,0,264,265,5,6,0,0,265,270,3,42,21,0,266,267,5,34,0,0,267,269,3,42,
-	21,0,268,266,1,0,0,0,269,272,1,0,0,0,270,268,1,0,0,0,270,271,1,0,0,0,271,
-	274,1,0,0,0,272,270,1,0,0,0,273,275,3,30,15,0,274,273,1,0,0,0,274,275,1,
-	0,0,0,275,29,1,0,0,0,276,279,3,32,16,0,277,279,3,34,17,0,278,276,1,0,0,
-	0,278,277,1,0,0,0,279,31,1,0,0,0,280,281,5,71,0,0,281,286,3,42,21,0,282,
-	283,5,34,0,0,283,285,3,42,21,0,284,282,1,0,0,0,285,288,1,0,0,0,286,284,
-	1,0,0,0,286,287,1,0,0,0,287,33,1,0,0,0,288,286,1,0,0,0,289,290,5,64,0,0,
-	290,291,3,32,16,0,291,292,5,65,0,0,292,35,1,0,0,0,293,294,5,4,0,0,294,295,
-	3,24,12,0,295,37,1,0,0,0,296,298,5,17,0,0,297,299,3,24,12,0,298,297,1,0,
-	0,0,298,299,1,0,0,0,299,302,1,0,0,0,300,301,5,30,0,0,301,303,3,24,12,0,
-	302,300,1,0,0,0,302,303,1,0,0,0,303,39,1,0,0,0,304,305,5,8,0,0,305,308,
-	3,24,12,0,306,307,5,30,0,0,307,309,3,24,12,0,308,306,1,0,0,0,308,309,1,
-	0,0,0,309,41,1,0,0,0,310,311,7,2,0,0,311,43,1,0,0,0,312,317,3,48,24,0,313,
-	314,5,36,0,0,314,316,3,48,24,0,315,313,1,0,0,0,316,319,1,0,0,0,317,315,
-	1,0,0,0,317,318,1,0,0,0,318,45,1,0,0,0,319,317,1,0,0,0,320,325,3,50,25,
-	0,321,322,5,36,0,0,322,324,3,50,25,0,323,321,1,0,0,0,324,327,1,0,0,0,325,
-	323,1,0,0,0,325,326,1,0,0,0,326,47,1,0,0,0,327,325,1,0,0,0,328,329,7,3,
-	0,0,329,49,1,0,0,0,330,331,5,76,0,0,331,51,1,0,0,0,332,375,5,45,0,0,333,
-	334,3,84,42,0,334,335,5,66,0,0,335,375,1,0,0,0,336,375,3,82,41,0,337,375,
-	3,84,42,0,338,375,3,78,39,0,339,375,5,48,0,0,340,375,3,86,43,0,341,342,
-	5,64,0,0,342,347,3,80,40,0,343,344,5,34,0,0,344,346,3,80,40,0,345,343,1,
-	0,0,0,346,349,1,0,0,0,347,345,1,0,0,0,347,348,1,0,0,0,348,350,1,0,0,0,349,
-	347,1,0,0,0,350,351,5,65,0,0,351,375,1,0,0,0,352,353,5,64,0,0,353,358,3,
-	78,39,0,354,355,5,34,0,0,355,357,3,78,39,0,356,354,1,0,0,0,357,360,1,0,
-	0,0,358,356,1,0,0,0,358,359,1,0,0,0,359,361,1,0,0,0,360,358,1,0,0,0,361,
-	362,5,65,0,0,362,375,1,0,0,0,363,364,5,64,0,0,364,369,3,86,43,0,365,366,
-	5,34,0,0,366,368,3,86,43,0,367,365,1,0,0,0,368,371,1,0,0,0,369,367,1,0,
-	0,0,369,370,1,0,0,0,370,372,1,0,0,0,371,369,1,0,0,0,372,373,5,65,0,0,373,
-	375,1,0,0,0,374,332,1,0,0,0,374,333,1,0,0,0,374,336,1,0,0,0,374,337,1,0,
-	0,0,374,338,1,0,0,0,374,339,1,0,0,0,374,340,1,0,0,0,374,341,1,0,0,0,374,
-	352,1,0,0,0,374,363,1,0,0,0,375,53,1,0,0,0,376,377,5,10,0,0,377,378,5,28,
-	0,0,378,55,1,0,0,0,379,380,5,16,0,0,380,385,3,58,29,0,381,382,5,34,0,0,
-	382,384,3,58,29,0,383,381,1,0,0,0,384,387,1,0,0,0,385,383,1,0,0,0,385,386,
-	1,0,0,0,386,57,1,0,0,0,387,385,1,0,0,0,388,390,3,10,5,0,389,391,7,4,0,0,
-	390,389,1,0,0,0,390,391,1,0,0,0,391,394,1,0,0,0,392,393,5,46,0,0,393,395,
-	7,5,0,0,394,392,1,0,0,0,394,395,1,0,0,0,395,59,1,0,0,0,396,397,5,9,0,0,
-	397,402,3,46,23,0,398,399,5,34,0,0,399,401,3,46,23,0,400,398,1,0,0,0,401,
-	404,1,0,0,0,402,400,1,0,0,0,402,403,1,0,0,0,403,61,1,0,0,0,404,402,1,0,
-	0,0,405,406,5,2,0,0,406,411,3,46,23,0,407,408,5,34,0,0,408,410,3,46,23,
-	0,409,407,1,0,0,0,410,413,1,0,0,0,411,409,1,0,0,0,411,412,1,0,0,0,412,63,
-	1,0,0,0,413,411,1,0,0,0,414,415,5,13,0,0,415,420,3,66,33,0,416,417,5,34,
-	0,0,417,419,3,66,33,0,418,416,1,0,0,0,419,422,1,0,0,0,420,418,1,0,0,0,420,
-	421,1,0,0,0,421,65,1,0,0,0,422,420,1,0,0,0,423,424,3,46,23,0,424,425,5,
-	80,0,0,425,426,3,46,23,0,426,67,1,0,0,0,427,428,5,1,0,0,428,429,3,18,9,
-	0,429,431,3,86,43,0,430,432,3,74,37,0,431,430,1,0,0,0,431,432,1,0,0,0,432,
-	69,1,0,0,0,433,434,5,7,0,0,434,435,3,18,9,0,435,436,3,86,43,0,436,71,1,
-	0,0,0,437,438,5,12,0,0,438,439,3,44,22,0,439,73,1,0,0,0,440,445,3,76,38,
-	0,441,442,5,34,0,0,442,444,3,76,38,0,443,441,1,0,0,0,444,447,1,0,0,0,445,
-	443,1,0,0,0,445,446,1,0,0,0,446,75,1,0,0,0,447,445,1,0,0,0,448,449,3,48,
-	24,0,449,450,5,33,0,0,450,451,3,52,26,0,451,77,1,0,0,0,452,453,7,6,0,0,
-	453,79,1,0,0,0,454,457,3,82,41,0,455,457,3,84,42,0,456,454,1,0,0,0,456,
-	455,1,0,0,0,457,81,1,0,0,0,458,460,7,0,0,0,459,458,1,0,0,0,459,460,1,0,
-	0,0,460,461,1,0,0,0,461,462,5,29,0,0,462,83,1,0,0,0,463,465,7,0,0,0,464,
-	463,1,0,0,0,464,465,1,0,0,0,465,466,1,0,0,0,466,467,5,28,0,0,467,85,1,0,
-	0,0,468,469,5,27,0,0,469,87,1,0,0,0,470,471,7,7,0,0,471,89,1,0,0,0,472,
-	473,5,5,0,0,473,474,3,92,46,0,474,91,1,0,0,0,475,476,5,64,0,0,476,477,3,
-	2,1,0,477,478,5,65,0,0,478,93,1,0,0,0,479,480,5,15,0,0,480,481,5,96,0,0,
-	481,95,1,0,0,0,482,483,5,11,0,0,483,484,5,100,0,0,484,97,1,0,0,0,485,486,
-	5,3,0,0,486,489,5,86,0,0,487,488,5,84,0,0,488,490,3,46,23,0,489,487,1,0,
-	0,0,489,490,1,0,0,0,490,500,1,0,0,0,491,492,5,85,0,0,492,497,3,100,50,0,
-	493,494,5,34,0,0,494,496,3,100,50,0,495,493,1,0,0,0,496,499,1,0,0,0,497,
-	495,1,0,0,0,497,498,1,0,0,0,498,501,1,0,0,0,499,497,1,0,0,0,500,491,1,0,
-	0,0,500,501,1,0,0,0,501,99,1,0,0,0,502,503,3,46,23,0,503,504,5,33,0,0,504,
-	506,1,0,0,0,505,502,1,0,0,0,505,506,1,0,0,0,506,507,1,0,0,0,507,508,3,46,
-	23,0,508,101,1,0,0,0,49,113,121,136,148,157,165,169,177,179,184,191,196,
-	203,209,217,219,229,239,242,254,262,270,274,278,286,298,302,308,317,325,
-	347,358,369,374,385,390,394,402,411,420,431,445,456,459,464,489,497,500,
-	505];
+	46,7,46,2,47,7,47,2,48,7,48,2,49,7,49,2,50,7,50,2,51,7,51,2,52,7,52,1,0,
+	1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,5,1,116,8,1,10,1,12,1,119,9,1,1,2,1,2,1,
+	2,1,2,1,2,3,2,126,8,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,
+	3,3,3,141,8,3,1,4,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,3,5,153,8,5,1,5,1,
+	5,1,5,1,5,1,5,5,5,160,8,5,10,5,12,5,163,9,5,1,5,1,5,1,5,1,5,1,5,3,5,170,
+	8,5,1,5,1,5,3,5,174,8,5,1,5,1,5,1,5,1,5,1,5,1,5,5,5,182,8,5,10,5,12,5,185,
+	9,5,1,6,1,6,3,6,189,8,6,1,6,1,6,1,6,1,6,1,6,3,6,196,8,6,1,6,1,6,1,6,3,6,
+	201,8,6,1,7,1,7,1,7,1,7,1,7,3,7,208,8,7,1,8,1,8,1,8,1,8,3,8,214,8,8,1,8,
+	1,8,1,8,1,8,1,8,1,8,5,8,222,8,8,10,8,12,8,225,9,8,1,9,1,9,1,9,1,9,1,9,1,
+	9,1,9,3,9,234,8,9,1,10,1,10,1,10,1,10,1,10,1,10,5,10,242,8,10,10,10,12,
+	10,245,9,10,3,10,247,8,10,1,10,1,10,1,11,1,11,1,11,1,12,1,12,1,12,5,12,
+	257,8,12,10,12,12,12,260,9,12,1,13,1,13,1,13,1,13,1,13,3,13,267,8,13,1,
+	14,1,14,1,14,1,14,5,14,273,8,14,10,14,12,14,276,9,14,1,14,3,14,279,8,14,
+	1,14,3,14,282,8,14,1,15,1,15,1,16,1,16,1,16,1,16,5,16,290,8,16,10,16,12,
+	16,293,9,16,1,17,1,17,1,17,1,17,1,18,1,18,3,18,301,8,18,1,19,1,19,1,19,
+	1,19,5,19,307,8,19,10,19,12,19,310,9,19,1,20,1,20,1,20,1,20,1,21,1,21,1,
+	21,1,22,1,22,3,22,321,8,22,1,22,1,22,3,22,325,8,22,1,23,1,23,1,23,1,23,
+	3,23,331,8,23,1,24,1,24,1,24,5,24,336,8,24,10,24,12,24,339,9,24,1,25,1,
+	25,1,25,5,25,344,8,25,10,25,12,25,347,9,25,1,26,1,26,1,27,1,27,1,28,1,28,
+	1,28,1,28,1,28,1,28,1,28,1,28,1,28,1,28,1,28,1,28,1,28,5,28,366,8,28,10,
+	28,12,28,369,9,28,1,28,1,28,1,28,1,28,1,28,1,28,5,28,377,8,28,10,28,12,
+	28,380,9,28,1,28,1,28,1,28,1,28,1,28,1,28,5,28,388,8,28,10,28,12,28,391,
+	9,28,1,28,1,28,3,28,395,8,28,1,29,1,29,1,29,1,30,1,30,1,30,1,30,5,30,404,
+	8,30,10,30,12,30,407,9,30,1,31,1,31,3,31,411,8,31,1,31,1,31,3,31,415,8,
+	31,1,32,1,32,1,32,1,32,5,32,421,8,32,10,32,12,32,424,9,32,1,33,1,33,1,33,
+	1,33,5,33,430,8,33,10,33,12,33,433,9,33,1,34,1,34,1,34,1,34,5,34,439,8,
+	34,10,34,12,34,442,9,34,1,35,1,35,1,35,1,35,1,36,1,36,1,36,1,36,3,36,452,
+	8,36,1,37,1,37,1,37,1,37,1,38,1,38,1,38,1,39,1,39,1,39,5,39,464,8,39,10,
+	39,12,39,467,9,39,1,40,1,40,1,40,1,40,1,41,1,41,1,42,1,42,3,42,477,8,42,
+	1,43,3,43,480,8,43,1,43,1,43,1,44,3,44,485,8,44,1,44,1,44,1,45,1,45,1,46,
+	1,46,1,47,1,47,1,47,1,48,1,48,1,48,1,48,1,49,1,49,1,49,1,50,1,50,1,50,1,
+	51,1,51,1,51,1,51,3,51,510,8,51,1,51,1,51,1,51,1,51,5,51,516,8,51,10,51,
+	12,51,519,9,51,3,51,521,8,51,1,52,1,52,1,52,3,52,526,8,52,1,52,1,52,1,52,
+	0,3,2,10,16,53,0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,
+	42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,74,76,78,80,82,84,86,88,
+	90,92,94,96,98,100,102,104,0,8,1,0,59,60,1,0,61,63,2,0,67,67,73,73,1,0,
+	66,67,2,0,32,32,35,35,1,0,38,39,2,0,37,37,51,51,2,0,52,52,54,58,555,0,106,
+	1,0,0,0,2,109,1,0,0,0,4,125,1,0,0,0,6,140,1,0,0,0,8,142,1,0,0,0,10,173,
+	1,0,0,0,12,200,1,0,0,0,14,207,1,0,0,0,16,213,1,0,0,0,18,233,1,0,0,0,20,
+	235,1,0,0,0,22,250,1,0,0,0,24,253,1,0,0,0,26,266,1,0,0,0,28,268,1,0,0,0,
+	30,283,1,0,0,0,32,285,1,0,0,0,34,294,1,0,0,0,36,300,1,0,0,0,38,302,1,0,
+	0,0,40,311,1,0,0,0,42,315,1,0,0,0,44,318,1,0,0,0,46,326,1,0,0,0,48,332,
+	1,0,0,0,50,340,1,0,0,0,52,348,1,0,0,0,54,350,1,0,0,0,56,394,1,0,0,0,58,
+	396,1,0,0,0,60,399,1,0,0,0,62,408,1,0,0,0,64,416,1,0,0,0,66,425,1,0,0,0,
+	68,434,1,0,0,0,70,443,1,0,0,0,72,447,1,0,0,0,74,453,1,0,0,0,76,457,1,0,
+	0,0,78,460,1,0,0,0,80,468,1,0,0,0,82,472,1,0,0,0,84,476,1,0,0,0,86,479,
+	1,0,0,0,88,484,1,0,0,0,90,488,1,0,0,0,92,490,1,0,0,0,94,492,1,0,0,0,96,
+	495,1,0,0,0,98,499,1,0,0,0,100,502,1,0,0,0,102,505,1,0,0,0,104,525,1,0,
+	0,0,106,107,3,2,1,0,107,108,5,0,0,1,108,1,1,0,0,0,109,110,6,1,-1,0,110,
+	111,3,4,2,0,111,117,1,0,0,0,112,113,10,1,0,0,113,114,5,26,0,0,114,116,3,
+	6,3,0,115,112,1,0,0,0,116,119,1,0,0,0,117,115,1,0,0,0,117,118,1,0,0,0,118,
+	3,1,0,0,0,119,117,1,0,0,0,120,126,3,94,47,0,121,126,3,28,14,0,122,126,3,
+	22,11,0,123,126,3,98,49,0,124,126,3,100,50,0,125,120,1,0,0,0,125,121,1,
+	0,0,0,125,122,1,0,0,0,125,123,1,0,0,0,125,124,1,0,0,0,126,5,1,0,0,0,127,
+	141,3,42,21,0,128,141,3,46,23,0,129,141,3,58,29,0,130,141,3,64,32,0,131,
+	141,3,60,30,0,132,141,3,44,22,0,133,141,3,8,4,0,134,141,3,66,33,0,135,141,
+	3,68,34,0,136,141,3,72,36,0,137,141,3,74,37,0,138,141,3,102,51,0,139,141,
+	3,76,38,0,140,127,1,0,0,0,140,128,1,0,0,0,140,129,1,0,0,0,140,130,1,0,0,
+	0,140,131,1,0,0,0,140,132,1,0,0,0,140,133,1,0,0,0,140,134,1,0,0,0,140,135,
+	1,0,0,0,140,136,1,0,0,0,140,137,1,0,0,0,140,138,1,0,0,0,140,139,1,0,0,0,
+	141,7,1,0,0,0,142,143,5,18,0,0,143,144,3,10,5,0,144,9,1,0,0,0,145,146,6,
+	5,-1,0,146,147,5,44,0,0,147,174,3,10,5,7,148,174,3,14,7,0,149,174,3,12,
+	6,0,150,152,3,14,7,0,151,153,5,44,0,0,152,151,1,0,0,0,152,153,1,0,0,0,153,
+	154,1,0,0,0,154,155,5,41,0,0,155,156,5,40,0,0,156,161,3,14,7,0,157,158,
+	5,34,0,0,158,160,3,14,7,0,159,157,1,0,0,0,160,163,1,0,0,0,161,159,1,0,0,
+	0,161,162,1,0,0,0,162,164,1,0,0,0,163,161,1,0,0,0,164,165,5,50,0,0,165,
+	174,1,0,0,0,166,167,3,14,7,0,167,169,5,42,0,0,168,170,5,44,0,0,169,168,
+	1,0,0,0,169,170,1,0,0,0,170,171,1,0,0,0,171,172,5,45,0,0,172,174,1,0,0,
+	0,173,145,1,0,0,0,173,148,1,0,0,0,173,149,1,0,0,0,173,150,1,0,0,0,173,166,
+	1,0,0,0,174,183,1,0,0,0,175,176,10,4,0,0,176,177,5,31,0,0,177,182,3,10,
+	5,5,178,179,10,3,0,0,179,180,5,47,0,0,180,182,3,10,5,4,181,175,1,0,0,0,
+	181,178,1,0,0,0,182,185,1,0,0,0,183,181,1,0,0,0,183,184,1,0,0,0,184,11,
+	1,0,0,0,185,183,1,0,0,0,186,188,3,14,7,0,187,189,5,44,0,0,188,187,1,0,0,
+	0,188,189,1,0,0,0,189,190,1,0,0,0,190,191,5,43,0,0,191,192,3,90,45,0,192,
+	201,1,0,0,0,193,195,3,14,7,0,194,196,5,44,0,0,195,194,1,0,0,0,195,196,1,
+	0,0,0,196,197,1,0,0,0,197,198,5,49,0,0,198,199,3,90,45,0,199,201,1,0,0,
+	0,200,186,1,0,0,0,200,193,1,0,0,0,201,13,1,0,0,0,202,208,3,16,8,0,203,204,
+	3,16,8,0,204,205,3,92,46,0,205,206,3,16,8,0,206,208,1,0,0,0,207,202,1,0,
+	0,0,207,203,1,0,0,0,208,15,1,0,0,0,209,210,6,8,-1,0,210,214,3,18,9,0,211,
+	212,7,0,0,0,212,214,3,16,8,3,213,209,1,0,0,0,213,211,1,0,0,0,214,223,1,
+	0,0,0,215,216,10,2,0,0,216,217,7,1,0,0,217,222,3,16,8,3,218,219,10,1,0,
+	0,219,220,7,0,0,0,220,222,3,16,8,2,221,215,1,0,0,0,221,218,1,0,0,0,222,
+	225,1,0,0,0,223,221,1,0,0,0,223,224,1,0,0,0,224,17,1,0,0,0,225,223,1,0,
+	0,0,226,234,3,56,28,0,227,234,3,48,24,0,228,234,3,20,10,0,229,230,5,40,
+	0,0,230,231,3,10,5,0,231,232,5,50,0,0,232,234,1,0,0,0,233,226,1,0,0,0,233,
+	227,1,0,0,0,233,228,1,0,0,0,233,229,1,0,0,0,234,19,1,0,0,0,235,236,3,52,
+	26,0,236,246,5,40,0,0,237,247,5,61,0,0,238,243,3,10,5,0,239,240,5,34,0,
+	0,240,242,3,10,5,0,241,239,1,0,0,0,242,245,1,0,0,0,243,241,1,0,0,0,243,
+	244,1,0,0,0,244,247,1,0,0,0,245,243,1,0,0,0,246,237,1,0,0,0,246,238,1,0,
+	0,0,246,247,1,0,0,0,247,248,1,0,0,0,248,249,5,50,0,0,249,21,1,0,0,0,250,
+	251,5,14,0,0,251,252,3,24,12,0,252,23,1,0,0,0,253,258,3,26,13,0,254,255,
+	5,34,0,0,255,257,3,26,13,0,256,254,1,0,0,0,257,260,1,0,0,0,258,256,1,0,
+	0,0,258,259,1,0,0,0,259,25,1,0,0,0,260,258,1,0,0,0,261,267,3,10,5,0,262,
+	263,3,48,24,0,263,264,5,33,0,0,264,265,3,10,5,0,265,267,1,0,0,0,266,261,
+	1,0,0,0,266,262,1,0,0,0,267,27,1,0,0,0,268,269,5,6,0,0,269,274,3,30,15,
+	0,270,271,5,34,0,0,271,273,3,30,15,0,272,270,1,0,0,0,273,276,1,0,0,0,274,
+	272,1,0,0,0,274,275,1,0,0,0,275,278,1,0,0,0,276,274,1,0,0,0,277,279,3,32,
+	16,0,278,277,1,0,0,0,278,279,1,0,0,0,279,281,1,0,0,0,280,282,3,36,18,0,
+	281,280,1,0,0,0,281,282,1,0,0,0,282,29,1,0,0,0,283,284,7,2,0,0,284,31,1,
+	0,0,0,285,286,5,71,0,0,286,291,3,34,17,0,287,288,5,34,0,0,288,290,3,34,
+	17,0,289,287,1,0,0,0,290,293,1,0,0,0,291,289,1,0,0,0,291,292,1,0,0,0,292,
+	33,1,0,0,0,293,291,1,0,0,0,294,295,3,90,45,0,295,296,5,33,0,0,296,297,3,
+	90,45,0,297,35,1,0,0,0,298,301,3,38,19,0,299,301,3,40,20,0,300,298,1,0,
+	0,0,300,299,1,0,0,0,301,37,1,0,0,0,302,303,5,72,0,0,303,308,3,30,15,0,304,
+	305,5,34,0,0,305,307,3,30,15,0,306,304,1,0,0,0,307,310,1,0,0,0,308,306,
+	1,0,0,0,308,309,1,0,0,0,309,39,1,0,0,0,310,308,1,0,0,0,311,312,5,64,0,0,
+	312,313,3,38,19,0,313,314,5,65,0,0,314,41,1,0,0,0,315,316,5,4,0,0,316,317,
+	3,24,12,0,317,43,1,0,0,0,318,320,5,17,0,0,319,321,3,24,12,0,320,319,1,0,
+	0,0,320,321,1,0,0,0,321,324,1,0,0,0,322,323,5,30,0,0,323,325,3,24,12,0,
+	324,322,1,0,0,0,324,325,1,0,0,0,325,45,1,0,0,0,326,327,5,8,0,0,327,330,
+	3,24,12,0,328,329,5,30,0,0,329,331,3,24,12,0,330,328,1,0,0,0,330,331,1,
+	0,0,0,331,47,1,0,0,0,332,337,3,52,26,0,333,334,5,36,0,0,334,336,3,52,26,
+	0,335,333,1,0,0,0,336,339,1,0,0,0,337,335,1,0,0,0,337,338,1,0,0,0,338,49,
+	1,0,0,0,339,337,1,0,0,0,340,345,3,54,27,0,341,342,5,36,0,0,342,344,3,54,
+	27,0,343,341,1,0,0,0,344,347,1,0,0,0,345,343,1,0,0,0,345,346,1,0,0,0,346,
+	51,1,0,0,0,347,345,1,0,0,0,348,349,7,3,0,0,349,53,1,0,0,0,350,351,5,77,
+	0,0,351,55,1,0,0,0,352,395,5,45,0,0,353,354,3,88,44,0,354,355,5,66,0,0,
+	355,395,1,0,0,0,356,395,3,86,43,0,357,395,3,88,44,0,358,395,3,82,41,0,359,
+	395,5,48,0,0,360,395,3,90,45,0,361,362,5,64,0,0,362,367,3,84,42,0,363,364,
+	5,34,0,0,364,366,3,84,42,0,365,363,1,0,0,0,366,369,1,0,0,0,367,365,1,0,
+	0,0,367,368,1,0,0,0,368,370,1,0,0,0,369,367,1,0,0,0,370,371,5,65,0,0,371,
+	395,1,0,0,0,372,373,5,64,0,0,373,378,3,82,41,0,374,375,5,34,0,0,375,377,
+	3,82,41,0,376,374,1,0,0,0,377,380,1,0,0,0,378,376,1,0,0,0,378,379,1,0,0,
+	0,379,381,1,0,0,0,380,378,1,0,0,0,381,382,5,65,0,0,382,395,1,0,0,0,383,
+	384,5,64,0,0,384,389,3,90,45,0,385,386,5,34,0,0,386,388,3,90,45,0,387,385,
+	1,0,0,0,388,391,1,0,0,0,389,387,1,0,0,0,389,390,1,0,0,0,390,392,1,0,0,0,
+	391,389,1,0,0,0,392,393,5,65,0,0,393,395,1,0,0,0,394,352,1,0,0,0,394,353,
+	1,0,0,0,394,356,1,0,0,0,394,357,1,0,0,0,394,358,1,0,0,0,394,359,1,0,0,0,
+	394,360,1,0,0,0,394,361,1,0,0,0,394,372,1,0,0,0,394,383,1,0,0,0,395,57,
+	1,0,0,0,396,397,5,10,0,0,397,398,5,28,0,0,398,59,1,0,0,0,399,400,5,16,0,
+	0,400,405,3,62,31,0,401,402,5,34,0,0,402,404,3,62,31,0,403,401,1,0,0,0,
+	404,407,1,0,0,0,405,403,1,0,0,0,405,406,1,0,0,0,406,61,1,0,0,0,407,405,
+	1,0,0,0,408,410,3,10,5,0,409,411,7,4,0,0,410,409,1,0,0,0,410,411,1,0,0,
+	0,411,414,1,0,0,0,412,413,5,46,0,0,413,415,7,5,0,0,414,412,1,0,0,0,414,
+	415,1,0,0,0,415,63,1,0,0,0,416,417,5,9,0,0,417,422,3,50,25,0,418,419,5,
+	34,0,0,419,421,3,50,25,0,420,418,1,0,0,0,421,424,1,0,0,0,422,420,1,0,0,
+	0,422,423,1,0,0,0,423,65,1,0,0,0,424,422,1,0,0,0,425,426,5,2,0,0,426,431,
+	3,50,25,0,427,428,5,34,0,0,428,430,3,50,25,0,429,427,1,0,0,0,430,433,1,
+	0,0,0,431,429,1,0,0,0,431,432,1,0,0,0,432,67,1,0,0,0,433,431,1,0,0,0,434,
+	435,5,13,0,0,435,440,3,70,35,0,436,437,5,34,0,0,437,439,3,70,35,0,438,436,
+	1,0,0,0,439,442,1,0,0,0,440,438,1,0,0,0,440,441,1,0,0,0,441,69,1,0,0,0,
+	442,440,1,0,0,0,443,444,3,50,25,0,444,445,5,81,0,0,445,446,3,50,25,0,446,
+	71,1,0,0,0,447,448,5,1,0,0,448,449,3,18,9,0,449,451,3,90,45,0,450,452,3,
+	78,39,0,451,450,1,0,0,0,451,452,1,0,0,0,452,73,1,0,0,0,453,454,5,7,0,0,
+	454,455,3,18,9,0,455,456,3,90,45,0,456,75,1,0,0,0,457,458,5,12,0,0,458,
+	459,3,48,24,0,459,77,1,0,0,0,460,465,3,80,40,0,461,462,5,34,0,0,462,464,
+	3,80,40,0,463,461,1,0,0,0,464,467,1,0,0,0,465,463,1,0,0,0,465,466,1,0,0,
+	0,466,79,1,0,0,0,467,465,1,0,0,0,468,469,3,52,26,0,469,470,5,33,0,0,470,
+	471,3,56,28,0,471,81,1,0,0,0,472,473,7,6,0,0,473,83,1,0,0,0,474,477,3,86,
+	43,0,475,477,3,88,44,0,476,474,1,0,0,0,476,475,1,0,0,0,477,85,1,0,0,0,478,
+	480,7,0,0,0,479,478,1,0,0,0,479,480,1,0,0,0,480,481,1,0,0,0,481,482,5,29,
+	0,0,482,87,1,0,0,0,483,485,7,0,0,0,484,483,1,0,0,0,484,485,1,0,0,0,485,
+	486,1,0,0,0,486,487,5,28,0,0,487,89,1,0,0,0,488,489,5,27,0,0,489,91,1,0,
+	0,0,490,491,7,7,0,0,491,93,1,0,0,0,492,493,5,5,0,0,493,494,3,96,48,0,494,
+	95,1,0,0,0,495,496,5,64,0,0,496,497,3,2,1,0,497,498,5,65,0,0,498,97,1,0,
+	0,0,499,500,5,15,0,0,500,501,5,97,0,0,501,99,1,0,0,0,502,503,5,11,0,0,503,
+	504,5,101,0,0,504,101,1,0,0,0,505,506,5,3,0,0,506,509,5,87,0,0,507,508,
+	5,85,0,0,508,510,3,50,25,0,509,507,1,0,0,0,509,510,1,0,0,0,510,520,1,0,
+	0,0,511,512,5,86,0,0,512,517,3,104,52,0,513,514,5,34,0,0,514,516,3,104,
+	52,0,515,513,1,0,0,0,516,519,1,0,0,0,517,515,1,0,0,0,517,518,1,0,0,0,518,
+	521,1,0,0,0,519,517,1,0,0,0,520,511,1,0,0,0,520,521,1,0,0,0,521,103,1,0,
+	0,0,522,523,3,50,25,0,523,524,5,33,0,0,524,526,1,0,0,0,525,522,1,0,0,0,
+	525,526,1,0,0,0,526,527,1,0,0,0,527,528,3,50,25,0,528,105,1,0,0,0,51,117,
+	125,140,152,161,169,173,181,183,188,195,200,207,213,221,223,233,243,246,
+	258,266,274,278,281,291,300,308,320,324,330,337,345,367,378,389,394,405,
+	410,414,422,431,440,451,465,476,479,484,509,517,520,525];
 
 	private static __ATN: ATN;
 	public static get _ATN(): ATN {
@@ -3914,6 +4011,9 @@ export class FromCommandContext extends ParserRuleContext {
 	public COMMA(i: number): TerminalNode {
 		return this.getToken(esql_parser.COMMA, i);
 	}
+	public fromOptions(): FromOptionsContext {
+		return this.getTypedRuleContext(FromOptionsContext, 0) as FromOptionsContext;
+	}
 	public metadata(): MetadataContext {
 		return this.getTypedRuleContext(MetadataContext, 0) as MetadataContext;
 	}
@@ -3933,6 +4033,99 @@ export class FromCommandContext extends ParserRuleContext {
 }
 
 
+export class FromIdentifierContext extends ParserRuleContext {
+	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
+		super(parent, invokingState);
+    	this.parser = parser;
+	}
+	public FROM_UNQUOTED_IDENTIFIER(): TerminalNode {
+		return this.getToken(esql_parser.FROM_UNQUOTED_IDENTIFIER, 0);
+	}
+	public QUOTED_IDENTIFIER(): TerminalNode {
+		return this.getToken(esql_parser.QUOTED_IDENTIFIER, 0);
+	}
+    public get ruleIndex(): number {
+    	return esql_parser.RULE_fromIdentifier;
+	}
+	public enterRule(listener: esql_parserListener): void {
+	    if(listener.enterFromIdentifier) {
+	 		listener.enterFromIdentifier(this);
+		}
+	}
+	public exitRule(listener: esql_parserListener): void {
+	    if(listener.exitFromIdentifier) {
+	 		listener.exitFromIdentifier(this);
+		}
+	}
+}
+
+
+export class FromOptionsContext extends ParserRuleContext {
+	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
+		super(parent, invokingState);
+    	this.parser = parser;
+	}
+	public OPTIONS(): TerminalNode {
+		return this.getToken(esql_parser.OPTIONS, 0);
+	}
+	public configOption_list(): ConfigOptionContext[] {
+		return this.getTypedRuleContexts(ConfigOptionContext) as ConfigOptionContext[];
+	}
+	public configOption(i: number): ConfigOptionContext {
+		return this.getTypedRuleContext(ConfigOptionContext, i) as ConfigOptionContext;
+	}
+	public COMMA_list(): TerminalNode[] {
+	    	return this.getTokens(esql_parser.COMMA);
+	}
+	public COMMA(i: number): TerminalNode {
+		return this.getToken(esql_parser.COMMA, i);
+	}
+    public get ruleIndex(): number {
+    	return esql_parser.RULE_fromOptions;
+	}
+	public enterRule(listener: esql_parserListener): void {
+	    if(listener.enterFromOptions) {
+	 		listener.enterFromOptions(this);
+		}
+	}
+	public exitRule(listener: esql_parserListener): void {
+	    if(listener.exitFromOptions) {
+	 		listener.exitFromOptions(this);
+		}
+	}
+}
+
+
+export class ConfigOptionContext extends ParserRuleContext {
+	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
+		super(parent, invokingState);
+    	this.parser = parser;
+	}
+	public string__list(): StringContext[] {
+		return this.getTypedRuleContexts(StringContext) as StringContext[];
+	}
+	public string_(i: number): StringContext {
+		return this.getTypedRuleContext(StringContext, i) as StringContext;
+	}
+	public ASSIGN(): TerminalNode {
+		return this.getToken(esql_parser.ASSIGN, 0);
+	}
+    public get ruleIndex(): number {
+    	return esql_parser.RULE_configOption;
+	}
+	public enterRule(listener: esql_parserListener): void {
+	    if(listener.enterConfigOption) {
+	 		listener.enterConfigOption(this);
+		}
+	}
+	public exitRule(listener: esql_parserListener): void {
+	    if(listener.exitConfigOption) {
+	 		listener.exitConfigOption(this);
+		}
+	}
+}
+
+
 export class MetadataContext extends ParserRuleContext {
 	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
 		super(parent, invokingState);
@@ -4123,33 +4316,6 @@ export class InlinestatsCommandContext extends ParserRuleContext {
 }
 
 
-export class FromIdentifierContext extends ParserRuleContext {
-	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
-		super(parent, invokingState);
-    	this.parser = parser;
-	}
-	public FROM_UNQUOTED_IDENTIFIER(): TerminalNode {
-		return this.getToken(esql_parser.FROM_UNQUOTED_IDENTIFIER, 0);
-	}
-	public QUOTED_IDENTIFIER(): TerminalNode {
-		return this.getToken(esql_parser.QUOTED_IDENTIFIER, 0);
-	}
-    public get ruleIndex(): number {
-    	return esql_parser.RULE_fromIdentifier;
-	}
-	public enterRule(listener: esql_parserListener): void {
-	    if(listener.enterFromIdentifier) {
-	 		listener.enterFromIdentifier(this);
-		}
-	}
-	public exitRule(listener: esql_parserListener): void {
-	    if(listener.exitFromIdentifier) {
-	 		listener.exitFromIdentifier(this);
-		}
-	}
-}
-
-
 export class QualifiedNameContext extends ParserRuleContext {
 	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
 		super(parent, invokingState);
@@ -5035,8 +5201,8 @@ export class StringContext extends ParserRuleContext {
 		super(parent, invokingState);
     	this.parser = parser;
 	}
-	public STRING(): TerminalNode {
-		return this.getToken(esql_parser.STRING, 0);
+	public QUOTED_STRING(): TerminalNode {
+		return this.getToken(esql_parser.QUOTED_STRING, 0);
 	}
     public get ruleIndex(): number {
     	return esql_parser.RULE_string;
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts b/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
index fb3741dc94a8d..6be67dfa2f1a3 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
@@ -31,13 +31,15 @@ import { RowCommandContext } from "./esql_parser";
 import { FieldsContext } from "./esql_parser";
 import { FieldContext } from "./esql_parser";
 import { FromCommandContext } from "./esql_parser";
+import { FromIdentifierContext } from "./esql_parser";
+import { FromOptionsContext } from "./esql_parser";
+import { ConfigOptionContext } from "./esql_parser";
 import { MetadataContext } from "./esql_parser";
 import { MetadataOptionContext } from "./esql_parser";
 import { Deprecated_metadataContext } from "./esql_parser";
 import { EvalCommandContext } from "./esql_parser";
 import { StatsCommandContext } from "./esql_parser";
 import { InlinestatsCommandContext } from "./esql_parser";
-import { FromIdentifierContext } from "./esql_parser";
 import { QualifiedNameContext } from "./esql_parser";
 import { QualifiedNamePatternContext } from "./esql_parser";
 import { IdentifierContext } from "./esql_parser";
@@ -387,6 +389,36 @@ export default class esql_parserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	exitFromCommand?: (ctx: FromCommandContext) => void;
+	/**
+	 * Enter a parse tree produced by `esql_parser.fromIdentifier`.
+	 * @param ctx the parse tree
+	 */
+	enterFromIdentifier?: (ctx: FromIdentifierContext) => void;
+	/**
+	 * Exit a parse tree produced by `esql_parser.fromIdentifier`.
+	 * @param ctx the parse tree
+	 */
+	exitFromIdentifier?: (ctx: FromIdentifierContext) => void;
+	/**
+	 * Enter a parse tree produced by `esql_parser.fromOptions`.
+	 * @param ctx the parse tree
+	 */
+	enterFromOptions?: (ctx: FromOptionsContext) => void;
+	/**
+	 * Exit a parse tree produced by `esql_parser.fromOptions`.
+	 * @param ctx the parse tree
+	 */
+	exitFromOptions?: (ctx: FromOptionsContext) => void;
+	/**
+	 * Enter a parse tree produced by `esql_parser.configOption`.
+	 * @param ctx the parse tree
+	 */
+	enterConfigOption?: (ctx: ConfigOptionContext) => void;
+	/**
+	 * Exit a parse tree produced by `esql_parser.configOption`.
+	 * @param ctx the parse tree
+	 */
+	exitConfigOption?: (ctx: ConfigOptionContext) => void;
 	/**
 	 * Enter a parse tree produced by `esql_parser.metadata`.
 	 * @param ctx the parse tree
@@ -447,16 +479,6 @@ export default class esql_parserListener extends ParseTreeListener {
 	 * @param ctx the parse tree
 	 */
 	exitInlinestatsCommand?: (ctx: InlinestatsCommandContext) => void;
-	/**
-	 * Enter a parse tree produced by `esql_parser.fromIdentifier`.
-	 * @param ctx the parse tree
-	 */
-	enterFromIdentifier?: (ctx: FromIdentifierContext) => void;
-	/**
-	 * Exit a parse tree produced by `esql_parser.fromIdentifier`.
-	 * @param ctx the parse tree
-	 */
-	exitFromIdentifier?: (ctx: FromIdentifierContext) => void;
 	/**
 	 * Enter a parse tree produced by `esql_parser.qualifiedName`.
 	 * @param ctx the parse tree
diff --git a/packages/kbn-esql-ast/src/ast_walker.ts b/packages/kbn-esql-ast/src/ast_walker.ts
index 740986ec3edd6..433bc4a46435a 100644
--- a/packages/kbn-esql-ast/src/ast_walker.ts
+++ b/packages/kbn-esql-ast/src/ast_walker.ts
@@ -311,7 +311,7 @@ function getConstant(ctx: ConstantContext | undefined): ESQLAstItem | undefined
     return getBooleanValue(ctx);
   }
   if (ctx instanceof StringLiteralContext) {
-    return createLiteral('string', ctx.string_().STRING());
+    return createLiteral('string', ctx.string_().QUOTED_STRING());
   }
   if (
     ctx instanceof NumericArrayLiteralContext ||
@@ -327,7 +327,7 @@ function getConstant(ctx: ConstantContext | undefined): ESQLAstItem | undefined
       values.push(getBooleanValue(booleanValue)!);
     }
     for (const string of ctx.getTypedRuleContexts(StringContext)) {
-      const literal = createLiteral('string', string.STRING());
+      const literal = createLiteral('string', string.QUOTED_STRING());
       if (literal) {
         values.push(literal);
       }
@@ -412,7 +412,7 @@ function collectRegexExpression(ctx: BooleanExpressionContext): ESQLFunction[] {
       const arg = visitValueExpression(regex.valueExpression());
       if (arg) {
         fn.args.push(arg);
-        const literal = createLiteral('string', regex._pattern.STRING());
+        const literal = createLiteral('string', regex._pattern.QUOTED_STRING());
         if (literal) {
           fn.args.push(literal);
         }
@@ -530,7 +530,7 @@ export function visitOrderExpression(ctx: OrderExpressionContext[]) {
 }
 
 export function visitDissect(ctx: DissectCommandContext) {
-  const pattern = ctx.string_().getToken(esql_parser.STRING, 0);
+  const pattern = ctx.string_().getToken(esql_parser.QUOTED_STRING, 0);
   return [
     visitPrimaryExpression(ctx.primaryExpression()),
     ...(pattern && textExistsAndIsValid(pattern.getText())
@@ -540,7 +540,7 @@ export function visitDissect(ctx: DissectCommandContext) {
 }
 
 export function visitGrok(ctx: GrokCommandContext) {
-  const pattern = ctx.string_().getToken(esql_parser.STRING, 0);
+  const pattern = ctx.string_().getToken(esql_parser.QUOTED_STRING, 0);
   return [
     visitPrimaryExpression(ctx.primaryExpression()),
     ...(pattern && textExistsAndIsValid(pattern.getText())
diff --git a/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.ts b/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.ts
index dc356669b2847..46e89e50a3444 100644
--- a/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.ts
@@ -300,7 +300,7 @@ function extractQuotedText(rawText: string, error: EditorError) {
 }
 
 function inferCodeFromError(error: EditorError & { owner?: string }, rawText: string) {
-  if (error.message.endsWith('expecting STRING')) {
+  if (error.message.endsWith('expecting QUOTED_STRING')) {
     const value = extractQuotedText(rawText, error);
     return /^'(.)*'$/.test(value) ? 'wrongQuotes' : undefined;
   }
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
index d6919bb97551f..c64d7235b907a 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
@@ -469,7 +469,7 @@
     {
       "query": "row",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -577,7 +577,7 @@
     {
       "query": "row var = 1 in (",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
         "Error: [in] function expects exactly 2 arguments, got 1."
       ],
       "warning": []
@@ -3960,21 +3960,21 @@
     {
       "query": "from a_index | dissect",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
     {
       "query": "from a_index | dissect stringField",
       "error": [
-        "SyntaxError: missing STRING at '<EOF>'"
+        "SyntaxError: missing QUOTED_STRING at '<EOF>'"
       ],
       "warning": []
     },
     {
       "query": "from a_index | dissect stringField 2",
       "error": [
-        "SyntaxError: mismatched input '2' expecting STRING"
+        "SyntaxError: mismatched input '2' expecting QUOTED_STRING"
       ],
       "warning": []
     },
@@ -3989,7 +3989,7 @@
     {
       "query": "from a_index | dissect stringField %a",
       "error": [
-        "SyntaxError: mismatched input '%' expecting STRING",
+        "SyntaxError: mismatched input '%' expecting QUOTED_STRING",
         "SyntaxError: mismatched input '<EOF>' expecting '='"
       ],
       "warning": []
@@ -4016,7 +4016,7 @@
     {
       "query": "from a_index | dissect stringField \"%{firstWord}\" option = ",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', 'null', '?', 'true', '+', '-', OPENING_BRACKET}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', 'null', '?', 'true', '+', '-', OPENING_BRACKET}",
         "Invalid option for DISSECT: [option]"
       ],
       "warning": []
@@ -4055,21 +4055,21 @@
     {
       "query": "from a_index | grok",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
     {
       "query": "from a_index | grok stringField",
       "error": [
-        "SyntaxError: missing STRING at '<EOF>'"
+        "SyntaxError: missing QUOTED_STRING at '<EOF>'"
       ],
       "warning": []
     },
     {
       "query": "from a_index | grok stringField 2",
       "error": [
-        "SyntaxError: mismatched input '2' expecting STRING"
+        "SyntaxError: mismatched input '2' expecting QUOTED_STRING"
       ],
       "warning": []
     },
@@ -4084,7 +4084,7 @@
     {
       "query": "from a_index | grok stringField %a",
       "error": [
-        "SyntaxError: mismatched input '%' expecting STRING"
+        "SyntaxError: mismatched input '%' expecting QUOTED_STRING"
       ],
       "warning": []
     },
@@ -4705,21 +4705,21 @@
     {
       "query": "from a_index | where *+ numberField",
       "error": [
-        "SyntaxError: extraneous input '*' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: extraneous input '*' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
     {
       "query": "from a_index | where /+ numberField",
       "error": [
-        "SyntaxError: extraneous input '/' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: extraneous input '/' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
     {
       "query": "from a_index | where %+ numberField",
       "error": [
-        "SyntaxError: extraneous input '%' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: extraneous input '%' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -5766,7 +5766,7 @@
     {
       "query": "from a_index | eval ",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -5809,7 +5809,7 @@
     {
       "query": "from a_index | eval a=b, ",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
         "Unknown column [b]"
       ],
       "warning": []
@@ -5836,7 +5836,7 @@
     {
       "query": "from a_index | eval a=round(numberField), ",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -6557,21 +6557,21 @@
     {
       "query": "from a_index | eval *+ numberField",
       "error": [
-        "SyntaxError: extraneous input '*' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: extraneous input '*' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
     {
       "query": "from a_index | eval /+ numberField",
       "error": [
-        "SyntaxError: extraneous input '/' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: extraneous input '/' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
     {
       "query": "from a_index | eval %+ numberField",
       "error": [
-        "SyntaxError: extraneous input '%' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: extraneous input '%' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -9377,7 +9377,7 @@
     {
       "query": "from a_index | eval not",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
         "Error: [not] function expects exactly one argument, got 0."
       ],
       "warning": []
@@ -9385,7 +9385,7 @@
     {
       "query": "from a_index | eval in",
       "error": [
-        "SyntaxError: mismatched input 'in' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input 'in' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -10569,7 +10569,7 @@
     {
       "query": "from a_index | stats by ",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -10583,14 +10583,14 @@
     {
       "query": "from a_index | stats numberField=",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
     {
       "query": "from a_index | stats numberField=5 by ",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -12188,7 +12188,7 @@
     {
       "query": "from a_index | sort ",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
@@ -12207,7 +12207,7 @@
     {
       "query": "from a_index | sort numberField, ",
       "error": [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}"
       ],
       "warning": []
     },
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts b/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
index 498d5f264a8f6..7d19f4c23cad1 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
@@ -453,7 +453,7 @@ describe('validation logic', () => {
 
     describe('row', () => {
       testErrorsAndWarnings('row', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('row missing_column', ['Unknown column [missing_column]']);
       testErrorsAndWarnings('row fn()', ['Unknown function [fn]']);
@@ -482,7 +482,7 @@ describe('validation logic', () => {
         "SyntaxError: mismatched input '<EOF>' expecting '('",
       ]);
       testErrorsAndWarnings('row var = 1 in (', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
         'Error: [in] function expects exactly 2 arguments, got 1.',
       ]);
       testErrorsAndWarnings('row var = 1 not in ', [
@@ -910,20 +910,20 @@ describe('validation logic', () => {
 
     describe('dissect', () => {
       testErrorsAndWarnings('from a_index | dissect', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | dissect stringField', [
-        "SyntaxError: missing STRING at '<EOF>'",
+        "SyntaxError: missing QUOTED_STRING at '<EOF>'",
       ]);
       testErrorsAndWarnings('from a_index | dissect stringField 2', [
-        "SyntaxError: mismatched input '2' expecting STRING",
+        "SyntaxError: mismatched input '2' expecting QUOTED_STRING",
       ]);
       testErrorsAndWarnings('from a_index | dissect stringField .', [
         "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
         'Unknown column [stringField.]',
       ]);
       testErrorsAndWarnings('from a_index | dissect stringField %a', [
-        "SyntaxError: mismatched input '%' expecting STRING",
+        "SyntaxError: mismatched input '%' expecting QUOTED_STRING",
         "SyntaxError: mismatched input '<EOF>' expecting '='",
       ]);
       // Do not try to validate the dissect pattern string
@@ -935,7 +935,7 @@ describe('validation logic', () => {
         "SyntaxError: mismatched input '<EOF>' expecting '='",
       ]);
       testErrorsAndWarnings('from a_index | dissect stringField "%{firstWord}" option = ', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', 'null', '?', 'true', '+', '-', OPENING_BRACKET}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', 'null', '?', 'true', '+', '-', OPENING_BRACKET}",
         'Invalid option for DISSECT: [option]',
       ]);
       testErrorsAndWarnings('from a_index | dissect stringField "%{firstWord}" option = 1', [
@@ -964,20 +964,20 @@ describe('validation logic', () => {
 
     describe('grok', () => {
       testErrorsAndWarnings('from a_index | grok', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | grok stringField', [
-        "SyntaxError: missing STRING at '<EOF>'",
+        "SyntaxError: missing QUOTED_STRING at '<EOF>'",
       ]);
       testErrorsAndWarnings('from a_index | grok stringField 2', [
-        "SyntaxError: mismatched input '2' expecting STRING",
+        "SyntaxError: mismatched input '2' expecting QUOTED_STRING",
       ]);
       testErrorsAndWarnings('from a_index | grok stringField .', [
         "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
         'Unknown column [stringField.]',
       ]);
       testErrorsAndWarnings('from a_index | grok stringField %a', [
-        "SyntaxError: mismatched input '%' expecting STRING",
+        "SyntaxError: mismatched input '%' expecting QUOTED_STRING",
       ]);
       // Do not try to validate the grok pattern string
       testErrorsAndWarnings('from a_index | grok stringField "%{firstWord}"', []);
@@ -1040,7 +1040,7 @@ describe('validation logic', () => {
       }
       for (const wrongOp of ['*', '/', '%']) {
         testErrorsAndWarnings(`from a_index | where ${wrongOp}+ numberField`, [
-          `SyntaxError: extraneous input '${wrongOp}' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}`,
+          `SyntaxError: extraneous input '${wrongOp}' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}`,
         ]);
       }
 
@@ -1213,7 +1213,7 @@ describe('validation logic', () => {
 
     describe('eval', () => {
       testErrorsAndWarnings('from a_index | eval ', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | eval stringField ', []);
       testErrorsAndWarnings('from a_index | eval b = stringField', []);
@@ -1226,7 +1226,7 @@ describe('validation logic', () => {
       ]);
       testErrorsAndWarnings('from a_index | eval a=b', ['Unknown column [b]']);
       testErrorsAndWarnings('from a_index | eval a=b, ', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
         'Unknown column [b]',
       ]);
       testErrorsAndWarnings('from a_index | eval a=round', ['Unknown column [round]']);
@@ -1235,7 +1235,7 @@ describe('validation logic', () => {
       ]);
       testErrorsAndWarnings('from a_index | eval a=round(numberField) ', []);
       testErrorsAndWarnings('from a_index | eval a=round(numberField), ', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | eval a=round(numberField) + round(numberField) ', []);
       testErrorsAndWarnings('from a_index | eval a=round(numberField) + round(stringField) ', [
@@ -1298,7 +1298,7 @@ describe('validation logic', () => {
 
       for (const wrongOp of ['*', '/', '%']) {
         testErrorsAndWarnings(`from a_index | eval ${wrongOp}+ numberField`, [
-          `SyntaxError: extraneous input '${wrongOp}' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}`,
+          `SyntaxError: extraneous input '${wrongOp}' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}`,
         ]);
       }
 
@@ -1655,11 +1655,11 @@ describe('validation logic', () => {
         []
       );
       testErrorsAndWarnings('from a_index | eval not', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
         'Error: [not] function expects exactly one argument, got 0.',
       ]);
       testErrorsAndWarnings('from a_index | eval in', [
-        "SyntaxError: mismatched input 'in' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input 'in' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
 
       testErrorsAndWarnings('from a_index | eval stringField in stringField', [
@@ -1728,16 +1728,16 @@ describe('validation logic', () => {
       ]);
       testErrorsAndWarnings('from a_index | stats by stringField', []);
       testErrorsAndWarnings('from a_index | stats by ', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | stats numberField ', [
         'Expected an aggregate function or group but got [numberField] of type [FieldAttribute]',
       ]);
       testErrorsAndWarnings('from a_index | stats numberField=', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | stats numberField=5 by ', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | stats avg(numberField) by wrongField', [
         'Unknown column [wrongField]',
@@ -2162,12 +2162,12 @@ describe('validation logic', () => {
 
     describe('sort', () => {
       testErrorsAndWarnings('from a_index | sort ', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | sort "field" ', []);
       testErrorsAndWarnings('from a_index | sort wrongField ', ['Unknown column [wrongField]']);
       testErrorsAndWarnings('from a_index | sort numberField, ', [
-        "SyntaxError: mismatched input '<EOF>' expecting {STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
+        "SyntaxError: mismatched input '<EOF>' expecting {QUOTED_STRING, INTEGER_LITERAL, DECIMAL_LITERAL, 'false', '(', 'not', 'null', '?', 'true', '+', '-', OPENING_BRACKET, UNQUOTED_IDENTIFIER, QUOTED_IDENTIFIER}",
       ]);
       testErrorsAndWarnings('from a_index | sort numberField, stringField', []);
       for (const dir of ['desc', 'asc']) {

From 6248a37ea17163a9e1a647359cb5cc3cde65e400 Mon Sep 17 00:00:00 2001
From: Joe McElroy <joseph.mcelroy@elastic.co>
Date: Tue, 2 Apr 2024 21:07:18 +0100
Subject: [PATCH 47/63] [Search] [Playground] Pick context fields + Mute
 support for Nested Vector (#179487)

## Summary

1. Introduce a new Context flyout that allows the user to adjust the
number of documents retrieved and the source fields used in the context
2. Hide nested vector fields. We will rely on passage first and
semantic_text for multi vector documents.


![image](https://github.com/elastic/kibana/assets/49480/306ed454-d867-4713-afc4-b26fc051e67a)
---
 .../fetch_query_source_fields.mock.ts         | 784 ++++++++++++++++++
 .../public/components/chat.tsx                |   7 +-
 .../edit_context/edit_context_action.tsx      |  33 +
 .../edit_context/edit_context_flyout.tsx      | 191 +++++
 .../sources_panel_for_start_chat.tsx          |  17 +-
 .../public/components/toolbar.tsx             |   2 +
 .../public/providers/playground_provider.tsx  |   5 +-
 .../plugins/search_playground/public/types.ts |   6 +-
 .../public/utils/create_query.test.ts         |  38 +
 .../public/utils/create_query.ts              |  12 +-
 .../search_playground/server/routes.ts        |  12 +
 .../server/utils/conversational_chain.test.ts | 119 +++
 .../server/utils/conversational_chain.ts      |   7 +-
 .../server/utils/elasticsearch_retriever.ts   |  13 +-
 .../utils/fetch_query_source_fields.test.ts   |  70 +-
 .../server/utils/fetch_query_source_fields.ts |  36 +-
 16 files changed, 1312 insertions(+), 40 deletions(-)
 create mode 100644 x-pack/plugins/search_playground/public/components/edit_context/edit_context_action.tsx
 create mode 100644 x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.tsx
 create mode 100644 x-pack/plugins/search_playground/server/utils/conversational_chain.test.ts

diff --git a/x-pack/plugins/search_playground/__mocks__/fetch_query_source_fields.mock.ts b/x-pack/plugins/search_playground/__mocks__/fetch_query_source_fields.mock.ts
index 21acf3b60f7ab..c690563691dde 100644
--- a/x-pack/plugins/search_playground/__mocks__/fetch_query_source_fields.mock.ts
+++ b/x-pack/plugins/search_playground/__mocks__/fetch_query_source_fields.mock.ts
@@ -45,6 +45,790 @@ export const ELSER_PASSAGE_CHUNKED_TWO_INDICES_DOCS = [
   },
 ];
 
+export const DENSE_VECTOR_DOCUMENT_FIRST = [
+  {
+    _index: 'workplace_index_nested',
+    _id: 'MXEeQo4BweykRPD22e0N',
+    _score: 1,
+    _ignored: ['content.keyword', 'metadata.summary.keyword', 'metadata.content.keyword'],
+    _source: {
+      metadata: {
+        summary:
+          'This policy outlines the guidelines for full-time remote work, including eligibility, equipment and resources, workspace requirements, communication expectations, performance expectations, time tracking and overtime, confidentiality and data security, health and well-being, and policy reviews and updates. Employees are encouraged to direct any questions or concerns',
+        _run_ml_inference: true,
+        updated_at: '2020-03-01',
+        created_on: '2020-03-01',
+        rolePermissions: ['demo', 'manager'],
+        name: 'Work From Home Policy',
+        category: 'teams',
+        content: `Effective: March 2020
+Purpose
+
+The purpose of this full-time work-from-home policy is to provide guidelines and support for employees to conduct their work remotely, ensuring the continuity and productivity of business operations during the COVID-19 pandemic and beyond.
+Scope
+
+This policy applies to all employees who are eligible for remote work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same level of performance and collaboration as they would in the office.
+Eligibility
+
+Employees who can perform their work duties remotely and have received approval from their direct supervisor and the HR department are eligible for this work-from-home arrangement.
+Equipment and Resources
+
+The necessary equipment and resources will be provided to employees for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for maintaining and protecting the company's equipment and data.
+Workspace
+
+Employees working from home are responsible for creating a comfortable and safe workspace that is conducive to productivity. This includes ensuring that their home office is ergonomically designed, well-lit, and free from distractions.
+Communication
+
+Effective communication is vital for successful remote work. Employees are expected to maintain regular communication with their supervisors, colleagues, and team members through email, phone calls, video conferences, and other approved communication tools.
+Work Hours and Availability
+
+Employees are expected to maintain their regular work hours and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated to the employee's supervisor and the HR department.
+Performance Expectations
+
+Employees working from home are expected to maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish clear expectations and goals for remote work.
+Time Tracking and Overtime
+
+Employees are required to accurately track their work hours using the company's time tracking system. Non-exempt employees must obtain approval from their supervisor before working overtime.
+Confidentiality and Data Security
+
+Employees must adhere to the company's confidentiality and data security policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet connections, and reporting any security breaches to the IT department.
+Health and Well-being
+
+The company encourages employees to prioritize their health and well-being while working from home. This includes taking regular breaks, maintaining a work-life balance, and seeking support from supervisors and colleagues when needed.
+Policy Review and Updates
+
+This work-from-home policy will be reviewed periodically and updated as necessary, taking into account changes in public health guidance, business needs, and employee feedback.
+Questions and Concerns
+
+Employees are encouraged to direct any questions or concerns about this policy to their supervisor or the HR department.
+`,
+        url: './sharepoint/Work from home policy.txt',
+      },
+      passages: [
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Effective: March 2020 Purpose',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'The purpose of this full-time work-from-home policy is to provide guidelines and support for employees to conduct their work remotely, ensuring the continuity and productivity of business operations',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'of this full-time work-from-home policy is to provide guidelines and support for employees to conduct their work remotely, ensuring the continuity and productivity of business operations during the',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'full-time work-from-home policy is to provide guidelines and support for employees to conduct their work remotely, ensuring the continuity and productivity of business operations during the COVID-19',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'work-from-home policy is to provide guidelines and support for employees to conduct their work remotely, ensuring the continuity and productivity of business operations during the COVID-19 pandemic',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'policy is to provide guidelines and support for employees to conduct their work remotely, ensuring the continuity and productivity of business operations during the COVID-19 pandemic and beyond.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Scope',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'This policy applies to all employees who are eligible for remote work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'policy applies to all employees who are eligible for remote work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'applies to all employees who are eligible for remote work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'to all employees who are eligible for remote work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same level of',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'who are eligible for remote work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same level of performance and',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'for remote work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same level of performance and collaboration as',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'remote work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same level of performance and collaboration as they',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'work as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same level of performance and collaboration as they would in',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'as determined by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same level of performance and collaboration as they would in the',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'by their role and responsibilities. It is designed to allow employees to work from home full time while maintaining the same level of performance and collaboration as they would in the office.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Eligibility',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Employees who can perform their work duties remotely and have received approval from their direct supervisor and the HR department are eligible for this work-from-home arrangement.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Equipment and Resources',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'The necessary equipment and resources will be provided to employees for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'equipment and resources will be provided to employees for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'and resources will be provided to employees for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for maintaining',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'resources will be provided to employees for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for maintaining and',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'will be provided to employees for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for maintaining and protecting',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'be provided to employees for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for maintaining and protecting the',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "to employees for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for maintaining and protecting the company's",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "for remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for maintaining and protecting the company's equipment and",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "remote work, including a company-issued laptop, software licenses, and access to secure communication tools. Employees are responsible for maintaining and protecting the company's equipment and data.",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Workspace',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Employees working from home are responsible for creating a comfortable and safe workspace that is conducive to productivity. This includes ensuring that their home office is ergonomically designed,',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'working from home are responsible for creating a comfortable and safe workspace that is conducive to productivity. This includes ensuring that their home office is ergonomically designed, well-lit,',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'from home are responsible for creating a comfortable and safe workspace that is conducive to productivity. This includes ensuring that their home office is ergonomically designed, well-lit, and free',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'home are responsible for creating a comfortable and safe workspace that is conducive to productivity. This includes ensuring that their home office is ergonomically designed, well-lit, and free from',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'for creating a comfortable and safe workspace that is conducive to productivity. This includes ensuring that their home office is ergonomically designed, well-lit, and free from distractions.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Communication',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Effective communication is vital for successful remote work. Employees are expected to maintain regular communication with their supervisors, colleagues, and team members through email, phone calls,',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'communication is vital for successful remote work. Employees are expected to maintain regular communication with their supervisors, colleagues, and team members through email, phone calls, video',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'is vital for successful remote work. Employees are expected to maintain regular communication with their supervisors, colleagues, and team members through email, phone calls, video conferences, and',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'for successful remote work. Employees are expected to maintain regular communication with their supervisors, colleagues, and team members through email, phone calls, video conferences, and other',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'successful remote work. Employees are expected to maintain regular communication with their supervisors, colleagues, and team members through email, phone calls, video conferences, and other approved',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'work. Employees are expected to maintain regular communication with their supervisors, colleagues, and team members through email, phone calls, video conferences, and other approved communication',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Employees are expected to maintain regular communication with their supervisors, colleagues, and team members through email, phone calls, video conferences, and other approved communication tools.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Work Hours and Availability',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Employees are expected to maintain their regular work hours and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'are expected to maintain their regular work hours and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'to maintain their regular work hours and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'maintain their regular work hours and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated to',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'their regular work hours and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated to the',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "regular work hours and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated to the employee's",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "hours and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated to the employee's supervisor",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "and be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated to the employee's supervisor and the",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "be available during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated to the employee's supervisor and the HR",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "during normal business hours, unless otherwise agreed upon with their supervisor. Any changes to work hours or availability must be communicated to the employee's supervisor and the HR department.",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Performance Expectations',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Employees working from home are expected to maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'working from home are expected to maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish clear',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'from home are expected to maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish clear expectations',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'home are expected to maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish clear expectations and',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'are expected to maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish clear expectations and goals',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'expected to maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish clear expectations and goals for',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'to maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish clear expectations and goals for remote',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'maintain the same level of performance and productivity as if they were working in the office. Supervisors and team members will collaborate to establish clear expectations and goals for remote work.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Time Tracking and Overtime',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "Employees are required to accurately track their work hours using the company's time tracking system. Non-exempt employees must obtain approval from their supervisor before working overtime.",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Confidentiality and Data Security',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "Employees must adhere to the company's confidentiality and data security policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "must adhere to the company's confidentiality and data security policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet connections,",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "adhere to the company's confidentiality and data security policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet connections, and",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "the company's confidentiality and data security policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet connections, and reporting",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: "company's confidentiality and data security policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet connections, and reporting any",
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'confidentiality and data security policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet connections, and reporting any security',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'and data security policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet connections, and reporting any security breaches to the IT',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'policies while working from home. This includes safeguarding sensitive information, securing personal devices and internet connections, and reporting any security breaches to the IT department.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Health and Well-being',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'The company encourages employees to prioritize their health and well-being while working from home. This includes taking regular breaks, maintaining a work-life balance, and seeking support from',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'encourages employees to prioritize their health and well-being while working from home. This includes taking regular breaks, maintaining a work-life balance, and seeking support from supervisors and',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'employees to prioritize their health and well-being while working from home. This includes taking regular breaks, maintaining a work-life balance, and seeking support from supervisors and colleagues',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'to prioritize their health and well-being while working from home. This includes taking regular breaks, maintaining a work-life balance, and seeking support from supervisors and colleagues when',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'prioritize their health and well-being while working from home. This includes taking regular breaks, maintaining a work-life balance, and seeking support from supervisors and colleagues when needed.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Policy Review and Updates',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'This work-from-home policy will be reviewed periodically and updated as necessary, taking into account changes in public health guidance, business needs, and employee feedback.',
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: `This work-from-home policy will be reviewed periodically and updated as necessary, taking into account changes in public health guidance, business needs, and employee feedback.
+Questions and Concerns`,
+        },
+        {
+          vector: {
+            model_id: '.multilingual-e5-small',
+          },
+          text: 'Employees are encouraged to direct any questions or concerns about this policy to their supervisor or the HR department.',
+        },
+      ],
+    },
+  },
+];
+
+export const DENSE_VECTOR_DOCUMENT_FIRST_FIELD_CAPS = {
+  indices: ['workplace_index_nested'],
+  fields: {
+    'passages.vector.model_id.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    metadata: {
+      object: {
+        type: 'object',
+        metadata_field: false,
+        searchable: false,
+        aggregatable: false,
+      },
+    },
+    'passages.vector.predicted_value': {
+      dense_vector: {
+        type: 'dense_vector',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'metadata.category': {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    content: {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'metadata.url': {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'metadata.summary.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'metadata.updated_at': {
+      date: {
+        type: 'date',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'metadata.rolePermissions': {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    passages: {
+      nested: {
+        type: 'nested',
+        metadata_field: false,
+        searchable: false,
+        aggregatable: false,
+      },
+    },
+    'metadata.name': {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'metadata._run_ml_inference': {
+      boolean: {
+        type: 'boolean',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'metadata.url.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'passages.text': {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'metadata.category.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'metadata.rolePermissions.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'metadata.name.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'metadata.summary': {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'passages.vector': {
+      object: {
+        type: 'object',
+        metadata_field: false,
+        searchable: false,
+        aggregatable: false,
+      },
+    },
+    'metadata.restricted': {
+      boolean: {
+        type: 'boolean',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'content.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'passages.vector.model_id': {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'metadata.created_on': {
+      date: {
+        type: 'date',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'metadata.content.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+    'metadata.content': {
+      text: {
+        type: 'text',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'passages.text.keyword': {
+      keyword: {
+        type: 'keyword',
+        metadata_field: false,
+        searchable: true,
+        aggregatable: true,
+      },
+    },
+  },
+};
+
 export const ELSER_PASSAGE_CHUNKED_TWO_INDICES = {
   indices: ['workplace_index', 'workplace_index2'],
   fields: {
diff --git a/x-pack/plugins/search_playground/public/components/chat.tsx b/x-pack/plugins/search_playground/public/components/chat.tsx
index d736ad6313910..2aec17816a2c0 100644
--- a/x-pack/plugins/search_playground/public/components/chat.tsx
+++ b/x-pack/plugins/search_playground/public/components/chat.tsx
@@ -25,7 +25,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { useAutoBottomScroll } from '../hooks/use_auto_bottom_scroll';
 import { ChatSidebar } from './chat_sidebar';
 import { useChat } from '../hooks/use_chat';
-import { ChatForm, ChatFormFields, MessageRole, SummarizationModelName } from '../types';
+import { ChatForm, ChatFormFields, MessageRole } from '../types';
 
 import { MessageList } from './message_list/message_list';
 import { QuestionInput } from './question_input';
@@ -40,8 +40,9 @@ const buildFormData = (formData: ChatForm) => ({
   api_key: formData[ChatFormFields.openAIKey],
   citations: formData[ChatFormFields.citations],
   elasticsearchQuery: JSON.stringify(formData[ChatFormFields.elasticsearchQuery]),
-  summarization_model:
-    formData[ChatFormFields.summarizationModel] ?? SummarizationModelName.gpt3_5_turbo_1106,
+  summarization_model: formData[ChatFormFields.summarizationModel],
+  source_fields: JSON.stringify(formData[ChatFormFields.sourceFields]),
+  docSize: formData[ChatFormFields.docSize],
 });
 
 export const Chat = () => {
diff --git a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_action.tsx b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_action.tsx
new file mode 100644
index 0000000000000..feb80f253dc69
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_action.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 React, { useState } from 'react';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { useFormContext } from 'react-hook-form';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { ChatForm } from '../../types';
+import { EditContextFlyout } from './edit_context_flyout';
+
+export const EditContextAction: React.FC = () => {
+  const { watch } = useFormContext<ChatForm>();
+  const [showFlyout, setShowFlyout] = useState(false);
+  const selectedIndices: string[] = watch('indices');
+
+  const closeFlyout = () => setShowFlyout(false);
+
+  return (
+    <>
+      {showFlyout && <EditContextFlyout onClose={closeFlyout} />}
+      <EuiButtonEmpty onClick={() => setShowFlyout(true)} disabled={selectedIndices?.length === 0}>
+        <FormattedMessage
+          id="xpack.searchPlayground.editContext.actionButtonLabel"
+          defaultMessage="Edit Context"
+        />
+      </EuiButtonEmpty>
+    </>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.tsx b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.tsx
new file mode 100644
index 0000000000000..96371c7f5ec95
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.tsx
@@ -0,0 +1,191 @@
+/*
+ * 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, useMemo, useState } from 'react';
+import {
+  EuiFlyout,
+  EuiFlyoutHeader,
+  EuiFlyoutBody,
+  EuiTitle,
+  EuiFlexItem,
+  EuiFlexGroup,
+  EuiButtonEmpty,
+  EuiButton,
+  EuiFlyoutFooter,
+  EuiSpacer,
+  EuiText,
+  EuiPanel,
+  EuiAccordion,
+  EuiSelectable,
+  EuiSelect,
+  EuiSelectableOption,
+} from '@elastic/eui';
+import { useController, useFormContext } from 'react-hook-form';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { ChatForm, ChatFormFields } from '../../types';
+import { useIndicesFields } from '../../hooks/use_indices_fields';
+import { getDefaultSourceFields } from '../../utils/create_query';
+
+interface EditContextFlyoutProps {
+  onClose: () => void;
+}
+
+export const EditContextFlyout: React.FC<EditContextFlyoutProps> = ({ onClose }) => {
+  const { watch } = useFormContext<ChatForm>();
+  const selectedIndices: string[] = watch('indices');
+  const { fields } = useIndicesFields(selectedIndices || []);
+  const defaultFields = useMemo(() => getDefaultSourceFields(fields), [fields]);
+  const [sourceFields, setSourceFields] = useState(defaultFields);
+
+  const {
+    field: { onChange: onChangeSize, value: docSizeInitialValue },
+  } = useController({
+    name: ChatFormFields.docSize,
+  });
+
+  const [docSize, setDocSize] = useState(docSizeInitialValue);
+
+  const {
+    field: { onChange: onChangeSourceFields },
+  } = useController({
+    name: ChatFormFields.sourceFields,
+  });
+
+  useEffect(() => {
+    if (selectedIndices?.length > 0) {
+      setSourceFields(defaultFields);
+    }
+  }, [selectedIndices, defaultFields]);
+
+  const toggleSourceField = (index: string, f: EuiSelectableOption[]) => {
+    setSourceFields({
+      ...sourceFields,
+      [index]: f.filter(({ checked }) => checked === 'on').map(({ label }) => label),
+    });
+  };
+
+  const saveSourceFields = () => {
+    onChangeSourceFields(sourceFields);
+    onChangeSize(docSize);
+    onClose();
+  };
+
+  return (
+    <EuiFlyout ownFocus onClose={onClose} size="s">
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2>
+            <FormattedMessage
+              id="xpack.searchPlayground.editContext.flyout.title"
+              defaultMessage="Edit Context"
+            />
+          </h2>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+        <EuiText color="subdued">
+          <p>
+            <FormattedMessage
+              id="xpack.searchPlayground.editContext.flyout.description"
+              defaultMessage="Documents retrieved and selected fields will be used to build the context."
+            />
+          </p>
+        </EuiText>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <EuiFlexGroup>
+          <EuiFlexItem grow={3}>
+            <EuiFlexGroup direction="column">
+              <EuiFlexItem grow={false}>
+                <EuiSelect
+                  prepend={i18n.translate(
+                    'xpack.searchPlayground.editContext.flyout.docsRetrievedCount',
+                    {
+                      defaultMessage: 'Retrieved Documents',
+                    }
+                  )}
+                  options={[
+                    {
+                      value: 3,
+                      text: '3',
+                    },
+                    {
+                      value: 5,
+                      text: '5',
+                    },
+                    {
+                      value: 10,
+                      text: '10',
+                    },
+                  ]}
+                  value={docSize}
+                  onChange={(e) => setDocSize(Number(e.target.value))}
+                />
+              </EuiFlexItem>
+              <EuiText>
+                <h5>
+                  <FormattedMessage
+                    id="xpack.searchPlayground.editContext.flyout.table.title"
+                    defaultMessage="Selected Fields"
+                  />
+                </h5>
+              </EuiText>
+              {Object.entries(fields).map(([index, group], i) => (
+                <EuiFlexItem grow={false} key={index}>
+                  <EuiPanel grow={false} hasShadow={false} hasBorder>
+                    <EuiAccordion
+                      initialIsOpen={i === 0}
+                      id={index}
+                      buttonContent={
+                        <EuiText>
+                          <h5>{index}</h5>
+                        </EuiText>
+                      }
+                    >
+                      <EuiSpacer size="s" />
+                      <EuiSelectable
+                        aria-label="Select context fields"
+                        options={group.source_fields.map((field) => ({
+                          label: field,
+                          checked: sourceFields[index]?.includes(field) ? 'on' : undefined,
+                        }))}
+                        onChange={(newOptions) => toggleSourceField(index, newOptions)}
+                        listProps={{ bordered: false }}
+                        singleSelection="always"
+                      >
+                        {(list) => list}
+                      </EuiSelectable>
+                    </EuiAccordion>
+                  </EuiPanel>
+                </EuiFlexItem>
+              ))}
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutBody>
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty iconType="cross" onClick={onClose} flush="left">
+              <FormattedMessage
+                id="xpack.searchPlayground.editContext.flyout.closeButton"
+                defaultMessage="Close"
+              />
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton onClick={saveSourceFields} fill>
+              <FormattedMessage
+                id="xpack.searchPlayground.editContext.flyout.saveButton"
+                defaultMessage="Save changes"
+              />
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.tsx b/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.tsx
index a907cf0d86547..b70f921ca65c7 100644
--- a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.tsx
+++ b/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.tsx
@@ -17,7 +17,11 @@ import { useSourceIndicesField } from '../../hooks/use_source_indices_field';
 import { useQueryIndices } from '../../hooks/use_query_indices';
 import { ChatFormFields } from '../../types';
 import { useIndicesFields } from '../../hooks/use_indices_fields';
-import { createQuery, getDefaultQueryFields } from '../../utils/create_query';
+import {
+  createQuery,
+  getDefaultQueryFields,
+  getDefaultSourceFields,
+} from '../../utils/create_query';
 
 export const SourcesPanelForStartChat: React.FC = () => {
   const { selectedIndices, removeIndex, addIndex } = useSourceIndicesField();
@@ -31,12 +35,21 @@ export const SourcesPanelForStartChat: React.FC = () => {
     defaultValue: {},
   });
 
+  const {
+    field: { onChange: sourceFieldsOnChange },
+  } = useController({
+    name: ChatFormFields.sourceFields,
+    defaultValue: {},
+  });
+
   useEffect(() => {
     if (fields) {
       const defaultFields = getDefaultQueryFields(fields);
+      const defaultSourceFields = getDefaultSourceFields(fields);
       elasticsearchQueryOnChange(createQuery(defaultFields, fields));
+      sourceFieldsOnChange(defaultSourceFields);
     }
-  }, [fields, elasticsearchQueryOnChange]);
+  }, [fields, elasticsearchQueryOnChange, sourceFieldsOnChange]);
 
   return (
     <StartChatPanel
diff --git a/x-pack/plugins/search_playground/public/components/toolbar.tsx b/x-pack/plugins/search_playground/public/components/toolbar.tsx
index 67f35c5adee57..b35062fa80eb6 100644
--- a/x-pack/plugins/search_playground/public/components/toolbar.tsx
+++ b/x-pack/plugins/search_playground/public/components/toolbar.tsx
@@ -9,10 +9,12 @@ import { EuiFlexGroup } from '@elastic/eui';
 import React from 'react';
 import { ViewCodeAction } from './view_code/view_code_action';
 import { ViewQueryAction } from './view_query/view_query_action';
+import { EditContextAction } from './edit_context/edit_context_action';
 
 export const Toolbar: React.FC = () => {
   return (
     <EuiFlexGroup gutterSize="s">
+      <EditContextAction />
       <ViewQueryAction />
       <ViewCodeAction />
     </EuiFlexGroup>
diff --git a/x-pack/plugins/search_playground/public/providers/playground_provider.tsx b/x-pack/plugins/search_playground/public/providers/playground_provider.tsx
index 54e9b3363411f..53a2842e4bce6 100644
--- a/x-pack/plugins/search_playground/public/providers/playground_provider.tsx
+++ b/x-pack/plugins/search_playground/public/providers/playground_provider.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { FormProvider, useForm } from 'react-hook-form';
-import { ChatForm } from '../types';
+import { ChatForm, SummarizationModelName } from '../types';
 
 const queryClient = new QueryClient({});
 
@@ -16,6 +16,9 @@ export const PlaygroundProvider: React.FC = ({ children }) => {
   const form = useForm<ChatForm>({
     defaultValues: {
       prompt: 'You are an assistant for question-answering tasks.',
+      docSize: 5,
+      source_fields: [],
+      summarization_model: SummarizationModelName.gpt3_5_turbo,
     },
   });
 
diff --git a/x-pack/plugins/search_playground/public/types.ts b/x-pack/plugins/search_playground/public/types.ts
index f0a97b092dd5f..8536b9a19a956 100644
--- a/x-pack/plugins/search_playground/public/types.ts
+++ b/x-pack/plugins/search_playground/public/types.ts
@@ -49,6 +49,8 @@ export enum ChatFormFields {
   indices = 'indices',
   elasticsearchQuery = 'elasticsearch_query',
   summarizationModel = 'summarization_model',
+  sourceFields = 'source_fields',
+  docSize = 'docSize',
 }
 
 export interface ChatForm {
@@ -59,6 +61,8 @@ export interface ChatForm {
   [ChatFormFields.indices]: string[];
   [ChatFormFields.summarizationModel]: string;
   [ChatFormFields.elasticsearchQuery]: QueryDslQueryContainer;
+  [ChatFormFields.sourceFields]: string[];
+  [ChatFormFields.docSize]: number;
 }
 
 export enum MessageRole {
@@ -128,7 +132,7 @@ export type JSONValue = null | string | number | boolean | { [x: string]: JSONVa
 
 export interface ChatRequestOptions {
   options?: RequestOptions;
-  data?: Record<string, string | boolean>;
+  data?: Record<string, string | number | boolean>;
 }
 
 export type CreateMessage = Omit<Message, 'id'> & {
diff --git a/x-pack/plugins/search_playground/public/utils/create_query.test.ts b/x-pack/plugins/search_playground/public/utils/create_query.test.ts
index ba663144f4e43..5af3e6f55bd63 100644
--- a/x-pack/plugins/search_playground/public/utils/create_query.test.ts
+++ b/x-pack/plugins/search_playground/public/utils/create_query.test.ts
@@ -131,6 +131,44 @@ describe('create_query', () => {
       });
     });
 
+    it('should throw for nested dense query', () => {
+      const fields = {
+        index1: ['passages.field1.predicted_value'],
+      };
+
+      const fieldDescriptors: IndicesQuerySourceFields = {
+        index1: {
+          elser_query_fields: [],
+          dense_vector_query_fields: [
+            { field: 'passages.field1.predicted_value', model_id: 'model1', nested: true },
+          ],
+          bm25_query_fields: [],
+          source_fields: [],
+        },
+      };
+
+      expect(createQuery(fields, fieldDescriptors)).toEqual({});
+    });
+
+    it('should throw for nested sparse query', () => {
+      const fields = {
+        index1: ['passages.field1.tokens'],
+      };
+
+      const fieldDescriptors: IndicesQuerySourceFields = {
+        index1: {
+          elser_query_fields: [
+            { field: 'passages.field1.tokens', model_id: 'model1', nested: true },
+          ],
+          dense_vector_query_fields: [],
+          bm25_query_fields: [],
+          source_fields: [],
+        },
+      };
+
+      expect(createQuery(fields, fieldDescriptors)).toEqual({});
+    });
+
     it('should return a hybrid query', () => {
       const fields = {
         index1: ['field1', 'content', 'title'],
diff --git a/x-pack/plugins/search_playground/public/utils/create_query.ts b/x-pack/plugins/search_playground/public/utils/create_query.ts
index 4649e9c9d6523..d973e44de2c96 100644
--- a/x-pack/plugins/search_playground/public/utils/create_query.ts
+++ b/x-pack/plugins/search_playground/public/utils/create_query.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IndicesQuerySourceFields } from '../types';
+import { IndicesQuerySourceFields, QuerySourceFields } from '../types';
 
 type IndexFields = Record<string, string[]>;
 
@@ -30,8 +30,8 @@ interface Matches {
 export function createQuery(fields: IndexFields, fieldDescriptors: IndicesQuerySourceFields) {
   const boolMatches = Object.keys(fields).reduce<Matches>(
     (acc, index) => {
-      const indexFields = fields[index];
-      const indexFieldDescriptors = fieldDescriptors[index];
+      const indexFields: string[] = fields[index];
+      const indexFieldDescriptors: QuerySourceFields = fieldDescriptors[index];
 
       const sparseMatches =
         indexFields.map((field) => {
@@ -39,7 +39,8 @@ export function createQuery(fields: IndexFields, fieldDescriptors: IndicesQueryS
             (x) => x.field === field
           );
 
-          if (elserField) {
+          // not supporting nested fields for now
+          if (elserField && !elserField.nested) {
             // when another index has the same field, we don't want to duplicate the match rule
             const hasExistingSparseMatch = acc.queryMatches.find(
               (x: any) =>
@@ -83,7 +84,8 @@ export function createQuery(fields: IndexFields, fieldDescriptors: IndicesQueryS
             (x) => x.field === field
           );
 
-          if (denseVectorField) {
+          // not supporting nested fields for now
+          if (denseVectorField && !denseVectorField.nested) {
             return {
               field: denseVectorField.field,
               k: 10,
diff --git a/x-pack/plugins/search_playground/server/routes.ts b/x-pack/plugins/search_playground/server/routes.ts
index 5f8fcd836fd0e..15f514b4fd0e7 100644
--- a/x-pack/plugins/search_playground/server/routes.ts
+++ b/x-pack/plugins/search_playground/server/routes.ts
@@ -63,6 +63,15 @@ export function defineRoutes({ log, router }: { log: Logger; router: IRouter })
         openAIApiKey: data.api_key,
       });
 
+      let sourceFields = {};
+
+      try {
+        sourceFields = JSON.parse(data.source_fields);
+      } catch (e) {
+        log.error('Failed to parse the source fields', e);
+        throw Error(e);
+      }
+
       const chain = ConversationalChain({
         model,
         rag: {
@@ -73,8 +82,11 @@ export function defineRoutes({ log, router }: { log: Logger; router: IRouter })
               return query.query;
             } catch (e) {
               log.error('Failed to parse the Elasticsearch query', e);
+              throw Error(e);
             }
           },
+          content_field: sourceFields,
+          size: Number(data.docSize),
         },
         prompt: Prompt(data.prompt, {
           citations: data.citations,
diff --git a/x-pack/plugins/search_playground/server/utils/conversational_chain.test.ts b/x-pack/plugins/search_playground/server/utils/conversational_chain.test.ts
new file mode 100644
index 0000000000000..16c7b54613065
--- /dev/null
+++ b/x-pack/plugins/search_playground/server/utils/conversational_chain.test.ts
@@ -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 type { Client } from '@elastic/elasticsearch';
+import { createAssist as Assist } from './assist';
+import { ConversationalChain } from './conversational_chain';
+import { FakeListLLM } from 'langchain/llms/fake';
+import { BaseChatModel } from '@langchain/core/language_models/chat_models';
+
+describe('conversational chain', () => {
+  it('should be able to create a conversational chain', async () => {
+    const searchMock = jest.fn().mockImplementation(() => {
+      return {
+        hits: {
+          hits: [
+            {
+              _index: 'index',
+              _id: '1',
+              _source: {
+                field: 'value',
+              },
+            },
+            {
+              _index: 'website',
+              _id: '1',
+              _source: {
+                body_content: 'value2',
+              },
+            },
+          ],
+        },
+      };
+    });
+
+    const mockElasticsearchClient = {
+      search: searchMock,
+    };
+
+    const llm = new FakeListLLM({
+      responses: ['question rewritten to work from home', 'the final answer'],
+    });
+
+    const aiClient = Assist({
+      es_client: mockElasticsearchClient as unknown as Client,
+    });
+
+    const conversationalChain = ConversationalChain({
+      model: llm as unknown as BaseChatModel,
+      rag: {
+        index: 'index,website',
+        retriever: (question: string) => ({
+          query: {
+            match: {
+              field: question,
+            },
+          },
+        }),
+        content_field: { index: 'field', website: 'body_content' },
+        size: 3,
+      },
+      prompt: 'you are a QA bot',
+    });
+
+    const stream = await conversationalChain.stream(aiClient, [
+      {
+        id: '1',
+        role: 'user',
+        content: 'what is the work from home policy?',
+      },
+    ]);
+
+    const streamToValue: string[] = await new Promise((resolve) => {
+      const reader = stream.getReader();
+      const textDecoder = new TextDecoder();
+      const chunks: string[] = [];
+
+      const read = () => {
+        reader.read().then(({ done, value }) => {
+          if (done) {
+            resolve(chunks);
+          } else {
+            chunks.push(textDecoder.decode(value));
+            read();
+          }
+        });
+      };
+      read();
+    });
+
+    const textValue = streamToValue
+      .filter((v) => v[0] === '0')
+      .reduce((acc, v) => acc + v.replace(/0:"(.*)"\n/, '$1'), '');
+    expect(textValue).toEqual('the final answer');
+
+    const docValue = streamToValue
+      .filter((v) => v[0] === '8')
+      .reduce((acc, v) => acc + v.replace(/8:(.*)\n/, '$1'), '');
+    expect(JSON.parse(docValue)).toEqual([
+      {
+        documents: [
+          { metadata: { id: '1', index: 'index' }, pageContent: 'value' },
+          { metadata: { id: '1', index: 'website' }, pageContent: 'value2' },
+        ],
+        type: 'retrieved_docs',
+      },
+    ]);
+    expect(searchMock.mock.calls[0]).toEqual([
+      {
+        index: 'index,website',
+        query: { query: { match: { field: 'question rewritten to work from home' } } },
+        size: 3,
+      },
+    ]);
+  });
+});
diff --git a/x-pack/plugins/search_playground/server/utils/conversational_chain.ts b/x-pack/plugins/search_playground/server/utils/conversational_chain.ts
index c4f5bc353a08b..9efeaa0d61b0a 100644
--- a/x-pack/plugins/search_playground/server/utils/conversational_chain.ts
+++ b/x-pack/plugins/search_playground/server/utils/conversational_chain.ts
@@ -27,7 +27,8 @@ interface RAGOptions {
   retriever: (question: string) => object;
   doc_context?: string;
   hit_doc_mapper?: (hit: SearchHit) => Document;
-  content_field?: string;
+  content_field: string | Record<string, string>;
+  size?: number;
 }
 
 interface ConversationalChainOptions {
@@ -81,9 +82,9 @@ class ConversationalChainFn {
         retriever: this.options.rag.retriever,
         index: this.options.rag.index,
         client: client.getClient(),
-        content_field: this.options.rag.content_field ?? 'text',
+        content_field: this.options.rag.content_field,
         hit_doc_mapper: this.options.rag.hit_doc_mapper ?? undefined,
-        k: 3,
+        k: this.options.rag.size ?? 3,
       });
 
       const buildContext = (docs: Document[]) => {
diff --git a/x-pack/plugins/search_playground/server/utils/elasticsearch_retriever.ts b/x-pack/plugins/search_playground/server/utils/elasticsearch_retriever.ts
index 78e23c677e53d..b2e030262c1f9 100644
--- a/x-pack/plugins/search_playground/server/utils/elasticsearch_retriever.ts
+++ b/x-pack/plugins/search_playground/server/utils/elasticsearch_retriever.ts
@@ -18,7 +18,7 @@ export interface ElasticsearchRetrieverInput extends BaseRetrieverInput {
   /**
    * The name of the field the content resides in
    */
-  content_field: string | ((hit: SearchHit<any>) => Document);
+  content_field: string | Record<string, string>;
 
   index: string;
 
@@ -42,7 +42,7 @@ export class ElasticsearchRetriever extends BaseRetriever {
 
   index: string;
 
-  content_field: string | ((hit: SearchHit<any>) => Document);
+  content_field: Record<string, string> | string;
 
   hit_doc_mapper?: HitDocMapper;
 
@@ -71,12 +71,19 @@ export class ElasticsearchRetriever extends BaseRetriever {
 
       const hits = results.hits.hits;
 
+      // default elasticsearch doc to LangChain doc
       let mapper: HitDocMapper = (hit: SearchHit<any>) => {
+        const pageContentFieldKey =
+          typeof this.content_field === 'string'
+            ? this.content_field
+            : this.content_field[hit._index as string];
+
         return new Document({
-          pageContent: hit._source[this.content_field as string],
+          pageContent: hit._source[pageContentFieldKey],
           metadata: {
             score: hit._score,
             id: hit._id,
+            index: hit._index,
           },
         });
       };
diff --git a/x-pack/plugins/search_playground/server/utils/fetch_query_source_fields.test.ts b/x-pack/plugins/search_playground/server/utils/fetch_query_source_fields.test.ts
index e4217637cb8cc..959c9b910c7a2 100644
--- a/x-pack/plugins/search_playground/server/utils/fetch_query_source_fields.test.ts
+++ b/x-pack/plugins/search_playground/server/utils/fetch_query_source_fields.test.ts
@@ -6,6 +6,8 @@
  */
 
 import {
+  DENSE_VECTOR_DOCUMENT_FIRST,
+  DENSE_VECTOR_DOCUMENT_FIRST_FIELD_CAPS,
   ELSER_PASSAGE_CHUNKED_TWO_INDICES,
   ELSER_PASSAGE_CHUNKED_TWO_INDICES_DOCS,
 } from '../../__mocks__/fetch_query_source_fields.mock';
@@ -27,14 +29,6 @@ describe('fetch_query_source_fields', () => {
         ])
       ).toEqual({
         workplace_index: {
-          elser_query_fields: [
-            {
-              field: 'vector.tokens',
-              model_id: '.elser_model_2',
-              nested: false,
-            },
-          ],
-          dense_vector_query_fields: [],
           bm25_query_fields: [
             'metadata.summary',
             'vector.model_id',
@@ -42,6 +36,10 @@ describe('fetch_query_source_fields', () => {
             'text',
             'metadata.name',
           ],
+          dense_vector_query_fields: [],
+          elser_query_fields: [
+            { field: 'vector.tokens', model_id: '.elser_model_2', nested: false },
+          ],
           source_fields: [
             'metadata.summary',
             'vector.model_id',
@@ -51,14 +49,6 @@ describe('fetch_query_source_fields', () => {
           ],
         },
         workplace_index2: {
-          elser_query_fields: [
-            {
-              field: 'content_vector.tokens',
-              model_id: '.elser_model_2',
-              nested: false,
-            },
-          ],
-          dense_vector_query_fields: [],
           bm25_query_fields: [
             'metadata.summary',
             'content',
@@ -66,6 +56,10 @@ describe('fetch_query_source_fields', () => {
             'content_vector.model_id',
             'metadata.name',
           ],
+          dense_vector_query_fields: [],
+          elser_query_fields: [
+            { field: 'content_vector.tokens', model_id: '.elser_model_2', nested: false },
+          ],
           source_fields: [
             'metadata.summary',
             'content',
@@ -76,5 +70,49 @@ describe('fetch_query_source_fields', () => {
         },
       });
     });
+
+    it('should return the correct fields for a document first index', () => {
+      expect(
+        parseFieldsCapabilities(DENSE_VECTOR_DOCUMENT_FIRST_FIELD_CAPS, [
+          {
+            index: 'workplace_index_nested',
+            doc: DENSE_VECTOR_DOCUMENT_FIRST[0],
+          },
+        ])
+      ).toEqual({
+        workplace_index_nested: {
+          bm25_query_fields: [
+            'metadata.category',
+            'content',
+            'metadata.url',
+            'metadata.rolePermissions',
+            'metadata.name',
+            'passages.text',
+            'metadata.summary',
+            'passages.vector.model_id',
+            'metadata.content',
+          ],
+          dense_vector_query_fields: [
+            {
+              field: 'passages.vector.predicted_value',
+              model_id: '.multilingual-e5-small',
+              nested: true,
+            },
+          ],
+          elser_query_fields: [],
+          source_fields: [
+            'metadata.category',
+            'content',
+            'metadata.url',
+            'metadata.rolePermissions',
+            'metadata.name',
+            'passages.text',
+            'metadata.summary',
+            'passages.vector.model_id',
+            'metadata.content',
+          ],
+        },
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/search_playground/server/utils/fetch_query_source_fields.ts b/x-pack/plugins/search_playground/server/utils/fetch_query_source_fields.ts
index c751e8bfd361f..eed3f0af6ca0e 100644
--- a/x-pack/plugins/search_playground/server/utils/fetch_query_source_fields.ts
+++ b/x-pack/plugins/search_playground/server/utils/fetch_query_source_fields.ts
@@ -45,8 +45,29 @@ export const fetchFields = async (
   return parseFieldsCapabilities(fieldCapabilities, indexDocs);
 };
 
-const getModelField = (field: string, indexDoc: any) => {
-  return get(indexDoc.doc, `_source.${[field.replace('.tokens', '.model_id')]}`);
+const getModelField = (field: string, indexDoc: any, nestedField: string | false) => {
+  // If the field is nested, we need to get the first occurrence as its an array
+  const path = nestedField ? field.replace(`${nestedField}.`, `${nestedField}[0].`) : field;
+  return get(indexDoc.doc, `_source.${[path.replace(/\.predicted_value|\.tokens/, '.model_id')]}`);
+};
+
+const isFieldNested = (field: string, fieldCapsResponse: FieldCapsResponse) => {
+  const parts = field.split('.');
+  const parents: string[] = [];
+  const { fields } = fieldCapsResponse;
+
+  // Iteratively construct parent strings
+  for (let i = parts.length - 1; i >= 1; i--) {
+    parents.push(parts.slice(0, i).join('.'));
+  }
+
+  // Check if any of the parents are nested
+  for (const parent of parents) {
+    if (fields[parent] && fields[parent].nested && fields[parent].nested.type === 'nested') {
+      return parent;
+    }
+  }
+  return false;
 };
 
 export const parseFieldsCapabilities = (
@@ -78,17 +99,20 @@ export const parseFieldsCapabilities = (
       for (const index of indicesPresentIn) {
         const indexDoc = indexDocs.find((x) => x.index === index);
         if ('rank_features' in field) {
+          const nestedField = isFieldNested(fieldKey, fieldCapsResponse);
+
           const elserModelField = {
             field: fieldKey,
-            model_id: getModelField(fieldKey, indexDoc),
-            nested: false,
+            model_id: getModelField(fieldKey, indexDoc, nestedField),
+            nested: !!isFieldNested(fieldKey, fieldCapsResponse),
           };
           acc[index].elser_query_fields.push(elserModelField);
         } else if ('dense_vector' in field) {
+          const nestedField = isFieldNested(fieldKey, fieldCapsResponse);
           const denseVectorField = {
             field: fieldKey,
-            model_id: getModelField(fieldKey, indexDoc),
-            nested: false,
+            model_id: getModelField(fieldKey, indexDoc, nestedField),
+            nested: !!nestedField,
           };
           acc[index].dense_vector_query_fields.push(denseVectorField);
         } else if ('text' in field && field.text.searchable) {

From 84532ff58a67fec1e870d158e678296caf8b7894 Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 2 Apr 2024 21:57:16 +0100
Subject: [PATCH 48/63] skip flaky suite (#178163)

---
 x-pack/plugins/cases/public/containers/use_get_cases.test.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx b/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
index 72eb3326f199a..dd3ee856ba50c 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
@@ -17,7 +17,8 @@ import { OWNERS } from '../../common/constants';
 jest.mock('./api');
 jest.mock('../common/lib/kibana/hooks');
 
-describe('useGetCases', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/178163
+describe.skip('useGetCases', () => {
   const abortCtrl = new AbortController();
   const addSuccess = jest.fn();
   (useToasts as jest.Mock).mockReturnValue({ addSuccess, addError: jest.fn() });

From b0b73ad30ad077e5ec1c9bedc8e1669249cfdf2a Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiago.costa@elastic.co>
Date: Tue, 2 Apr 2024 21:58:22 +0100
Subject: [PATCH 49/63] skip flaky suite (#178027)

---
 .../security/cloud_security_posture/status/status_indexed.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexed.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexed.ts
index ec3216971ec35..fcfa461197d77 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexed.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/status/status_indexed.ts
@@ -47,7 +47,8 @@ export default function (providerContext: FtrProviderContext) {
 
     let agentPolicyId: string;
 
-    describe('STATUS = INDEXED TEST', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/178027
+    describe.skip('STATUS = INDEXED TEST', () => {
       beforeEach(async () => {
         await kibanaServer.savedObjects.cleanStandardList();
         await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');

From 6b29552382cb84f908f02d5dc605b150d1ebbde5 Mon Sep 17 00:00:00 2001
From: Kyle Pollich <kyle.pollich@elastic.co>
Date: Tue, 2 Apr 2024 17:49:46 -0400
Subject: [PATCH 50/63] [Fleet] Use latest compatible version in K8's manifest
 instead of latest available version (#179662)

Fixes #175149

## Summary

Uses the same "latest compatible version" logic present in
`useAgentVersion` when we render agent install instructions when we
display the Docker image version for K8's manifests.

## To test

1. Create a file at
`x-pack/plugins/fleet/target/agent_versions_list.json` with some newer
versions, e.g.

```json
[
  "8.16.0",
  "8.15.0"
]
```
2. Create an agent policy and add an integration policy for the
`kubernetes` integration
3. Click the `Add Agent` button in the action dropdown for your agent
policy
4. Observe the `image` value in the displayed K8's manifest has a
version of `8.13.0` and not one of your newer versions


![image](https://github.com/elastic/kibana/assets/6766512/563dd3b3-3f5f-4c4c-94e9-5fb668173d16)

### 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
---
 .../server/routes/agent/upgrade_handler.ts    |  4 +-
 .../server/routes/agent_policy/handlers.ts    | 14 ++-
 .../services/agents/agent_service.test.ts     | 12 +--
 .../server/services/agents/agent_service.ts   |  4 +-
 .../fleet/server/services/agents/crud.test.ts |  2 +-
 .../fleet/server/services/agents/crud.ts      |  4 +-
 .../fleet/server/services/agents/index.ts     |  2 +-
 .../server/services/agents/upgrade.test.ts    |  2 +-
 .../services/agents/upgrade_action_runner.ts  |  4 +-
 .../server/services/agents/versions.test.ts   | 87 ++++++++++++++++++-
 .../fleet/server/services/agents/versions.ts  | 38 ++++++--
 x-pack/plugins/fleet/server/services/index.ts |  2 +-
 12 files changed, 142 insertions(+), 33 deletions(-)

diff --git a/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts b/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
index 4e4e8d1f367ca..c2a4361a8253e 100644
--- a/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/upgrade_handler.ts
@@ -32,7 +32,7 @@ import { checkFleetServerVersion } from '../../../common/services/check_fleet_se
 import { getAgentById } from '../../services/agents';
 
 import { getAllFleetServerAgents } from '../../collectors/get_all_fleet_server_agents';
-import { getLatestAvailableVersion } from '../../services/agents/versions';
+import { getLatestAvailableAgentVersion } from '../../services/agents/versions';
 
 export const postAgentUpgradeHandler: RequestHandler<
   TypeOf<typeof PostAgentUpgradeRequestSchema.params>,
@@ -44,7 +44,7 @@ export const postAgentUpgradeHandler: RequestHandler<
   const esClient = coreContext.elasticsearch.client.asInternalUser;
   const { version, source_uri: sourceUri, force, skipRateLimitCheck } = request.body;
   const kibanaVersion = appContextService.getKibanaVersion();
-  const latestAgentVersion = await getLatestAvailableVersion();
+  const latestAgentVersion = await getLatestAvailableAgentVersion();
   try {
     checkKibanaVersion(version, kibanaVersion, force);
   } catch (err) {
diff --git a/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
index 89b6e5a7c88c8..c4c31214da332 100644
--- a/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/agent_policy/handlers.ts
@@ -19,7 +19,7 @@ import { HTTPAuthorizationHeader } from '../../../common/http_authorization_head
 
 import { fullAgentPolicyToYaml } from '../../../common/services';
 import { appContextService, agentPolicyService } from '../../services';
-import { getAgentsByKuery } from '../../services/agents';
+import { getAgentsByKuery, getLatestAvailableAgentVersion } from '../../services/agents';
 import { AGENTS_PREFIX } from '../../constants';
 import type {
   GetAgentPoliciesRequestSchema,
@@ -466,13 +466,12 @@ export const getK8sManifest: FleetRequestHandler<
   undefined,
   TypeOf<typeof GetK8sManifestRequestSchema.query>
 > = async (context, request, response) => {
-  const fleetContext = await context.fleet;
-
   try {
     const fleetServer = request.query.fleetServer ?? '';
     const token = request.query.enrolToken ?? '';
-    const agentVersion =
-      await fleetContext.agentClient.asInternalUser.getLatestAgentAvailableVersion();
+
+    const agentVersion = await getLatestAvailableAgentVersion();
+
     const fullAgentManifest = await agentPolicyService.getFullAgentManifest(
       fleetServer,
       token,
@@ -500,13 +499,10 @@ export const downloadK8sManifest: FleetRequestHandler<
   undefined,
   TypeOf<typeof GetK8sManifestRequestSchema.query>
 > = async (context, request, response) => {
-  const fleetContext = await context.fleet;
-
   try {
     const fleetServer = request.query.fleetServer ?? '';
     const token = request.query.enrolToken ?? '';
-    const agentVersion =
-      await fleetContext.agentClient.asInternalUser.getLatestAgentAvailableVersion();
+    const agentVersion = await getLatestAvailableAgentVersion();
     const fullAgentManifest = await agentPolicyService.getFullAgentManifest(
       fleetServer,
       token,
diff --git a/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts b/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
index a5b87d970c4c6..05ca64eaeaf7b 100644
--- a/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/agent_service.test.ts
@@ -27,14 +27,14 @@ import type { AgentClient } from './agent_service';
 import { AgentServiceImpl } from './agent_service';
 import { getAgentsByKuery, getAgentById } from './crud';
 import { getAgentStatusById, getAgentStatusForAgentPolicy } from './status';
-import { getLatestAvailableVersion } from './versions';
+import { getLatestAvailableAgentVersion } from './versions';
 
 const mockGetAuthzFromRequest = getAuthzFromRequest as jest.Mock<Promise<FleetAuthz>>;
 const mockGetAgentsByKuery = getAgentsByKuery as jest.Mock;
 const mockGetAgentById = getAgentById as jest.Mock;
 const mockGetAgentStatusById = getAgentStatusById as jest.Mock;
 const mockGetAgentStatusForAgentPolicy = getAgentStatusForAgentPolicy as jest.Mock;
-const mockGetLatestAvailableVersion = getLatestAvailableVersion as jest.Mock;
+const mockgetLatestAvailableAgentVersion = getLatestAvailableAgentVersion as jest.Mock;
 
 describe('AgentService', () => {
   beforeEach(() => {
@@ -187,11 +187,11 @@ function expectApisToCallServicesSuccessfully(
     );
   });
 
-  test('client.getLatestAgentAvailableVersion calls getLatestAvailableVersion and returns results', async () => {
-    mockGetLatestAvailableVersion.mockResolvedValue('getLatestAvailableVersion success');
+  test('client.getLatestAgentAvailableVersion calls getLatestAvailableAgentVersion and returns results', async () => {
+    mockgetLatestAvailableAgentVersion.mockResolvedValue('getLatestAvailableAgentVersion success');
     await expect(agentClient.getLatestAgentAvailableVersion()).resolves.toEqual(
-      'getLatestAvailableVersion success'
+      'getLatestAvailableAgentVersion success'
     );
-    expect(mockGetLatestAvailableVersion).toHaveBeenCalledTimes(1);
+    expect(mockgetLatestAvailableAgentVersion).toHaveBeenCalledTimes(1);
   });
 }
diff --git a/x-pack/plugins/fleet/server/services/agents/agent_service.ts b/x-pack/plugins/fleet/server/services/agents/agent_service.ts
index 1f419d71e22d7..512db893d1c63 100644
--- a/x-pack/plugins/fleet/server/services/agents/agent_service.ts
+++ b/x-pack/plugins/fleet/server/services/agents/agent_service.ts
@@ -28,7 +28,7 @@ import { FleetUnauthorizedError } from '../../errors';
 
 import { getAgentsByKuery, getAgentById } from './crud';
 import { getAgentStatusById, getAgentStatusForAgentPolicy } from './status';
-import { getLatestAvailableVersion } from './versions';
+import { getLatestAvailableAgentVersion } from './versions';
 
 /**
  * A service for interacting with Agent data. See {@link AgentClient} for more information.
@@ -139,7 +139,7 @@ class AgentClientImpl implements AgentClient {
 
   public async getLatestAgentAvailableVersion(includeCurrentVersion?: boolean) {
     await this.#runPreflight();
-    return getLatestAvailableVersion(includeCurrentVersion);
+    return getLatestAvailableAgentVersion({ includeCurrentVersion });
   }
 
   #runPreflight = async () => {
diff --git a/x-pack/plugins/fleet/server/services/agents/crud.test.ts b/x-pack/plugins/fleet/server/services/agents/crud.test.ts
index 33f30ab1b966b..3716319991be5 100644
--- a/x-pack/plugins/fleet/server/services/agents/crud.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/crud.test.ts
@@ -33,7 +33,7 @@ jest.mock('./versions', () => {
     getAvailableVersions: jest
       .fn()
       .mockResolvedValue(['8.4.0', '8.5.0', '8.6.0', '8.7.0', '8.8.0']),
-    getLatestAvailableVersion: jest.fn().mockResolvedValue('8.8.0'),
+    getLatestAvailableAgentVersion: jest.fn().mockResolvedValue('8.8.0'),
   };
 });
 
diff --git a/x-pack/plugins/fleet/server/services/agents/crud.ts b/x-pack/plugins/fleet/server/services/agents/crud.ts
index 5492c52a16394..8449605b14764 100644
--- a/x-pack/plugins/fleet/server/services/agents/crud.ts
+++ b/x-pack/plugins/fleet/server/services/agents/crud.ts
@@ -30,7 +30,7 @@ import { auditLoggingService } from '../audit_logging';
 import { searchHitToAgent, agentSOAttributesToFleetServerAgentDoc } from './helpers';
 
 import { buildAgentStatusRuntimeField } from './build_status_runtime_field';
-import { getLatestAvailableVersion } from './versions';
+import { getLatestAvailableAgentVersion } from './versions';
 
 const INACTIVE_AGENT_CONDITION = `status:inactive OR status:unenrolled`;
 const ACTIVE_AGENT_CONDITION = `NOT (${INACTIVE_AGENT_CONDITION})`;
@@ -332,7 +332,7 @@ export async function getAgentsByKuery(
   // filtering for a range on the version string will not work,
   // nor does filtering on a flattened field (local_metadata), so filter here
   if (showUpgradeable) {
-    const latestAgentVersion = await getLatestAvailableVersion();
+    const latestAgentVersion = await getLatestAvailableAgentVersion();
     // fixing a bug where upgradeable filter was not returning right results https://github.com/elastic/kibana/issues/117329
     // query all agents, then filter upgradeable, and return the requested page and correct total
     // if there are more than SO_SEARCH_LIMIT agents, the logic falls back to same as before
diff --git a/x-pack/plugins/fleet/server/services/agents/index.ts b/x-pack/plugins/fleet/server/services/agents/index.ts
index 1852d891232a6..2fad96c87bb79 100644
--- a/x-pack/plugins/fleet/server/services/agents/index.ts
+++ b/x-pack/plugins/fleet/server/services/agents/index.ts
@@ -19,4 +19,4 @@ export { getAgentUploads, getAgentUploadFile } from './uploads';
 export { AgentServiceImpl } from './agent_service';
 export type { AgentClient, AgentService } from './agent_service';
 export { BulkActionsResolver } from './bulk_actions_resolver';
-export { getAvailableVersions, getLatestAvailableVersion } from './versions';
+export { getAvailableVersions, getLatestAvailableAgentVersion } from './versions';
diff --git a/x-pack/plugins/fleet/server/services/agents/upgrade.test.ts b/x-pack/plugins/fleet/server/services/agents/upgrade.test.ts
index 23688ec52462a..78468e2337dec 100644
--- a/x-pack/plugins/fleet/server/services/agents/upgrade.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/upgrade.test.ts
@@ -20,7 +20,7 @@ jest.mock('./versions', () => {
     getAvailableVersions: jest
       .fn()
       .mockResolvedValue(['8.4.0', '8.5.0', '8.6.0', '8.7.0', '8.8.0']),
-    getLatestAvailableVersion: jest.fn().mockResolvedValue('8.8.0'),
+    getLatestAvailableAgentVersion: jest.fn().mockResolvedValue('8.8.0'),
   };
 });
 
diff --git a/x-pack/plugins/fleet/server/services/agents/upgrade_action_runner.ts b/x-pack/plugins/fleet/server/services/agents/upgrade_action_runner.ts
index 9b36dd84f56fa..d123489fe9ead 100644
--- a/x-pack/plugins/fleet/server/services/agents/upgrade_action_runner.ts
+++ b/x-pack/plugins/fleet/server/services/agents/upgrade_action_runner.ts
@@ -30,7 +30,7 @@ import { createErrorActionResults, createAgentAction } from './actions';
 import { getHostedPolicies, isHostedAgent } from './hosted_agent';
 import { BulkActionTaskType } from './bulk_action_types';
 import { getCancelledActions } from './action_status';
-import { getLatestAvailableVersion } from './versions';
+import { getLatestAvailableAgentVersion } from './versions';
 
 export class UpgradeActionRunner extends ActionRunner {
   protected async processAgents(agents: Agent[]): Promise<{ actionId: string }> {
@@ -78,7 +78,7 @@ export async function upgradeBatch(
       ? givenAgents.filter((agent: Agent) => !isHostedAgent(hostedPolicies, agent))
       : givenAgents;
 
-  const latestAgentVersion = await getLatestAvailableVersion();
+  const latestAgentVersion = await getLatestAvailableAgentVersion();
   const upgradeableResults = await Promise.allSettled(
     agentsToCheckUpgradeable.map(async (agent) => {
       // Filter out agents that are:
diff --git a/x-pack/plugins/fleet/server/services/agents/versions.test.ts b/x-pack/plugins/fleet/server/services/agents/versions.test.ts
index 85ac760614c49..1277099f65f9a 100644
--- a/x-pack/plugins/fleet/server/services/agents/versions.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/versions.test.ts
@@ -12,7 +12,7 @@ import type { DeepPartial } from 'utility-types';
 
 import type { FleetConfigType } from '../../../public/plugin';
 
-import { getAvailableVersions } from './versions';
+import { getAvailableVersions, getLatestAvailableAgentVersion } from './versions';
 
 let mockKibanaVersion = '300.0.0';
 let mockConfig: DeepPartial<FleetConfigType> = {};
@@ -39,6 +39,91 @@ const emptyResponse = {
   text: jest.fn().mockResolvedValue(JSON.stringify({})),
 } as any;
 
+beforeEach(() => {
+  mockedReadFile.mockReset();
+  mockedFetch.mockReset();
+});
+
+describe('getLatestAvailableAgentVersion', () => {
+  it('should return latest available version when aligned with kibana version', async () => {
+    mockKibanaVersion = '8.13.0';
+    mockedReadFile.mockResolvedValue(`["8.13.0", "8.12.2", "8.12.1", "8.12.0"]`);
+    mockedFetch.mockResolvedValueOnce({
+      status: 200,
+      text: jest.fn().mockResolvedValue(
+        JSON.stringify([
+          [
+            {
+              title: 'Elastic Agent 8.13.0',
+              version_number: '8.13.0',
+            },
+            {
+              title: 'Elastic Agent 8.12.2',
+              version_number: '8.12.2',
+            },
+            {
+              title: 'Elastic Agent 8.12.1',
+              version_number: '8.12.1',
+            },
+            {
+              title: 'Elastic Agent 8.12.0',
+              version_number: '8.12.0',
+            },
+          ],
+        ])
+      ),
+    } as any);
+
+    const res = await getLatestAvailableAgentVersion({ ignoreCache: true });
+
+    expect(res).toEqual('8.13.0');
+  });
+
+  it('should return kibana version when kibana version is newer than latest available and API results are empty', async () => {
+    mockKibanaVersion = '8.14.0';
+    mockedReadFile.mockResolvedValue(`["8.13.0", "8.12.2", "8.12.1", "8.12.0"]`);
+    mockedFetch.mockResolvedValueOnce(emptyResponse);
+
+    const res = await getLatestAvailableAgentVersion({ ignoreCache: true });
+
+    expect(res).toEqual('8.14.0');
+  });
+
+  it('should return latest compatible version when kibana version is older than latest available', async () => {
+    mockKibanaVersion = '8.12.2';
+    mockedReadFile.mockResolvedValue(`["8.13.0", "8.12.2", "8.12.1", "8.12.0"]`);
+    mockedFetch.mockResolvedValueOnce({
+      status: 200,
+      text: jest.fn().mockResolvedValue(
+        JSON.stringify([
+          [
+            {
+              title: 'Elastic Agent 8.13.0',
+              version_number: '8.13.0',
+            },
+            {
+              title: 'Elastic Agent 8.12.2',
+              version_number: '8.12.2',
+            },
+            {
+              title: 'Elastic Agent 8.12.1',
+              version_number: '8.12.1',
+            },
+            {
+              title: 'Elastic Agent 8.12.0',
+              version_number: '8.12.0',
+            },
+          ],
+        ])
+      ),
+    } as any);
+
+    const res = await getLatestAvailableAgentVersion({ ignoreCache: true });
+
+    expect(res).toEqual('8.12.2');
+  });
+});
+
 describe('getAvailableVersions', () => {
   beforeEach(() => {
     mockedReadFile.mockReset();
diff --git a/x-pack/plugins/fleet/server/services/agents/versions.ts b/x-pack/plugins/fleet/server/services/agents/versions.ts
index de295a588bee9..fad0028c80691 100644
--- a/x-pack/plugins/fleet/server/services/agents/versions.ts
+++ b/x-pack/plugins/fleet/server/services/agents/versions.ts
@@ -13,10 +13,14 @@ import pRetry from 'p-retry';
 import { uniq } from 'lodash';
 import semverGte from 'semver/functions/gte';
 import semverGt from 'semver/functions/gt';
+import semverRcompare from 'semver/functions/rcompare';
+import semverLt from 'semver/functions/lt';
 import semverCoerce from 'semver/functions/coerce';
 
 import { REPO_ROOT } from '@kbn/repo-info';
 
+import { differsOnlyInPatch } from '../../../common/services';
+
 import { appContextService } from '..';
 
 const MINIMUM_SUPPORTED_VERSION = '7.17.0';
@@ -31,12 +35,36 @@ const CACHE_DURATION = 1000 * 60 * 60;
 let CACHED_AVAILABLE_VERSIONS: string[] | undefined;
 let LAST_FETCHED: number | undefined;
 
-export const getLatestAvailableVersion = async (
-  includeCurrentVersion?: boolean
-): Promise<string> => {
-  const versions = await getAvailableVersions({ includeCurrentVersion });
+/**
+ * Fetch the latest available version of Elastic Agent that is compatible with the current Kibana version.
+ *
+ * e.g. if the current Kibana version is 8.12.0, and there is an 8.12.2 patch release of agent available,
+ * this function will return "8.12.2".
+ */
+export const getLatestAvailableAgentVersion = async ({
+  includeCurrentVersion = false,
+  ignoreCache = false,
+}: {
+  includeCurrentVersion?: boolean;
+  ignoreCache?: boolean;
+} = {}): Promise<string> => {
+  const kibanaVersion = appContextService.getKibanaVersion();
+
+  let latestCompatibleVersion;
+
+  const versions = await getAvailableVersions({ includeCurrentVersion, ignoreCache });
+  versions.sort(semverRcompare);
+
+  if (versions && versions.length > 0 && versions.indexOf(kibanaVersion) !== 0) {
+    latestCompatibleVersion =
+      versions.find((version) => {
+        return semverLt(version, kibanaVersion) || differsOnlyInPatch(version, kibanaVersion);
+      }) || versions[0];
+  } else {
+    latestCompatibleVersion = kibanaVersion;
+  }
 
-  return versions[0];
+  return latestCompatibleVersion;
 };
 
 export const getAvailableVersions = async ({
diff --git a/x-pack/plugins/fleet/server/services/index.ts b/x-pack/plugins/fleet/server/services/index.ts
index 9a15061b9944d..a3425562c6517 100644
--- a/x-pack/plugins/fleet/server/services/index.ts
+++ b/x-pack/plugins/fleet/server/services/index.ts
@@ -27,7 +27,7 @@ export interface AgentPolicyServiceInterface {
 // Agent services
 export { AgentServiceImpl } from './agents';
 export type { AgentClient, AgentService } from './agents';
-export { getAvailableVersions, getLatestAvailableVersion } from './agents';
+export { getAvailableVersions, getLatestAvailableAgentVersion } from './agents';
 
 // Saved object services
 export { agentPolicyService } from './agent_policy';

From 9215efb6aad2c430f923404d33e60a61efc435dc Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Tue, 2 Apr 2024 14:53:08 -0700
Subject: [PATCH 51/63] [Detection Engine][FTR] Audit DE exceptions tests
 (#179706)

## Summary

Continues work on https://github.com/elastic/kibana/issues/169185 and
https://github.com/elastic/kibana/issues/151877 . There wasn't a ton of
folder restructure, just switching the tests to run on basic
license/essentials tier and some test renaming for clarity sake.
---
 .buildkite/ftr_configs.yml                    |  24 +-
 .../api_integration/api-integration-tests.sh  |   2 +-
 .../serverless_resources/security_roles.json  |  10 +-
 .../package.json                              |  70 +-
 .../query_alerts.ts                           |   1 -
 .../configs/ess.config.ts                     |   4 +-
 .../configs/serverless.config.ts              |   4 +-
 .../date.ts                                   |   0
 .../double.ts                                 |   0
 .../float.ts                                  |   0
 .../index.ts                                  |   0
 .../integer.ts                                |   0
 .../configs/ess.config.ts                     |   4 +-
 .../configs/serverless.config.ts              |   4 +-
 .../index.ts                                  |   0
 .../ip.ts                                     |   0
 .../ip_array.ts                               |   0
 .../configs/ess.config.ts                     |   4 +-
 .../configs/serverless.config.ts              |   4 +-
 .../index.ts                                  |   0
 .../keyword.ts                                |   0
 .../keyword_array.ts                          |   0
 .../configs/ess.config.ts                     |   4 +-
 .../configs/serverless.config.ts              |   4 +-
 .../index.ts                                  |   0
 .../long.ts                                   |   0
 .../configs/ess.config.ts                     |   4 +-
 .../configs/serverless.config.ts              |   4 +-
 .../index.ts                                  |   0
 .../text.ts                                   |   0
 .../text_array.ts                             |   0
 .../configs/ess.config.ts                     |   4 +-
 .../configs/serverless.config.ts              |   4 +-
 .../create_endpoint_exceptions.ts             |   0
 .../create_rule_exceptions.ts                 |  63 +-
 .../create_rule_exceptions_ess.ts             | 104 ++
 .../exception_comments_ess.ts}                |   2 +-
 .../exception_comments_serverless.ts          | 222 ++++
 .../exceptions_data_integrity.ts}             |   3 +-
 .../find_rule_exception_references.ts         |   6 +-
 .../index.ts                                  |  13 +-
 .../prebuilt_rules.ts                         | 402 +++++++
 .../rule_exceptions_execution.ts              | 479 +++++++++
 .../role_based_rule_exceptions_workflows.ts   | 984 ------------------
 44 files changed, 1305 insertions(+), 1128 deletions(-)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/{trial_license_complete_tier => basic_license_essentials_tier}/configs/ess.config.ts (91%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/{trial_license_complete_tier => basic_license_essentials_tier}/configs/serverless.config.ts (83%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/{trial_license_complete_tier => basic_license_essentials_tier}/date.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/{trial_license_complete_tier => basic_license_essentials_tier}/double.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/{trial_license_complete_tier => basic_license_essentials_tier}/float.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/{trial_license_complete_tier => basic_license_essentials_tier}/index.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/{trial_license_complete_tier => basic_license_essentials_tier}/integer.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/{trial_license_complete_tier => basic_license_essentials_tier}/configs/ess.config.ts (93%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/{trial_license_complete_tier => basic_license_essentials_tier}/configs/serverless.config.ts (85%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/{trial_license_complete_tier => basic_license_essentials_tier}/index.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/{trial_license_complete_tier => basic_license_essentials_tier}/ip.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/{trial_license_complete_tier => basic_license_essentials_tier}/ip_array.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/{trial_license_complete_tier => basic_license_essentials_tier}/configs/ess.config.ts (92%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/{trial_license_complete_tier => basic_license_essentials_tier}/configs/serverless.config.ts (84%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/{trial_license_complete_tier => basic_license_essentials_tier}/index.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/{trial_license_complete_tier => basic_license_essentials_tier}/keyword.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/{trial_license_complete_tier => basic_license_essentials_tier}/keyword_array.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/{trial_license_complete_tier => basic_license_essentials_tier}/configs/ess.config.ts (92%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/{trial_license_complete_tier => basic_license_essentials_tier}/configs/serverless.config.ts (85%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/{trial_license_complete_tier => basic_license_essentials_tier}/index.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/{trial_license_complete_tier => basic_license_essentials_tier}/long.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/{trial_license_complete_tier => basic_license_essentials_tier}/configs/ess.config.ts (92%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/{trial_license_complete_tier => basic_license_essentials_tier}/configs/serverless.config.ts (85%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/{trial_license_complete_tier => basic_license_essentials_tier}/index.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/{trial_license_complete_tier => basic_license_essentials_tier}/text.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/{trial_license_complete_tier => basic_license_essentials_tier}/text_array.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/{trial_license_complete_tier => basic_license_essentials_tier}/configs/ess.config.ts (94%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/{trial_license_complete_tier => basic_license_essentials_tier}/configs/serverless.config.ts (87%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/{trial_license_complete_tier => basic_license_essentials_tier}/create_endpoint_exceptions.ts (100%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/{trial_license_complete_tier => basic_license_essentials_tier}/create_rule_exceptions.ts (78%)
 create mode 100644 x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions_ess.ts
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/{trial_license_complete_tier/role_based_add_edit_comments.ts => basic_license_essentials_tier/exception_comments_ess.ts} (99%)
 create mode 100644 x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exception_comments_serverless.ts
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/{trial_license_complete_tier/rule_exception_synchronizations.ts => basic_license_essentials_tier/exceptions_data_integrity.ts} (96%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/{trial_license_complete_tier => basic_license_essentials_tier}/find_rule_exception_references.ts (97%)
 rename x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/{trial_license_complete_tier => basic_license_essentials_tier}/index.ts (56%)
 create mode 100644 x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/prebuilt_rules.ts
 create mode 100644 x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/rule_exceptions_execution.ts
 delete mode 100644 x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/role_based_rule_exceptions_workflows.ts

diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
index 93e089866afcc..ee6bb5ca8ffc1 100644
--- a/.buildkite/ftr_configs.yml
+++ b/.buildkite/ftr_configs.yml
@@ -475,18 +475,18 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/configs/ess.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/configs/ess.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/configs/ess.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/configs/ess.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/configs/ess.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/configs/ess.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/configs/ess.config.ts
diff --git a/.buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh b/.buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh
index 9bbb9aa5b7442..f87df9cb58bac 100755
--- a/.buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh
+++ b/.buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh
@@ -90,7 +90,7 @@ FORMATTED_KB_URL="${KB_URL/https:\/\//}"
 # This is used in order to wait for the environment to be ready.
 sleep 150
 
-TEST_CLOUD=1 TEST_ES_URL="https://elastic:$PASSWORD@$FORMATTED_ES_URL:443" TEST_KIBANA_URL="https://elastic:$PASSWORD@$FORMATTED_KB_URL:443" yarn run $1
+TEST_CLOUD=1 TEST_ES_URL="https://$USERNAME:$PASSWORD@$FORMATTED_ES_URL:443" TEST_KIBANA_URL="https://$USERNAME:$PASSWORD@$FORMATTED_KB_URL:443" yarn run $1
 cmd_status=$?
 echo "Exit code with status: $cmd_status"
 
diff --git a/packages/kbn-es/src/serverless_resources/security_roles.json b/packages/kbn-es/src/serverless_resources/security_roles.json
index 0c965328a971c..8ba9dc4c6bc73 100644
--- a/packages/kbn-es/src/serverless_resources/security_roles.json
+++ b/packages/kbn-es/src/serverless_resources/security_roles.json
@@ -104,6 +104,7 @@
             "logs-*",
             "packetbeat-*",
             "winlogbeat-*",
+            "logstash-*",
             ".asset-criticality.asset-criticality-*"
           ],
           "privileges": ["read", "write"]
@@ -117,7 +118,7 @@
           "privileges": ["read", "write"]
         },
         {
-          "names": ["metrics-endpoint.metadata_current_*", ".fleet-agents*", ".fleet-actions*"],
+          "names": ["metrics-endpoint.metadata_current_*", ".fleet-agents*", ".fleet-actions*", "risk-score.risk-score-*"],
           "privileges": ["read"]
         }
       ],
@@ -143,9 +144,14 @@
             "file_operations_all"
           ],
           "securitySolutionCases": ["all"],
+          "securitySolutionAssistant": ["all"],
           "actions": ["read"],
           "builtInAlerts": ["all"],
-          "osquery": ["all"]
+          "osquery": ["all"],
+          "discover": ["all"],
+          "dashboard": ["all"],
+          "maps": ["all"],
+          "visualize": ["all"]
         },
         "spaces": ["*"],
         "base": []
diff --git a/x-pack/test/security_solution_api_integration/package.json b/x-pack/test/security_solution_api_integration/package.json
index 270927876dc14..c716c47ec7c33 100644
--- a/x-pack/test/security_solution_api_integration/package.json
+++ b/x-pack/test/security_solution_api_integration/package.json
@@ -74,41 +74,41 @@
     "telemetry:server:ess": "npm run initialize-server:dr telemetry ess",
     "telemetry:runner:ess": "npm run run-tests:dr telemetry ess essEnv",
 
-    "exception_workflows:server:serverless": "npm run initialize-server:de exceptions/workflows serverless",
-    "exception_workflows:runner:serverless": "npm run run-tests:de exceptions/workflows serverless serverlessEnv",
-    "exception_workflows:qa:serverless": "npm run run-tests:de exceptions/workflows serverless qaEnv",
-    "exception_workflows:server:ess": "npm run initialize-server:de exceptions/workflows ess",
-    "exception_workflows:runner:ess": "npm run run-tests:de exceptions/workflows ess essEnv",
-
-    "exception_operators_date_numeric_types:server:serverless": "npm run initialize-server:de exceptions/operators_data_types/date_numeric_types serverless",
-    "exception_operators_date_numeric_types:runner:serverless": "npm run run-tests:de exceptions/operators_data_types/date_numeric_types serverless serverlessEnv",
-    "exception_operators_date_numeric_types:qa:serverless": "npm run run-tests:de exceptions/operators_data_types/date_numeric_types serverless qaEnv",
-    "exception_operators_date_numeric_types:server:ess": "npm run initialize-server:de exceptions/operators_data_types/date_numeric_types ess",
-    "exception_operators_date_numeric_types:runner:ess": "npm run run-tests:de exceptions/operators_data_types/date_numeric_types ess essEnv",
-
-    "exception_operators_keyword:server:serverless": "npm run initialize-server:de exceptions/operators_data_types/keyword serverless",
-    "exception_operators_keyword:runner:serverless": "npm run run-tests:de  exceptions/operators_data_types/keyword serverless serverlessEnv",
-    "exception_operators_keyword:qa:serverless": "npm run run-tests:de  exceptions/operators_data_types/keyword serverless qaEnv",
-    "exception_operators_keyword:server:ess": "npm run initialize-server:de exceptions/operators_data_types/keyword ess",
-    "exception_operators_keyword:runner:ess": "npm run run-tests:de  exceptions/operators_data_types/keyword ess essEnv",
-
-    "exception_operators_ips:server:serverless": "npm run initialize-server:de exceptions/operators_data_types/ips serverless",
-    "exception_operators_ips:runner:serverless": "npm run run-tests:de  exceptions/operators_data_types/ips serverless serverlessEnv",
-    "exception_operators_ips:qa:serverless": "npm run run-tests:de  exceptions/operators_data_types/ips serverless qaEnv",
-    "exception_operators_ips:server:ess": "npm run initialize-server:de exceptions/operators_data_types/ips ess",
-    "exception_operators_ips:runner:ess": "npm run run-tests:de  exceptions/operators_data_types/ips ess essEnv",
-
-    "exception_operators_long:server:serverless": "npm run initialize-server:de exceptions/operators_data_types/long serverless",
-    "exception_operators_long:runner:serverless": "npm run run-tests:de  exceptions/operators_data_types/long serverless serverlessEnv",
-    "exception_operators_long:qa:serverless": "npm run run-tests:de  exceptions/operators_data_types/long serverless qaEnv",
-    "exception_operators_long:server:ess": "npm run initialize-server:de exceptions/operators_data_types/long ess",
-    "exception_operators_long:runner:ess": "npm run run-tests:de  exceptions/operators_data_types/long ess essEnv",
-
-    "exception_operators_text:server:serverless": "npm run initialize-server:de exceptions/operators_data_types/text serverless",
-    "exception_operators_text:runner:serverless": "npm run run-tests:de  exceptions/operators_data_types/text serverless serverlessEnv",
-    "exception_operators_text:qa:serverless": "npm run run-tests:de  exceptions/operators_data_types/text serverless qaEnv",
-    "exception_operators_text:server:ess": "npm run initialize-server:de exceptions/operators_data_types/text ess",
-    "exception_operators_text:runner:ess": "npm run run-tests:de  exceptions/operators_data_types/text ess essEnv",
+    "exception_workflows:essentials:server:serverless": "npm run initialize-server:de:basic_essentials exceptions/workflows serverless",
+    "exception_workflows:essentials:runner:serverless": "npm run run-tests:de:basic_essentials exceptions/workflows serverless serverlessEnv",
+    "exception_workflows:essentials:qa:serverless": "npm run run-tests:de:basic_essentials exceptions/workflows serverless qaEnv",
+    "exception_workflows:basic:server:ess": "npm run initialize-server:de:basic_essentials exceptions/workflows ess",
+    "exception_workflows:basic:runner:ess": "npm run run-tests:de:basic_essentials exceptions/workflows ess essEnv",
+
+    "exception_operators_date_numeric_types:essentials:server:serverless": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/date_numeric_types serverless",
+    "exception_operators_date_numeric_types:essentials:runner:serverless": "npm run run-tests:de:basic_essentials exceptions/operators_data_types/date_numeric_types serverless serverlessEnv",
+    "exception_operators_date_numeric_types:essentials:qa:serverless": "npm run run-tests:de:basic_essentials exceptions/operators_data_types/date_numeric_types serverless qaEnv",
+    "exception_operators_date_numeric_types:basic:server:ess": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/date_numeric_types ess",
+    "exception_operators_date_numeric_types:basic:runner:ess": "npm run run-tests:de:basic_essentials exceptions/operators_data_types/date_numeric_types ess essEnv",
+
+    "exception_operators_keyword:essentials:server:serverless": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/keyword serverless",
+    "exception_operators_keyword:essentials:runner:serverless": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/keyword serverless serverlessEnv",
+    "exception_operators_keyword:essentials:qa:serverless": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/keyword serverless qaEnv",
+    "exception_operators_keyword:basic:server:ess": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/keyword ess",
+    "exception_operators_keyword:basic:runner:ess": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/keyword ess essEnv",
+
+    "exception_operators_ips:essentials:server:serverless": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/ips serverless",
+    "exception_operators_ips:essentials:runner:serverless": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/ips serverless serverlessEnv",
+    "exception_operators_ips:essentials:qa:serverless": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/ips serverless qaEnv",
+    "exception_operators_ips:basic:server:ess": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/ips ess",
+    "exception_operators_ips:basic:runner:ess": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/ips ess essEnv",
+
+    "exception_operators_long:essentials:server:serverless": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/long serverless",
+    "exception_operators_long:essentials:runner:serverless": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/long serverless serverlessEnv",
+    "exception_operators_long:essentials:qa:serverless": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/long serverless qaEnv",
+    "exception_operators_long:basic:server:ess": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/long ess",
+    "exception_operators_long:basic:runner:ess": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/long ess essEnv",
+
+    "exception_operators_text:essentials:server:serverless": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/text serverless",
+    "exception_operators_text:essentials:runner:serverless": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/text serverless serverlessEnv",
+    "exception_operators_text:essentials:qa:serverless": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/text serverless qaEnv",
+    "exception_operators_text:basic:server:ess": "npm run initialize-server:de:basic_essentials exceptions/operators_data_types/text ess",
+    "exception_operators_text:basic:runner:ess": "npm run run-tests:de:basic_essentials  exceptions/operators_data_types/text ess essEnv",
 
     "actions:server:serverless": "npm run initialize-server:de actions serverless",
     "actions:runner:serverless": "npm run run-tests:de actions serverless serverlessEnv",
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts
index 4412632f2c4a9..5dcc78486ebdc 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/query_alerts.ts
@@ -72,7 +72,6 @@ export default ({ getService }: FtrProviderContext) => {
         await createAlertsIndex(supertest, log);
       });
       after(async () => {
-        // await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/signals');
         await deleteAllAlerts(supertest, log, es);
       });
 
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/configs/ess.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/ess.config.ts
similarity index 91%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/configs/ess.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/ess.config.ts
index e2a1fb7a5773a..e8856e50b064a 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/configs/ess.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/ess.config.ts
@@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(
-    require.resolve('../../../../../../../../config/ess/config.base.trial')
+    require.resolve('../../../../../../../../config/ess/config.base.basic')
   );
 
   return {
@@ -17,7 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [require.resolve('..')],
     junit: {
       reportName:
-        'Detection Engine - Exception Operators Date & Numeric Types Integration Tests - ESS Env - Trial License',
+        'Detection Engine - Exception Operators Date & Numeric Types Integration Tests - ESS Env - Basic License',
     },
   };
 }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/serverless.config.ts
similarity index 83%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/configs/serverless.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/serverless.config.ts
index ef5d538b9983e..1098fc2b5c0fd 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/configs/serverless.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/serverless.config.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { createTestConfig } from '../../../../../../../../config/serverless/config.base';
+import { createTestConfig } from '../../../../../../../../config/serverless/config.base.essentials';
 
 export default createTestConfig({
   testFiles: [require.resolve('..')],
   junit: {
     reportName:
-      'Detection Engine - Exception Operators Date & Numeric Types Integration Tests - Serverless Env - Complete Tier',
+      'Detection Engine - Exception Operators Date & Numeric Types Integration Tests - Serverless Env - Essentials Tier',
   },
 });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/date.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/date.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/date.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/date.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/double.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/double.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/double.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/double.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/float.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/float.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/float.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/float.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/index.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/index.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/index.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/integer.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/integer.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/trial_license_complete_tier/integer.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/integer.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/configs/ess.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/ess.config.ts
similarity index 93%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/configs/ess.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/ess.config.ts
index 7e32a2da4551f..dab0c82986bc8 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/configs/ess.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/ess.config.ts
@@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(
-    require.resolve('../../../../../../../../config/ess/config.base.trial')
+    require.resolve('../../../../../../../../config/ess/config.base.basic')
   );
 
   return {
@@ -17,7 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [require.resolve('..')],
     junit: {
       reportName:
-        'Detection Engine - Exception Operators IP Types Integration Tests - ESS Env - Trial License',
+        'Detection Engine - Exception Operators IP Types Integration Tests - ESS Env - Basic License',
     },
   };
 }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/serverless.config.ts
similarity index 85%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/configs/serverless.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/serverless.config.ts
index dff4e5acb1bd8..8608db2c51108 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/configs/serverless.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/serverless.config.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { createTestConfig } from '../../../../../../../../config/serverless/config.base';
+import { createTestConfig } from '../../../../../../../../config/serverless/config.base.essentials';
 
 export default createTestConfig({
   testFiles: [require.resolve('..')],
   junit: {
     reportName:
-      'Detection Engine - Exception Operators IP Types Integration Tests - Serverless Env - Complete Tier',
+      'Detection Engine - Exception Operators IP Types Integration Tests - Serverless Env - Essentials Tier',
   },
 });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/index.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/index.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/index.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/ip.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/ip.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/ip_array.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip_array.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/trial_license_complete_tier/ip_array.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/ip_array.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/configs/ess.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/ess.config.ts
similarity index 92%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/configs/ess.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/ess.config.ts
index a347d2e5634f6..9c9103e5cc5dd 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/configs/ess.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/ess.config.ts
@@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(
-    require.resolve('../../../../../../../../config/ess/config.base.trial')
+    require.resolve('../../../../../../../../config/ess/config.base.basic')
   );
 
   return {
@@ -17,7 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [require.resolve('..')],
     junit: {
       reportName:
-        'Detection Engine - Exception Operators Keyword Types Integration Tests - ESS Env - Trial License',
+        'Detection Engine - Exception Operators Keyword Types Integration Tests - ESS Env - Basic License',
     },
   };
 }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/serverless.config.ts
similarity index 84%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/configs/serverless.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/serverless.config.ts
index 0c7574bae6e0e..e8adea7fc7cda 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/configs/serverless.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/serverless.config.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { createTestConfig } from '../../../../../../../../config/serverless/config.base';
+import { createTestConfig } from '../../../../../../../../config/serverless/config.base.essentials';
 
 export default createTestConfig({
   testFiles: [require.resolve('..')],
   junit: {
     reportName:
-      'Detection Engine - Exception Operators Keyword Types Integration Tests - Serverless Env - Complete Tier',
+      'Detection Engine - Exception Operators Keyword Types Integration Tests - Serverless Env - Essentials Tier',
   },
 });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/index.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/index.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/index.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/keyword.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/keyword.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/keyword_array.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword_array.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/trial_license_complete_tier/keyword_array.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/keyword_array.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/configs/ess.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/ess.config.ts
similarity index 92%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/configs/ess.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/ess.config.ts
index 45b835d2a4de7..d9ebb277f3554 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/configs/ess.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/ess.config.ts
@@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(
-    require.resolve('../../../../../../../../config/ess/config.base.trial')
+    require.resolve('../../../../../../../../config/ess/config.base.basic')
   );
 
   return {
@@ -17,7 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [require.resolve('..')],
     junit: {
       reportName:
-        'Detection Engine - Exception Operators Long Types Integration Tests - ESS Env - Trial License',
+        'Detection Engine - Exception Operators Long Types Integration Tests - ESS Env - Basic License',
     },
   };
 }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/serverless.config.ts
similarity index 85%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/configs/serverless.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/serverless.config.ts
index 2855c92ca239b..3e92c768e2c6e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/configs/serverless.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/serverless.config.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { createTestConfig } from '../../../../../../../../config/serverless/config.base';
+import { createTestConfig } from '../../../../../../../../config/serverless/config.base.essentials';
 
 export default createTestConfig({
   testFiles: [require.resolve('..')],
   junit: {
     reportName:
-      'Detection Engine - Exception Operators Long Types Integration Tests - Serverless Env - Complete Tier',
+      'Detection Engine - Exception Operators Long Types Integration Tests - Serverless Env - Essentials Tier',
   },
 });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/index.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/index.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/index.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/long.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/long.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/trial_license_complete_tier/long.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/long.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/configs/ess.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/ess.config.ts
similarity index 92%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/configs/ess.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/ess.config.ts
index f3b5a18bacaad..5054fed7f616f 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/configs/ess.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/ess.config.ts
@@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(
-    require.resolve('../../../../../../../../config/ess/config.base.trial')
+    require.resolve('../../../../../../../../config/ess/config.base.basic')
   );
 
   return {
@@ -17,7 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [require.resolve('..')],
     junit: {
       reportName:
-        'Detection Engine - Exception Operators Text Types Integration Tests - ESS Env - Trial License',
+        'Detection Engine - Exception Operators Text Types Integration Tests - ESS Env - Basic License',
     },
   };
 }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/serverless.config.ts
similarity index 85%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/configs/serverless.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/serverless.config.ts
index 750d852361911..cc118940c3384 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/configs/serverless.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/serverless.config.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { createTestConfig } from '../../../../../../../../config/serverless/config.base';
+import { createTestConfig } from '../../../../../../../../config/serverless/config.base.essentials';
 
 export default createTestConfig({
   testFiles: [require.resolve('..')],
   junit: {
     reportName:
-      'Detection Engine - Exception Operators Text Types Integration Tests - Serverless Env - Complete Tier',
+      'Detection Engine - Exception Operators Text Types Integration Tests - Serverless Env - Essentials Tier',
   },
 });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/index.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/index.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/index.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/text.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/text.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/text_array.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text_array.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/trial_license_complete_tier/text_array.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/text_array.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/configs/ess.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/ess.config.ts
similarity index 94%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/configs/ess.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/ess.config.ts
index e3d1852401d8c..210e19bfbbfc1 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/configs/ess.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/ess.config.ts
@@ -9,7 +9,7 @@ import { FtrConfigProviderContext } from '@kbn/test';
 
 export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   const functionalConfig = await readConfigFile(
-    require.resolve('../../../../../../../config/ess/config.base.trial')
+    require.resolve('../../../../../../../config/ess/config.base.basic')
   );
 
   return {
@@ -17,7 +17,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [require.resolve('..')],
     junit: {
       reportName:
-        'Detection Engine - Exception Workflows Integration Tests - ESS Env - Trial License',
+        'Detection Engine - Exception Workflows Integration Tests - ESS Env - Basic License',
     },
   };
 }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/serverless.config.ts
similarity index 87%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/configs/serverless.config.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/serverless.config.ts
index 0e664b489dd9a..d4423273eaadc 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/configs/serverless.config.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/serverless.config.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { createTestConfig } from '../../../../../../../config/serverless/config.base';
+import { createTestConfig } from '../../../../../../../config/serverless/config.base.essentials';
 
 export default createTestConfig({
   testFiles: [require.resolve('..')],
   junit: {
     reportName:
-      'Detection Engine - Exception Workflows Integration Tests - Serverless Env - Complete Tier',
+      'Detection Engine - Exception Workflows Integration Tests - Serverless Env - Essentials Tier',
   },
 });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/create_endpoint_exceptions.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_endpoint_exceptions.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/create_endpoint_exceptions.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_endpoint_exceptions.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/create_rule_exceptions.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions.ts
similarity index 78%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/create_rule_exceptions.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions.ts
index 9a51cd8a1e130..e65914d7f4193 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/create_rule_exceptions.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions.ts
@@ -6,8 +6,6 @@
  */
 
 import expect from '@kbn/expect';
-import { Rule } from '@kbn/alerting-plugin/common';
-import { BaseRuleParams } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_schema';
 import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   CreateExceptionListSchema,
@@ -16,15 +14,7 @@ import {
   ExceptionListTypeEnum,
 } from '@kbn/securitysolution-io-ts-list-types';
 import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
-import {
-  fetchRule,
-  getSimpleRule,
-  createExceptionList,
-  getRuleSOById,
-  createRuleThroughAlertingEndpoint,
-  getRuleSavedObjectWithLegacyInvestigationFields,
-  checkInvestigationFieldSoValue,
-} from '../../../../utils';
+import { fetchRule, getSimpleRule, createExceptionList } from '../../../../utils';
 import {
   createRule,
   createAlertsIndex,
@@ -58,7 +48,7 @@ export default ({ getService }: FtrProviderContext) => {
   const config = getService('config');
   const ELASTICSEARCH_USERNAME = config.get('servers.kibana.username');
 
-  describe('@serverless @ess create_rule_exception_route', () => {
+  describe('@serverless @ess create "rule_default" exceptions', () => {
     before(async () => {
       await createAlertsIndex(supertest, log);
     });
@@ -254,54 +244,5 @@ export default ({ getService }: FtrProviderContext) => {
         status_code: 500,
       });
     });
-
-    // TODO: When available this tag should be @skipInServerless
-    // This use case is not relevant to serverless.
-    describe('@brokenInServerless legacy investigation_fields', () => {
-      let ruleWithLegacyInvestigationField: Rule<BaseRuleParams>;
-
-      beforeEach(async () => {
-        await deleteAllRules(supertest, log);
-        ruleWithLegacyInvestigationField = await createRuleThroughAlertingEndpoint(
-          supertest,
-          getRuleSavedObjectWithLegacyInvestigationFields()
-        );
-      });
-
-      afterEach(async () => {
-        await deleteAllRules(supertest, log);
-      });
-
-      it('creates and associates a `rule_default` exception list to a rule with a legacy investigation_field', async () => {
-        await supertest
-          .post(`${DETECTION_ENGINE_RULES_URL}/${ruleWithLegacyInvestigationField.id}/exceptions`)
-          .set('kbn-xsrf', 'true')
-          .set('elastic-api-version', '2023-10-31')
-          .send({
-            items: [getRuleExceptionItemMock()],
-          })
-          .expect(200);
-
-        /**
-         * Confirm type on SO so that it's clear in the tests whether it's expected that
-         * the SO itself is migrated to the inteded object type, or if the transformation is
-         * happening just on the response. In this case, change will
-         * NOT include a migration on SO.
-         */
-        const {
-          hits: {
-            hits: [{ _source: ruleSO }],
-          },
-        } = await getRuleSOById(es, ruleWithLegacyInvestigationField.id);
-        const isInvestigationFieldMigratedInSo = await checkInvestigationFieldSoValue(ruleSO, {
-          field_names: ['client.address', 'agent.name'],
-        });
-
-        expect(
-          ruleSO?.alert.params.exceptionsList.some((list) => list.type === 'rule_default')
-        ).to.eql(true);
-        expect(isInvestigationFieldMigratedInSo).to.eql(false);
-      });
-    });
   });
 };
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions_ess.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions_ess.ts
new file mode 100644
index 0000000000000..9406964106170
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions_ess.ts
@@ -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 expect from '@kbn/expect';
+import { Rule } from '@kbn/alerting-plugin/common';
+import { BaseRuleParams } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_schema';
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { CreateRuleExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import {
+  getRuleSOById,
+  createRuleThroughAlertingEndpoint,
+  getRuleSavedObjectWithLegacyInvestigationFields,
+  checkInvestigationFieldSoValue,
+} from '../../../../utils';
+import {
+  createAlertsIndex,
+  deleteAllRules,
+  deleteAllAlerts,
+} from '../../../../../../../common/utils/security_solution';
+import { deleteAllExceptions } from '../../../../../lists_and_exception_lists/utils';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+
+const getRuleExceptionItemMock = (): CreateRuleExceptionListItemSchema => ({
+  description: 'Exception item for rule default exception list',
+  entries: [
+    {
+      field: 'some.not.nested.field',
+      operator: 'included',
+      type: 'match',
+      value: 'some value',
+    },
+  ],
+  name: 'Sample exception item',
+  type: 'simple',
+});
+
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const log = getService('log');
+  const es = getService('es');
+
+  describe('@ess create rule exception routes, ESS specific logic', () => {
+    before(async () => {
+      await createAlertsIndex(supertest, log);
+    });
+
+    after(async () => {
+      await deleteAllExceptions(supertest, log);
+      await deleteAllAlerts(supertest, log, es);
+      await deleteAllRules(supertest, log);
+    });
+
+    describe('legacy investigation_fields', () => {
+      let ruleWithLegacyInvestigationField: Rule<BaseRuleParams>;
+
+      beforeEach(async () => {
+        await deleteAllRules(supertest, log);
+        ruleWithLegacyInvestigationField = await createRuleThroughAlertingEndpoint(
+          supertest,
+          getRuleSavedObjectWithLegacyInvestigationFields()
+        );
+      });
+
+      afterEach(async () => {
+        await deleteAllRules(supertest, log);
+      });
+
+      it('creates and associates a `rule_default` exception list to a rule with a legacy investigation_field', async () => {
+        await supertest
+          .post(`${DETECTION_ENGINE_RULES_URL}/${ruleWithLegacyInvestigationField.id}/exceptions`)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({
+            items: [getRuleExceptionItemMock()],
+          })
+          .expect(200);
+
+        /**
+         * Confirm type on SO so that it's clear in the tests whether it's expected that
+         * the SO itself is migrated to the inteded object type, or if the transformation is
+         * happening just on the response. In this case, change will
+         * NOT include a migration on SO.
+         */
+        const {
+          hits: {
+            hits: [{ _source: ruleSO }],
+          },
+        } = await getRuleSOById(es, ruleWithLegacyInvestigationField.id);
+        const isInvestigationFieldMigratedInSo = await checkInvestigationFieldSoValue(ruleSO, {
+          field_names: ['client.address', 'agent.name'],
+        });
+
+        expect(
+          ruleSO?.alert.params.exceptionsList.some((list) => list.type === 'rule_default')
+        ).to.eql(true);
+        expect(isInvestigationFieldMigratedInSo).to.eql(false);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/role_based_add_edit_comments.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exception_comments_ess.ts
similarity index 99%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/role_based_add_edit_comments.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exception_comments_ess.ts
index 6535273cacb13..aeecef2a60ade 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/role_based_add_edit_comments.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exception_comments_ess.ts
@@ -30,7 +30,7 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
-  describe('@serverless @ess @brokenInServerless role_based_add_edit_comments', () => {
+  describe('@ess exception item comments', () => {
     const socManager = ROLES.soc_manager;
     const detectionAdmin = ROLES.detections_admin;
 
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exception_comments_serverless.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exception_comments_serverless.ts
new file mode 100644
index 0000000000000..e4431967bf439
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exception_comments_serverless.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.
+ */
+
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import expect from 'expect';
+
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { ROLES } from '@kbn/security-solution-plugin/common/test';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { deleteAllExceptions } from '../../../../../lists_and_exception_lists/utils';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const log = getService('log');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  // @skipInQA purposefully - only running tests in MKI whose failure should block release
+  describe('@serverless @skipInQA exception item comments - serverless specific behavior', () => {
+    describe('Rule Exceptions', () => {
+      afterEach(async () => {
+        await deleteAllExceptions(supertest, log);
+      });
+
+      it('Add comment on a new exception, add another comment has unicode from a different user', async () => {
+        await supertest
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        const { os_types, ...ruleException } = getCreateExceptionListItemMinimalSchemaMock();
+
+        // Add comment by another user
+        await supertestWithoutAuth
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .auth(ROLES.t3_analyst, 'changeme')
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...ruleException,
+            comments: [{ comment: 'Comment by user@t3_analyst' }],
+          })
+          .expect(200);
+        const { body: items } = await supertest
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        // Validate the first user comment
+        expect(items.total).toEqual(1);
+        const [item] = items.data;
+        const t3AnalystComments = item.comments;
+        expect(t3AnalystComments.length).toEqual(1);
+
+        expect(t3AnalystComments[0]).toEqual(
+          expect.objectContaining({
+            created_by: 't3_analyst',
+            comment: 'Comment by user@t3_analyst',
+          })
+        );
+
+        const expectedId = item.id;
+
+        // Update exception comment by different user
+        const { item_id: _, ...updateItemWithoutItemId } =
+          getUpdateMinimalExceptionListItemSchemaMock();
+
+        const updatePayload: UpdateExceptionListItemSchema = {
+          ...updateItemWithoutItemId,
+          comments: [
+            ...(updateItemWithoutItemId.comments || []),
+            { comment: 'Comment by elastic_serverless' },
+          ],
+          id: expectedId,
+        };
+        await supertest
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatePayload)
+          .expect(200);
+
+        const { body: itemsAfterUpdate } = await supertest
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        const [itemAfterUpdate] = itemsAfterUpdate.data;
+        const comments = itemAfterUpdate.comments;
+
+        expect(comments.length).toEqual(2);
+
+        expect(comments).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({
+              created_by: 't3_analyst',
+              comment: 'Comment by user@t3_analyst',
+            }),
+            expect.objectContaining({
+              created_by: 'elastic_serverless',
+              comment: 'Comment by elastic_serverless',
+            }),
+          ])
+        );
+      });
+    });
+    describe('Endpoint Exceptions', () => {
+      afterEach(async () => {
+        await deleteAllExceptions(supertest, log);
+      });
+
+      it('Add comment on a new exception, add another comment has unicode from a different user', async () => {
+        await supertest
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // Add comment by the t3 analyst
+        await supertestWithoutAuth
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .auth(ROLES.t3_analyst, 'changeme')
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            comments: [{ comment: 'Comment by user@t3_analyst' }],
+          })
+          .expect(200);
+
+        const { body: items } = await supertest
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        // Validate the first user comment
+        expect(items.total).toEqual(1);
+        const [item] = items.data;
+        const t3AnalystComments = item.comments;
+        expect(t3AnalystComments.length).toEqual(1);
+
+        expect(t3AnalystComments[0]).toEqual(
+          expect.objectContaining({
+            created_by: 't3_analyst',
+            comment: 'Comment by user@t3_analyst',
+          })
+        );
+
+        const expectedId = item.id;
+
+        // Update exception comment by different user
+        const { item_id: _, ...updateItemWithoutItemId } =
+          getUpdateMinimalExceptionListItemSchemaMock();
+
+        const updatePayload: UpdateExceptionListItemSchema = {
+          ...updateItemWithoutItemId,
+          comments: [
+            ...(updateItemWithoutItemId.comments || []),
+            { comment: 'Comment by elastic_serverless' },
+          ],
+          id: expectedId,
+        };
+        await supertest
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatePayload)
+          .expect(200);
+
+        const { body: itemsAfterUpdate } = await supertest
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+        const [itemAfterUpdate] = itemsAfterUpdate.data;
+        const comments = itemAfterUpdate.comments;
+
+        expect(comments.length).toEqual(2);
+
+        expect(comments).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({
+              created_by: 't3_analyst',
+              comment: 'Comment by user@t3_analyst',
+            }),
+            expect.objectContaining({
+              created_by: 'elastic_serverless',
+              comment: 'Comment by elastic_serverless',
+            }),
+          ])
+        );
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/rule_exception_synchronizations.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exceptions_data_integrity.ts
similarity index 96%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/rule_exception_synchronizations.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exceptions_data_integrity.ts
index f966098d4fa58..8aac6a504d52e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/rule_exception_synchronizations.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/exceptions_data_integrity.ts
@@ -37,7 +37,8 @@ export default ({ getService }: FtrProviderContext) => {
   const log = getService('log');
   const es = getService('es');
 
-  describe('@serverless @ess Synchronizations', () => {
+  // @skipInQA purposefully - only running tests in MKI whose failure should block release
+  describe('@serverless @ess @skipInQA exceptions data integrity', () => {
     afterEach(async () => {
       await deleteAllAlerts(supertest, log, es);
       await deleteAllRules(supertest, log);
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/find_rule_exception_references.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/find_rule_exception_references.ts
similarity index 97%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/find_rule_exception_references.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/find_rule_exception_references.ts
index de24472e94989..e8f8a5bab1981 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/find_rule_exception_references.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/find_rule_exception_references.ts
@@ -43,11 +43,11 @@ export default ({ getService }: FtrProviderContext) => {
 
     after(async () => {
       await deleteAllAlerts(supertest, log, es);
-      await deleteAllRules(supertest, log);
     });
 
     afterEach(async () => {
       await deleteAllExceptions(supertest, log);
+      await deleteAllRules(supertest, log);
     });
 
     it('returns empty array per list_id if no references are found', async () => {
@@ -67,6 +67,7 @@ export default ({ getService }: FtrProviderContext) => {
         .get(DETECTION_ENGINE_RULES_EXCEPTIONS_REFERENCE_URL)
         .set('kbn-xsrf', 'true')
         .set('elastic-api-version', '1')
+        .set('X-Elastic-Internal-Origin', 'Kibana')
         .query({
           ids: `${exceptionList.id}`,
           list_ids: `${exceptionList.list_id}`,
@@ -121,6 +122,7 @@ export default ({ getService }: FtrProviderContext) => {
         .get(DETECTION_ENGINE_RULES_EXCEPTIONS_REFERENCE_URL)
         .set('kbn-xsrf', 'true')
         .set('elastic-api-version', '1')
+        .set('X-Elastic-Internal-Origin', 'Kibana')
         .query({
           ids: `1234`,
           list_ids: `i_dont_exist`,
@@ -168,6 +170,7 @@ export default ({ getService }: FtrProviderContext) => {
         .get(DETECTION_ENGINE_RULES_EXCEPTIONS_REFERENCE_URL)
         .set('kbn-xsrf', 'true')
         .set('elastic-api-version', '1')
+        .set('X-Elastic-Internal-Origin', 'Kibana')
         .query({
           ids: `${exceptionList.id},${exceptionList2.id}`,
           list_ids: `${exceptionList.list_id},${exceptionList2.list_id}`,
@@ -217,6 +220,7 @@ export default ({ getService }: FtrProviderContext) => {
         .get(DETECTION_ENGINE_RULES_EXCEPTIONS_REFERENCE_URL)
         .set('kbn-xsrf', 'true')
         .set('elastic-api-version', '1')
+        .set('X-Elastic-Internal-Origin', 'Kibana')
         .query({
           namespace_types: 'single,agnostic',
         })
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/index.ts
similarity index 56%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/index.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/index.ts
index 729f941111d8f..66941493174a7 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/index.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/index.ts
@@ -8,11 +8,14 @@ import { FtrProviderContext } from '../../../../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Detection Engine - Exception workflows APIs', function () {
-    loadTestFile(require.resolve('./create_rule_exceptions'));
-    loadTestFile(require.resolve('./create_rule_exceptions'));
-    loadTestFile(require.resolve('./role_based_rule_exceptions_workflows'));
+    loadTestFile(require.resolve('./exception_comments_ess'));
+    loadTestFile(require.resolve('./exception_comments_serverless'));
     loadTestFile(require.resolve('./create_endpoint_exceptions'));
-    loadTestFile(require.resolve('./role_based_add_edit_comments'));
-    loadTestFile(require.resolve('./rule_exception_synchronizations'));
+    loadTestFile(require.resolve('./create_rule_exceptions_ess'));
+    loadTestFile(require.resolve('./create_rule_exceptions'));
+    loadTestFile(require.resolve('./exceptions_data_integrity'));
+    loadTestFile(require.resolve('./find_rule_exception_references'));
+    loadTestFile(require.resolve('./rule_exceptions_execution'));
+    loadTestFile(require.resolve('./prebuilt_rules'));
   });
 }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/prebuilt_rules.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/prebuilt_rules.ts
new file mode 100644
index 0000000000000..0eb674d148727
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/prebuilt_rules.ts
@@ -0,0 +1,402 @@
+/*
+ * 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 @typescript-eslint/naming-convention */
+
+import expect from 'expect';
+
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+
+import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
+import { ELASTIC_SECURITY_RULE_ID } from '@kbn/security-solution-plugin/common';
+
+import {
+  fetchRule,
+  createExceptionList,
+  removeServerGeneratedProperties,
+  downgradeImmutableRule,
+  installMockPrebuiltRules,
+  findImmutableRuleById,
+  getPrebuiltRulesAndTimelinesStatus,
+  SAMPLE_PREBUILT_RULES,
+} from '../../../../utils';
+import {
+  createAlertsIndex,
+  deleteAllRules,
+  deleteAllAlerts,
+} from '../../../../../../../common/utils/security_solution';
+import { deleteAllExceptions } from '../../../../../lists_and_exception_lists/utils';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const log = getService('log');
+  const es = getService('es');
+
+  // @skipInQA purposefully - only running tests in MKI whose failure should block release
+  describe('@serverless @ess @skipInQA exceptions workflows for prebuilt rules', () => {
+    describe('creating rules with exceptions', () => {
+      beforeEach(async () => {
+        await createAlertsIndex(supertest, log);
+      });
+
+      afterEach(async () => {
+        await deleteAllAlerts(supertest, log, es);
+        await deleteAllRules(supertest, log);
+        await deleteAllExceptions(supertest, log);
+      });
+
+      it('should allow removing an exception list from an immutable rule through patch', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        // This rule has an existing exceptions_list that we are going to use
+        const immutableRule = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+        expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one exceptions_list
+
+        // remove the exceptions list as a user is allowed to remove it from an immutable rule
+        await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({ rule_id: ELASTIC_SECURITY_RULE_ID, exceptions_list: [] })
+          .expect(200);
+
+        const immutableRuleSecondTime = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+        expect(immutableRuleSecondTime.exceptions_list.length).toEqual(0);
+      });
+
+      it('should allow adding a second exception list to an immutable rule through patch', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        const { id, list_id, namespace_type, type } = await createExceptionList(
+          supertest,
+          log,
+          getCreateExceptionListMinimalSchemaMock()
+        );
+
+        // This rule has an existing exceptions_list that we are going to use
+        const immutableRule = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+        expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
+
+        // add a second exceptions list as a user is allowed to add a second list to an immutable rule
+        await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({
+            rule_id: ELASTIC_SECURITY_RULE_ID,
+            exceptions_list: [
+              ...immutableRule.exceptions_list,
+              {
+                id,
+                list_id,
+                namespace_type,
+                type,
+              },
+            ],
+          })
+          .expect(200);
+
+        const immutableRuleSecondTime = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+
+        expect(immutableRuleSecondTime.exceptions_list.length).toEqual(2);
+      });
+
+      it('should override any updates to pre-packaged rules if the user removes the exception list through the API but the new version of a rule has an exception list again', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        // This rule has an existing exceptions_list that we are going to use
+        const immutableRule = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+        expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
+
+        await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({ rule_id: ELASTIC_SECURITY_RULE_ID, exceptions_list: [] })
+          .expect(200);
+
+        await downgradeImmutableRule(es, log, ELASTIC_SECURITY_RULE_ID);
+        await installMockPrebuiltRules(supertest, es);
+        const immutableRuleSecondTime = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+
+        // We should have a length of 1 and it should be the same as our original before we tried to remove it using patch
+        expect(immutableRuleSecondTime.exceptions_list.length).toEqual(1);
+        expect(immutableRuleSecondTime.exceptions_list).toEqual(immutableRule.exceptions_list);
+      });
+
+      it('should merge back an exceptions_list if it was removed from the immutable rule through PATCH', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        const { id, list_id, namespace_type, type } = await createExceptionList(
+          supertest,
+          log,
+          getCreateExceptionListMinimalSchemaMock()
+        );
+
+        // This rule has an existing exceptions_list that we are going to ensure does not stomp on our existing rule
+        const immutableRule = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+        expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
+
+        // remove the exception list and only have a single list that is not an endpoint_list
+        await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({
+            rule_id: ELASTIC_SECURITY_RULE_ID,
+            exceptions_list: [
+              {
+                id,
+                list_id,
+                namespace_type,
+                type,
+              },
+            ],
+          })
+          .expect(200);
+
+        await downgradeImmutableRule(es, log, ELASTIC_SECURITY_RULE_ID);
+        await installMockPrebuiltRules(supertest, es);
+        const immutableRuleSecondTime = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+
+        expect(immutableRuleSecondTime.exceptions_list).toEqual([
+          ...immutableRule.exceptions_list,
+          {
+            id,
+            list_id,
+            namespace_type,
+            type,
+          },
+        ]);
+      });
+
+      it('should NOT add an extra exceptions_list that already exists on a rule during an upgrade', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        // This rule has an existing exceptions_list that we are going to ensure does not stomp on our existing rule
+        const immutableRule = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+        expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
+
+        await downgradeImmutableRule(es, log, ELASTIC_SECURITY_RULE_ID);
+        await installMockPrebuiltRules(supertest, es);
+
+        const immutableRuleSecondTime = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+
+        // The installed rule should have both the original immutable exceptions list back and the
+        // new list the user added.
+        expect(immutableRuleSecondTime.exceptions_list).toEqual([...immutableRule.exceptions_list]);
+      });
+
+      it('should NOT allow updates to pre-packaged rules to overwrite existing exception based rules when the user adds an additional exception list', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        const { id, list_id, namespace_type, type } = await createExceptionList(
+          supertest,
+          log,
+          getCreateExceptionListMinimalSchemaMock()
+        );
+
+        // This rule has an existing exceptions_list that we are going to ensure does not stomp on our existing rule
+        const immutableRule = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+
+        // add a second exceptions list as a user is allowed to add a second list to an immutable rule
+        await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({
+            rule_id: ELASTIC_SECURITY_RULE_ID,
+            exceptions_list: [
+              ...immutableRule.exceptions_list,
+              {
+                id,
+                list_id,
+                namespace_type,
+                type,
+              },
+            ],
+          })
+          .expect(200);
+
+        await downgradeImmutableRule(es, log, ELASTIC_SECURITY_RULE_ID);
+        await installMockPrebuiltRules(supertest, es);
+        const immutableRuleSecondTime = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+
+        // It should be the same as what the user added originally
+        expect(immutableRuleSecondTime.exceptions_list).toEqual([
+          ...immutableRule.exceptions_list,
+          {
+            id,
+            list_id,
+            namespace_type,
+            type,
+          },
+        ]);
+      });
+
+      it('should not remove any exceptions added to a pre-packaged/immutable rule during an update if that rule has no existing exception lists', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        // Create a new exception list
+        const { id, list_id, namespace_type, type } = await createExceptionList(
+          supertest,
+          log,
+          getCreateExceptionListMinimalSchemaMock()
+        );
+
+        // Find a rule without exceptions_list
+        const ruleWithoutExceptionList = SAMPLE_PREBUILT_RULES.find(
+          (rule) => !rule['security-rule'].exceptions_list
+        );
+        const ruleId = ruleWithoutExceptionList?.['security-rule'].rule_id;
+        if (!ruleId) {
+          throw new Error('Cannot find a rule without exceptions_list in the sample data');
+        }
+
+        const immutableRule = await fetchRule(supertest, { ruleId });
+        expect(immutableRule.exceptions_list.length).toEqual(0); // make sure we have no exceptions_list
+
+        // add a second exceptions list as a user is allowed to add a second list to an immutable rule
+        await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({
+            rule_id: ruleId,
+            exceptions_list: [
+              {
+                id,
+                list_id,
+                namespace_type,
+                type,
+              },
+            ],
+          })
+          .expect(200);
+
+        await downgradeImmutableRule(es, log, ruleId);
+        await installMockPrebuiltRules(supertest, es);
+        const immutableRuleSecondTime = await fetchRule(supertest, { ruleId });
+
+        expect(immutableRuleSecondTime.exceptions_list).toEqual([
+          {
+            id,
+            list_id,
+            namespace_type,
+            type,
+          },
+        ]);
+      });
+
+      it('should not change the immutable tags when adding a second exception list to an immutable rule through patch', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        const { id, list_id, namespace_type, type } = await createExceptionList(
+          supertest,
+          log,
+          getCreateExceptionListMinimalSchemaMock()
+        );
+
+        // This rule has an existing exceptions_list that we are going to use
+        const immutableRule = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+        expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
+
+        // add a second exceptions list as a user is allowed to add a second list to an immutable rule
+        await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({
+            rule_id: ELASTIC_SECURITY_RULE_ID,
+            exceptions_list: [
+              ...immutableRule.exceptions_list,
+              {
+                id,
+                list_id,
+                namespace_type,
+                type,
+              },
+            ],
+          })
+          .expect(200);
+
+        const body = await findImmutableRuleById(supertest, log, ELASTIC_SECURITY_RULE_ID);
+        expect(body.data.length).toEqual(1); // should have only one length to the data set, otherwise we have duplicates or the tags were removed and that is incredibly bad.
+
+        const bodyToCompare = removeServerGeneratedProperties(body.data[0]);
+        expect(bodyToCompare.rule_id).toEqual(immutableRule.rule_id); // Rule id should not change with a a patch
+        expect(bodyToCompare.immutable).toEqual(immutableRule.immutable); // Immutable should always stay the same which is true and never flip to false.
+        expect(bodyToCompare.version).toEqual(immutableRule.version); // The version should never update on a patch
+      });
+
+      it('should not change count of prepacked rules when adding a second exception list to an immutable rule through patch. If this fails, suspect the immutable tags are not staying on the rule correctly.', async () => {
+        await installMockPrebuiltRules(supertest, es);
+
+        const { id, list_id, namespace_type, type } = await createExceptionList(
+          supertest,
+          log,
+          getCreateExceptionListMinimalSchemaMock()
+        );
+
+        // This rule has an existing exceptions_list that we are going to use
+        const immutableRule = await fetchRule(supertest, {
+          ruleId: ELASTIC_SECURITY_RULE_ID,
+        });
+        expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
+
+        // add a second exceptions list as a user is allowed to add a second list to an immutable rule
+        await supertest
+          .patch(DETECTION_ENGINE_RULES_URL)
+          .set('kbn-xsrf', 'true')
+          .set('elastic-api-version', '2023-10-31')
+          .send({
+            rule_id: ELASTIC_SECURITY_RULE_ID,
+            exceptions_list: [
+              ...immutableRule.exceptions_list,
+              {
+                id,
+                list_id,
+                namespace_type,
+                type,
+              },
+            ],
+          })
+          .expect(200);
+
+        const status = await getPrebuiltRulesAndTimelinesStatus(es, supertest);
+        expect(status.rules_not_installed).toEqual(0);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/rule_exceptions_execution.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/rule_exceptions_execution.ts
new file mode 100644
index 0000000000000..4c24d025ce76f
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/rule_exceptions_execution.ts
@@ -0,0 +1,479 @@
+/*
+ * 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 @typescript-eslint/naming-convention */
+
+import expect from 'expect';
+import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { LIST_URL } from '@kbn/securitysolution-list-constants';
+import type {
+  RuleCreateProps,
+  EqlRuleCreateProps,
+  QueryRuleCreateProps,
+  ThreatMatchRuleCreateProps,
+  ThresholdRuleCreateProps,
+} from '@kbn/security-solution-plugin/common/api/detection_engine';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+
+import { EsArchivePathBuilder } from '../../../../../../es_archive_path_builder';
+import {
+  getSimpleRule,
+  createExceptionList,
+  createExceptionListItem,
+  getThresholdRuleForAlertTesting,
+  getOpenAlerts,
+  createRuleWithExceptionEntries,
+  getEqlRuleForAlertTesting,
+} from '../../../../utils';
+import {
+  createAlertsIndex,
+  createRule,
+  deleteAllRules,
+  waitForRuleSuccess,
+  waitForAlertsToBePresent,
+  getAlertsByIds,
+  deleteAllAlerts,
+} from '../../../../../../../common/utils/security_solution';
+import {
+  createListsIndex,
+  deleteAllExceptions,
+  deleteListsIndex,
+  importFile,
+} from '../../../../../lists_and_exception_lists/utils';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+  const log = getService('log');
+  const es = getService('es');
+  // TODO: add a new service for loading archiver files similar to "getService('es')"
+  const config = getService('config');
+  const isServerless = config.get('serverless');
+  const dataPathBuilder = new EsArchivePathBuilder(isServerless);
+  const path = dataPathBuilder.getPath('auditbeat/hosts');
+
+  describe('@serverless @ess rule exceptions execution', () => {
+    before(async () => {
+      await esArchiver.load(path);
+    });
+
+    after(async () => {
+      await esArchiver.unload(path);
+    });
+
+    describe('creating rules with exceptions', () => {
+      beforeEach(async () => {
+        await createAlertsIndex(supertest, log);
+      });
+
+      afterEach(async () => {
+        await deleteAllAlerts(supertest, log, es);
+        await deleteAllRules(supertest, log);
+        await deleteAllExceptions(supertest, log);
+      });
+
+      it('should be able to execute against an exception list that does not include valid entries and get back 10 alerts', async () => {
+        const { id, list_id, namespace_type, type } = await createExceptionList(
+          supertest,
+          log,
+          getCreateExceptionListMinimalSchemaMock()
+        );
+
+        const exceptionListItem: CreateExceptionListItemSchema = {
+          ...getCreateExceptionListItemMinimalSchemaMock(),
+          entries: [
+            {
+              field: 'some.none.existent.field', // non-existent field where we should not exclude anything
+              operator: 'included',
+              type: 'match',
+              value: 'some value',
+            },
+          ],
+        };
+        await createExceptionListItem(supertest, log, exceptionListItem);
+
+        const ruleWithException: RuleCreateProps = {
+          name: 'Simple Rule Query',
+          description: 'Simple Rule Query',
+          enabled: true,
+          risk_score: 1,
+          rule_id: 'rule-1',
+          severity: 'high',
+          index: ['auditbeat-*'],
+          type: 'query',
+          from: '1900-01-01T00:00:00.000Z',
+          query: 'host.name: "suricata-sensor-amsterdam"',
+          exceptions_list: [
+            {
+              id,
+              list_id,
+              namespace_type,
+              type,
+            },
+          ],
+        };
+        const { id: createdId } = await createRule(supertest, log, ruleWithException);
+        await waitForRuleSuccess({ supertest, log, id: createdId });
+        await waitForAlertsToBePresent(supertest, log, 10, [createdId]);
+        const alertsOpen = await getAlertsByIds(supertest, log, [createdId]);
+        expect(alertsOpen.hits.hits.length).toEqual(10);
+      });
+
+      it('should be able to execute against an exception list that does include valid entries and get back 0 alerts', async () => {
+        const rule: QueryRuleCreateProps = {
+          name: 'Simple Rule Query',
+          description: 'Simple Rule Query',
+          enabled: true,
+          risk_score: 1,
+          rule_id: 'rule-1',
+          severity: 'high',
+          index: ['auditbeat-*'],
+          type: 'query',
+          from: '1900-01-01T00:00:00.000Z',
+          query: 'host.name: "suricata-sensor-amsterdam"',
+        };
+        const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+          [
+            {
+              field: 'host.name', // This matches the query above which will exclude everything
+              operator: 'included',
+              type: 'match',
+              value: 'suricata-sensor-amsterdam',
+            },
+          ],
+        ]);
+        const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+        expect(alertsOpen.hits.hits.length).toEqual(0);
+      });
+
+      it('should be able to execute against an exception list that does include valid case sensitive entries and get back 0 alerts', async () => {
+        const rule: QueryRuleCreateProps = {
+          name: 'Simple Rule Query',
+          description: 'Simple Rule Query',
+          enabled: true,
+          risk_score: 1,
+          rule_id: 'rule-1',
+          severity: 'high',
+          index: ['auditbeat-*'],
+          type: 'query',
+          from: '1900-01-01T00:00:00.000Z',
+          query: 'host.name: "suricata-sensor-amsterdam"',
+        };
+        const rule2: QueryRuleCreateProps = {
+          name: 'Simple Rule Query',
+          description: 'Simple Rule Query',
+          enabled: true,
+          risk_score: 1,
+          rule_id: 'rule-2',
+          severity: 'high',
+          index: ['auditbeat-*'],
+          type: 'query',
+          from: '1900-01-01T00:00:00.000Z',
+          query: 'host.name: "suricata-sensor-amsterdam"',
+        };
+        const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+          [
+            {
+              field: 'host.os.name',
+              operator: 'included',
+              type: 'match_any',
+              value: ['ubuntu'],
+            },
+          ],
+        ]);
+        const createdRule2 = await createRuleWithExceptionEntries(supertest, log, rule2, [
+          [
+            {
+              field: 'host.os.name', // This matches the query above which will exclude everything
+              operator: 'included',
+              type: 'match_any',
+              value: ['ubuntu', 'Ubuntu'],
+            },
+          ],
+        ]);
+        const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+        const alertsOpen2 = await getOpenAlerts(supertest, log, es, createdRule2);
+        // Expect alerts here because all values are "Ubuntu"
+        // and exception is one of ["ubuntu"]
+        expect(alertsOpen.hits.hits.length).toEqual(10);
+        // Expect no alerts here because all values are "Ubuntu"
+        // and exception is one of ["ubuntu", "Ubuntu"]
+        expect(alertsOpen2.hits.hits.length).toEqual(0);
+      });
+
+      it('generates no alerts when an exception is added for an EQL rule', async () => {
+        const rule: EqlRuleCreateProps = {
+          ...getEqlRuleForAlertTesting(['auditbeat-*']),
+          query: 'configuration where agent.id=="a1d7b39c-f898-4dbe-a761-efb61939302d"',
+        };
+        const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+          [
+            {
+              field: 'host.id',
+              operator: 'included',
+              type: 'match',
+              value: '8cc95778cce5407c809480e8e32ad76b',
+            },
+          ],
+        ]);
+        const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+        expect(alertsOpen.hits.hits.length).toEqual(0);
+      });
+
+      it('generates no alerts when an exception is added for a threshold rule', async () => {
+        const rule: ThresholdRuleCreateProps = {
+          ...getThresholdRuleForAlertTesting(['auditbeat-*']),
+          threshold: {
+            field: 'host.id',
+            value: 700,
+          },
+        };
+        const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+          [
+            {
+              field: 'host.id',
+              operator: 'included',
+              type: 'match',
+              value: '8cc95778cce5407c809480e8e32ad76b',
+            },
+          ],
+        ]);
+        const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+        expect(alertsOpen.hits.hits.length).toEqual(0);
+      });
+
+      it('generates no alerts when an exception is added for a threat match rule', async () => {
+        const rule: ThreatMatchRuleCreateProps = {
+          description: 'Detecting root and admin users',
+          name: 'Query with a rule id',
+          severity: 'high',
+          index: ['auditbeat-*'],
+          type: 'threat_match',
+          risk_score: 55,
+          language: 'kuery',
+          rule_id: 'rule-1',
+          from: '1900-01-01T00:00:00.000Z',
+          query: '*:*',
+          threat_query: 'source.ip: "188.166.120.93"', // narrow things down with a query to a specific source ip
+          threat_index: ['auditbeat-*'], // We use auditbeat as both the matching index and the threat list for simplicity
+          threat_mapping: [
+            // We match host.name against host.name
+            {
+              entries: [
+                {
+                  field: 'host.name',
+                  value: 'host.name',
+                  type: 'mapping',
+                },
+              ],
+            },
+          ],
+          threat_filters: [],
+        };
+
+        const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+          [
+            {
+              field: 'source.ip',
+              operator: 'included',
+              type: 'match',
+              value: '188.166.120.93',
+            },
+          ],
+        ]);
+        const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+        expect(alertsOpen.hits.hits.length).toEqual(0);
+      });
+      describe('rules with value list exceptions', () => {
+        beforeEach(async () => {
+          await createListsIndex(supertest, log);
+        });
+
+        afterEach(async () => {
+          await deleteListsIndex(supertest, log);
+        });
+
+        it('generates no alerts when a value list exception is added for a query rule', async () => {
+          const valueListId = 'value-list-id.txt';
+          await importFile(supertest, log, 'keyword', ['suricata-sensor-amsterdam'], valueListId);
+          const rule: QueryRuleCreateProps = {
+            name: 'Simple Rule Query',
+            description: 'Simple Rule Query',
+            enabled: true,
+            risk_score: 1,
+            rule_id: 'rule-1',
+            severity: 'high',
+            index: ['auditbeat-*'],
+            type: 'query',
+            from: '1900-01-01T00:00:00.000Z',
+            query: 'host.name: "suricata-sensor-amsterdam"',
+          };
+          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+            [
+              {
+                field: 'host.name',
+                operator: 'included',
+                type: 'list',
+                list: {
+                  id: valueListId,
+                  type: 'keyword',
+                },
+              },
+            ],
+          ]);
+          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+          expect(alertsOpen.hits.hits.length).toEqual(0);
+        });
+
+        it('generates no alerts when a value list exception is added for a threat match rule', async () => {
+          const valueListId = 'value-list-id.txt';
+          await importFile(supertest, log, 'keyword', ['zeek-sensor-amsterdam'], valueListId);
+          const rule: ThreatMatchRuleCreateProps = {
+            description: 'Detecting root and admin users',
+            name: 'Query with a rule id',
+            severity: 'high',
+            index: ['auditbeat-*'],
+            type: 'threat_match',
+            risk_score: 55,
+            language: 'kuery',
+            rule_id: 'rule-1',
+            from: '1900-01-01T00:00:00.000Z',
+            query: '*:*',
+            threat_query: 'source.ip: "188.166.120.93"', // narrow things down with a query to a specific source ip
+            threat_index: ['auditbeat-*'], // We use auditbeat as both the matching index and the threat list for simplicity
+            threat_mapping: [
+              // We match host.name against host.name
+              {
+                entries: [
+                  {
+                    field: 'host.name',
+                    value: 'host.name',
+                    type: 'mapping',
+                  },
+                ],
+              },
+            ],
+            threat_filters: [],
+          };
+
+          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+            [
+              {
+                field: 'host.name',
+                operator: 'included',
+                type: 'list',
+                list: {
+                  id: valueListId,
+                  type: 'keyword',
+                },
+              },
+            ],
+          ]);
+          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+          expect(alertsOpen.hits.hits.length).toEqual(0);
+        });
+
+        it('generates no alerts when a value list exception is added for a threshold rule', async () => {
+          const valueListId = 'value-list-id.txt';
+          await importFile(supertest, log, 'keyword', ['zeek-sensor-amsterdam'], valueListId);
+          const rule: ThresholdRuleCreateProps = {
+            description: 'Detecting root and admin users',
+            name: 'Query with a rule id',
+            severity: 'high',
+            index: ['auditbeat-*'],
+            type: 'threshold',
+            risk_score: 55,
+            language: 'kuery',
+            rule_id: 'rule-1',
+            from: '1900-01-01T00:00:00.000Z',
+            query: 'host.name: "zeek-sensor-amsterdam"',
+            threshold: {
+              field: 'host.name',
+              value: 1,
+            },
+          };
+
+          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+            [
+              {
+                field: 'host.name',
+                operator: 'included',
+                type: 'list',
+                list: {
+                  id: valueListId,
+                  type: 'keyword',
+                },
+              },
+            ],
+          ]);
+          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+          expect(alertsOpen.hits.hits.length).toEqual(0);
+        });
+
+        it('generates no alerts when a value list exception is added for an EQL rule', async () => {
+          const valueListId = 'value-list-id.txt';
+          await importFile(supertest, log, 'keyword', ['zeek-sensor-amsterdam'], valueListId);
+          const rule: EqlRuleCreateProps = {
+            ...getEqlRuleForAlertTesting(['auditbeat-*']),
+            query: 'configuration where host.name=="zeek-sensor-amsterdam"',
+          };
+
+          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
+            [
+              {
+                field: 'host.name',
+                operator: 'included',
+                type: 'list',
+                list: {
+                  id: valueListId,
+                  type: 'keyword',
+                },
+              },
+            ],
+          ]);
+          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
+          expect(alertsOpen.hits.hits.length).toEqual(0);
+        });
+        it('should Not allow deleting value list when there are references and ignoreReferences is false', async () => {
+          const valueListId = 'value-list-id.txt';
+          await importFile(supertest, log, 'keyword', ['suricata-sensor-amsterdam'], valueListId);
+          const rule: QueryRuleCreateProps = {
+            ...getSimpleRule(),
+            query: 'host.name: "suricata-sensor-amsterdam"',
+          };
+          await createRuleWithExceptionEntries(supertest, log, rule, [
+            [
+              {
+                field: 'host.name',
+                operator: 'included',
+                type: 'list',
+                list: {
+                  id: valueListId,
+                  type: 'keyword',
+                },
+              },
+            ],
+          ]);
+
+          const deleteReferences = false;
+          const ignoreReferences = false;
+
+          // Delete the value list
+          await supertest
+            .delete(
+              `${LIST_URL}?deleteReferences=${deleteReferences}&id=${valueListId}&ignoreReferences=${ignoreReferences}`
+            )
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(409);
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/role_based_rule_exceptions_workflows.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/role_based_rule_exceptions_workflows.ts
deleted file mode 100644
index 1472637d3b5f5..0000000000000
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/trial_license_complete_tier/role_based_rule_exceptions_workflows.ts
+++ /dev/null
@@ -1,984 +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 @typescript-eslint/naming-convention */
-
-import expect from 'expect';
-import type { CreateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
-import {
-  EXCEPTION_LIST_ITEM_URL,
-  EXCEPTION_LIST_URL,
-  LIST_URL,
-} from '@kbn/securitysolution-list-constants';
-import type {
-  RuleCreateProps,
-  EqlRuleCreateProps,
-  QueryRuleCreateProps,
-  ThreatMatchRuleCreateProps,
-  ThresholdRuleCreateProps,
-} from '@kbn/security-solution-plugin/common/api/detection_engine';
-import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
-import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
-
-import { DETECTION_ENGINE_RULES_URL } from '@kbn/security-solution-plugin/common/constants';
-import { ROLES } from '@kbn/security-solution-plugin/common/test';
-import { ELASTIC_SECURITY_RULE_ID } from '@kbn/security-solution-plugin/common';
-
-import { EsArchivePathBuilder } from '../../../../../../es_archive_path_builder';
-import {
-  fetchRule,
-  getSimpleRule,
-  createExceptionList,
-  createExceptionListItem,
-  getThresholdRuleForAlertTesting,
-  getSimpleRuleOutput,
-  removeServerGeneratedProperties,
-  downgradeImmutableRule,
-  installMockPrebuiltRules,
-  findImmutableRuleById,
-  getPrebuiltRulesAndTimelinesStatus,
-  getOpenAlerts,
-  createRuleWithExceptionEntries,
-  getEqlRuleForAlertTesting,
-  SAMPLE_PREBUILT_RULES,
-  updateUsername,
-} from '../../../../utils';
-import {
-  createAlertsIndex,
-  createRule,
-  deleteAllRules,
-  waitForRuleSuccess,
-  waitForAlertsToBePresent,
-  getAlertsByIds,
-  deleteAllAlerts,
-} from '../../../../../../../common/utils/security_solution';
-import {
-  createListsIndex,
-  deleteAllExceptions,
-  deleteListsIndex,
-  importFile,
-} from '../../../../../lists_and_exception_lists/utils';
-import {
-  createUserAndRole,
-  deleteUserAndRole,
-} from '../../../../../../../common/services/security_solution';
-import { FtrProviderContext } from '../../../../../../ftr_provider_context';
-
-export default ({ getService }: FtrProviderContext) => {
-  const supertest = getService('supertest');
-  const supertestWithoutAuth = getService('supertestWithoutAuth');
-  const esArchiver = getService('esArchiver');
-  const log = getService('log');
-  const es = getService('es');
-  // TODO: add a new service for loading archiver files similar to "getService('es')"
-  const config = getService('config');
-  const ELASTICSEARCH_USERNAME = config.get('servers.kibana.username');
-  const isServerless = config.get('serverless');
-  const dataPathBuilder = new EsArchivePathBuilder(isServerless);
-  const path = dataPathBuilder.getPath('auditbeat/hosts');
-
-  describe('@serverless @ess role_based_rule_exceptions_workflows', () => {
-    before(async () => {
-      await esArchiver.load(path);
-    });
-
-    after(async () => {
-      await esArchiver.unload(path);
-    });
-
-    describe('creating rules with exceptions', () => {
-      beforeEach(async () => {
-        await createAlertsIndex(supertest, log);
-      });
-
-      afterEach(async () => {
-        await deleteAllAlerts(supertest, log, es);
-        await deleteAllRules(supertest, log);
-        await deleteAllExceptions(supertest, log);
-      });
-
-      describe('elastic admin', () => {
-        it('should create a single rule with a rule_id and add an exception list to the rule', async () => {
-          const {
-            body: { id, list_id, namespace_type, type },
-          } = await supertest
-            .post(EXCEPTION_LIST_URL)
-            .set('kbn-xsrf', 'true')
-            .send(getCreateExceptionListMinimalSchemaMock())
-            .expect(200);
-
-          const ruleWithException: RuleCreateProps = {
-            ...getSimpleRule(),
-            exceptions_list: [
-              {
-                id,
-                list_id,
-                namespace_type,
-                type,
-              },
-            ],
-          };
-          const expectedRule = updateUsername(getSimpleRuleOutput(), ELASTICSEARCH_USERNAME);
-          const rule = await createRule(supertest, log, ruleWithException);
-          const expected = {
-            ...expectedRule,
-            exceptions_list: [
-              {
-                id,
-                list_id,
-                namespace_type,
-                type,
-              },
-            ],
-          };
-          const bodyToCompare = removeServerGeneratedProperties(rule);
-          expect(bodyToCompare).toEqual(expected);
-        });
-
-        it('should create a single rule with an exception list and validate it ran successfully', async () => {
-          const {
-            body: { id, list_id, namespace_type, type },
-          } = await supertest
-            .post(EXCEPTION_LIST_URL)
-            .set('kbn-xsrf', 'true')
-            .send(getCreateExceptionListMinimalSchemaMock())
-            .expect(200);
-
-          const ruleWithException: RuleCreateProps = {
-            ...getSimpleRule(),
-            enabled: true,
-            exceptions_list: [
-              {
-                id,
-                list_id,
-                namespace_type,
-                type,
-              },
-            ],
-          };
-
-          const rule = await createRule(supertest, log, ruleWithException);
-          await waitForRuleSuccess({ supertest, log, id: rule.id });
-          const bodyToCompare = removeServerGeneratedProperties(rule);
-          const expectedRule = updateUsername(getSimpleRuleOutput(), ELASTICSEARCH_USERNAME);
-
-          const expected = {
-            ...expectedRule,
-            enabled: true,
-            exceptions_list: [
-              {
-                id,
-                list_id,
-                namespace_type,
-                type,
-              },
-            ],
-          };
-          expect(bodyToCompare).toEqual(expected);
-        });
-
-        it('@skipInQA should allow removing an exception list from an immutable rule through patch', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          // This rule has an existing exceptions_list that we are going to use
-          const immutableRule = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-          expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one exceptions_list
-
-          // remove the exceptions list as a user is allowed to remove it from an immutable rule
-          await supertest
-            .patch(DETECTION_ENGINE_RULES_URL)
-            .set('kbn-xsrf', 'true')
-            .set('elastic-api-version', '2023-10-31')
-            .send({ rule_id: ELASTIC_SECURITY_RULE_ID, exceptions_list: [] })
-            .expect(200);
-
-          const immutableRuleSecondTime = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-          expect(immutableRuleSecondTime.exceptions_list.length).toEqual(0);
-        });
-
-        it('@skipInQA should allow adding a second exception list to an immutable rule through patch', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          const { id, list_id, namespace_type, type } = await createExceptionList(
-            supertest,
-            log,
-            getCreateExceptionListMinimalSchemaMock()
-          );
-
-          // This rule has an existing exceptions_list that we are going to use
-          const immutableRule = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-          expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
-
-          // add a second exceptions list as a user is allowed to add a second list to an immutable rule
-          await supertest
-            .patch(DETECTION_ENGINE_RULES_URL)
-            .set('kbn-xsrf', 'true')
-            .set('elastic-api-version', '2023-10-31')
-            .send({
-              rule_id: ELASTIC_SECURITY_RULE_ID,
-              exceptions_list: [
-                ...immutableRule.exceptions_list,
-                {
-                  id,
-                  list_id,
-                  namespace_type,
-                  type,
-                },
-              ],
-            })
-            .expect(200);
-
-          const immutableRuleSecondTime = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-
-          expect(immutableRuleSecondTime.exceptions_list.length).toEqual(2);
-        });
-
-        it('@skipInQA should override any updates to pre-packaged rules if the user removes the exception list through the API but the new version of a rule has an exception list again', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          // This rule has an existing exceptions_list that we are going to use
-          const immutableRule = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-          expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
-
-          await supertest
-            .patch(DETECTION_ENGINE_RULES_URL)
-            .set('kbn-xsrf', 'true')
-            .set('elastic-api-version', '2023-10-31')
-            .send({ rule_id: ELASTIC_SECURITY_RULE_ID, exceptions_list: [] })
-            .expect(200);
-
-          await downgradeImmutableRule(es, log, ELASTIC_SECURITY_RULE_ID);
-          await installMockPrebuiltRules(supertest, es);
-          const immutableRuleSecondTime = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-
-          // We should have a length of 1 and it should be the same as our original before we tried to remove it using patch
-          expect(immutableRuleSecondTime.exceptions_list.length).toEqual(1);
-          expect(immutableRuleSecondTime.exceptions_list).toEqual(immutableRule.exceptions_list);
-        });
-
-        it('@skipInQA should merge back an exceptions_list if it was removed from the immutable rule through PATCH', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          const { id, list_id, namespace_type, type } = await createExceptionList(
-            supertest,
-            log,
-            getCreateExceptionListMinimalSchemaMock()
-          );
-
-          // This rule has an existing exceptions_list that we are going to ensure does not stomp on our existing rule
-          const immutableRule = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-          expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
-
-          // remove the exception list and only have a single list that is not an endpoint_list
-          await supertest
-            .patch(DETECTION_ENGINE_RULES_URL)
-            .set('kbn-xsrf', 'true')
-            .set('elastic-api-version', '2023-10-31')
-            .send({
-              rule_id: ELASTIC_SECURITY_RULE_ID,
-              exceptions_list: [
-                {
-                  id,
-                  list_id,
-                  namespace_type,
-                  type,
-                },
-              ],
-            })
-            .expect(200);
-
-          await downgradeImmutableRule(es, log, ELASTIC_SECURITY_RULE_ID);
-          await installMockPrebuiltRules(supertest, es);
-          const immutableRuleSecondTime = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-
-          expect(immutableRuleSecondTime.exceptions_list).toEqual([
-            ...immutableRule.exceptions_list,
-            {
-              id,
-              list_id,
-              namespace_type,
-              type,
-            },
-          ]);
-        });
-
-        it('@skipInQA should NOT add an extra exceptions_list that already exists on a rule during an upgrade', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          // This rule has an existing exceptions_list that we are going to ensure does not stomp on our existing rule
-          const immutableRule = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-          expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
-
-          await downgradeImmutableRule(es, log, ELASTIC_SECURITY_RULE_ID);
-          await installMockPrebuiltRules(supertest, es);
-
-          const immutableRuleSecondTime = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-
-          // The installed rule should have both the original immutable exceptions list back and the
-          // new list the user added.
-          expect(immutableRuleSecondTime.exceptions_list).toEqual([
-            ...immutableRule.exceptions_list,
-          ]);
-        });
-
-        it('@skipInQA should NOT allow updates to pre-packaged rules to overwrite existing exception based rules when the user adds an additional exception list', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          const { id, list_id, namespace_type, type } = await createExceptionList(
-            supertest,
-            log,
-            getCreateExceptionListMinimalSchemaMock()
-          );
-
-          // This rule has an existing exceptions_list that we are going to ensure does not stomp on our existing rule
-          const immutableRule = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-
-          // add a second exceptions list as a user is allowed to add a second list to an immutable rule
-          await supertest
-            .patch(DETECTION_ENGINE_RULES_URL)
-            .set('kbn-xsrf', 'true')
-            .set('elastic-api-version', '2023-10-31')
-            .send({
-              rule_id: ELASTIC_SECURITY_RULE_ID,
-              exceptions_list: [
-                ...immutableRule.exceptions_list,
-                {
-                  id,
-                  list_id,
-                  namespace_type,
-                  type,
-                },
-              ],
-            })
-            .expect(200);
-
-          await downgradeImmutableRule(es, log, ELASTIC_SECURITY_RULE_ID);
-          await installMockPrebuiltRules(supertest, es);
-          const immutableRuleSecondTime = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-
-          // It should be the same as what the user added originally
-          expect(immutableRuleSecondTime.exceptions_list).toEqual([
-            ...immutableRule.exceptions_list,
-            {
-              id,
-              list_id,
-              namespace_type,
-              type,
-            },
-          ]);
-        });
-
-        it('@skipInQA should not remove any exceptions added to a pre-packaged/immutable rule during an update if that rule has no existing exception lists', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          // Create a new exception list
-          const { id, list_id, namespace_type, type } = await createExceptionList(
-            supertest,
-            log,
-            getCreateExceptionListMinimalSchemaMock()
-          );
-
-          // Find a rule without exceptions_list
-          const ruleWithoutExceptionList = SAMPLE_PREBUILT_RULES.find(
-            (rule) => !rule['security-rule'].exceptions_list
-          );
-          const ruleId = ruleWithoutExceptionList?.['security-rule'].rule_id;
-          if (!ruleId) {
-            throw new Error('Cannot find a rule without exceptions_list in the sample data');
-          }
-
-          const immutableRule = await fetchRule(supertest, { ruleId });
-          expect(immutableRule.exceptions_list.length).toEqual(0); // make sure we have no exceptions_list
-
-          // add a second exceptions list as a user is allowed to add a second list to an immutable rule
-          await supertest
-            .patch(DETECTION_ENGINE_RULES_URL)
-            .set('kbn-xsrf', 'true')
-            .set('elastic-api-version', '2023-10-31')
-            .send({
-              rule_id: ruleId,
-              exceptions_list: [
-                {
-                  id,
-                  list_id,
-                  namespace_type,
-                  type,
-                },
-              ],
-            })
-            .expect(200);
-
-          await downgradeImmutableRule(es, log, ruleId);
-          await installMockPrebuiltRules(supertest, es);
-          const immutableRuleSecondTime = await fetchRule(supertest, { ruleId });
-
-          expect(immutableRuleSecondTime.exceptions_list).toEqual([
-            {
-              id,
-              list_id,
-              namespace_type,
-              type,
-            },
-          ]);
-        });
-
-        it('@skipInQA should not change the immutable tags when adding a second exception list to an immutable rule through patch', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          const { id, list_id, namespace_type, type } = await createExceptionList(
-            supertest,
-            log,
-            getCreateExceptionListMinimalSchemaMock()
-          );
-
-          // This rule has an existing exceptions_list that we are going to use
-          const immutableRule = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-          expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
-
-          // add a second exceptions list as a user is allowed to add a second list to an immutable rule
-          await supertest
-            .patch(DETECTION_ENGINE_RULES_URL)
-            .set('kbn-xsrf', 'true')
-            .set('elastic-api-version', '2023-10-31')
-            .send({
-              rule_id: ELASTIC_SECURITY_RULE_ID,
-              exceptions_list: [
-                ...immutableRule.exceptions_list,
-                {
-                  id,
-                  list_id,
-                  namespace_type,
-                  type,
-                },
-              ],
-            })
-            .expect(200);
-
-          const body = await findImmutableRuleById(supertest, log, ELASTIC_SECURITY_RULE_ID);
-          expect(body.data.length).toEqual(1); // should have only one length to the data set, otherwise we have duplicates or the tags were removed and that is incredibly bad.
-
-          const bodyToCompare = removeServerGeneratedProperties(body.data[0]);
-          expect(bodyToCompare.rule_id).toEqual(immutableRule.rule_id); // Rule id should not change with a a patch
-          expect(bodyToCompare.immutable).toEqual(immutableRule.immutable); // Immutable should always stay the same which is true and never flip to false.
-          expect(bodyToCompare.version).toEqual(immutableRule.version); // The version should never update on a patch
-        });
-
-        it('@skipInQA should not change count of prepacked rules when adding a second exception list to an immutable rule through patch. If this fails, suspect the immutable tags are not staying on the rule correctly.', async () => {
-          await installMockPrebuiltRules(supertest, es);
-
-          const { id, list_id, namespace_type, type } = await createExceptionList(
-            supertest,
-            log,
-            getCreateExceptionListMinimalSchemaMock()
-          );
-
-          // This rule has an existing exceptions_list that we are going to use
-          const immutableRule = await fetchRule(supertest, {
-            ruleId: ELASTIC_SECURITY_RULE_ID,
-          });
-          expect(immutableRule.exceptions_list.length).toBeGreaterThan(0); // make sure we have at least one
-
-          // add a second exceptions list as a user is allowed to add a second list to an immutable rule
-          await supertest
-            .patch(DETECTION_ENGINE_RULES_URL)
-            .set('kbn-xsrf', 'true')
-            .set('elastic-api-version', '2023-10-31')
-            .send({
-              rule_id: ELASTIC_SECURITY_RULE_ID,
-              exceptions_list: [
-                ...immutableRule.exceptions_list,
-                {
-                  id,
-                  list_id,
-                  namespace_type,
-                  type,
-                },
-              ],
-            })
-            .expect(200);
-
-          const status = await getPrebuiltRulesAndTimelinesStatus(es, supertest);
-          expect(status.rules_not_installed).toEqual(0);
-        });
-      });
-
-      describe('@brokenInServerless t1_analyst', () => {
-        const role = ROLES.t1_analyst;
-
-        beforeEach(async () => {
-          await createUserAndRole(getService, role);
-        });
-
-        afterEach(async () => {
-          await deleteUserAndRole(getService, role);
-        });
-
-        it('should NOT be able to create an exception list', async () => {
-          await supertestWithoutAuth
-            .post(EXCEPTION_LIST_ITEM_URL)
-            .auth(role, 'changeme')
-            .set('kbn-xsrf', 'true')
-            .send(getCreateExceptionListItemMinimalSchemaMock())
-            .expect(403);
-        });
-
-        it('should NOT be able to create an exception list item', async () => {
-          await supertestWithoutAuth
-            .post(EXCEPTION_LIST_ITEM_URL)
-            .auth(role, 'changeme')
-            .set('kbn-xsrf', 'true')
-            .send(getCreateExceptionListItemMinimalSchemaMock())
-            .expect(403);
-        });
-      });
-
-      // FLAKY: https://github.com/elastic/kibana/issues/169664
-      describe.skip('tests with auditbeat data', () => {
-        before(async () => {
-          await esArchiver.load(path);
-        });
-
-        after(async () => {
-          await esArchiver.unload(path);
-        });
-
-        beforeEach(async () => {
-          await createAlertsIndex(supertest, log);
-        });
-
-        afterEach(async () => {
-          await deleteAllAlerts(supertest, log, es);
-          await deleteAllRules(supertest, log);
-          await deleteAllExceptions(supertest, log);
-        });
-
-        it('should be able to execute against an exception list that does not include valid entries and get back 10 alerts', async () => {
-          const { id, list_id, namespace_type, type } = await createExceptionList(
-            supertest,
-            log,
-            getCreateExceptionListMinimalSchemaMock()
-          );
-
-          const exceptionListItem: CreateExceptionListItemSchema = {
-            ...getCreateExceptionListItemMinimalSchemaMock(),
-            entries: [
-              {
-                field: 'some.none.existent.field', // non-existent field where we should not exclude anything
-                operator: 'included',
-                type: 'match',
-                value: 'some value',
-              },
-            ],
-          };
-          await createExceptionListItem(supertest, log, exceptionListItem);
-
-          const ruleWithException: RuleCreateProps = {
-            name: 'Simple Rule Query',
-            description: 'Simple Rule Query',
-            enabled: true,
-            risk_score: 1,
-            rule_id: 'rule-1',
-            severity: 'high',
-            index: ['auditbeat-*'],
-            type: 'query',
-            from: '1900-01-01T00:00:00.000Z',
-            query: 'host.name: "suricata-sensor-amsterdam"',
-            exceptions_list: [
-              {
-                id,
-                list_id,
-                namespace_type,
-                type,
-              },
-            ],
-          };
-          const { id: createdId } = await createRule(supertest, log, ruleWithException);
-          await waitForRuleSuccess({ supertest, log, id: createdId });
-          await waitForAlertsToBePresent(supertest, log, 10, [createdId]);
-          const alertsOpen = await getAlertsByIds(supertest, log, [createdId]);
-          expect(alertsOpen.hits.hits.length).toEqual(10);
-        });
-
-        it('should be able to execute against an exception list that does include valid entries and get back 0 alerts', async () => {
-          const rule: QueryRuleCreateProps = {
-            name: 'Simple Rule Query',
-            description: 'Simple Rule Query',
-            enabled: true,
-            risk_score: 1,
-            rule_id: 'rule-1',
-            severity: 'high',
-            index: ['auditbeat-*'],
-            type: 'query',
-            from: '1900-01-01T00:00:00.000Z',
-            query: 'host.name: "suricata-sensor-amsterdam"',
-          };
-          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-            [
-              {
-                field: 'host.name', // This matches the query above which will exclude everything
-                operator: 'included',
-                type: 'match',
-                value: 'suricata-sensor-amsterdam',
-              },
-            ],
-          ]);
-          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-          expect(alertsOpen.hits.hits.length).toEqual(0);
-        });
-
-        it('should be able to execute against an exception list that does include valid case sensitive entries and get back 0 alerts', async () => {
-          const rule: QueryRuleCreateProps = {
-            name: 'Simple Rule Query',
-            description: 'Simple Rule Query',
-            enabled: true,
-            risk_score: 1,
-            rule_id: 'rule-1',
-            severity: 'high',
-            index: ['auditbeat-*'],
-            type: 'query',
-            from: '1900-01-01T00:00:00.000Z',
-            query: 'host.name: "suricata-sensor-amsterdam"',
-          };
-          const rule2: QueryRuleCreateProps = {
-            name: 'Simple Rule Query',
-            description: 'Simple Rule Query',
-            enabled: true,
-            risk_score: 1,
-            rule_id: 'rule-2',
-            severity: 'high',
-            index: ['auditbeat-*'],
-            type: 'query',
-            from: '1900-01-01T00:00:00.000Z',
-            query: 'host.name: "suricata-sensor-amsterdam"',
-          };
-          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-            [
-              {
-                field: 'host.os.name',
-                operator: 'included',
-                type: 'match_any',
-                value: ['ubuntu'],
-              },
-            ],
-          ]);
-          const createdRule2 = await createRuleWithExceptionEntries(supertest, log, rule2, [
-            [
-              {
-                field: 'host.os.name', // This matches the query above which will exclude everything
-                operator: 'included',
-                type: 'match_any',
-                value: ['ubuntu', 'Ubuntu'],
-              },
-            ],
-          ]);
-          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-          const alertsOpen2 = await getOpenAlerts(supertest, log, es, createdRule2);
-          // Expect alerts here because all values are "Ubuntu"
-          // and exception is one of ["ubuntu"]
-          expect(alertsOpen.hits.hits.length).toEqual(10);
-          // Expect no alerts here because all values are "Ubuntu"
-          // and exception is one of ["ubuntu", "Ubuntu"]
-          expect(alertsOpen2.hits.hits.length).toEqual(0);
-        });
-
-        it('generates no alerts when an exception is added for an EQL rule', async () => {
-          const rule: EqlRuleCreateProps = {
-            ...getEqlRuleForAlertTesting(['auditbeat-*']),
-            query: 'configuration where agent.id=="a1d7b39c-f898-4dbe-a761-efb61939302d"',
-          };
-          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-            [
-              {
-                field: 'host.id',
-                operator: 'included',
-                type: 'match',
-                value: '8cc95778cce5407c809480e8e32ad76b',
-              },
-            ],
-          ]);
-          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-          expect(alertsOpen.hits.hits.length).toEqual(0);
-        });
-
-        it('generates no alerts when an exception is added for a threshold rule', async () => {
-          const rule: ThresholdRuleCreateProps = {
-            ...getThresholdRuleForAlertTesting(['auditbeat-*']),
-            threshold: {
-              field: 'host.id',
-              value: 700,
-            },
-          };
-          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-            [
-              {
-                field: 'host.id',
-                operator: 'included',
-                type: 'match',
-                value: '8cc95778cce5407c809480e8e32ad76b',
-              },
-            ],
-          ]);
-          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-          expect(alertsOpen.hits.hits.length).toEqual(0);
-        });
-
-        it('generates no alerts when an exception is added for a threat match rule', async () => {
-          const rule: ThreatMatchRuleCreateProps = {
-            description: 'Detecting root and admin users',
-            name: 'Query with a rule id',
-            severity: 'high',
-            index: ['auditbeat-*'],
-            type: 'threat_match',
-            risk_score: 55,
-            language: 'kuery',
-            rule_id: 'rule-1',
-            from: '1900-01-01T00:00:00.000Z',
-            query: '*:*',
-            threat_query: 'source.ip: "188.166.120.93"', // narrow things down with a query to a specific source ip
-            threat_index: ['auditbeat-*'], // We use auditbeat as both the matching index and the threat list for simplicity
-            threat_mapping: [
-              // We match host.name against host.name
-              {
-                entries: [
-                  {
-                    field: 'host.name',
-                    value: 'host.name',
-                    type: 'mapping',
-                  },
-                ],
-              },
-            ],
-            threat_filters: [],
-          };
-
-          const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-            [
-              {
-                field: 'source.ip',
-                operator: 'included',
-                type: 'match',
-                value: '188.166.120.93',
-              },
-            ],
-          ]);
-          const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-          expect(alertsOpen.hits.hits.length).toEqual(0);
-        });
-        describe('rules with value list exceptions', () => {
-          beforeEach(async () => {
-            await createListsIndex(supertest, log);
-          });
-
-          afterEach(async () => {
-            await deleteListsIndex(supertest, log);
-          });
-
-          it('generates no alerts when a value list exception is added for a query rule', async () => {
-            const valueListId = 'value-list-id.txt';
-            await importFile(supertest, log, 'keyword', ['suricata-sensor-amsterdam'], valueListId);
-            const rule: QueryRuleCreateProps = {
-              name: 'Simple Rule Query',
-              description: 'Simple Rule Query',
-              enabled: true,
-              risk_score: 1,
-              rule_id: 'rule-1',
-              severity: 'high',
-              index: ['auditbeat-*'],
-              type: 'query',
-              from: '1900-01-01T00:00:00.000Z',
-              query: 'host.name: "suricata-sensor-amsterdam"',
-            };
-            const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-              [
-                {
-                  field: 'host.name',
-                  operator: 'included',
-                  type: 'list',
-                  list: {
-                    id: valueListId,
-                    type: 'keyword',
-                  },
-                },
-              ],
-            ]);
-            const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-            expect(alertsOpen.hits.hits.length).toEqual(0);
-          });
-
-          it('generates no alerts when a value list exception is added for a threat match rule', async () => {
-            const valueListId = 'value-list-id.txt';
-            await importFile(supertest, log, 'keyword', ['zeek-sensor-amsterdam'], valueListId);
-            const rule: ThreatMatchRuleCreateProps = {
-              description: 'Detecting root and admin users',
-              name: 'Query with a rule id',
-              severity: 'high',
-              index: ['auditbeat-*'],
-              type: 'threat_match',
-              risk_score: 55,
-              language: 'kuery',
-              rule_id: 'rule-1',
-              from: '1900-01-01T00:00:00.000Z',
-              query: '*:*',
-              threat_query: 'source.ip: "188.166.120.93"', // narrow things down with a query to a specific source ip
-              threat_index: ['auditbeat-*'], // We use auditbeat as both the matching index and the threat list for simplicity
-              threat_mapping: [
-                // We match host.name against host.name
-                {
-                  entries: [
-                    {
-                      field: 'host.name',
-                      value: 'host.name',
-                      type: 'mapping',
-                    },
-                  ],
-                },
-              ],
-              threat_filters: [],
-            };
-
-            const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-              [
-                {
-                  field: 'host.name',
-                  operator: 'included',
-                  type: 'list',
-                  list: {
-                    id: valueListId,
-                    type: 'keyword',
-                  },
-                },
-              ],
-            ]);
-            const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-            expect(alertsOpen.hits.hits.length).toEqual(0);
-          });
-
-          it('generates no alerts when a value list exception is added for a threshold rule', async () => {
-            const valueListId = 'value-list-id.txt';
-            await importFile(supertest, log, 'keyword', ['zeek-sensor-amsterdam'], valueListId);
-            const rule: ThresholdRuleCreateProps = {
-              description: 'Detecting root and admin users',
-              name: 'Query with a rule id',
-              severity: 'high',
-              index: ['auditbeat-*'],
-              type: 'threshold',
-              risk_score: 55,
-              language: 'kuery',
-              rule_id: 'rule-1',
-              from: '1900-01-01T00:00:00.000Z',
-              query: 'host.name: "zeek-sensor-amsterdam"',
-              threshold: {
-                field: 'host.name',
-                value: 1,
-              },
-            };
-
-            const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-              [
-                {
-                  field: 'host.name',
-                  operator: 'included',
-                  type: 'list',
-                  list: {
-                    id: valueListId,
-                    type: 'keyword',
-                  },
-                },
-              ],
-            ]);
-            const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-            expect(alertsOpen.hits.hits.length).toEqual(0);
-          });
-
-          it('generates no alerts when a value list exception is added for an EQL rule', async () => {
-            const valueListId = 'value-list-id.txt';
-            await importFile(supertest, log, 'keyword', ['zeek-sensor-amsterdam'], valueListId);
-            const rule: EqlRuleCreateProps = {
-              ...getEqlRuleForAlertTesting(['auditbeat-*']),
-              query: 'configuration where host.name=="zeek-sensor-amsterdam"',
-            };
-
-            const createdRule = await createRuleWithExceptionEntries(supertest, log, rule, [
-              [
-                {
-                  field: 'host.name',
-                  operator: 'included',
-                  type: 'list',
-                  list: {
-                    id: valueListId,
-                    type: 'keyword',
-                  },
-                },
-              ],
-            ]);
-            const alertsOpen = await getOpenAlerts(supertest, log, es, createdRule);
-            expect(alertsOpen.hits.hits.length).toEqual(0);
-          });
-          it('should Not allow deleting value list when there are references and ignoreReferences is false', async () => {
-            const valueListId = 'value-list-id.txt';
-            await importFile(supertest, log, 'keyword', ['suricata-sensor-amsterdam'], valueListId);
-            const rule: QueryRuleCreateProps = {
-              ...getSimpleRule(),
-              query: 'host.name: "suricata-sensor-amsterdam"',
-            };
-            await createRuleWithExceptionEntries(supertest, log, rule, [
-              [
-                {
-                  field: 'host.name',
-                  operator: 'included',
-                  type: 'list',
-                  list: {
-                    id: valueListId,
-                    type: 'keyword',
-                  },
-                },
-              ],
-            ]);
-
-            const deleteReferences = false;
-            const ignoreReferences = false;
-
-            // Delete the value list
-            await supertest
-              .delete(
-                `${LIST_URL}?deleteReferences=${deleteReferences}&id=${valueListId}&ignoreReferences=${ignoreReferences}`
-              )
-              .set('kbn-xsrf', 'true')
-              .send()
-              .expect(409);
-          });
-        });
-      });
-    });
-  });
-};

From 8abdfb44015edf5fe56122422528e77c9f65e851 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Wed, 3 Apr 2024 06:35:27 +0800
Subject: [PATCH 52/63] [Fleet] Add cypress test for subfeature privileges
 (#179781)

---
 ..._fleet_agents_read_integrations_none.cy.ts | 65 +++++++++++++++++++
 .../cypress/e2e/privileges_editor_role.cy.ts  | 21 ++----
 ...ivileges_fleet_all_integrations_none.cy.ts |  8 +--
 ...ivileges_fleet_all_integrations_read.cy.ts | 14 ----
 .../cypress/e2e/privileges_viewer_role.cy.ts  | 41 ++++++++++--
 x-pack/plugins/fleet/cypress/screens/fleet.ts |  1 +
 .../plugins/fleet/cypress/tasks/privileges.ts | 27 ++++++++
 .../public/applications/fleet/app.test.tsx    |  6 ++
 .../agents/agent_list_page/index.test.tsx     |  4 +-
 .../hooks/use_fleet_server_unhealthy.test.tsx |  3 +
 .../hooks/use_fleet_server_unhealthy.tsx      |  4 +-
 x-pack/test/fleet_cypress/config.ts           |  5 +-
 12 files changed, 151 insertions(+), 48 deletions(-)
 create mode 100644 x-pack/plugins/fleet/cypress/e2e/privilages_fleet_agents_read_integrations_none.cy.ts

diff --git a/x-pack/plugins/fleet/cypress/e2e/privilages_fleet_agents_read_integrations_none.cy.ts b/x-pack/plugins/fleet/cypress/e2e/privilages_fleet_agents_read_integrations_none.cy.ts
new file mode 100644
index 0000000000000..d4346225239df
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/e2e/privilages_fleet_agents_read_integrations_none.cy.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FLEET } from '../tasks/navigation';
+import {
+  deleteUsers,
+  FleetAgentsReadIntegrNoneRole,
+  FleetAgentsReadIntegrNoneUser,
+  createUsersAndRoles,
+} from '../tasks/privileges';
+import { login, loginWithUserAndWaitForPage, logout } from '../tasks/login';
+
+import {
+  MISSING_PRIVILEGES,
+  AGENTS_TAB,
+  ADD_AGENT_BUTTON,
+  ADD_FLEET_SERVER_HEADER,
+  AGENT_POLICIES_TAB,
+  SETTINGS_TAB,
+  UNINSTALL_TOKENS_TAB,
+} from '../screens/fleet';
+
+const rolesToCreate = [FleetAgentsReadIntegrNoneRole];
+const usersToCreate = [FleetAgentsReadIntegrNoneUser];
+
+describe('When the user has Fleet Agents Read built-in role', () => {
+  before(() => {
+    createUsersAndRoles(usersToCreate, rolesToCreate);
+  });
+
+  beforeEach(() => {
+    login();
+  });
+
+  afterEach(() => {
+    logout();
+  });
+
+  after(() => {
+    deleteUsers(usersToCreate);
+  });
+
+  describe('Fleet', () => {
+    it('is accessible but user cannot perform any write actions on agent tabs', () => {
+      loginWithUserAndWaitForPage(FLEET, FleetAgentsReadIntegrNoneUser);
+      cy.getBySel(AGENTS_TAB).should('exist');
+      cy.getBySel(MISSING_PRIVILEGES.TITLE).should('not.exist');
+      cy.getBySel(ADD_AGENT_BUTTON).should('not.exist');
+      cy.getBySel(ADD_FLEET_SERVER_HEADER).should('not.exist');
+    });
+
+    it('is accessible and user only see agents tab', () => {
+      loginWithUserAndWaitForPage(FLEET, FleetAgentsReadIntegrNoneUser);
+
+      cy.getBySel(AGENTS_TAB).should('exist');
+      cy.getBySel(AGENT_POLICIES_TAB).should('not.exist');
+      cy.getBySel(SETTINGS_TAB).should('not.exist');
+      cy.getBySel(UNINSTALL_TOKENS_TAB).should('not.exist');
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/cypress/e2e/privileges_editor_role.cy.ts b/x-pack/plugins/fleet/cypress/e2e/privileges_editor_role.cy.ts
index 0a06d42ab5c9d..afab363f87ad4 100644
--- a/x-pack/plugins/fleet/cypress/e2e/privileges_editor_role.cy.ts
+++ b/x-pack/plugins/fleet/cypress/e2e/privileges_editor_role.cy.ts
@@ -11,11 +11,7 @@ import { login, loginWithUserAndWaitForPage, logout } from '../tasks/login';
 
 import { getIntegrationCard } from '../screens/integrations';
 
-import {
-  FLEET_SERVER_MISSING_PRIVILEGES,
-  ADD_AGENT_BUTTON_TOP,
-  AGENT_FLYOUT,
-} from '../screens/fleet';
+import { LANDING_PAGE_ADD_FLEET_SERVER_BUTTON } from '../screens/fleet';
 import { ADD_INTEGRATION_POLICY_BTN } from '../screens/integrations';
 import { scrollToIntegration } from '../tasks/integrations';
 
@@ -44,18 +40,9 @@ describe('When the user has Editor built-in role', () => {
       navigateTo(FLEET);
     });
 
-    describe('When there are no agent policies', () => {
-      it('If fleet server is not set up, Fleet shows a callout', () => {
-        loginWithUserAndWaitForPage(FLEET, BuiltInEditorUser);
-        cy.getBySel(FLEET_SERVER_MISSING_PRIVILEGES.MESSAGE).should(
-          'contain',
-          'Fleet Server needs to be set up.'
-        );
-
-        cy.getBySel(ADD_AGENT_BUTTON_TOP).click();
-        cy.getBySel(AGENT_FLYOUT.MANAGED_TAB).click();
-        cy.getBySel(FLEET_SERVER_MISSING_PRIVILEGES.PROMPT).should('exist');
-      });
+    it('It should not show a callout', () => {
+      loginWithUserAndWaitForPage(FLEET, BuiltInEditorUser);
+      cy.getBySel(LANDING_PAGE_ADD_FLEET_SERVER_BUTTON).should('exist');
     });
   });
 
diff --git a/x-pack/plugins/fleet/cypress/e2e/privileges_fleet_all_integrations_none.cy.ts b/x-pack/plugins/fleet/cypress/e2e/privileges_fleet_all_integrations_none.cy.ts
index eaae2c3a7e01c..e80ca16a15e75 100644
--- a/x-pack/plugins/fleet/cypress/e2e/privileges_fleet_all_integrations_none.cy.ts
+++ b/x-pack/plugins/fleet/cypress/e2e/privileges_fleet_all_integrations_none.cy.ts
@@ -35,12 +35,8 @@ describe('When the user has All privilege for Fleet but None for integrations',
     deleteUsersAndRoles(usersToCreate, rolesToCreate);
   });
 
-  it('Fleet access is blocked with a callout', () => {
+  it('Fleet is accessible', () => {
     loginWithUserAndWaitForPage(FLEET, FleetAllIntegrNoneUser);
-    cy.getBySel(MISSING_PRIVILEGES.TITLE).should('have.text', 'Permission denied');
-    cy.getBySel(MISSING_PRIVILEGES.MESSAGE).should(
-      'contain',
-      'You are not authorized to access Fleet.'
-    );
+    cy.getBySel(MISSING_PRIVILEGES.TITLE).should('not.exist');
   });
 });
diff --git a/x-pack/plugins/fleet/cypress/e2e/privileges_fleet_all_integrations_read.cy.ts b/x-pack/plugins/fleet/cypress/e2e/privileges_fleet_all_integrations_read.cy.ts
index 91b675c527a9d..3e05380ca3430 100644
--- a/x-pack/plugins/fleet/cypress/e2e/privileges_fleet_all_integrations_read.cy.ts
+++ b/x-pack/plugins/fleet/cypress/e2e/privileges_fleet_all_integrations_read.cy.ts
@@ -18,8 +18,6 @@ import { cleanupAgentPolicies, unenrollAgent } from '../tasks/cleanup';
 import { getIntegrationCard } from '../screens/integrations';
 
 import {
-  FLEET_SERVER_MISSING_PRIVILEGES,
-  ADD_AGENT_BUTTON_TOP,
   AGENT_POLICIES_TAB,
   AGENT_POLICY_SAVE_INTEGRATION,
   ADD_PACKAGE_POLICY_BTN,
@@ -68,18 +66,6 @@ describe('When the user has All privilege for Fleet but Read for integrations',
     });
   });
 
-  describe('When there are no agent policies', () => {
-    it('If fleet server is not set up, Fleet shows a callout', () => {
-      loginWithUserAndWaitForPage(FLEET, FleetAllIntegrReadUser);
-      cy.getBySel(FLEET_SERVER_MISSING_PRIVILEGES.TITLE).should('have.text', 'Permission denied');
-      cy.getBySel(FLEET_SERVER_MISSING_PRIVILEGES.MESSAGE).should(
-        'contain',
-        'Fleet Server needs to be set up.'
-      );
-      cy.getBySel(ADD_AGENT_BUTTON_TOP).should('not.be.disabled');
-    });
-  });
-
   describe('Integrations', () => {
     it('are visible but cannot be added', () => {
       loginWithUserAndWaitForPage(INTEGRATIONS, FleetAllIntegrReadUser);
diff --git a/x-pack/plugins/fleet/cypress/e2e/privileges_viewer_role.cy.ts b/x-pack/plugins/fleet/cypress/e2e/privileges_viewer_role.cy.ts
index 11fe9b905ea1e..8c3f346855812 100644
--- a/x-pack/plugins/fleet/cypress/e2e/privileges_viewer_role.cy.ts
+++ b/x-pack/plugins/fleet/cypress/e2e/privileges_viewer_role.cy.ts
@@ -11,9 +11,20 @@ import { login, loginWithUserAndWaitForPage, logout } from '../tasks/login';
 
 import { getIntegrationCard } from '../screens/integrations';
 
-import { MISSING_PRIVILEGES } from '../screens/fleet';
+import {
+  MISSING_PRIVILEGES,
+  AGENTS_TAB,
+  ADD_AGENT_BUTTON,
+  ADD_FLEET_SERVER_HEADER,
+  AGENT_POLICIES_TAB,
+  ADD_AGENT_POLICY_BTN,
+  SETTINGS_TAB,
+  SETTINGS_OUTPUTS,
+  SETTINGS_FLEET_SERVER_HOSTS,
+} from '../screens/fleet';
 import { ADD_INTEGRATION_POLICY_BTN } from '../screens/integrations';
 import { scrollToIntegration } from '../tasks/integrations';
+import { navigateToTab } from '../tasks/fleet';
 
 const usersToCreate = [BuiltInViewerUser];
 
@@ -36,13 +47,29 @@ describe('When the user has Viewer built-in role', () => {
   });
 
   describe('Fleet', () => {
-    it('is blocked with a callout', () => {
+    it('is accessible but user cannot perform any write actions on agent tabs', () => {
       loginWithUserAndWaitForPage(FLEET, BuiltInViewerUser);
-      cy.getBySel(MISSING_PRIVILEGES.TITLE).should('have.text', 'Permission denied');
-      cy.getBySel(MISSING_PRIVILEGES.MESSAGE).should(
-        'contain',
-        'You are not authorized to access Fleet.'
-      );
+      cy.getBySel(AGENTS_TAB).should('exist');
+      cy.getBySel(MISSING_PRIVILEGES.TITLE).should('not.exist');
+      cy.getBySel(ADD_AGENT_BUTTON).should('not.exist');
+      cy.getBySel(ADD_FLEET_SERVER_HEADER).should('not.exist');
+    });
+
+    it('is accessible but user cannot perform any write actions on agent policies tabs', () => {
+      loginWithUserAndWaitForPage(FLEET, BuiltInViewerUser);
+      navigateToTab(AGENT_POLICIES_TAB);
+
+      // Not write actions
+      cy.getBySel(ADD_AGENT_POLICY_BTN).should('not.be.enabled');
+    });
+
+    it('is accessible but user cannot perform any write actions on settings tabs', () => {
+      loginWithUserAndWaitForPage(FLEET, BuiltInViewerUser);
+      navigateToTab(SETTINGS_TAB);
+
+      // Not write actions
+      cy.getBySel(SETTINGS_OUTPUTS.ADD_BTN).should('not.exist');
+      cy.getBySel(SETTINGS_FLEET_SERVER_HOSTS.ADD_BUTTON).should('not.exist');
     });
   });
 
diff --git a/x-pack/plugins/fleet/cypress/screens/fleet.ts b/x-pack/plugins/fleet/cypress/screens/fleet.ts
index 6ebf0fad10b9b..1f80947d1b74c 100644
--- a/x-pack/plugins/fleet/cypress/screens/fleet.ts
+++ b/x-pack/plugins/fleet/cypress/screens/fleet.ts
@@ -33,6 +33,7 @@ export const PACKAGE_POLICY_TABLE_LINK = 'PackagePoliciesTableLink';
 export const ADD_PACKAGE_POLICY_BTN = 'addPackagePolicyButton';
 export const GENERATE_FLEET_SERVER_POLICY_BUTTON = 'generateFleetServerPolicyButton';
 export const ADD_FLEET_SERVER_HEADER = 'addFleetServerHeader';
+export const ADD_AGENT_POLICY_BTN = 'createAgentPolicyButton';
 
 export const PLATFORM_TYPE_LINUX_BUTTON = 'platformTypeLinux';
 export const ADVANCED_FLEET_SERVER_ADD_HOST_BUTTON = 'fleetServerAddHostBtn';
diff --git a/x-pack/plugins/fleet/cypress/tasks/privileges.ts b/x-pack/plugins/fleet/cypress/tasks/privileges.ts
index da73f27e459b7..0f8aba10e8fcb 100644
--- a/x-pack/plugins/fleet/cypress/tasks/privileges.ts
+++ b/x-pack/plugins/fleet/cypress/tasks/privileges.ts
@@ -133,6 +133,33 @@ export const FleetAllIntegrNoneUser: User = {
   password: 'password',
   roles: [FleetAllIntegrNoneRole.name],
 };
+export const FleetAgentsReadIntegrNoneRole: Role = {
+  name: 'fleet_agents_read_int_none_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          fleetv2: ['minimal_read', 'agents_read'],
+          fleet: ['none'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+export const FleetAgentsReadIntegrNoneUser: User = {
+  username: 'fleet_agents_read_int_none_role',
+  password: 'password',
+  roles: [FleetAgentsReadIntegrNoneRole.name],
+};
 export const FleetNoneIntegrAllRole: Role = {
   name: 'fleet_none_int_all_role',
   privileges: {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.test.tsx
index da698a83a7827..a79946e49f366 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.test.tsx
@@ -35,6 +35,7 @@ describe('AppRoutes', () => {
           fleet: {
             readAgents: true,
           },
+          integrations: {},
         },
       },
       {
@@ -44,6 +45,7 @@ describe('AppRoutes', () => {
           'You are not authorized to access that page. It requires the Agents Read Kibana privilege for Fleet.',
         authz: {
           fleet: {},
+          integrations: {},
         },
       },
       {
@@ -54,6 +56,7 @@ describe('AppRoutes', () => {
           fleet: {
             readAgentPolicies: true,
           },
+          integrations: {},
         },
       },
       {
@@ -63,6 +66,7 @@ describe('AppRoutes', () => {
           'You are not authorized to access that page. It requires the Agent policies Read Kibana privilege for Fleet.',
         authz: {
           fleet: {},
+          integrations: {},
         },
       },
       {
@@ -73,6 +77,7 @@ describe('AppRoutes', () => {
           fleet: {
             readSettings: true,
           },
+          integrations: {},
         },
       },
       {
@@ -82,6 +87,7 @@ describe('AppRoutes', () => {
           'You are not authorized to access that page. It requires the Settings Read Kibana privilege for Fleet.',
         authz: {
           fleet: {},
+          integrations: {},
         },
       },
     ];
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx
index b85de4034ca71..f7b3b1588b31b 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx
@@ -49,7 +49,9 @@ jest.mock('../../../hooks', () => ({
   sendGetAgentStatus: jest.fn(),
   sendGetAgentPolicies: jest.fn().mockResolvedValue({ data: { items: [] } }),
   sendGetAgentTags: jest.fn().mockReturnValue({ data: { items: ['tag1', 'tag2'] } }),
-  useAuthz: jest.fn().mockReturnValue({ fleet: { all: true, allAgents: true, readAgents: true } }),
+  useAuthz: jest
+    .fn()
+    .mockReturnValue({ fleet: { all: true, allAgents: true, readAgents: true }, integrations: {} }),
   useStartServices: jest.fn().mockReturnValue({
     notifications: {
       toasts: {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy.test.tsx
index 1a1b2d1472c2a..b280819e2461b 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy.test.tsx
@@ -95,6 +95,9 @@ describe('useFleetServerUnhealthy', () => {
         allAgents: true,
         readAgentPolicies: true,
       },
+      integrations: {
+        readIntegrationPolicies: true,
+      },
     } as any);
   });
   it('should return isUnHealthy:false with an online fleet slerver', async () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy.tsx
index 94a563afc66e8..a60a6d4584e21 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy.tsx
@@ -70,12 +70,12 @@ export function useFleetServerUnhealthy() {
   }, [notifications.toasts]);
 
   useEffect(() => {
-    if (!authz.fleet.allAgents || !authz.fleet.readAgentPolicies) {
+    if (!authz.fleet.allAgents || !authz.integrations.readIntegrationPolicies) {
       setIsLoading(false);
       return;
     }
     fetchData();
-  }, [fetchData, authz.fleet.allAgents, authz.fleet.readAgentPolicies]);
+  }, [fetchData, authz.fleet.allAgents, authz.integrations.readIntegrationPolicies]);
 
   return {
     isLoading,
diff --git a/x-pack/test/fleet_cypress/config.ts b/x-pack/test/fleet_cypress/config.ts
index af6e2e20342e3..c4f05b4daed8b 100644
--- a/x-pack/test/fleet_cypress/config.ts
+++ b/x-pack/test/fleet_cypress/config.ts
@@ -41,7 +41,10 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         `--elasticsearch.ssl.certificateAuthorities=${CA_CERT_PATH}`,
 
         // add feature flags here
-        `--xpack.fleet.enableExperimental=${JSON.stringify(['agentTamperProtectionEnabled'])}`,
+        `--xpack.fleet.enableExperimental=${JSON.stringify([
+          'agentTamperProtectionEnabled',
+          'subfeaturePrivileges',
+        ])}`,
 
         `--logging.loggers=${JSON.stringify([
           ...getKibanaCliLoggers(xpackFunctionalTestsConfig.get('kbnTestServer.serverArgs')),

From a16be392efb1fc0a75aa3e04788bcf85a1074f71 Mon Sep 17 00:00:00 2001
From: Davis McPhee <davis.mcphee@elastic.co>
Date: Tue, 2 Apr 2024 19:51:36 -0300
Subject: [PATCH 53/63] [Data Discovery] Unskip tests skipped in #175740
 (#178592)

## Summary

This PR fixes and unskips the Data Discovery tests skipped in #176882.

Flaky test runner x50:
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/5594.

Partially resolves #176882.

### Checklist

- [ ] 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
- [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
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] 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)

### 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: Matthias Wilhelm <matthias.wilhelm@elastic.co>
---
 test/functional/apps/discover/group1/_discover.ts         | 3 +--
 test/functional/apps/discover/group1/_url_state.ts        | 3 +--
 .../test_suites/common/discover/group1/_discover.ts       | 3 +--
 .../common/discover/group1/_discover_histogram.ts         | 5 ++---
 .../common/discover_ml_uptime/discover/index.ts           | 8 +++++++-
 .../discover_ml_uptime/discover/search_source_alert.ts    | 3 +--
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/functional/apps/discover/group1/_discover.ts b/test/functional/apps/discover/group1/_discover.ts
index 3885230c861cd..c931187250cc3 100644
--- a/test/functional/apps/discover/group1/_discover.ts
+++ b/test/functional/apps/discover/group1/_discover.ts
@@ -31,8 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     defaultIndex: 'logstash-*',
   };
 
-  // Failing: See https://github.com/elastic/kibana/issues/176882
-  describe.skip('discover test', function describeIndexTests() {
+  describe('discover test', function describeIndexTests() {
     before(async function () {
       log.debug('load kibana index with default index pattern');
       await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
diff --git a/test/functional/apps/discover/group1/_url_state.ts b/test/functional/apps/discover/group1/_url_state.ts
index 95ef40a58698c..e97ac332e8b6e 100644
--- a/test/functional/apps/discover/group1/_url_state.ts
+++ b/test/functional/apps/discover/group1/_url_state.ts
@@ -35,8 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     hideAnnouncements: true,
   };
 
-  // Failing: See https://github.com/elastic/kibana/issues/176882
-  describe.skip('discover URL state', () => {
+  describe('discover URL state', () => {
     before(async function () {
       log.debug('load kibana index with default index pattern');
       await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover.ts
index ffc9b434ebe32..a5274115cfbaf 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover.ts
@@ -31,8 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     defaultIndex: 'logstash-*',
   };
 
-  // Failing: See https://github.com/elastic/kibana/issues/176882
-  describe.skip('discover test', function describeIndexTests() {
+  describe('discover test', function describeIndexTests() {
     before(async function () {
       log.debug('load kibana index with default index pattern');
       await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover_histogram.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover_histogram.ts
index a02365ed056e8..7267ab20ace43 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover_histogram.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group1/_discover_histogram.ts
@@ -32,8 +32,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');
   const queryBar = getService('queryBar');
 
-  // Failing: See https://github.com/elastic/kibana/issues/176882
-  describe.skip('discover histogram', function describeIndexTests() {
+  describe('discover histogram', function describeIndexTests() {
     before(async () => {
       await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await esArchiver.load('test/functional/fixtures/es_archiver/long_window_logstash');
@@ -86,7 +85,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       await PageObjects.discover.brushHistogram();
       await PageObjects.discover.waitUntilSearchingHasFinished();
-      renderingCountInc = 3; // Multiple renders caused by https://github.com/elastic/kibana/issues/177055
+      renderingCountInc = 4; // Multiple renders caused by https://github.com/elastic/kibana/issues/177055
       await retry.waitFor('chart rendering complete after being brushed', async () => {
         const actualCount = await elasticChart.getVisualizationRenderingCount();
         const expectedCount = prevRenderingCount + renderingCountInc * 2;
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/index.ts b/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/index.ts
index f4f8c8c550cb2..e32235185df6d 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/index.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/index.ts
@@ -6,8 +6,14 @@
  */
 import { FtrProviderContext } from '../../../../ftr_provider_context';
 
-export default ({ loadTestFile }: FtrProviderContext) => {
+export default ({ getService, loadTestFile }: FtrProviderContext) => {
+  const browser = getService('browser');
+
   describe('Discover alerting', function () {
+    before(async function () {
+      await browser.setWindowSize(1600, 1200);
+    });
+
     loadTestFile(require.resolve('./search_source_alert'));
   });
 };
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts b/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts
index 9c654b518d6f2..1a82e4b73b2be 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts
@@ -341,8 +341,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     expect(await titleElem.getAttribute('value')).to.equal(dataView);
   };
 
-  // Failing: See https://github.com/elastic/kibana/issues/176882
-  describe.skip('Search source Alert', () => {
+  describe('Search source Alert', () => {
     before(async () => {
       await security.testUser.setRoles(['discover_alert']);
       await PageObjects.svlCommonPage.loginAsAdmin();

From e7a3e2ce2d48c038220351866f52065a05356b49 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Tue, 2 Apr 2024 20:22:44 -0500
Subject: [PATCH 54/63] [data views] DataViewLazy implementation phase 1
 (#173948)

## Summary

Part 1 of https://github.com/elastic/kibana/issues/178594

Initial implementation of DataViewLazy class - an alternative DataView
implementation that doesn't load the full field list on initial
creation.

```
Implements DataViewLazy (variations from DataView class)
- getFields ({ mapped = true, scripted = true, runtime = true, fieldName, forceRefresh = false, unmapped, indexFilter, metaFields = true }) =>
    Promise<{ getFieldMap: () => Record<string, DataViewField>; getFieldMapSorted: () => Record<string, DataViewField> }>
- getRuntimeFields({ fieldName = ['*'] }) => Record<string, DataViewField>
- getScriptedFields({ fieldName = ['*'] }) => Record<string, DataViewField>
- getFieldByName (string) => Promise<DataViewField>
- toSpec (same params as getFields) => Promise<DataViewSpec>

other notable changes using DataViewLazy over DataView
- won't throw if index pattern fails to match
- by default toSpec doesn't return fields, must pass in parameters for requested fields

---

DataViews service additions
- toDataView: (toDataView: DataViewLazy) => Promise<DataView>;
- toDataViewLazy: (dataView: DataView) => Promise<DataViewLazy>;
- getAllDataViewLazy: () => Promise<DataViewLazy[]>;
- getDataViewLazy: (id: string) => Promise<DataViewLazy>;
- createDataViewLazy: (spec: DataViewSpec) => Promise<DataViewLazy>;
- createAndSaveDataViewLazy: (spec: DataViewSpec, override?: boolean) => Promise<DataViewLazy>;
- getDefaultDataViewLazy: () => Promise<DataViewLazy | null>;
```

Closes https://github.com/elastic/kibana/issues/176426 and
https://github.com/elastic/kibana/issues/167750

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
---
 packages/kbn-optimizer/limits.yml             |   2 +-
 .../data_view_flyout_content_container.tsx    |   7 +-
 .../__snapshots__/data_view_lazy.test.ts.snap | 720 ++++++++++++++++
 .../__snapshots__/data_views.test.ts.snap     |   2 +
 .../common/data_views/abstract_data_views.ts  | 119 ++-
 .../data_views/common/data_views/data_view.ts |  82 +-
 .../common/data_views/data_view_lazy.test.ts  | 811 ++++++++++++++++++
 .../common/data_views/data_view_lazy.ts       | 632 ++++++++++++++
 .../common/data_views/data_view_lazy_util.ts  |  19 +
 .../common/data_views/data_views.test.ts      | 162 +++-
 .../common/data_views/data_views.ts           | 245 +++++-
 .../data_views/common/data_views/index.ts     |   1 +
 src/plugins/data_views/common/index.ts        |   2 +-
 src/plugins/data_views/common/types.ts        |   9 +-
 src/plugins/data_views/server/mocks.ts        |   2 +
 .../public/create_data_view.ts                |   8 +-
 .../public/fields/update_fields.test.ts       |   6 +-
 .../public/fields/update_fields.ts            |   4 +-
 .../rest_api_routes/public/get_data_view.ts   |   4 +-
 .../create_runtime_field.test.ts              |  14 +-
 .../runtime_fields/create_runtime_field.ts    |  19 +-
 .../delete_runtime_field.test.ts              |   6 +-
 .../runtime_fields/delete_runtime_field.ts    |   2 +-
 .../runtime_fields/get_runtime_field.test.ts  |  13 +-
 .../runtime_fields/get_runtime_field.ts       |   9 +-
 .../runtime_fields/put_runtime_field.test.ts  |  15 +-
 .../runtime_fields/put_runtime_field.ts       |  12 +-
 .../runtime_fields/response_formatter.test.ts |  14 +-
 .../runtime_fields/response_formatter.ts      |  14 +-
 .../update_runtime_field.test.ts              |   6 +-
 .../runtime_fields/update_runtime_field.ts    |  10 +-
 .../scripted_fields/create_scripted_field.ts  |   8 +-
 .../scripted_fields/delete_scripted_field.ts  |   4 +-
 .../scripted_fields/get_scripted_field.ts     |   4 +-
 .../scripted_fields/put_scripted_field.ts     |   6 +-
 .../scripted_fields/update_scripted_field.ts  |   8 +-
 .../public/update_data_view.ts                |  23 +-
 .../log_views/log_views_client.test.ts        |   2 +-
 38 files changed, 2794 insertions(+), 232 deletions(-)
 create mode 100644 src/plugins/data_views/common/data_views/__snapshots__/data_view_lazy.test.ts.snap
 create mode 100644 src/plugins/data_views/common/data_views/data_view_lazy.test.ts
 create mode 100644 src/plugins/data_views/common/data_views/data_view_lazy.ts
 create mode 100644 src/plugins/data_views/common/data_views/data_view_lazy_util.ts

diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index bb04f9d5b4eb4..d8cd1983662ff 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -32,7 +32,7 @@ pageLoadAssetSize:
   dataViewEditor: 28082
   dataViewFieldEditor: 27000
   dataViewManagement: 5176
-  dataViews: 55000
+  dataViews: 65000
   dataVisualizer: 27530
   devTools: 38637
   discover: 99999
diff --git a/src/plugins/data_view_editor/public/components/data_view_flyout_content_container.tsx b/src/plugins/data_view_editor/public/components/data_view_flyout_content_container.tsx
index fc7127c02ddeb..8e1627a04e4a3 100644
--- a/src/plugins/data_view_editor/public/components/data_view_flyout_content_container.tsx
+++ b/src/plugins/data_view_editor/public/components/data_view_flyout_content_container.tsx
@@ -55,9 +55,10 @@ const DataViewFlyoutContentContainer = ({
         editData.name = name;
         editData.timeFieldName = timeFieldName;
         editData.setAllowHidden(allowHidden);
-        saveResponse = editData.isPersisted()
-          ? await dataViews.updateSavedObject(editData)
-          : editData;
+        if (editData.isPersisted()) {
+          await dataViews.updateSavedObject(editData);
+        }
+        saveResponse = editData;
       } else {
         saveResponse = persist
           ? await dataViews.createAndSave(dataViewSpec)
diff --git a/src/plugins/data_views/common/data_views/__snapshots__/data_view_lazy.test.ts.snap b/src/plugins/data_views/common/data_views/__snapshots__/data_view_lazy.test.ts.snap
new file mode 100644
index 0000000000000..af25681927c6a
--- /dev/null
+++ b/src/plugins/data_views/common/data_views/__snapshots__/data_view_lazy.test.ts.snap
@@ -0,0 +1,720 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`DataViewLazy addRuntimeField and removeRuntimeField add and remove composite runtime field as new fields 1`] = `
+Object {
+  "fields": Object {
+    "a": Object {
+      "type": "keyword",
+    },
+    "b": Object {
+      "type": "long",
+    },
+  },
+  "script": Object {
+    "source": "emit('hello world');",
+  },
+  "type": "composite",
+}
+`;
+
+exports[`DataViewLazy addRuntimeField and removeRuntimeField add and remove runtime field as new field 1`] = `
+Object {
+  "script": Object {
+    "source": "emit('hello world');",
+  },
+  "type": "keyword",
+}
+`;
+
+exports[`DataViewLazy toMinimalSpec can exclude fields 1`] = `
+Object {
+  "allowHidden": false,
+  "allowNoIndex": false,
+  "fieldFormats": Object {},
+  "id": "test-pattern",
+  "name": "Name",
+  "runtimeFieldMap": Object {
+    "runtime_field": Object {
+      "script": Object {
+        "source": "emit('hello world')",
+      },
+      "type": "keyword",
+    },
+  },
+  "sourceFilters": Array [],
+  "timeFieldName": "time",
+  "title": "title",
+  "type": "index-pattern",
+  "version": "2",
+}
+`;
+
+exports[`DataViewLazy toSpec can optionally exclude fields 1`] = `
+Object {
+  "allowHidden": false,
+  "allowNoIndex": false,
+  "fieldAttrs": Object {},
+  "fieldFormats": Object {},
+  "id": "test-pattern",
+  "name": "Name",
+  "runtimeFieldMap": Object {
+    "runtime_field": Object {
+      "script": Object {
+        "source": "emit('hello world')",
+      },
+      "type": "keyword",
+    },
+  },
+  "sourceFilters": Array [],
+  "timeFieldName": "time",
+  "title": "title",
+  "type": "index-pattern",
+  "version": "2",
+}
+`;
+
+exports[`DataViewLazy toSpec should match snapshot 1`] = `
+Object {
+  "allowHidden": false,
+  "allowNoIndex": false,
+  "fieldAttrs": Object {
+    "@timestamp": Object {
+      "count": 30,
+    },
+    "bytes": Object {
+      "count": 10,
+    },
+    "ssl": Object {
+      "count": 20,
+    },
+    "time": Object {
+      "count": 30,
+    },
+  },
+  "fieldFormats": Object {},
+  "fields": Object {
+    "@tags": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "keyword",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "@tags",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "@timestamp": Object {
+      "aggregatable": true,
+      "count": 30,
+      "esTypes": Array [
+        "date",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "@timestamp",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "date",
+    },
+    "_id": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "_id",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "_id",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "_source": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "_source",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "_source",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "_source",
+    },
+    "_type": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "_type",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "_type",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "area": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "geo_shape",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "area",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "geo_shape",
+    },
+    "bytes": Object {
+      "aggregatable": true,
+      "count": 10,
+      "esTypes": Array [
+        "long",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "bytes",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "number",
+    },
+    "custom_user_field": Object {
+      "aggregatable": true,
+      "conflictDescriptions": Object {
+        "keyword": Array [
+          "index_a",
+        ],
+        "long": Array [
+          "index_b",
+        ],
+      },
+      "count": 0,
+      "esTypes": Array [
+        "conflict",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "custom_user_field",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "conflict",
+    },
+    "extension": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "text",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "extension",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "extension.keyword": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "keyword",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "extension.keyword",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "subType": Object {
+        "multi": Object {
+          "parent": "extension",
+        },
+      },
+      "type": "string",
+    },
+    "geo.coordinates": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "geo_point",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "geo.coordinates",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "geo_point",
+    },
+    "geo.src": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "keyword",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "geo.src",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "hashed": Object {
+      "aggregatable": false,
+      "count": 0,
+      "esTypes": Array [
+        "murmur3",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "hashed",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "murmur3",
+    },
+    "ip": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "ip",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "ip",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "ip",
+    },
+    "machine.os": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "text",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "machine.os",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "machine.os.raw": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "keyword",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "machine.os.raw",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "subType": Object {
+        "multi": Object {
+          "parent": "machine.os",
+        },
+      },
+      "type": "string",
+    },
+    "non-filterable": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "text",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "non-filterable",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": false,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "non-sortable": Object {
+      "aggregatable": false,
+      "count": 0,
+      "esTypes": Array [
+        "text",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "non-sortable",
+      "readFromDocValues": false,
+      "scripted": false,
+      "searchable": false,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "phpmemory": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "integer",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "phpmemory",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "number",
+    },
+    "point": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "geo_point",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "point",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "geo_point",
+    },
+    "request_body": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "attachment",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "request_body",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "attachment",
+    },
+    "runtime_field": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "keyword",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "name": "runtime_field",
+      "readFromDocValues": false,
+      "runtimeField": Object {
+        "script": Object {
+          "source": "emit('hello world')",
+        },
+        "type": "keyword",
+      },
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "string",
+    },
+    "script date": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "date",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": false,
+      "lang": "painless",
+      "name": "script date",
+      "readFromDocValues": false,
+      "script": "1234",
+      "scripted": true,
+      "searchable": true,
+      "type": "date",
+    },
+    "script murmur3": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "murmur3",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": false,
+      "lang": "expression",
+      "name": "script murmur3",
+      "readFromDocValues": false,
+      "script": "1234",
+      "scripted": true,
+      "searchable": true,
+      "type": "murmur3",
+    },
+    "script number": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "long",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": false,
+      "lang": "expression",
+      "name": "script number",
+      "readFromDocValues": false,
+      "script": "1234",
+      "scripted": true,
+      "searchable": true,
+      "type": "number",
+    },
+    "script string": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "text",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": false,
+      "lang": "expression",
+      "name": "script string",
+      "readFromDocValues": false,
+      "script": "'i am a string'",
+      "scripted": true,
+      "searchable": true,
+      "type": "string",
+    },
+    "ssl": Object {
+      "aggregatable": true,
+      "count": 20,
+      "esTypes": Array [
+        "boolean",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "ssl",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "boolean",
+    },
+    "time": Object {
+      "aggregatable": true,
+      "count": 30,
+      "esTypes": Array [
+        "date",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "time",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "date",
+    },
+    "utc_time": Object {
+      "aggregatable": true,
+      "count": 0,
+      "esTypes": Array [
+        "date",
+      ],
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
+      "isMapped": true,
+      "name": "utc_time",
+      "readFromDocValues": true,
+      "scripted": false,
+      "searchable": true,
+      "shortDotsEnable": false,
+      "type": "date",
+    },
+  },
+  "id": "test-pattern",
+  "name": "Name",
+  "runtimeFieldMap": Object {
+    "runtime_field": Object {
+      "script": Object {
+        "source": "emit('hello world')",
+      },
+      "type": "keyword",
+    },
+  },
+  "sourceFilters": Array [],
+  "timeFieldName": "time",
+  "title": "title",
+  "type": "index-pattern",
+  "version": "2",
+}
+`;
diff --git a/src/plugins/data_views/common/data_views/__snapshots__/data_views.test.ts.snap b/src/plugins/data_views/common/data_views/__snapshots__/data_views.test.ts.snap
index 96663f1105cce..1b2939aefb53c 100644
--- a/src/plugins/data_views/common/data_views/__snapshots__/data_views.test.ts.snap
+++ b/src/plugins/data_views/common/data_views/__snapshots__/data_views.test.ts.snap
@@ -26,6 +26,8 @@ FldList [
 
 exports[`IndexPatterns createAndSave will throw if insufficient access 1`] = `[DataViewInsufficientAccessError: Operation failed due to insufficient access, id: undefined]`;
 
+exports[`IndexPatterns createAndSaveDataViewLazy will throw if insufficient access 1`] = `[DataViewInsufficientAccessError: Operation failed due to insufficient access, id: undefined]`;
+
 exports[`IndexPatterns delete will throw if insufficient access 1`] = `[DataViewInsufficientAccessError: Operation failed due to insufficient access, id: 1]`;
 
 exports[`IndexPatterns savedObjectToSpec 1`] = `
diff --git a/src/plugins/data_views/common/data_views/abstract_data_views.ts b/src/plugins/data_views/common/data_views/abstract_data_views.ts
index 360cf28c24a49..18fcaf5331d76 100644
--- a/src/plugins/data_views/common/data_views/abstract_data_views.ts
+++ b/src/plugins/data_views/common/data_views/abstract_data_views.ts
@@ -12,7 +12,7 @@ import type {
   SerializedFieldFormat,
 } from '@kbn/field-formats-plugin/common';
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '@kbn/field-types';
-import { cloneDeep, findIndex, merge } from 'lodash';
+import { cloneDeep, merge } from 'lodash';
 import type { DataViewFieldBase } from '@kbn/es-query';
 import type {
   DataViewSpec,
@@ -48,6 +48,8 @@ interface AbstractDataViewDeps {
   metaFields?: string[];
 }
 
+type DataViewFieldBaseSpecMap = Record<string, DataViewFieldBase>;
+
 export abstract class AbstractDataView {
   /**
    * Saved object id
@@ -125,7 +127,7 @@ export abstract class AbstractDataView {
    */
   public matchedIndices: string[] = [];
 
-  protected scriptedFields: DataViewFieldBase[];
+  protected scriptedFieldsMap: DataViewFieldBaseSpecMap;
 
   private allowHidden: boolean = false;
 
@@ -155,10 +157,15 @@ export abstract class AbstractDataView {
       : [];
 
     this.allowNoIndex = spec?.allowNoIndex || false;
-    // CRUD operations on scripted fields need to be examined
-    this.scriptedFields = spec?.fields
-      ? Object.values(spec.fields).filter((field) => field.scripted)
-      : [];
+
+    this.scriptedFieldsMap = spec?.fields
+      ? Object.values(spec.fields)
+          .filter((field) => field.scripted)
+          .reduce<DataViewFieldBaseSpecMap>((acc, field) => {
+            acc[field.name] = field;
+            return acc;
+          }, {})
+      : {};
 
     // set dependencies
     this.fieldFormats = { ...fieldFormats };
@@ -302,6 +309,16 @@ export abstract class AbstractDataView {
     this.setFieldAttrs(fieldName, 'customLabel', customLabel === null ? undefined : customLabel);
   }
 
+  /**
+   * Set field count
+   * @param fieldName name of field to set count on
+   * @param count count value. If undefined, count is removed
+   */
+
+  protected setFieldCountInternal(fieldName: string, count: number | undefined | null) {
+    this.setFieldAttrs(fieldName, 'count', count === null ? undefined : count);
+  }
+
   /**
    * Set field custom description
    * @param fieldName name of field to set custom description on
@@ -348,7 +365,7 @@ export abstract class AbstractDataView {
       title: this.getIndexPattern(),
       timeFieldName: this.timeFieldName,
       sourceFilters: stringifyOrUndefined(this.sourceFilters),
-      fields: stringifyOrUndefined(this.scriptedFields),
+      fields: stringifyOrUndefined(Object.values(this.scriptedFieldsMap)),
       fieldFormatMap: stringifyOrUndefined(this.fieldFormatMap),
       type: this.type!,
       typeMeta: stringifyOrUndefined(this.typeMeta),
@@ -359,31 +376,72 @@ export abstract class AbstractDataView {
     };
   }
 
-  protected upsertScriptedFieldInternal = (field: FieldSpec) => {
-    // search for scriped field with same name
-    const findByName = (f: DataViewFieldBase) => f.name === field.name;
+  protected toSpecShared(includeFields = true): DataViewSpec {
+    // if fields aren't included, don't include count
+    const fieldAttrs = cloneDeep(this.fieldAttrs);
+    if (!includeFields) {
+      Object.keys(fieldAttrs).forEach((key) => {
+        delete fieldAttrs[key].count;
+        if (Object.keys(fieldAttrs[key]).length === 0) {
+          delete fieldAttrs[key];
+        }
+      });
+    }
 
-    const fieldIndex = findIndex(this.scriptedFields, findByName);
+    const spec: DataViewSpec = {
+      id: this.id,
+      version: this.version,
+      title: this.getIndexPattern(),
+      timeFieldName: this.timeFieldName,
+      sourceFilters: [...(this.sourceFilters || [])],
+      typeMeta: this.typeMeta,
+      type: this.type,
+      fieldFormats: { ...this.fieldFormatMap },
+      runtimeFieldMap: cloneDeep(this.runtimeFieldMap),
+      fieldAttrs,
+      allowNoIndex: this.allowNoIndex,
+      name: this.name,
+      allowHidden: this.getAllowHidden(),
+    };
 
-    const scriptedField: DataViewFieldBase = {
+    // Filter undefined values from the spec
+    return Object.fromEntries(Object.entries(spec).filter(([, v]) => typeof v !== 'undefined'));
+  }
+
+  protected upsertScriptedFieldInternal = (field: FieldSpec) => {
+    this.scriptedFieldsMap[field.name] = {
       name: field.name,
       script: field.script,
       lang: field.lang,
       type: field.type,
       scripted: field.scripted,
     };
-
-    if (fieldIndex === -1) {
-      this.scriptedFields.push(scriptedField);
-    } else {
-      this.scriptedFields[fieldIndex] = scriptedField;
-    }
   };
 
   protected deleteScriptedFieldInternal = (fieldName: string) => {
-    this.scriptedFields = this.scriptedFields.filter((field) => field.name !== fieldName);
+    delete this.scriptedFieldsMap[fieldName];
   };
 
+  replaceAllScriptedFields(newFields: Record<string, FieldSpec>) {
+    const oldScriptedFieldNames = Object.keys(this.scriptedFieldsMap);
+
+    oldScriptedFieldNames.forEach((name) => {
+      this.removeScriptedField(name);
+    });
+
+    Object.entries(newFields).forEach(([name, field]) => {
+      this.upsertScriptedField(field);
+    });
+  }
+
+  removeScriptedField(name: string) {
+    return this.deleteScriptedFieldInternal(name);
+  }
+
+  upsertScriptedField(field: FieldSpec) {
+    return this.upsertScriptedFieldInternal(field);
+  }
+
   /**
    * Checks if runtime field exists
    * @param name field name
@@ -430,6 +488,29 @@ export abstract class AbstractDataView {
     );
   }
 
+  /**
+   * Replaces all existing runtime fields with new fields.
+   * @param newFields Map of runtime field definitions by field name
+   */
+  replaceAllRuntimeFields(newFields: Record<string, RuntimeField>) {
+    const oldRuntimeFieldNames = Object.keys(this.runtimeFieldMap);
+    oldRuntimeFieldNames.forEach((name) => {
+      this.removeRuntimeField(name);
+    });
+
+    Object.entries(newFields).forEach(([name, field]) => {
+      this.addRuntimeField(name, field);
+    });
+  }
+
+  removeRuntimeField(name: string) {
+    return this.removeRuntimeFieldInteral(name);
+  }
+
+  addRuntimeField(name: string, runtimeField: RuntimeField) {
+    return this.addRuntimeFieldInteral(name, runtimeField);
+  }
+
   protected removeRuntimeFieldInteral(name: string) {
     delete this.runtimeFieldMap[name];
   }
diff --git a/src/plugins/data_views/common/data_views/data_view.ts b/src/plugins/data_views/common/data_views/data_view.ts
index 5e4278b7e2d42..77460db5993e5 100644
--- a/src/plugins/data_views/common/data_views/data_view.ts
+++ b/src/plugins/data_views/common/data_views/data_view.ts
@@ -11,7 +11,7 @@ import type { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
 import { castEsToKbnFieldTypeName } from '@kbn/field-types';
 import { CharacterNotAllowedInField } from '@kbn/kibana-utils-plugin/common';
 import type { DataViewBase } from '@kbn/es-query';
-import { cloneDeep, each, mapValues, pick, pickBy, reject } from 'lodash';
+import { each, mapValues, pick, pickBy, reject } from 'lodash';
 import type { DataViewField, IIndexPatternFieldList } from '../fields';
 import { fieldList } from '../fields';
 import type {
@@ -79,6 +79,18 @@ export class DataView extends AbstractDataView implements DataViewBase {
     this.fields.replaceAll(Object.values(spec.fields || {}));
   }
 
+  getScriptedFieldsForQuery() {
+    return this.getScriptedFields().reduce((scriptFields, field) => {
+      scriptFields[field.name] = {
+        script: {
+          source: field.script as string,
+          lang: field.lang,
+        },
+      };
+      return scriptFields;
+    }, {} as Record<string, estypes.ScriptField>);
+  }
+
   getEtag = () => this.etag;
 
   setEtag = (etag: string | undefined) => (this.etag = etag);
@@ -119,12 +131,10 @@ export class DataView extends AbstractDataView implements DataViewBase {
       };
     });
 
-    const runtimeFields = this.getRuntimeMappings();
-
     return {
-      scriptFields,
+      scriptFields: this.getScriptedFieldsForQuery(),
       docvalueFields,
-      runtimeFields,
+      runtimeFields: this.getRuntimeMappings(),
     };
   }
 
@@ -134,41 +144,17 @@ export class DataView extends AbstractDataView implements DataViewBase {
    * will be fetched from Elasticsearch when instantiating a new Data View with this spec.
    */
   public toSpec(includeFields = true): DataViewSpec {
+    const spec = this.toSpecShared(includeFields);
     const fields =
       includeFields && this.fields
         ? this.fields.toSpec({ getFormatterForField: this.getFormatterForField.bind(this) })
         : undefined;
 
-    // if fields aren't included, don't include count
-    const fieldAttrs = cloneDeep(this.fieldAttrs);
-    if (!includeFields) {
-      Object.keys(fieldAttrs).forEach((key) => {
-        delete fieldAttrs[key].count;
-        if (Object.keys(fieldAttrs[key]).length === 0) {
-          delete fieldAttrs[key];
-        }
-      });
+    if (fields) {
+      spec.fields = fields;
     }
 
-    const spec: DataViewSpec = {
-      id: this.id,
-      version: this.version,
-      title: this.getIndexPattern(),
-      timeFieldName: this.timeFieldName,
-      sourceFilters: [...(this.sourceFilters || [])],
-      fields,
-      typeMeta: this.typeMeta,
-      type: this.type,
-      fieldFormats: { ...this.fieldFormatMap },
-      runtimeFieldMap: cloneDeep(this.runtimeFieldMap),
-      fieldAttrs,
-      allowNoIndex: this.allowNoIndex,
-      name: this.name,
-      allowHidden: this.getAllowHidden(),
-    };
-
-    // Filter undefined values from the spec
-    return Object.fromEntries(Object.entries(spec).filter(([, v]) => typeof v !== 'undefined'));
+    return spec;
   }
 
   /**
@@ -342,21 +328,6 @@ export class DataView extends AbstractDataView implements DataViewBase {
     return primitveRuntimeField && { [name]: primitveRuntimeField };
   }
 
-  /**
-   * Replaces all existing runtime fields with new fields.
-   * @param newFields Map of runtime field definitions by field name
-   */
-  replaceAllRuntimeFields(newFields: Record<string, RuntimeField>) {
-    const oldRuntimeFieldNames = Object.keys(this.runtimeFieldMap);
-    oldRuntimeFieldNames.forEach((name) => {
-      this.removeRuntimeField(name);
-    });
-
-    Object.entries(newFields).forEach(([name, field]) => {
-      this.addRuntimeField(name, field);
-    });
-  }
-
   /**
    * Remove a runtime field - removed from mapped field or removed unmapped
    * field as appropriate. Doesn't clear associated field attributes.
@@ -380,11 +351,11 @@ export class DataView extends AbstractDataView implements DataViewBase {
    * Return the "runtime_mappings" section of the ES search query.
    */
   getRuntimeMappings(): estypes.MappingRuntimeFields {
-    const mappedFields = this.getMappedFieldNames();
     const records = Object.keys(this.runtimeFieldMap).reduce<Record<string, RuntimeFieldSpec>>(
       (acc, fieldName) => {
         // do not include fields that are mapped
-        if (!mappedFields.includes(fieldName)) {
+        const field = this.fields.getByName(fieldName);
+        if (!field?.isMapped) {
           acc[fieldName] = this.runtimeFieldMap[fieldName];
         }
 
@@ -447,16 +418,7 @@ export class DataView extends AbstractDataView implements DataViewBase {
       if (!newCount) fieldObject.deleteCount();
       else fieldObject.count = newCount;
     }
-    this.setFieldAttrs(fieldName, 'count', newCount);
-  }
-
-  private getMappedFieldNames() {
-    return this.fields.getAll().reduce<string[]>((acc, dataViewField) => {
-      if (dataViewField.isMapped) {
-        acc.push(dataViewField.name);
-      }
-      return acc;
-    }, []);
+    this.setFieldCountInternal(fieldName, newCount);
   }
 
   /**
diff --git a/src/plugins/data_views/common/data_views/data_view_lazy.test.ts b/src/plugins/data_views/common/data_views/data_view_lazy.test.ts
new file mode 100644
index 0000000000000..4d65f2ece7aea
--- /dev/null
+++ b/src/plugins/data_views/common/data_views/data_view_lazy.test.ts
@@ -0,0 +1,811 @@
+/*
+ * 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 { FieldFormat } from '@kbn/field-formats-plugin/common';
+
+import { RuntimeField, RuntimePrimitiveTypes, FieldSpec, DataViewSpec } from '../types';
+import { stubLogstashFields } from '../field.stub';
+import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
+import { CharacterNotAllowedInField } from '@kbn/kibana-utils-plugin/common';
+import { last, map } from 'lodash';
+import { stubbedSavedObjectIndexPattern } from '../data_view.stub';
+import { DataViewField } from '../fields';
+import { DataViewLazy } from './data_view_lazy';
+import { stubLogstashFieldSpecMap } from '../field.stub';
+
+let fieldCapsResponse: FieldSpec[];
+
+const runtimeFieldScript = {
+  type: 'keyword' as RuntimeField['type'],
+  script: {
+    source: "emit('hello world')",
+  },
+};
+
+const runtimeFieldMap = {
+  runtime_field: runtimeFieldScript,
+};
+
+const runtimeField = {
+  name: 'runtime_field',
+  runtimeField: runtimeFieldScript,
+  scripted: false,
+  esTypes: ['keyword'],
+  type: 'string',
+};
+
+const toSpecGetAllFields = {
+  fieldParams: { fieldName: ['*'] },
+};
+
+// helper function to create index patterns
+function create(id: string, spec?: DataViewSpec) {
+  const {
+    type,
+    version,
+    attributes: { timeFieldName, fields, title, name },
+  } = stubbedSavedObjectIndexPattern(id);
+
+  return new DataViewLazy({
+    spec: {
+      id,
+      type,
+      version,
+      timeFieldName,
+      fields: { ...JSON.parse(fields), runtime_field: runtimeField },
+      title,
+      name,
+      runtimeFieldMap,
+      ...spec,
+    },
+    fieldFormats: fieldFormatsMock,
+    shortDotsEnable: false,
+    metaFields: [],
+    apiClient: {
+      getFieldsForWildcard: jest
+        .fn()
+        .mockImplementation(() => Promise.resolve({ fields: fieldCapsResponse })),
+    } as any,
+    scriptedFieldsEnabled: true,
+  });
+}
+
+/**
+ * To test
+ * create data view, check a number of attributes
+ */
+
+describe('DataViewLazy', () => {
+  let dataViewLazy: DataViewLazy;
+
+  // create an dataViewLazy instance for each test
+  beforeEach(() => {
+    dataViewLazy = create('test-pattern');
+    // strip out scripted fields as they're not returned by field caps
+    fieldCapsResponse = Object.values(stubLogstashFieldSpecMap).filter((fld) => !fld.scripted);
+  });
+
+  describe('api', () => {
+    test('should have expected properties', () => {
+      expect(dataViewLazy).toHaveProperty('getScriptedFields');
+      expect(dataViewLazy).toHaveProperty('removeScriptedField');
+      expect(dataViewLazy).toHaveProperty('addRuntimeField');
+      expect(dataViewLazy).toHaveProperty('removeRuntimeField');
+    });
+  });
+
+  describe('fields', () => {
+    test('should have expected properties on fields', async function () {
+      const { bytes: field } = (
+        await dataViewLazy.getFields({ fieldName: ['bytes'] })
+      ).getFieldMap();
+      expect(field).toHaveProperty('displayName');
+      expect(field).toHaveProperty('filterable');
+      expect(field).toHaveProperty('sortable');
+      expect(field).toHaveProperty('scripted');
+      expect(field).toHaveProperty('isMapped');
+    });
+  });
+
+  describe('sorted fields', () => {
+    test('should have expected properties on fields', async function () {
+      const fieldMap = (await dataViewLazy.getFields({ fieldName: ['*'] })).getFieldMapSorted();
+      const expectSortedsKeys = fieldCapsResponse
+        .map((field) => field.name)
+        .concat([
+          'runtime_field',
+          'script date',
+          'script murmur3',
+          'script number',
+          'script string',
+        ])
+        .sort();
+      expect(Object.keys(fieldMap)).toEqual(expectSortedsKeys);
+    });
+  });
+
+  describe('isTSDBMode', () => {
+    const tsdbField: FieldSpec = {
+      name: 'tsdb-metric-field',
+      type: 'number',
+      aggregatable: true,
+      searchable: true,
+      timeSeriesMetric: 'gauge',
+    };
+
+    test('should return false if no fields are tsdb fields', async () => {
+      expect(await dataViewLazy.isTSDBMode()).toBe(false);
+    });
+
+    test('should return true if some fields are tsdb fields', async () => {
+      fieldCapsResponse.push(tsdbField);
+      expect(await dataViewLazy.isTSDBMode()).toBe(true);
+    });
+  });
+
+  describe('getScriptedFields', () => {
+    test('should return all scripted fields', async () => {
+      const scriptedNames = stubLogstashFields
+        .filter((item: DataViewField) => item.scripted === true)
+        .map((item: DataViewField) => item.name);
+      const respNames = Object.keys(
+        (
+          await dataViewLazy.getFields({ fieldName: ['*'], mapped: false, runtime: false })
+        ).getFieldMap()
+      );
+
+      expect(respNames).toEqual(scriptedNames);
+    });
+  });
+
+  describe('getComputedFields', () => {
+    test('should be a function', () => {
+      expect(dataViewLazy.getComputedFields).toBeInstanceOf(Function);
+    });
+
+    test('should request date fields as docvalue_fields', async () => {
+      fieldCapsResponse = Object.values(stubLogstashFieldSpecMap).filter(
+        (field) => field.type === 'date' && !field.scripted
+      );
+      const { docvalueFields } = await dataViewLazy.getComputedFields({ fieldName: ['*'] });
+      const docValueFieldNames = docvalueFields.map((field) => field.field);
+
+      expect(Object.keys(docValueFieldNames).length).toBe(3);
+      expect(docValueFieldNames).toContain('@timestamp');
+      expect(docValueFieldNames).toContain('time');
+      expect(docValueFieldNames).toContain('utc_time');
+    });
+
+    test('should return runtimeField', async () => {
+      expect((await dataViewLazy.getComputedFields({ fieldName: ['*'] })).runtimeFields).toEqual({
+        runtime_field: runtimeFieldScript,
+      });
+    });
+
+    test('should request date field doc values in date_time format', async () => {
+      const { docvalueFields } = await dataViewLazy.getComputedFields({ fieldName: ['*'] });
+      const timestampField = docvalueFields.find((field) => field.field === '@timestamp');
+
+      expect(timestampField).toHaveProperty('format', 'date_time');
+    });
+
+    test('should not request scripted date fields as docvalue_fields', async () => {
+      const { docvalueFields } = await dataViewLazy.getComputedFields({ fieldName: ['*'] });
+
+      expect(docvalueFields).not.toContain('script date');
+    });
+  });
+
+  describe('getNonScriptedFields', () => {
+    test('should return all non-scripted fields', async () => {
+      fieldCapsResponse = Object.values(stubLogstashFieldSpecMap).filter(
+        (field) => !field.scripted
+      );
+      const notScriptedNames = stubLogstashFields
+        .filter((item: DataViewField) => item.scripted === false)
+        .map((item: DataViewField) => item.name);
+      notScriptedNames.push('runtime_field');
+
+      const fieldMap = (
+        await dataViewLazy.getFields({ fieldName: ['*'], scripted: false })
+      ).getFieldMap();
+
+      const respNames = map(fieldMap, 'name');
+
+      expect(respNames).toEqual(notScriptedNames);
+    });
+  });
+
+  describe('add and remove scripted fields', () => {
+    test('should append the scripted field', async () => {
+      // keep a copy of the current scripted field count
+      const oldCount = Object.keys(
+        (
+          await dataViewLazy.getFields({ fieldName: ['*'], mapped: false, runtime: false })
+        ).getFieldMap()
+      ).length;
+
+      // add a new scripted field
+      const scriptedField = {
+        name: 'new scripted field',
+        script: 'false',
+        type: 'boolean',
+      };
+
+      dataViewLazy.upsertScriptedField({
+        name: scriptedField.name,
+        script: scriptedField.script,
+        type: scriptedField.type,
+        scripted: true,
+        lang: 'painless',
+        aggregatable: true,
+        searchable: true,
+      });
+
+      const scriptedFields = Object.keys(
+        (
+          await dataViewLazy.getFields({ fieldName: ['*'], mapped: false, runtime: false })
+        ).getFieldMap()
+      );
+      expect(scriptedFields).toHaveLength(oldCount + 1);
+
+      expect((await dataViewLazy.getFieldByName(scriptedField.name))?.name).toEqual(
+        scriptedField.name
+      );
+    });
+
+    test('should remove scripted field, by name', async () => {
+      fieldCapsResponse = [];
+      const scriptedFields = Object.values(
+        (
+          await dataViewLazy.getFields({ fieldName: ['*'], mapped: false, runtime: false })
+        ).getFieldMap()
+      );
+      const oldCount = scriptedFields.length;
+      const scriptedField = last(scriptedFields)!;
+
+      await dataViewLazy.removeScriptedField(scriptedField.name);
+
+      expect(
+        Object.keys(
+          (
+            await dataViewLazy.getFields({ fieldName: ['*'], mapped: false, runtime: false })
+          ).getFieldMap()
+        ).length
+      ).toEqual(oldCount - 1);
+
+      expect(await dataViewLazy.getFieldByName(scriptedField.name)).toEqual(undefined);
+    });
+  });
+
+  describe('setFieldFormat and deleteFieldFormaat', () => {
+    test('should persist changes', async () => {
+      const formatter = {
+        toJSON: () => ({ id: 'bytes' }),
+      } as FieldFormat;
+      dataViewLazy.getFormatterForField = () => formatter;
+      dataViewLazy.setFieldFormat('bytes', { id: 'bytes' });
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).fieldFormats).toEqual({
+        bytes: { id: 'bytes' },
+      });
+
+      dataViewLazy.deleteFieldFormat('bytes');
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).fieldFormats).toEqual({});
+    });
+  });
+
+  describe('addRuntimeField and removeRuntimeField', () => {
+    const runtime = {
+      type: 'keyword' as RuntimeField['type'],
+      script: {
+        source: "emit('hello world');",
+      },
+    };
+
+    const runtimeWithAttrs = {
+      ...runtime,
+      popularity: 5,
+      customLabel: 'custom name',
+      format: {
+        id: 'bytes',
+      },
+    };
+
+    const runtimeComposite = {
+      type: 'composite' as RuntimeField['type'],
+      script: {
+        source: "emit('hello world');",
+      },
+      fields: {
+        a: {
+          type: 'keyword' as RuntimePrimitiveTypes,
+        },
+        b: {
+          type: 'long' as RuntimePrimitiveTypes,
+        },
+      },
+    };
+
+    const runtimeCompositeWithAttrs = {
+      type: runtimeComposite.type,
+      script: runtimeComposite.script,
+      fields: {
+        a: {
+          ...runtimeComposite.fields.a,
+          popularity: 3,
+          customLabel: 'custom name a',
+          format: {
+            id: 'bytes',
+          },
+        },
+        b: {
+          ...runtimeComposite.fields.b,
+          popularity: 4,
+          customLabel: 'custom name b',
+          format: {
+            id: 'bytes',
+          },
+        },
+      },
+    };
+
+    beforeEach(() => {
+      const formatter = {
+        toJSON: () => ({ id: 'bytes' }),
+      } as FieldFormat;
+      dataViewLazy.getFormatterForField = () => formatter;
+      dataViewLazy.getFormatterForFieldNoDefault = () => undefined;
+    });
+
+    /*
+    // keeping disabled test since we'd like to move toward this functionality in the future
+    test('add and remove runtime field to existing field', async () => {
+      fieldCapsResponse = fieldCapsResponse.filter((field) => field.name === '@tags');
+      await dataViewLazy.addRuntimeField('@tags', runtimeWithAttrs);
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).runtimeFieldMap).toEqual({
+        '@tags': runtime,
+        runtime_field: runtimeField.runtimeField,
+      });
+      const field = (await dataViewLazy.toSpec(toSpecGetAllFields))!.fields!['@tags'];
+      expect(field.runtimeField).toEqual(runtime);
+      expect(field.count).toEqual(5);
+      expect(field.format).toEqual({
+        id: 'bytes',
+      });
+      expect(field.customLabel).toEqual('custom name');
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).fieldAttrs!['@tags']).toEqual({
+        customLabel: 'custom name',
+        count: 5,
+      });
+
+      dataViewLazy.removeRuntimeField('@tags');
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).runtimeFieldMap).toEqual({
+        runtime_field: runtimeField.runtimeField,
+      });
+      expect(
+        (await dataViewLazy.toSpec(toSpecGetAllFields))!.fields!['@tags'].runtimeField
+      ).toBeUndefined();
+    });
+    */
+
+    test('ignore runtime field mapping if a mapped field exists with the same name', async () => {
+      expect(dataViewLazy.getRuntimeMappings()).toEqual({
+        runtime_field: { script: { source: "emit('hello world')" }, type: 'keyword' },
+      });
+
+      // add a runtime field called "theme"
+      dataViewLazy.addRuntimeField('theme', runtimeWithAttrs);
+
+      // its added to runtimeFieldMappings
+      expect(dataViewLazy.getRuntimeMappings()).toEqual({
+        runtime_field: { script: { source: "emit('hello world')" }, type: 'keyword' },
+        theme: { script: { source: "emit('hello world');" }, type: 'keyword' },
+      });
+
+      // we can get the field
+      expect((await dataViewLazy.getFieldByName('theme'))?.runtimeField).toEqual({
+        script: { source: "emit('hello world');" },
+        type: 'keyword',
+      });
+
+      // add a new mapped field also called "theme"
+      const themeFieldSpec = {
+        name: 'theme',
+        type: 'keyword',
+        aggregatable: true,
+        searchable: true,
+        readFromDocValues: false,
+        isMapped: true,
+      };
+
+      fieldCapsResponse = [themeFieldSpec];
+
+      expect((await dataViewLazy.getFieldByName('theme'))?.runtimeField).toEqual(undefined);
+    });
+
+    test('add and remove runtime field as new field', async () => {
+      dataViewLazy.addRuntimeField('new_field', runtimeWithAttrs);
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).runtimeFieldMap).toEqual({
+        runtime_field: runtimeField.runtimeField,
+        new_field: runtime,
+      });
+      expect(dataViewLazy.getRuntimeField('new_field')).toMatchSnapshot();
+      expect(
+        (await dataViewLazy.toSpec(toSpecGetAllFields))!.fields!.new_field.runtimeField
+      ).toEqual(runtime);
+
+      dataViewLazy.removeRuntimeField('new_field');
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).runtimeFieldMap).toEqual({
+        runtime_field: runtimeField.runtimeField,
+      });
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields))!.fields!.new_field).toBeUndefined();
+    });
+
+    test('add and remove a custom label from a runtime field', async () => {
+      const newField = 'new_field_test';
+      fieldCapsResponse = [];
+      dataViewLazy.addRuntimeField(newField, {
+        ...runtimeWithAttrs,
+        customLabel: 'test1',
+      });
+      expect((await dataViewLazy.getFieldByName(newField))?.customLabel).toEqual('test1');
+      dataViewLazy.setFieldCustomLabel(newField, 'test2');
+      expect((await dataViewLazy.getFieldByName(newField))?.customLabel).toEqual('test2');
+      dataViewLazy.setFieldCustomLabel(newField, undefined);
+      expect((await dataViewLazy.getFieldByName(newField))?.customLabel).toBeUndefined();
+      dataViewLazy.removeRuntimeField(newField);
+    });
+
+    test('add and remove composite runtime field as new fields', async () => {
+      const fieldMap = (await dataViewLazy.getFields({ fieldName: ['*'] })).getFieldMap();
+      const fieldCount = Object.values(fieldMap).length;
+      await dataViewLazy.addRuntimeField('new_field', runtimeCompositeWithAttrs);
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).runtimeFieldMap).toEqual({
+        new_field: runtimeComposite,
+        runtime_field: runtimeField.runtimeField,
+      });
+      expect(
+        Object.values((await dataViewLazy.getFields({ fieldName: ['*'] })).getFieldMap()).length -
+          fieldCount
+      ).toEqual(2);
+      expect(dataViewLazy.getRuntimeField('new_field')).toMatchSnapshot();
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields))!.fields!['new_field.a']).toBeDefined();
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields))!.fields!['new_field.b']).toBeDefined();
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).fieldAttrs!['new_field.a']).toEqual({
+        count: 3,
+        customLabel: 'custom name a',
+      });
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).fieldAttrs!['new_field.b']).toEqual({
+        count: 4,
+        customLabel: 'custom name b',
+      });
+
+      dataViewLazy.removeRuntimeField('new_field');
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields)).runtimeFieldMap).toEqual({
+        runtime_field: runtimeField.runtimeField,
+      });
+      expect((await dataViewLazy.toSpec(toSpecGetAllFields))!.fields!.new_field).toBeUndefined();
+    });
+
+    test('should not allow runtime field with * in name', async () => {
+      try {
+        await dataViewLazy.addRuntimeField('test*123', runtime);
+      } catch (e) {
+        expect(e).toBeInstanceOf(CharacterNotAllowedInField);
+      }
+    });
+  });
+
+  describe('getIndexPattern', () => {
+    test('should return the index pattern, labeled title on the data view spec', () => {
+      expect(dataViewLazy.getIndexPattern()).toBe(
+        stubbedSavedObjectIndexPattern().attributes.title
+      );
+    });
+
+    test('setIndexPattern', () => {
+      dataViewLazy.setIndexPattern('test');
+      expect(dataViewLazy.getIndexPattern()).toBe('test');
+    });
+  });
+
+  describe('getFormatterForField', () => {
+    test('should return the default one for empty objects', () => {
+      dataViewLazy.setFieldFormat('scriptedFieldWithEmptyFormatter', {});
+      expect(
+        dataViewLazy.getFormatterForField({
+          name: 'scriptedFieldWithEmptyFormatter',
+          type: 'number',
+          esTypes: ['long'],
+          searchable: true,
+          aggregatable: true,
+        })
+      ).toEqual(
+        expect.objectContaining({
+          convert: expect.any(Function),
+          getConverterFor: expect.any(Function),
+        })
+      );
+    });
+  });
+
+  describe('toSpec', () => {
+    test('should match snapshot', async () => {
+      const formatter = {
+        toJSON: () => ({ id: 'number', params: { pattern: '$0,0.[00]' } }),
+      } as unknown as FieldFormat;
+      dataViewLazy.getFormatterForField = () => formatter;
+      expect(await dataViewLazy.toSpec(toSpecGetAllFields)).toMatchSnapshot();
+    });
+
+    test('can optionally exclude fields', async () => {
+      expect(await dataViewLazy.toSpec()).toMatchSnapshot();
+    });
+
+    test('can restore from spec', async () => {
+      const formatter = {
+        toJSON: () => ({ id: 'number', params: { pattern: '$0,0.[00]' } }),
+      } as unknown as FieldFormat;
+      dataViewLazy.getFormatterForField = () => formatter;
+      const spec = await dataViewLazy.toSpec(toSpecGetAllFields);
+      const restoredPattern = new DataViewLazy({
+        spec,
+        fieldFormats: fieldFormatsMock,
+        shortDotsEnable: false,
+        metaFields: [],
+        apiClient: {
+          getFieldsForWildcard: jest
+            .fn()
+            .mockImplementation(() => Promise.resolve({ fields: fieldCapsResponse })),
+        } as any,
+        scriptedFieldsEnabled: true,
+      });
+      expect(restoredPattern.id).toEqual(dataViewLazy.id);
+      expect(restoredPattern.getIndexPattern()).toEqual(dataViewLazy.getIndexPattern());
+      expect(restoredPattern.timeFieldName).toEqual(dataViewLazy.timeFieldName);
+      const restoredPatternFieldMap = (
+        await restoredPattern.getFields({ fieldName: ['*'] })
+      ).getFieldMap();
+      const fieldMap = (await dataViewLazy.getFields({ fieldName: ['*'] })).getFieldMap();
+      expect(Object.keys(restoredPatternFieldMap).length).toEqual(Object.keys(fieldMap).length);
+    });
+
+    test('creating from spec does not contain references to spec', () => {
+      const sourceFilters = [{ value: 'test' }];
+      const spec = { sourceFilters };
+      const dataView1 = create('test1', spec);
+      const dataView2 = create('test2', spec);
+      expect(dataView1.sourceFilters).not.toBe(dataView2.sourceFilters);
+    });
+  });
+
+  describe('toMinimalSpec', () => {
+    test('can exclude fields', async () => {
+      expect(await dataViewLazy.toMinimalSpec()).toMatchSnapshot();
+    });
+
+    test('can omit counts', async () => {
+      const fieldsMap = {
+        test1: {
+          name: 'test1',
+          type: 'keyword',
+          aggregatable: true,
+          searchable: true,
+          readFromDocValues: false,
+        },
+        test2: {
+          name: 'test2',
+          type: 'keyword',
+          aggregatable: true,
+          searchable: true,
+          readFromDocValues: false,
+        },
+        test3: {
+          name: 'test3',
+          type: 'keyword',
+          aggregatable: true,
+          searchable: true,
+          readFromDocValues: false,
+        },
+      };
+      expect(
+        (
+          await create('test', {
+            id: 'test',
+            title: 'test*',
+            fields: fieldsMap,
+            fieldAttrs: undefined,
+          }).toMinimalSpec()
+        ).fieldAttrs
+      ).toBeUndefined();
+      expect(
+        (
+          await create('test', {
+            id: 'test',
+            title: 'test*',
+            fields: fieldsMap,
+            fieldAttrs: {
+              test1: {
+                count: 11,
+              },
+              test2: {
+                count: 12,
+              },
+            },
+          }).toMinimalSpec()
+        ).fieldAttrs
+      ).toBeUndefined();
+
+      expect(
+        (
+          await create('test', {
+            id: 'test',
+            title: 'test*',
+            fields: fieldsMap,
+            fieldAttrs: {
+              test1: {
+                count: 11,
+                customLabel: 'test11',
+              },
+              test2: {
+                count: 12,
+              },
+            },
+          }).toMinimalSpec()
+        ).fieldAttrs
+      ).toMatchInlineSnapshot(`
+        Object {
+          "test1": Object {
+            "customLabel": "test11",
+          },
+        }
+      `);
+
+      expect(
+        (
+          await create('test', {
+            id: 'test',
+            title: 'test*',
+            fields: fieldsMap,
+            fieldAttrs: {
+              test1: {
+                count: 11,
+                customLabel: 'test11',
+              },
+              test2: {
+                customLabel: 'test12',
+                customDescription: 'test12 description',
+              },
+              test3: {
+                count: 30,
+              },
+              test4: {
+                customDescription: 'test14 description',
+              },
+            },
+          }).toMinimalSpec()
+        ).fieldAttrs
+      ).toMatchInlineSnapshot(`
+        Object {
+          "test1": Object {
+            "customLabel": "test11",
+          },
+          "test2": Object {
+            "customDescription": "test12 description",
+            "customLabel": "test12",
+          },
+          "test4": Object {
+            "customDescription": "test14 description",
+          },
+        }
+      `);
+    });
+
+    test('can customize what attributes to keep', () => {
+      const fieldsMap = {
+        test1: {
+          name: 'test1',
+          type: 'keyword',
+          aggregatable: true,
+          searchable: true,
+          readFromDocValues: false,
+        },
+        test2: {
+          name: 'test2',
+          type: 'keyword',
+          aggregatable: true,
+          searchable: true,
+          readFromDocValues: false,
+        },
+        test3: {
+          name: 'test3',
+          type: 'keyword',
+          aggregatable: true,
+          searchable: true,
+          readFromDocValues: false,
+        },
+        test4: {
+          name: 'test4',
+          type: 'keyword',
+          aggregatable: true,
+          searchable: true,
+          readFromDocValues: false,
+        },
+      };
+
+      const spec = {
+        id: 'test',
+        title: 'test*',
+        fields: fieldsMap,
+        fieldAttrs: {
+          test1: {
+            count: 11,
+            customLabel: 'test11',
+          },
+          test2: {
+            customLabel: 'test12',
+            customDescription: 'test12 description',
+          },
+          test3: {
+            count: 30,
+          },
+          test4: {
+            customDescription: 'test14 description',
+          },
+        },
+      };
+
+      expect(create('test', spec).toMinimalSpec({ keepFieldAttrs: ['customLabel'] }).fieldAttrs)
+        .toMatchInlineSnapshot(`
+        Object {
+          "test1": Object {
+            "customLabel": "test11",
+          },
+          "test2": Object {
+            "customLabel": "test12",
+          },
+        }
+      `);
+
+      expect(
+        create('test', spec).toMinimalSpec({ keepFieldAttrs: ['customDescription'] }).fieldAttrs
+      ).toMatchInlineSnapshot(`
+        Object {
+          "test2": Object {
+            "customDescription": "test12 description",
+          },
+          "test4": Object {
+            "customDescription": "test14 description",
+          },
+        }
+      `);
+
+      expect(
+        create('test', spec).toMinimalSpec({ keepFieldAttrs: ['customLabel', 'customDescription'] })
+          .fieldAttrs
+      ).toMatchInlineSnapshot(`
+        Object {
+          "test1": Object {
+            "customLabel": "test11",
+          },
+          "test2": Object {
+            "customDescription": "test12 description",
+            "customLabel": "test12",
+          },
+          "test4": Object {
+            "customDescription": "test14 description",
+          },
+        }
+      `);
+
+      expect(
+        create('test', spec).toMinimalSpec({ keepFieldAttrs: [] }).fieldAttrs
+      ).toMatchInlineSnapshot(`undefined`);
+    });
+  });
+});
diff --git a/src/plugins/data_views/common/data_views/data_view_lazy.ts b/src/plugins/data_views/common/data_views/data_view_lazy.ts
new file mode 100644
index 0000000000000..e524ad2cbf2f3
--- /dev/null
+++ b/src/plugins/data_views/common/data_views/data_view_lazy.ts
@@ -0,0 +1,632 @@
+/*
+ * 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 * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import type { FieldFormatsStartCommon } from '@kbn/field-formats-plugin/common';
+import { castEsToKbnFieldTypeName } from '@kbn/field-types';
+import { each, pickBy, mapValues, pick, assign, chain } from 'lodash';
+import { CharacterNotAllowedInField } from '@kbn/kibana-utils-plugin/common';
+import { AbstractDataView } from './abstract_data_views';
+import { DataViewField } from '../fields';
+import { fieldMatchesFieldsRequested, fieldsMatchFieldsRequested } from './data_view_lazy_util';
+
+import type {
+  DataViewFieldMap as DataViewFieldSpecMap,
+  DataViewSpec,
+  FieldConfiguration,
+  RuntimeField,
+  RuntimeFieldSpec,
+  RuntimeType,
+  FieldSpec,
+  IDataViewsApiClient,
+} from '../types';
+import { removeFieldAttrs } from './utils';
+
+interface DataViewDeps {
+  spec?: DataViewSpec;
+  fieldFormats: FieldFormatsStartCommon;
+  shortDotsEnable?: boolean;
+  metaFields?: string[];
+  apiClient: IDataViewsApiClient;
+  scriptedFieldsEnabled: boolean;
+}
+
+interface GetFieldsParams {
+  indexFilter?: QueryDslQueryContainer;
+  unmapped?: boolean;
+  fieldName: string[]; // supports wildcard
+  mapped?: boolean;
+  scripted?: boolean;
+  runtime?: boolean;
+  forceRefresh?: boolean;
+  metaFields?: boolean;
+  fieldTypes?: string[];
+}
+
+type DataViewFieldMap = Record<string, DataViewField>;
+
+export class DataViewLazy extends AbstractDataView {
+  private apiClient: IDataViewsApiClient;
+  private fieldCache = new Map<string, DataViewField>();
+
+  /**
+   * Returns true if scripted fields are enabled
+   */
+  protected scriptedFieldsEnabled: boolean = false;
+
+  constructor(config: DataViewDeps) {
+    super(config);
+    this.apiClient = config.apiClient;
+    this.scriptedFieldsEnabled = config.scriptedFieldsEnabled;
+  }
+
+  async getFields({
+    mapped = true,
+    scripted = true,
+    runtime = true,
+    fieldName,
+    forceRefresh = false,
+    unmapped,
+    indexFilter,
+    metaFields = true,
+  }: GetFieldsParams) {
+    let mappedResult: DataViewFieldMap = {};
+    let scriptedResult: DataViewFieldMap = {};
+    let runtimeResult: DataViewFieldMap = {};
+    // need to know if runtime fields are also mapped
+    if (mapped || runtime) {
+      // if we just need runtime fields, we can ask for the set of runtime fields specifically
+      const fieldsToRequest = mapped
+        ? fieldName
+        : fieldsMatchFieldsRequested(Object.keys(this.runtimeFieldMap), fieldName);
+      mappedResult = await this.getMappedFields({
+        fieldName: fieldsToRequest,
+        forceRefresh,
+        unmapped,
+        indexFilter,
+        metaFields,
+      });
+    }
+
+    if (scripted && this.scriptedFieldsEnabled) {
+      scriptedResult = this.getScriptedFields({ fieldName });
+    }
+
+    if (runtime) {
+      runtimeResult = this.getRuntimeFields({ fieldName });
+    }
+
+    const fieldMap = { ...mappedResult, ...scriptedResult, ...runtimeResult };
+    let fieldMapSorted = {};
+    let hasBeenSorted = false;
+
+    return {
+      getFieldMap: () => fieldMap,
+      getFieldMapSorted: () => {
+        if (!hasBeenSorted) {
+          fieldMapSorted = chain(fieldMap).toPairs().sortBy(0).fromPairs().value();
+          hasBeenSorted = true;
+        }
+        return fieldMapSorted;
+      },
+    };
+  }
+
+  public getRuntimeFields = ({ fieldName = ['*'] }: Pick<GetFieldsParams, 'fieldName'>) =>
+    // getRuntimeFieldSpecMap flattens composites into a list of fields
+    Object.values(this.getRuntimeFieldSpecMap({ fieldName })).reduce<DataViewFieldMap>(
+      (col, field) => {
+        if (!fieldMatchesFieldsRequested(field.name, fieldName)) {
+          return col;
+        }
+        let cachedField = this.fieldCache.get(field.name);
+        // if mapped field, can't be runtime field
+        if (cachedField?.isMapped) {
+          return col;
+        }
+        if (!cachedField) {
+          cachedField = new DataViewField({
+            ...field,
+            count: this.fieldAttrs?.[field.name]?.count,
+            customLabel: this.fieldAttrs?.[field.name]?.customLabel,
+            customDescription: this.fieldAttrs?.[field.name]?.customDescription,
+            shortDotsEnable: this.shortDotsEnable,
+          });
+          this.fieldCache.set(field.name, cachedField);
+        }
+        col[field.name] = cachedField;
+        return col;
+      },
+      {}
+    );
+
+  /**
+   * Add a runtime field - Appended to existing mapped field or a new field is
+   * created as appropriate.
+   * @param name Field name
+   * @param runtimeField Runtime field definition
+   */
+  async addRuntimeField(name: string, runtimeField: RuntimeField): Promise<DataViewField[]> {
+    if (name.includes('*')) {
+      throw new CharacterNotAllowedInField('*', name);
+    }
+
+    const { type, script, customLabel, format, popularity } = runtimeField;
+
+    if (type === 'composite') {
+      return this.addCompositeRuntimeField(name, runtimeField);
+    }
+
+    this.addRuntimeFieldInteral(name, runtimeField);
+    const field = await this.updateOrAddRuntimeField(
+      name,
+      type,
+      { type, script },
+      {
+        customLabel,
+        format,
+        popularity,
+      }
+    );
+
+    return [field];
+  }
+
+  private async addCompositeRuntimeField(
+    name: string,
+    runtimeField: RuntimeField
+  ): Promise<DataViewField[]> {
+    const { fields } = runtimeField;
+
+    // Make sure subFields are provided
+    if (fields === undefined || Object.keys(fields).length === 0) {
+      throw new Error(`Can't add composite runtime field [name = ${name}] without subfields.`);
+    }
+
+    // Make sure no field with the same name already exist
+    if ((await this.getFieldByName(name)) !== undefined) {
+      throw new Error(
+        `Can't create composite runtime field ["${name}"] as there is already a field with this name`
+      );
+    }
+
+    // We first remove the runtime composite field with the same name which will remove all of its subFields.
+    // This guarantees that we don't leave behind orphan data view fields
+    this.removeRuntimeField(name);
+
+    const runtimeFieldSpec = removeFieldAttrs(runtimeField);
+
+    // We don't add composite runtime fields to the field list as
+    // they are not fields but **holder** of fields.
+    // What we do add to the field list are all their subFields.
+    const dataViewFields = await Promise.all(
+      Object.entries(fields).map(
+        async ([subFieldName, subField]) =>
+          // Every child field gets the complete runtime field script for consumption by searchSource
+          await this.updateOrAddRuntimeField(
+            `${name}.${subFieldName}`,
+            subField.type,
+            runtimeFieldSpec,
+            {
+              customLabel: subField.customLabel,
+              format: subField.format,
+              popularity: subField.popularity,
+            }
+          )
+      )
+    );
+
+    this.addRuntimeFieldInteral(name, runtimeField);
+    return dataViewFields;
+  }
+
+  /**
+   * Remove a runtime field - removed from mapped field or removed unmapped
+   * field as appropriate. Doesn't clear associated field attributes.
+   * @param name - Field name to remove
+   */
+  removeRuntimeField(name: string) {
+    const existingField = this.fieldCache.get(name);
+
+    if (existingField && existingField.isMapped) {
+      // mapped field, remove runtimeField definition
+      existingField.runtimeField = undefined;
+    } else {
+      Object.values(this.getFieldsByRuntimeFieldName(name) || {}).forEach((field) => {
+        this.fieldCache.delete(field.name);
+      });
+    }
+
+    this.removeRuntimeFieldInteral(name);
+  }
+
+  private getFieldsByRuntimeFieldName(name: string): Record<string, DataViewField> | undefined {
+    const runtimeField = this.getRuntimeField(name);
+    if (!runtimeField) {
+      return;
+    }
+
+    if (runtimeField.type === 'composite') {
+      return Object.entries(runtimeField.fields!).reduce<Record<string, DataViewField>>(
+        (acc, [subFieldName, subField]) => {
+          const fieldFullName = `${name}.${subFieldName}`;
+          const dataViewField = this.fieldCache.get(fieldFullName);
+
+          if (!dataViewField) {
+            // We should never enter here as all composite runtime subfield
+            // are converted to data view fields.
+            return acc;
+          }
+          acc[subFieldName] = dataViewField;
+          return acc;
+        },
+        {}
+      );
+    }
+
+    const primitveRuntimeField = this.fieldCache.get(name);
+
+    return primitveRuntimeField && { [name]: primitveRuntimeField };
+  }
+
+  // creates / updates non composite runtime fields. only called from addRuntimeField or addCompositeRuntimeField
+  private async updateOrAddRuntimeField(
+    fieldName: string,
+    fieldType: RuntimeType,
+    runtimeFieldSpec: RuntimeFieldSpec,
+    config: FieldConfiguration
+  ): Promise<DataViewField> {
+    if (fieldType === 'composite') {
+      throw new Error(
+        `Trying to add composite field as primitive field, this shouldn't happen! [name = ${fieldName}]`
+      );
+    }
+
+    // Create the field if it does not exist or update an existing one
+    let fld = await this.getFieldByName(fieldName);
+
+    if (fld) {
+      fld.runtimeField = runtimeFieldSpec;
+      fld.spec.type = castEsToKbnFieldTypeName(fieldType);
+      fld.spec.esTypes = [fieldType];
+    } else {
+      fld = new DataViewField({
+        name: fieldName,
+        runtimeField: runtimeFieldSpec,
+        type: castEsToKbnFieldTypeName(fieldType),
+        esTypes: [fieldType],
+        aggregatable: true,
+        searchable: true,
+        count: config.popularity ?? 0,
+        readFromDocValues: false,
+        shortDotsEnable: this.shortDotsEnable,
+      });
+      this.fieldCache.set(fieldName, fld);
+    }
+
+    this.setFieldCustomLabel(fieldName, config.customLabel);
+    this.setFieldCustomDescription(fieldName, config.customDescription);
+
+    if (config.popularity || config.popularity === null) {
+      this.setFieldCount(fieldName, config.popularity);
+    }
+
+    if (config.format) {
+      this.setFieldFormat(fieldName, config.format);
+    } else if (config.format === null) {
+      this.deleteFieldFormat(fieldName);
+    }
+
+    return fld;
+  }
+
+  private getRuntimeFieldSpecMap = ({ fieldName = ['*'] }: Pick<GetFieldsParams, 'fieldName'>) => {
+    const spec: DataViewFieldSpecMap = {};
+
+    const addRuntimeFieldToSpecFields = (
+      name: string,
+      fieldType: RuntimeType,
+      runtimeField: RuntimeFieldSpec,
+      parentName?: string
+    ) => {
+      spec[name] = {
+        name,
+        type: castEsToKbnFieldTypeName(fieldType),
+        esTypes: [fieldType],
+        runtimeField,
+        aggregatable: true,
+        searchable: true,
+        readFromDocValues: false,
+        customLabel: this.fieldAttrs?.[name]?.customLabel,
+        customDescription: this.fieldAttrs?.[name]?.customDescription,
+        count: this.fieldAttrs?.[name]?.count,
+      };
+
+      if (parentName) {
+        spec[name].parentName = parentName;
+      }
+    };
+
+    // CREATE RUNTIME FIELDS
+    for (const [name, runtimeField] of Object.entries(this.runtimeFieldMap || {})) {
+      if (fieldMatchesFieldsRequested(name, fieldName)) {
+        // For composite runtime field we add the subFields, **not** the composite
+        if (runtimeField.type === 'composite') {
+          Object.entries(runtimeField.fields!).forEach(([subFieldName, subField]) => {
+            addRuntimeFieldToSpecFields(
+              `${name}.${subFieldName}`,
+              subField.type,
+              runtimeField,
+              name
+            );
+          });
+        } else {
+          addRuntimeFieldToSpecFields(name, runtimeField.type, runtimeField);
+        }
+      }
+    }
+
+    return spec;
+  };
+
+  public getScriptedFields({ fieldName = ['*'] }: Pick<GetFieldsParams, 'fieldName'>) {
+    const dataViewFields: Record<string, DataViewField> = {};
+
+    Object.values(this.scriptedFieldsMap).forEach((field) => {
+      if (!fieldMatchesFieldsRequested(field.name, fieldName)) {
+        return;
+      }
+      let fld = this.fieldCache.get(field.name);
+
+      // scripted field overrides mapped field
+      if (fld && !fld.scripted && fld.isMapped) {
+        this.fieldCache.delete(field.name);
+      }
+      fld = new DataViewField({
+        ...field,
+        scripted: true,
+        searchable: false,
+        aggregatable: false,
+        count: this.fieldAttrs?.[field.name]?.count,
+        customLabel: this.fieldAttrs?.[field.name]?.customLabel,
+        customDescription: this.fieldAttrs?.[field.name]?.customDescription,
+      });
+      this.fieldCache.set(field.name, fld);
+      dataViewFields[field.name] = fld;
+    });
+    return dataViewFields;
+  }
+
+  private async getMappedFields({
+    fieldName,
+    forceRefresh = false,
+    unmapped: includeUnmapped,
+    indexFilter,
+    metaFields,
+    fieldTypes,
+  }: Omit<GetFieldsParams, 'mapped' | 'scripted' | 'runtime'>) {
+    const response = await this.apiClient.getFieldsForWildcard({
+      pattern: this.getIndexPattern(),
+      metaFields: metaFields ? this.metaFields : undefined,
+      type: this.type,
+      rollupIndex: this.typeMeta?.params?.rollup_index,
+      fields: fieldName || ['*'],
+      allowNoIndex: true,
+      indexFilter,
+      includeUnmapped,
+      forceRefresh,
+      fieldTypes,
+    });
+
+    const dataViewFields: Record<string, DataViewField> = {};
+    response.fields.forEach((field) => {
+      // keep existing field object, make sure content is fresh
+      let fld = this.fieldCache.get(field.name);
+      if (fld) {
+        // get fresh attributes
+        assign(fld.spec, field);
+        fld.spec.runtimeField = undefined; // unset if it was a runtime field but now mapped
+        fld.spec.isMapped = true;
+      } else {
+        fld = new DataViewField({
+          ...field,
+          count: this.fieldAttrs?.[field.name]?.count,
+          customLabel: this.fieldAttrs?.[field.name]?.customLabel,
+          customDescription: this.fieldAttrs?.[field.name]?.customDescription,
+          shortDotsEnable: this.shortDotsEnable,
+        });
+        this.fieldCache.set(field.name, fld);
+      }
+      dataViewFields[field.name] = fld;
+    });
+
+    return dataViewFields;
+  }
+
+  getScriptedFieldsForQuery() {
+    return Object.values(this.scriptedFieldsMap).reduce<Record<string, estypes.ScriptField>>(
+      (scriptFields, field) => {
+        scriptFields[field.name] = {
+          script: {
+            source: field.script as string,
+            lang: field.lang,
+          },
+        };
+        return scriptFields;
+      },
+      {}
+    );
+  }
+
+  async getComputedFields({ fieldName = ['*'] }: { fieldName: string[] }) {
+    const scriptFields: Record<string, estypes.ScriptField> = {};
+
+    const fieldMap = (
+      await this.getFields({
+        fieldName,
+        fieldTypes: ['date', 'date_nanos'],
+        scripted: false,
+        runtime: false,
+      })
+    ).getFieldMap();
+
+    const docvalueFields = Object.values(fieldMap).map((dateField) => {
+      return {
+        field: dateField.name,
+        format:
+          dateField.esTypes && dateField.esTypes.indexOf('date_nanos') !== -1
+            ? 'strict_date_time'
+            : 'date_time',
+      };
+    });
+
+    each(this.getScriptedFields({ fieldName }), function (field) {
+      scriptFields[field.name] = {
+        script: {
+          source: field.script!,
+          lang: field.lang,
+        },
+      };
+    });
+
+    return {
+      scriptFields,
+      docvalueFields,
+      runtimeFields: this.getRuntimeMappings(),
+    };
+  }
+
+  getRuntimeMappings(): estypes.MappingRuntimeFields {
+    // @ts-expect-error composite type is not yet supported by es client but it can be forced
+    return this.runtimeFieldMap;
+  }
+
+  /**
+   * Creates static representation of the data view.
+   * @param includeFields Whether or not to include the `fields` list as part of this spec. If not included, the list
+   * will be fetched from Elasticsearch when instantiating a new Data View with this spec.
+   */
+  public async toSpec(params?: { fieldParams?: GetFieldsParams }): Promise<DataViewSpec> {
+    const spec = this.toSpecShared(!!params?.fieldParams);
+
+    if (params?.fieldParams) {
+      const fields: DataViewFieldSpecMap = {};
+      const fieldMap = (await this.getFields(params.fieldParams)).getFieldMap();
+      Object.values(fieldMap).forEach((field) => {
+        fields[field.name] = field.toSpec({
+          getFormatterForField: this.getFormatterForField.bind(this),
+        });
+      });
+      spec.fields = fields;
+    }
+
+    return spec;
+  }
+
+  /**
+   * Creates a minimal static representation of the data view. Fields and popularity scores will be omitted.
+   */
+  // todo make shared
+  public toMinimalSpec(params?: {
+    keepFieldAttrs?: Array<'customLabel' | 'customDescription'>;
+  }): Omit<DataViewSpec, 'fields'> {
+    const fieldAttrsToKeep = params?.keepFieldAttrs ?? ['customLabel', 'customDescription'];
+    // removes `fields`
+    const spec = this.toSpecShared(false);
+
+    if (spec.fieldAttrs) {
+      // removes `count` props (popularity scores) from `fieldAttrs`
+      spec.fieldAttrs = pickBy(
+        // removes unnecessary attributes
+        mapValues(spec.fieldAttrs, (fieldAttrs) => pick(fieldAttrs, fieldAttrsToKeep)),
+        // removes empty objects if all attributes have been removed
+        (trimmedFieldAttrs) => Object.keys(trimmedFieldAttrs).length > 0
+      );
+
+      // removes `fieldAttrs` if it's empty
+      if (Object.keys(spec.fieldAttrs).length === 0) {
+        delete spec.fieldAttrs;
+      }
+    }
+
+    return Object.fromEntries(Object.entries(spec).filter(([, v]) => typeof v !== 'undefined'));
+  }
+
+  /**
+   * returns true if dataview contains TSDB fields
+   */
+  async isTSDBMode() {
+    const fieldMap = (await this.getFields({ fieldName: ['*'] })).getFieldMap();
+
+    return Object.values(fieldMap).some(
+      (field) => field.timeSeriesDimension || field.timeSeriesMetric
+    );
+  }
+
+  removeScriptedField(fieldName: string) {
+    this.deleteScriptedFieldInternal(fieldName);
+    this.fieldCache.delete(fieldName);
+  }
+
+  upsertScriptedField(field: FieldSpec) {
+    return this.upsertScriptedFieldInternal(field);
+  }
+
+  isTimeBased = async () => !!(await this.getTimeField());
+
+  async isTimeNanosBased(): Promise<boolean> {
+    const field = await this.getTimeField();
+    return field ? field.type === 'date_nanos' : false;
+  }
+
+  getTimeField = () => (this.timeFieldName ? this.getFieldByName(this.timeFieldName) : undefined);
+
+  async getFieldByName(name: string, forceRefresh = false) {
+    const fieldMap = (await this.getFields({ fieldName: [name], forceRefresh })).getFieldMap();
+    return fieldMap[name];
+  }
+
+  /**
+   * Set field custom label
+   * @param fieldName name of field to set custom label on
+   * @param customLabel custom label value. If undefined, custom label is removed
+   */
+
+  public setFieldCustomLabel(fieldName: string, customLabel: string | undefined | null) {
+    const newCustomLabel: string | undefined = customLabel === null ? undefined : customLabel;
+    this.setFieldCustomLabelInternal(fieldName, customLabel);
+    const fieldObject = this.fieldCache.get(fieldName);
+    if (fieldObject) {
+      fieldObject.spec.customLabel = newCustomLabel;
+    }
+  }
+
+  public setFieldCount(fieldName: string, count: number | undefined | null) {
+    const newCount: number | undefined = count === null ? undefined : count;
+    this.setFieldCountInternal(fieldName, count);
+    const fieldObject = this.fieldCache.get(fieldName);
+    if (fieldObject) {
+      if (!newCount) fieldObject.deleteCount();
+      else fieldObject.spec.count = newCount;
+    }
+  }
+
+  public setFieldCustomDescription(
+    fieldName: string,
+    customDescription: string | undefined | null
+  ) {
+    const newCustomDescription: string | undefined =
+      customDescription === null ? undefined : customDescription;
+    this.setFieldCustomDescriptionInternal(fieldName, customDescription);
+    const fieldObject = this.fieldCache.get(fieldName);
+    if (fieldObject) {
+      fieldObject.spec.customDescription = newCustomDescription;
+    }
+  }
+}
diff --git a/src/plugins/data_views/common/data_views/data_view_lazy_util.ts b/src/plugins/data_views/common/data_views/data_view_lazy_util.ts
new file mode 100644
index 0000000000000..5952fa7eca5c1
--- /dev/null
+++ b/src/plugins/data_views/common/data_views/data_view_lazy_util.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 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 { union } from 'lodash';
+
+export const fieldMatchesFieldsRequested = (
+  fieldName: string,
+  fieldsRequested: string[]
+): boolean => (fieldsRequested.includes('*') ? true : fieldsRequested.includes(fieldName));
+
+export const fieldsMatchFieldsRequested = (
+  fieldName: string[],
+  fieldsRequested: string[]
+): string[] => (fieldsRequested.includes('*') ? fieldName : union(fieldName, fieldsRequested));
diff --git a/src/plugins/data_views/common/data_views/data_views.test.ts b/src/plugins/data_views/common/data_views/data_views.test.ts
index 4d0fa196e9ccc..5a2357f4a7891 100644
--- a/src/plugins/data_views/common/data_views/data_views.test.ts
+++ b/src/plugins/data_views/common/data_views/data_views.test.ts
@@ -8,7 +8,7 @@
 
 import { set } from '@kbn/safer-lodash-set';
 import { defaults, get } from 'lodash';
-import { DataViewsService, DataView } from '.';
+import { DataViewsService, DataView, DataViewLazy } from '.';
 import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 
 import {
@@ -156,6 +156,30 @@ describe('IndexPatterns', () => {
     SOClientGetDelay = 0;
   });
 
+  test('does cache gets for the same id for DataViewLazy', async () => {
+    SOClientGetDelay = 1000;
+    const id = '1';
+    setDocsourcePayload(id, {
+      id: 'foo',
+      version: 'foo',
+      attributes: {
+        title: 'something',
+      },
+    });
+
+    // make two requests before first can complete
+    const dataViewLazyPromise = indexPatterns.getDataViewLazy(id);
+    indexPatterns.getDataViewLazy(id);
+
+    dataViewLazyPromise.then((dataViewLazy) => {
+      expect(savedObjectsClient.get).toBeCalledTimes(1);
+      expect(dataViewLazy).toBeDefined();
+    });
+
+    expect(await dataViewLazyPromise).toBe(await indexPatterns.getDataViewLazy(id));
+    SOClientGetDelay = 0;
+  });
+
   test('force field refresh', async () => {
     const id = '1';
     // make sure initial load and subsequent reloads use same params
@@ -233,6 +257,46 @@ describe('IndexPatterns', () => {
     expect(mockedCreateFromSpec).toHaveBeenCalledWith({ id: '1' }, false, true);
   });
 
+  test('does cache ad-hoc data views for DataViewLazy', async () => {
+    const id = '1';
+
+    const createFromSpecOriginal = get(indexPatterns, 'createFromSpecLazy');
+    let mockedCreateFromSpec: jest.Mock;
+
+    set(
+      indexPatterns,
+      'createFromSpecLazy',
+      (mockedCreateFromSpec = jest
+        .fn()
+        .mockImplementation((spec: DataViewSpec) =>
+          doWithTimeout(() => createFromSpecOriginal.call(indexPatterns, spec), 1000)
+        ))
+    );
+
+    // run creating in parallel
+    await Promise.all([
+      indexPatterns.createDataViewLazy({ id }),
+      indexPatterns.createDataViewLazy({ id }),
+      indexPatterns.createDataViewLazy({ id }),
+      doWithTimeout(() => indexPatterns.createDataViewLazy({ id }), 1),
+      doWithTimeout(() => indexPatterns.createDataViewLazy({ id }), 10),
+
+      doWithTimeout(() => indexPatterns.getDataViewLazy(id), 10),
+      doWithTimeout(() => indexPatterns.getDataViewLazy(id), 40),
+    ]).then((results) =>
+      results.forEach((value) => {
+        expect(value.id).toBe(id);
+      })
+    );
+
+    // tests after promise was resolved
+    expect((await indexPatterns.getDataViewLazy(id)).id).toBe(id);
+    expect((await indexPatterns.createDataViewLazy({ id })).id).toBe(id);
+
+    expect(mockedCreateFromSpec).toHaveBeenCalledTimes(1);
+    expect(mockedCreateFromSpec).toHaveBeenCalledWith({ id: '1' });
+  });
+
   test('allowNoIndex flag preserves existing fields when index is missing', async () => {
     const id = '2';
     setDocsourcePayload(id, {
@@ -304,6 +368,7 @@ describe('IndexPatterns', () => {
     expect(indexPattern).toBeDefined();
     await indexPatterns.delete(id);
     expect(indexPattern).not.toBe(await indexPatterns.get(id));
+    expect(indexPattern).not.toBe(await indexPatterns.getDataViewLazy(id));
   });
 
   test('delete will throw if insufficient access', async () => {
@@ -357,12 +422,31 @@ describe('IndexPatterns', () => {
     expect(indexPatterns.refreshFields).toBeCalled();
     expect(dataView.id).toBeDefined();
     expect(dataView.isPersisted()).toBe(false);
+
+    const dataViewLazy = await indexPatterns.toDataViewLazy(dataView);
+    expect(dataViewLazy instanceof DataViewLazy).toBe(true);
+  });
+
+  test('create DataViewLazy', async () => {
+    const indexPattern = 'kibana-*';
+
+    const dataViewLazy = await indexPatterns.createDataViewLazy({ title: indexPattern });
+    expect(dataViewLazy).toBeInstanceOf(DataViewLazy);
+    expect(dataViewLazy.getIndexPattern()).toBe(indexPattern);
+
+    await indexPatterns.createDataViewLazy({ title: indexPattern });
+    expect(dataViewLazy.id).toBeDefined();
+    expect(dataViewLazy.isPersisted()).toBe(false);
+
+    const dataView = await indexPatterns.toDataView(dataViewLazy);
+    expect(dataView instanceof DataView).toBe(true);
   });
 
   test('createSavedObject', async () => {
     const title = 'kibana-*';
     const version = '8.4.0';
     const dataView = await indexPatterns.create({ title }, true);
+    const id = dataView.id;
 
     savedObjectsClient.find = jest.fn().mockResolvedValue([]);
     savedObjectsClient.create = jest.fn().mockResolvedValue({
@@ -375,11 +459,10 @@ describe('IndexPatterns', () => {
       },
     });
 
-    const indexPattern = await indexPatterns.createSavedObject(dataView);
-    expect(indexPattern).toBeInstanceOf(DataView);
-    expect(indexPattern.id).toBe(dataView.id);
-    expect(indexPattern.getIndexPattern()).toBe(title);
-    expect(indexPattern.isPersisted()).toBe(true);
+    await indexPatterns.createSavedObject(dataView);
+    expect(dataView.id).toBe(id);
+    expect(dataView.getIndexPattern()).toBe(title);
+    expect(dataView.isPersisted()).toBe(true);
   });
 
   test('find', async () => {
@@ -397,24 +480,40 @@ describe('IndexPatterns', () => {
 
   test('createAndSave', async () => {
     const title = 'kibana-*';
-
-    indexPatterns.createSavedObject = jest.fn(() =>
-      Promise.resolve({
-        id: 'id',
-      } as unknown as DataView)
-    );
+    indexPatterns.createSavedObject = jest.fn(() => Promise.resolve());
+    savedObjectsClient.find = jest.fn().mockResolvedValue([]);
+    savedObjectsClient.create = jest.fn().mockResolvedValue({});
     indexPatterns.setDefault = jest.fn();
     await indexPatterns.createAndSave({ title });
     expect(indexPatterns.createSavedObject).toBeCalled();
     expect(indexPatterns.setDefault).toBeCalled();
   });
 
+  test('createAndSave DataViewLazy', async () => {
+    const title = 'kibana-*';
+    indexPatterns.createSavedObject = jest.fn(() => Promise.resolve());
+    savedObjectsClient.find = jest.fn().mockResolvedValue([]);
+    savedObjectsClient.create = jest.fn().mockResolvedValue({});
+    indexPatterns.setDefault = jest.fn();
+    await indexPatterns.createAndSaveDataViewLazy({ title });
+    expect(indexPatterns.createSavedObject).toBeCalled();
+    expect(indexPatterns.setDefault).toBeCalled();
+  });
+
   test('createAndSave will throw if insufficient access', async () => {
     const title = 'kibana-*';
 
     await expect(indexPatternsNoAccess.createAndSave({ title })).rejects.toMatchSnapshot();
   });
 
+  test('createAndSaveDataViewLazy will throw if insufficient access', async () => {
+    const title = 'kibana-*';
+
+    await expect(
+      indexPatternsNoAccess.createAndSaveDataViewLazy({ title })
+    ).rejects.toMatchSnapshot();
+  });
+
   test('updateSavedObject will throw if insufficient access', async () => {
     await expect(
       indexPatternsNoAccess.updateSavedObject({ id: 'id' } as unknown as DataView)
@@ -453,6 +552,27 @@ describe('IndexPatterns', () => {
     expect(async () => await indexPatterns.get(id)).toBeDefined();
   });
 
+  test('failed requests are not cached for DataViewLazy', async () => {
+    savedObjectsClient.get = jest
+      .fn()
+      .mockImplementation(async (type, id) => {
+        return {
+          id: object.id,
+          version: object.version,
+          attributes: object.attributes,
+        };
+      })
+      .mockRejectedValueOnce({});
+
+    const id = '1';
+
+    // failed request!
+    expect(indexPatterns.getDataViewLazy(id)).rejects.toBeDefined();
+
+    // successful subsequent request
+    expect(async () => await indexPatterns.getDataViewLazy(id)).toBeDefined();
+  });
+
   test('can set and remove field format', async () => {
     const id = 'id';
     setDocsourcePayload(id, savedObject);
@@ -521,6 +641,17 @@ describe('IndexPatterns', () => {
       expect(savedObjectsClient.find).toBeCalledTimes(1);
     });
 
+    test('gets default data view lazy', async () => {
+      uiSettings.get = jest.fn().mockResolvedValue(indexPatternObj.id);
+      savedObjectsClient.find = jest.fn().mockResolvedValue([indexPatternObj]);
+      savedObjectsClient.get = jest.fn().mockResolvedValue(indexPatternObj);
+
+      expect(await indexPatterns.getDefaultDataViewLazy()).toBeInstanceOf(DataViewLazy);
+      // make sure we're not pulling from cache
+      expect(savedObjectsClient.get).toBeCalledTimes(1);
+      expect(savedObjectsClient.find).toBeCalledTimes(1);
+    });
+
     test('gets default data view and passes down defined arguments (refreshFields and displayErrors)', async () => {
       uiSettings.get = jest.fn().mockResolvedValue(indexPatternObj.id);
       savedObjectsClient.get = jest.fn().mockResolvedValue(indexPatternObj);
@@ -566,6 +697,13 @@ describe('IndexPatterns', () => {
       expect(await indexPatterns.getDefaultDataView()).toBeNull();
     });
 
+    test('returns undefined if no data views exist - dataViewLazy', async () => {
+      uiSettings.get = jest.fn().mockResolvedValue('foo');
+      savedObjectsClient.find = jest.fn().mockResolvedValue([]);
+
+      expect(await indexPatterns.getDefaultDataViewLazy()).toBeNull();
+    });
+
     test("default doesn't exist, grabs another data view", async () => {
       uiSettings.get = jest.fn().mockResolvedValue('foo');
       savedObjectsClient.find = jest.fn().mockResolvedValue([indexPatternObj]);
diff --git a/src/plugins/data_views/common/data_views/data_views.ts b/src/plugins/data_views/common/data_views/data_views.ts
index dcdce7c1e8c5d..43508a6db9cae 100644
--- a/src/plugins/data_views/common/data_views/data_views.ts
+++ b/src/plugins/data_views/common/data_views/data_views.ts
@@ -12,7 +12,9 @@ import { castEsToKbnFieldTypeName } from '@kbn/field-types';
 import { FieldFormatsStartCommon, FORMATS_UI_SETTINGS } from '@kbn/field-formats-plugin/common';
 import { v4 as uuidv4 } from 'uuid';
 import { PersistenceAPI } from '../types';
+import { DataViewLazy } from './data_view_lazy';
 import { DEFAULT_DATA_VIEW_ID } from '../constants';
+import { AbstractDataView } from './abstract_data_views';
 
 import type { RuntimeField, RuntimeFieldSpec, RuntimeType } from '../types';
 import { DataView } from './data_view';
@@ -163,15 +165,10 @@ export interface DataViewsServicePublicMethods {
   ) => Promise<DataView>;
   /**
    * Save data view
-   * @param dataView - Data view instance to save.
+   * @param dataView - Data view  or data view lazy instance to save.
    * @param override - If true, save over existing data view
-   * @param displayErrors - If set false, API consumer is responsible for displaying and handling errors.
    */
-  createSavedObject: (
-    indexPattern: DataView,
-    overwrite?: boolean,
-    displayErrors?: boolean
-  ) => Promise<DataView>;
+  createSavedObject: (indexPattern: AbstractDataView, overwrite?: boolean) => Promise<void>;
   /**
    * Delete data view
    * @param indexPatternId - Id of the data view to delete.
@@ -289,7 +286,7 @@ export interface DataViewsServicePublicMethods {
     saveAttempts?: number,
     ignoreErrors?: boolean,
     displayErrors?: boolean
-  ) => Promise<DataView | void | Error>;
+  ) => Promise<void>;
 
   /**
    * Returns whether a default data view exists.
@@ -298,6 +295,20 @@ export interface DataViewsServicePublicMethods {
 
   getMetaFields: () => Promise<string[] | undefined>;
   getShortDotsEnable: () => Promise<boolean | undefined>;
+
+  toDataView: (toDataView: DataViewLazy) => Promise<DataView>;
+
+  toDataViewLazy: (dataView: DataView) => Promise<DataViewLazy>;
+
+  getAllDataViewLazy: () => Promise<DataViewLazy[]>;
+
+  getDataViewLazy: (id: string) => Promise<DataViewLazy>;
+
+  createDataViewLazy: (spec: DataViewSpec) => Promise<DataViewLazy>;
+
+  createAndSaveDataViewLazy: (spec: DataViewSpec, override?: boolean) => Promise<DataViewLazy>;
+
+  getDefaultDataViewLazy: () => Promise<DataViewLazy | null>;
 }
 
 /**
@@ -322,7 +333,10 @@ export class DataViewsService {
    * @param key used to indicate uniqueness of the error
    */
   private onError: OnError;
+
   private dataViewCache: Map<string, Promise<DataView>>;
+  private dataViewLazyCache: Map<string, Promise<DataViewLazy>>;
+
   /**
    * Can the user save advanced settings?
    */
@@ -359,6 +373,7 @@ export class DataViewsService {
     this.getCanSaveAdvancedSettings = getCanSaveAdvancedSettings;
 
     this.dataViewCache = new Map();
+    this.dataViewLazyCache = new Map();
     this.scriptedFieldsEnabled = scriptedFieldsEnabled;
   }
 
@@ -441,6 +456,19 @@ export class DataViewsService {
     }));
   };
 
+  getAllDataViewLazy = async (refresh: boolean = false) => {
+    if (!this.savedObjectsCache || refresh) {
+      await this.refreshSavedObjectsCache();
+    }
+    if (!this.savedObjectsCache) {
+      return [];
+    }
+
+    return await Promise.all(
+      this.savedObjectsCache.map(async (so) => (await this.getDataViewLazy(so.id)) as DataViewLazy)
+    );
+  };
+
   /**
    * Clear index pattern saved objects cache.
    */
@@ -922,6 +950,40 @@ export class DataViewsService {
     return spec;
   };
 
+  getDataViewLazy = async (id: string) => {
+    const dataViewLazyFromCache = this.dataViewLazyCache.get(id);
+    if (dataViewLazyFromCache) {
+      return dataViewLazyFromCache;
+    } else {
+      const getDataViewLazyPromise = async () => {
+        const savedObject = await this.savedObjectsClient.get(id);
+
+        const spec = this.savedObjectToSpec(savedObject);
+
+        const shortDotsEnable = await this.getShortDotsEnable();
+        const metaFields = await this.getMetaFields();
+
+        return new DataViewLazy({
+          spec,
+          fieldFormats: this.fieldFormats,
+          shortDotsEnable,
+          metaFields,
+          apiClient: this.apiClient,
+          scriptedFieldsEnabled: this.scriptedFieldsEnabled,
+        });
+      };
+
+      const dataViewLazyPromise = getDataViewLazyPromise();
+
+      dataViewLazyPromise.catch(() => {
+        this.dataViewLazyCache.delete(id);
+      });
+
+      this.dataViewLazyCache.set(id, dataViewLazyPromise);
+      return dataViewLazyPromise;
+    }
+  };
+
   /**
    * Get an index pattern by id, cache optimized.
    * @param id
@@ -1025,6 +1087,77 @@ export class DataViewsService {
     return dataView;
   }
 
+  /**
+   * Create a new data view instance.
+   * @param spec data view spec
+   * @returns DataViewLazy
+   */
+  private async createFromSpecLazy({
+    id,
+    name,
+    title,
+    ...restOfSpec
+  }: DataViewSpec): Promise<DataViewLazy> {
+    const shortDotsEnable = await this.getShortDotsEnable();
+    const metaFields = await this.getMetaFields();
+
+    const spec = {
+      id: id ?? uuidv4(),
+      title,
+      name: name || title,
+      ...restOfSpec,
+    };
+
+    return new DataViewLazy({
+      spec,
+      fieldFormats: this.fieldFormats,
+      shortDotsEnable,
+      metaFields,
+      apiClient: this.apiClient,
+      scriptedFieldsEnabled: this.scriptedFieldsEnabled,
+    });
+  }
+
+  /**
+   * Create data view lazy instance.
+   * @param spec data view spec
+   * @returns DataViewLazy
+   */
+  async createDataViewLazy(spec: DataViewSpec): Promise<DataViewLazy> {
+    const doCreate = () => this.createFromSpecLazy(spec);
+
+    if (spec.id) {
+      const cachedDataView = this.dataViewLazyCache.get(spec.id);
+
+      if (cachedDataView) {
+        return cachedDataView;
+      }
+
+      const dataViewPromise = doCreate();
+
+      this.dataViewLazyCache.set(spec.id, dataViewPromise);
+
+      return dataViewPromise;
+    }
+
+    const dataView = await doCreate();
+    this.dataViewLazyCache.set(dataView.id!, Promise.resolve(dataView));
+    return dataView;
+  }
+
+  /**
+   * Create a new data view lazy and save it right away.
+   * @param spec data view spec
+   * @param override Overwrite if existing index pattern exists.
+   */
+
+  async createAndSaveDataViewLazy(spec: DataViewSpec, overwrite = false) {
+    const dataViewLazy = await this.createFromSpecLazy(spec);
+    await this.createSavedObject(dataViewLazy, overwrite);
+    await this.setDefault(dataViewLazy.id!);
+    return dataViewLazy;
+  }
+
   /**
    * Create a new data view and save it right away.
    * @param spec data view spec
@@ -1039,24 +1172,19 @@ export class DataViewsService {
     skipFetchFields = false,
     displayErrors = true
   ) {
-    const indexPattern = await this.createFromSpec(spec, skipFetchFields, displayErrors);
-    const createdIndexPattern = await this.createSavedObject(
-      indexPattern,
-      overwrite,
-      displayErrors
-    );
-    await this.setDefault(createdIndexPattern.id!);
-    return createdIndexPattern!;
+    const dataView = await this.createFromSpec(spec, skipFetchFields, displayErrors);
+    await this.createSavedObject(dataView, overwrite);
+    await this.setDefault(dataView.id!);
+    return dataView;
   }
 
   /**
    * Save a new data view.
    * @param dataView data view instance
    * @param override Overwrite if existing index pattern exists
-   * @param displayErrors - If set false, API consumer is responsible for displaying and handling errors.
    */
 
-  async createSavedObject(dataView: DataView, overwrite = false, displayErrors = true) {
+  async createSavedObject(dataView: AbstractDataView, overwrite = false) {
     if (!(await this.getCanSave())) {
       throw new DataViewInsufficientAccessError();
     }
@@ -1078,11 +1206,11 @@ export class DataViewsService {
       overwrite,
     })) as SavedObject<DataViewAttributes>;
 
-    const createdIndexPattern = await this.initFromSavedObject(response, displayErrors);
     if (this.savedObjectsCache) {
       this.savedObjectsCache.push(response as SavedObject<IndexPatternListSavedObjectAttrs>);
     }
-    return createdIndexPattern;
+    dataView.version = response.version;
+    dataView.namespaces = response.namespaces || [];
   }
 
   /**
@@ -1094,11 +1222,11 @@ export class DataViewsService {
    */
 
   async updateSavedObject(
-    indexPattern: DataView,
+    indexPattern: AbstractDataView,
     saveAttempts: number = 0,
     ignoreErrors: boolean = false,
     displayErrors: boolean = true
-  ): Promise<DataView | void | Error> {
+  ) {
     if (!indexPattern.id) return;
     if (!(await this.getCanSave())) {
       throw new DataViewInsufficientAccessError(indexPattern.id);
@@ -1117,18 +1245,17 @@ export class DataViewsService {
       }
     });
 
-    return this.savedObjectsClient
+    await this.savedObjectsClient
       .update(indexPattern.id, body, {
         version: indexPattern.version,
       })
       .then((response) => {
         indexPattern.id = response.id;
         indexPattern.version = response.version;
-        return indexPattern;
       })
       .catch(async (err) => {
         if (err?.response?.status === 409 && saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS) {
-          const samePattern = await this.get(indexPattern.id as string, displayErrors);
+          const samePattern = await this.getDataViewLazy(indexPattern.id!);
           // What keys changed from now and what the server returned
           const updatedBody = samePattern.getAsSavedObjectBody();
 
@@ -1182,9 +1309,10 @@ export class DataViewsService {
 
           // Clear cache
           this.dataViewCache.delete(indexPattern.id!);
+          this.dataViewLazyCache.delete(indexPattern.id!);
 
           // Try the save again
-          return this.updateSavedObject(indexPattern, saveAttempts, ignoreErrors, displayErrors);
+          await this.updateSavedObject(indexPattern, saveAttempts, ignoreErrors, displayErrors);
         }
         throw err;
       });
@@ -1199,6 +1327,7 @@ export class DataViewsService {
       throw new DataViewInsufficientAccessError(indexPatternId);
     }
     this.dataViewCache.delete(indexPatternId);
+    this.dataViewLazyCache.delete(indexPatternId);
     return this.savedObjectsClient.delete(indexPatternId);
   }
 
@@ -1232,6 +1361,24 @@ export class DataViewsService {
     return !!(await this.getDefaultDataViewId());
   }
 
+  /**
+   * Returns the default data view as a DataViewLazy.
+   * If no default is found, or it is missing
+   * another data view is selected as default and returned.
+   * If no possible data view found to become a default returns null.
+   *
+   * @returns default data view lazy
+   */
+  async getDefaultDataViewLazy(): Promise<DataViewLazy | null> {
+    const defaultId = await this.getDefaultDataViewId();
+
+    if (defaultId) {
+      return this.getDataViewLazy(defaultId);
+    } else {
+      return null;
+    }
+  }
+
   /**
    * Returns the default data view as an object.
    * If no default is found, or it is missing
@@ -1258,6 +1405,52 @@ export class DataViewsService {
       return null;
     }
   }
+
+  // unsaved DataViewLazy changes will not be reflected in the returned DataView
+  async toDataView(dataViewLazy: DataViewLazy) {
+    // if persisted
+    if (dataViewLazy.id) {
+      return this.get(dataViewLazy.id);
+    }
+
+    // if not persisted
+    const shortDotsEnable = await this.getShortDotsEnable();
+    const metaFields = await this.getMetaFields();
+
+    const dataView = new DataView({
+      spec: await dataViewLazy.toSpec(),
+      fieldFormats: this.fieldFormats,
+      shortDotsEnable,
+      metaFields,
+    });
+
+    // necessary to load fields
+    await this.refreshFields(dataView, false);
+
+    return dataView;
+  }
+
+  // unsaved DataView changes will not be reflected in the returned DataViewLazy
+  async toDataViewLazy(dataView: DataView) {
+    // if persisted
+    if (dataView.id) {
+      const dataViewLazy = await this.getDataViewLazy(dataView.id);
+      return dataViewLazy!;
+    }
+
+    // if not persisted
+    const shortDotsEnable = await this.getShortDotsEnable();
+    const metaFields = await this.getMetaFields();
+
+    return new DataViewLazy({
+      spec: dataView.toSpec(),
+      fieldFormats: this.fieldFormats,
+      shortDotsEnable,
+      metaFields,
+      apiClient: this.apiClient,
+      scriptedFieldsEnabled: this.scriptedFieldsEnabled,
+    });
+  }
 }
 
 /**
diff --git a/src/plugins/data_views/common/data_views/index.ts b/src/plugins/data_views/common/data_views/index.ts
index 080ffe3bbd98d..f533a946e51e4 100644
--- a/src/plugins/data_views/common/data_views/index.ts
+++ b/src/plugins/data_views/common/data_views/index.ts
@@ -9,4 +9,5 @@
 export * from './flatten_hit';
 export * from './data_view';
 export * from './data_views';
+export * from './data_view_lazy';
 export { DataViewPersistableStateService } from './persistable_state';
diff --git a/src/plugins/data_views/common/index.ts b/src/plugins/data_views/common/index.ts
index 05020fb011203..6a05c3e8b6bca 100644
--- a/src/plugins/data_views/common/index.ts
+++ b/src/plugins/data_views/common/index.ts
@@ -70,7 +70,7 @@ export type {
   DataViewsServicePublicMethods,
   TimeBasedDataView,
 } from './data_views';
-export { DataView } from './data_views';
+export { DataView, DataViewLazy } from './data_views';
 export {
   DuplicateDataViewError,
   DataViewSavedObjectConflictError,
diff --git a/src/plugins/data_views/common/types.ts b/src/plugins/data_views/common/types.ts
index 7abcbc846edeb..f0fe2734ff51f 100644
--- a/src/plugins/data_views/common/types.ts
+++ b/src/plugins/data_views/common/types.ts
@@ -314,7 +314,6 @@ export interface PersistenceAPI {
 export interface GetFieldsOptions {
   pattern: string;
   type?: string;
-  lookBack?: boolean;
   metaFields?: string[];
   rollupIndex?: string;
   allowNoIndex?: boolean;
@@ -331,7 +330,7 @@ export interface GetFieldsOptions {
  * FieldsForWildcard response
  */
 export interface FieldsForWildcardResponse {
-  fields: FieldSpec[];
+  fields: FieldsForWildcardSpec[];
   indices: string[];
   etag?: string;
 }
@@ -388,6 +387,12 @@ export enum DataViewType {
 
 export type FieldSpecConflictDescriptions = Record<string, string[]>;
 
+// omit items saved DataView
+type FieldsForWildcardSpec = Omit<
+  FieldSpec,
+  'format' | 'customLabel' | 'runtimeField' | 'count' | 'customDescription'
+>;
+
 /**
  * Serialized version of DataViewField
  * @public
diff --git a/src/plugins/data_views/server/mocks.ts b/src/plugins/data_views/server/mocks.ts
index 1e142d2e1650b..57eb46ddc440f 100644
--- a/src/plugins/data_views/server/mocks.ts
+++ b/src/plugins/data_views/server/mocks.ts
@@ -21,8 +21,10 @@ export const dataViewsService = {
   ensureDefaultIndexPattern: jest.fn(),
   ensureDefaultDataView: jest.fn().mockReturnValue(Promise.resolve({})),
   get: jest.fn().mockReturnValue(Promise.resolve({})),
+  getDataViewLazy: jest.fn().mockReturnValue(Promise.resolve({})),
   clearCache: jest.fn(),
   createAndSave: jest.fn(),
+  createAndSaveDataViewLazy: jest.fn(),
   setDefault: jest.fn(),
   delete: jest.fn(),
   hasUserDataView: jest.fn(),
diff --git a/src/plugins/data_views/server/rest_api_routes/public/create_data_view.ts b/src/plugins/data_views/server/rest_api_routes/public/create_data_view.ts
index 94c9817f329ed..3cb6f448dc258 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/create_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/create_data_view.ts
@@ -40,11 +40,10 @@ export const createDataView = async ({
   usageCollection,
   spec,
   override,
-  refreshFields,
   counterName,
 }: CreateDataViewArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  return dataViewsService.createAndSave(spec, override, !refreshFields);
+  return dataViewsService.createAndSaveDataViewLazy(spec, override);
 };
 
 const registerCreateDataViewRouteFactory =
@@ -104,9 +103,12 @@ const registerCreateDataViewRouteFactory =
             counterName: `${req.route.method} ${path}`,
           });
 
+          const toSpecParams =
+            body.refresh_fields === false ? {} : { fieldParams: { fieldName: ['*'] } };
+
           const responseBody: Record<string, DataViewSpecRestResponse> = {
             [serviceKey]: {
-              ...dataView.toSpec(),
+              ...(await dataView.toSpec(toSpecParams)),
               namespaces: dataView.namespaces,
             },
           };
diff --git a/src/plugins/data_views/server/rest_api_routes/public/fields/update_fields.test.ts b/src/plugins/data_views/server/rest_api_routes/public/fields/update_fields.test.ts
index 1e1eecc8e136d..c2ff246568c84 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/fields/update_fields.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/fields/update_fields.test.ts
@@ -9,13 +9,13 @@
 import { updateFields } from './update_fields';
 import { dataViewsService } from '../../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from '../../../../common';
+import { DataViewLazy } from '../../../../common';
 
 describe('create runtime field', () => {
   it('call usageCollection', () => {
     const usageCollection = getUsageCollection();
 
-    dataViewsService.get.mockImplementation(
+    dataViewsService.getDataViewLazy.mockImplementation(
       async (id: string) =>
         ({
           addRuntimeField: jest.fn(),
@@ -24,7 +24,7 @@ describe('create runtime field', () => {
             getByName: jest.fn().mockReturnValueOnce(undefined).mockReturnValueOnce({}),
           },
           getFieldsByRuntimeFieldName: jest.fn().mockReturnValueOnce({}),
-        } as unknown as DataView)
+        } as unknown as DataViewLazy)
     );
 
     updateFields({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/fields/update_fields.ts b/src/plugins/data_views/server/rest_api_routes/public/fields/update_fields.ts
index cddcea79de1f6..725e491b6d6f3 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/fields/update_fields.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/fields/update_fields.ts
@@ -44,7 +44,7 @@ export const updateFields = async ({
   fields,
 }: UpdateFieldsArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  const dataView = await dataViewsService.get(id);
+  const dataView = await dataViewsService.getDataViewLazy(id);
 
   const fieldNames = Object.keys(fields);
 
@@ -182,7 +182,7 @@ const updateFieldsActionRouteFactory = (path: string, serviceKey: string) => {
           });
 
           const body: Record<string, DataViewSpecRestResponse> = {
-            [serviceKey]: dataView.toSpec(),
+            [serviceKey]: await dataView.toSpec({ fieldParams: { fieldName: ['*'] } }),
           };
 
           return res.ok({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/get_data_view.ts b/src/plugins/data_views/server/rest_api_routes/public/get_data_view.ts
index 395df4d61ce87..5f92ecb797fec 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/get_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/get_data_view.ts
@@ -39,7 +39,7 @@ export const getDataView = async ({
   id,
 }: GetDataViewArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  return dataViewsService.get(id);
+  return dataViewsService.getDataViewLazy(id);
 };
 
 const getDataViewRouteFactory =
@@ -98,7 +98,7 @@ const getDataViewRouteFactory =
 
           const responseBody: Record<string, DataViewSpecRestResponse> = {
             [serviceKey]: {
-              ...dataView.toSpec(),
+              ...(await dataView.toSpec({ fieldParams: { fieldName: ['*'] } })),
               namespaces: dataView.namespaces,
             },
           };
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/create_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/create_runtime_field.test.ts
index b6a3741e21f67..30ba66ec22b55 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/create_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/create_runtime_field.test.ts
@@ -9,29 +9,23 @@
 import { createRuntimeField } from './create_runtime_field';
 import { dataViewsService } from '../../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from '../../../../common';
+import { DataViewLazy } from '../../../../common';
 
 describe('create runtime field', () => {
   it('call usageCollection', () => {
     const usageCollection = getUsageCollection();
 
-    dataViewsService.get.mockImplementation(
+    dataViewsService.getDataViewLazy.mockImplementation(
       async (id: string) =>
         ({
           addRuntimeField: jest.fn(),
-          fields: {
-            getByName: jest
-              .fn()
-              .mockReturnValueOnce(undefined)
-              .mockReturnValueOnce(undefined)
-              .mockReturnValueOnce({}),
-          },
+          getFields: jest.fn().mockReturnValue({ getFieldMap: jest.fn().mockReturnValue({}) }),
           getRuntimeField: jest
             .fn()
             .mockReturnValueOnce(undefined)
             .mockReturnValueOnce(undefined)
             .mockReturnValueOnce({}),
-        } as unknown as DataView)
+        } as unknown as DataViewLazy)
     );
 
     createRuntimeField({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/create_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/create_runtime_field.ts
index fa5bad0bb2db6..8f2ed701ecf0a 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/create_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/create_runtime_field.ts
@@ -47,19 +47,20 @@ export const createRuntimeField = async ({
   runtimeField,
 }: CreateRuntimeFieldArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  const dataView = await dataViewsService.get(id);
-
-  if (dataView.fields.getByName(name) || dataView.getRuntimeField(name)) {
-    throw new Error(`Field [name = ${name}] already exists.`);
-  }
+  const dataView = await dataViewsService.getDataViewLazy(id);
 
   const firstNameSegment = name.split('.')[0];
 
-  if (dataView.fields.getByName(firstNameSegment) || dataView.getRuntimeField(firstNameSegment)) {
-    throw new Error(`Field [name = ${firstNameSegment}] already exists.`);
+  const fld = Object.keys(
+    (await dataView.getFields({ fieldName: [name, firstNameSegment] })).getFieldMap()
+  );
+
+  // check getRuntimeField to cover composite fields
+  if (fld.length || dataView.getRuntimeField(name) || dataView.getRuntimeField(firstNameSegment)) {
+    throw new Error(`Field [name = ${name}] already exists.`);
   }
 
-  const createdRuntimeFields = dataView.addRuntimeField(name, runtimeField);
+  const createdRuntimeFields = await dataView.addRuntimeField(name, runtimeField);
 
   await dataViewsService.updateSavedObject(dataView);
 
@@ -124,7 +125,7 @@ const runtimeCreateFieldRouteFactory =
           runtimeField: runtimeField as RuntimeField,
         });
 
-        const response: RuntimeResponseType = responseFormatter({
+        const response: RuntimeResponseType = await responseFormatter({
           serviceKey,
           dataView,
           fields,
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/delete_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/delete_runtime_field.test.ts
index 8d48f41048869..6f0fb6ab168d8 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/delete_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/delete_runtime_field.test.ts
@@ -9,18 +9,18 @@
 import { deleteRuntimeField } from './delete_runtime_field';
 import { dataViewsService } from '../../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from '../../../../common';
+import { DataViewLazy } from '../../../../common';
 
 describe('delete runtime field', () => {
   it('call usageCollection', () => {
     const usageCollection = getUsageCollection();
 
-    dataViewsService.get.mockImplementation(
+    dataViewsService.getDataViewLazy.mockImplementation(
       async (id: string) =>
         ({
           removeRuntimeField: jest.fn(),
           getRuntimeField: jest.fn().mockReturnValueOnce({}),
-        } as unknown as DataView)
+        } as unknown as DataViewLazy)
     );
 
     deleteRuntimeField({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/delete_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/delete_runtime_field.ts
index c15df8f3ab147..8cebe12e2836a 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/delete_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/delete_runtime_field.ts
@@ -38,7 +38,7 @@ export const deleteRuntimeField = async ({
   name,
 }: DeleteRuntimeFieldArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  const dataView = await dataViewsService.get(id);
+  const dataView = await dataViewsService.getDataViewLazy(id);
   const field = dataView.getRuntimeField(name);
 
   if (!field) {
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/get_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/get_runtime_field.test.ts
index 8cc9ce081f36b..8693c78961bfc 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/get_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/get_runtime_field.test.ts
@@ -9,23 +9,20 @@
 import { getRuntimeField } from './get_runtime_field';
 import { dataViewsService } from '../../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from '../../../../common';
+import { DataViewLazy } from '../../../../common';
 
 describe('get runtime field', () => {
   it('call usageCollection', () => {
     const usageCollection = getUsageCollection();
 
-    dataViewsService.get.mockImplementation(
+    dataViewsService.getDataViewLazy.mockImplementation(
       async (id: string) =>
         ({
-          fields: {
-            getByName: jest.fn().mockReturnValueOnce({
-              runtimeField: {},
-            }),
-          },
+          getFields: jest.fn().mockReturnValueOnce({ getFieldMap: () => ({}) }),
           getRuntimeField: jest.fn().mockReturnValueOnce({}),
+          getRuntimeFields: jest.fn().mockReturnValueOnce({}),
           getFieldsByRuntimeFieldName: jest.fn().mockReturnValueOnce({}),
-        } as unknown as DataView)
+        } as unknown as DataViewLazy)
     );
 
     getRuntimeField({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/get_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/get_runtime_field.ts
index c3684cbab5ce9..928a6a6df6884 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/get_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/get_runtime_field.ts
@@ -44,7 +44,7 @@ export const getRuntimeField = async ({
   name,
 }: GetRuntimeFieldArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  const dataView = await dataViewsService.get(id);
+  const dataView = await dataViewsService.getDataViewLazy(id);
 
   const field = dataView.getRuntimeField(name);
 
@@ -52,7 +52,10 @@ export const getRuntimeField = async ({
     throw new ErrorIndexPatternFieldNotFound(id, name);
   }
 
-  return { dataView, fields: Object.values(dataView.getFieldsByRuntimeFieldName(name) || {}) };
+  return {
+    dataView,
+    fields: Object.values(dataView.getRuntimeFields({ fieldName: [name] })),
+  };
 };
 
 const getRuntimeFieldRouteFactory =
@@ -109,7 +112,7 @@ const getRuntimeFieldRouteFactory =
           name,
         });
 
-        const response: RuntimeResponseType = responseFormatter({
+        const response: RuntimeResponseType = await responseFormatter({
           serviceKey,
           dataView,
           fields: fields || [],
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/put_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/put_runtime_field.test.ts
index 5091b9946bb90..a0ea59c8e663c 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/put_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/put_runtime_field.test.ts
@@ -9,23 +9,22 @@
 import { putRuntimeField } from './put_runtime_field';
 import { dataViewsService } from '../../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from '../../../../common';
+import { DataViewLazy } from '../../../../common';
 
 describe('put runtime field', () => {
   it('call usageCollection', () => {
     const usageCollection = getUsageCollection();
 
-    dataViewsService.get.mockImplementation(
+    dataViewsService.getDataViewLazy.mockImplementation(
       async (id: string) =>
         ({
           removeRuntimeField: jest.fn(),
           addRuntimeField: jest.fn(),
-          fields: {
-            getByName: jest.fn().mockReturnValue({
-              runtimeField: {},
-            }),
-          },
-        } as unknown as DataView)
+          getFieldByName: jest.fn().mockReturnValue({
+            runtimeField: {},
+          }),
+          getRuntimeField: jest.fn(),
+        } as unknown as DataViewLazy)
     );
 
     putRuntimeField({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/put_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/put_runtime_field.ts
index d6ae15486fb67..de06d2cded9f7 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/put_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/put_runtime_field.ts
@@ -47,9 +47,9 @@ export const putRuntimeField = async ({
   runtimeField,
 }: PutRuntimeFieldArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  const dataView = await dataViewsService.get(id);
+  const dataView = await dataViewsService.getDataViewLazy(id);
 
-  const oldFieldObject = dataView.fields.getByName(name);
+  const oldFieldObject = await dataView.getFieldByName(name);
 
   if (oldFieldObject && !oldFieldObject.runtimeField) {
     throw new Error('Only runtime fields can be updated');
@@ -59,7 +59,7 @@ export const putRuntimeField = async ({
     dataView.removeRuntimeField(name);
   }
 
-  const fields = dataView.addRuntimeField(name, runtimeField);
+  const fields = await dataView.addRuntimeField(name, runtimeField);
 
   await dataViewsService.updateSavedObject(dataView);
 
@@ -127,7 +127,11 @@ const putRuntimeFieldRouteFactory =
           counterName: `${req.route.method} ${path}`,
         });
 
-        const response: RuntimeResponseType = responseFormatter({ serviceKey, dataView, fields });
+        const response: RuntimeResponseType = await responseFormatter({
+          serviceKey,
+          dataView,
+          fields,
+        });
 
         return res.ok(response);
       })
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/response_formatter.test.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/response_formatter.test.ts
index d06c6a9caed86..b7964e9e27e40 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/response_formatter.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/response_formatter.test.ts
@@ -8,15 +8,15 @@
 
 import { responseFormatter } from './response_formatter';
 import { SERVICE_KEY, SERVICE_KEY_LEGACY } from '../../../constants';
-import { DataView, DataViewField } from '../../../../common';
+import { DataViewLazy, DataViewField } from '../../../../common';
 
 const dataView = {
-  toSpec: () => {
+  toSpec: async () => {
     return {
       title: 'dataView',
     };
   },
-} as DataView;
+} as DataViewLazy;
 
 const fields = [
   {
@@ -29,8 +29,8 @@ const fields = [
 ] as DataViewField[];
 
 describe('responseFormatter', () => {
-  it('returns correct format', () => {
-    const response = responseFormatter({
+  it('returns correct format', async () => {
+    const response = await responseFormatter({
       serviceKey: SERVICE_KEY,
       dataView,
       fields,
@@ -38,8 +38,8 @@ describe('responseFormatter', () => {
     expect(response).toMatchSnapshot();
   });
 
-  it('returns correct format for legacy', () => {
-    const response = responseFormatter({
+  it('returns correct format for legacy', async () => {
+    const response = await responseFormatter({
       serviceKey: SERVICE_KEY_LEGACY,
       dataView,
       fields,
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/response_formatter.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/response_formatter.ts
index 790cdeb29926e..7acfb8ffd9cf7 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/response_formatter.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/response_formatter.ts
@@ -6,26 +6,30 @@
  * Side Public License, v 1.
  */
 
-import { DataView, DataViewField } from '../../../../common';
+import { DataViewField, DataViewLazy } from '../../../../common';
 import { SERVICE_KEY_LEGACY, SERVICE_KEY_TYPE, SERVICE_KEY } from '../../../constants';
 
 interface ResponseFormatterArgs {
   serviceKey: SERVICE_KEY_TYPE;
   fields: DataViewField[];
-  dataView: DataView;
+  dataView: DataViewLazy;
 }
 
-export const responseFormatter = ({ serviceKey, fields, dataView }: ResponseFormatterArgs) => {
+export const responseFormatter = async ({
+  serviceKey,
+  fields,
+  dataView,
+}: ResponseFormatterArgs) => {
   const response = {
     body: {
       fields: fields.map((field) => field.toSpec()),
-      [SERVICE_KEY]: dataView.toSpec(),
+      [SERVICE_KEY]: await dataView.toSpec(),
     },
   };
 
   const legacyResponse = {
     body: {
-      [SERVICE_KEY_LEGACY]: dataView.toSpec(),
+      [SERVICE_KEY_LEGACY]: await dataView.toSpec(),
       field: fields[0].toSpec(),
     },
   };
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/update_runtime_field.test.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/update_runtime_field.test.ts
index 6784ddcab3f05..69154d89f3a1d 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/update_runtime_field.test.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/update_runtime_field.test.ts
@@ -9,13 +9,13 @@
 import { updateRuntimeField } from './update_runtime_field';
 import { dataViewsService } from '../../../mocks';
 import { getUsageCollection } from '../test_utils';
-import { DataView } from '../../../../common';
+import { DataViewLazy } from '../../../../common';
 
 describe('update runtime field', () => {
   it('call usageCollection', () => {
     const usageCollection = getUsageCollection();
 
-    dataViewsService.get.mockImplementation(
+    dataViewsService.getDataViewLazy.mockImplementation(
       async (id: string) =>
         ({
           removeRuntimeField: jest.fn(),
@@ -26,7 +26,7 @@ describe('update runtime field', () => {
               runtimeField: {},
             }),
           },
-        } as unknown as DataView)
+        } as unknown as DataViewLazy)
     );
 
     updateRuntimeField({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/update_runtime_field.ts b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/update_runtime_field.ts
index dff7144d03b95..efbe7fd31e8d2 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/update_runtime_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/runtime_fields/update_runtime_field.ts
@@ -48,7 +48,7 @@ export const updateRuntimeField = async ({
   runtimeField,
 }: UpdateRuntimeFieldArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  const dataView = await dataViewsService.get(id);
+  const dataView = await dataViewsService.getDataViewLazy(id);
   const existingRuntimeField = dataView.getRuntimeField(name);
 
   if (!existingRuntimeField) {
@@ -56,7 +56,7 @@ export const updateRuntimeField = async ({
   }
 
   dataView.removeRuntimeField(name);
-  const fields = dataView.addRuntimeField(name, {
+  const fields = await dataView.addRuntimeField(name, {
     ...existingRuntimeField,
     ...runtimeField,
   });
@@ -126,7 +126,11 @@ const updateRuntimeFieldRouteFactory =
           runtimeField,
         });
 
-        const response: RuntimeResponseType = responseFormatter({ serviceKey, dataView, fields });
+        const response: RuntimeResponseType = await responseFormatter({
+          serviceKey,
+          dataView,
+          fields,
+        });
 
         return res.ok(response);
       })
diff --git a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/create_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/create_scripted_field.ts
index ac33e1be0e4d3..ed6716b1684ba 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/create_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/create_scripted_field.ts
@@ -70,9 +70,9 @@ export const registerCreateScriptedFieldRoute = (
             throw new Error('Only scripted fields can be created.');
           }
 
-          const indexPattern = await indexPatternsService.get(id);
+          const indexPattern = await indexPatternsService.getDataViewLazy(id);
 
-          if (indexPattern.fields.getByName(field.name)) {
+          if (await indexPattern.getFieldByName(field.name)) {
             throw new Error(`Field [name = ${field.name}] already exists.`);
           }
 
@@ -85,12 +85,12 @@ export const registerCreateScriptedFieldRoute = (
 
           await indexPatternsService.updateSavedObject(indexPattern);
 
-          const fieldObject = indexPattern.fields.getByName(field.name);
+          const fieldObject = await indexPattern.getFieldByName(field.name);
           if (!fieldObject) throw new Error(`Could not create a field [name = ${field.name}].`);
 
           const body: IndexPatternsRuntimeResponseType = {
             field: fieldObject.toSpec(),
-            index_pattern: indexPattern.toSpec(),
+            index_pattern: await indexPattern.toSpec({ fieldParams: { fieldName: ['*'] } }),
           };
 
           return res.ok({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts
index f631440544d48..29296c3a0b0d1 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts
@@ -68,8 +68,8 @@ export const registerDeleteScriptedFieldRoute = (
           const id = req.params.id;
           const name = req.params.name;
 
-          const indexPattern = await indexPatternsService.get(id);
-          const field = indexPattern.fields.getByName(name);
+          const indexPattern = await indexPatternsService.getDataViewLazy(id);
+          const field = await indexPattern.getFieldByName(name);
 
           if (!field) {
             throw new ErrorIndexPatternFieldNotFound(id, name);
diff --git a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/get_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/get_scripted_field.ts
index 0bda9a21b10d7..8d77284c5611f 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/get_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/get_scripted_field.ts
@@ -69,8 +69,8 @@ export const registerGetScriptedFieldRoute = (
           const id = req.params.id;
           const name = req.params.name;
 
-          const indexPattern = await indexPatternsService.get(id);
-          const field = indexPattern.fields.getByName(name);
+          const indexPattern = await indexPatternsService.getDataViewLazy(id);
+          const field = await indexPattern.getFieldByName(name);
 
           if (!field) {
             throw new ErrorIndexPatternFieldNotFound(id, name);
diff --git a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/put_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/put_scripted_field.ts
index 4d3e772bf8c8a..20e828009f2a1 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/put_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/put_scripted_field.ts
@@ -70,7 +70,7 @@ export const registerPutScriptedFieldRoute = (
             throw new Error('Only scripted fields can be put.');
           }
 
-          const indexPattern = await indexPatternsService.get(id);
+          const indexPattern = await indexPatternsService.getDataViewLazy(id);
           indexPattern.upsertScriptedField({
             ...field,
             runtimeField: undefined, // make sure not creating runttime field with scripted field endpoint
@@ -80,12 +80,12 @@ export const registerPutScriptedFieldRoute = (
 
           await indexPatternsService.updateSavedObject(indexPattern);
 
-          const fieldObject = indexPattern.fields.getByName(field.name);
+          const fieldObject = await indexPattern.getFieldByName(field.name);
           if (!fieldObject) throw new Error(`Could not create a field [name = ${field.name}].`);
 
           const body: IndexPatternsRuntimeResponseType = {
             field: fieldObject.toSpec(),
-            index_pattern: indexPattern.toSpec(),
+            index_pattern: await indexPattern.toSpec({ fieldParams: { fieldName: ['*'] } }),
           };
 
           return res.ok({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/update_scripted_field.ts b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/update_scripted_field.ts
index 08b587e53003c..53e9d165814b5 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/update_scripted_field.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/update_scripted_field.ts
@@ -91,8 +91,8 @@ export const registerUpdateScriptedFieldRoute = (
           const name = req.params.name;
           const field = { ...req.body.field, name } as unknown as FieldSpec;
 
-          const indexPattern = await indexPatternsService.get(id);
-          let fieldObject = indexPattern.fields.getByName(field.name);
+          const indexPattern = await indexPatternsService.getDataViewLazy(id);
+          let fieldObject = await indexPattern.getFieldByName(name);
 
           if (!fieldObject) {
             throw new ErrorIndexPatternFieldNotFound(id, name);
@@ -112,12 +112,12 @@ export const registerUpdateScriptedFieldRoute = (
 
           await indexPatternsService.updateSavedObject(indexPattern);
 
-          fieldObject = indexPattern.fields.getByName(field.name);
+          fieldObject = await indexPattern.getFieldByName(name);
           if (!fieldObject) throw new Error(`Could not create a field [name = ${field.name}].`);
 
           const body: IndexPatternsRuntimeResponseType = {
             field: fieldObject.toSpec(),
-            index_pattern: indexPattern.toSpec(),
+            index_pattern: await indexPattern.toSpec({ fieldParams: { fieldName: ['*'] } }),
           };
 
           return res.ok({
diff --git a/src/plugins/data_views/server/rest_api_routes/public/update_data_view.ts b/src/plugins/data_views/server/rest_api_routes/public/update_data_view.ts
index 348b86f956aae..c379b854f9880 100644
--- a/src/plugins/data_views/server/rest_api_routes/public/update_data_view.ts
+++ b/src/plugins/data_views/server/rest_api_routes/public/update_data_view.ts
@@ -10,7 +10,7 @@ import { schema } from '@kbn/config-schema';
 import { UsageCounter } from '@kbn/usage-collection-plugin/server';
 import { IRouter, StartServicesAccessor } from '@kbn/core/server';
 import { DataViewSpecRestResponse } from '../route_types';
-import { DataViewsService, DataView } from '../../../common/data_views';
+import { DataViewsService } from '../../../common/data_views';
 import { DataViewSpec } from '../../../common/types';
 import { handleErrors } from './util/handle_errors';
 import {
@@ -69,7 +69,7 @@ export const updateDataView = async ({
   counterName,
 }: UpdateDataViewArgs) => {
   usageCollection?.incrementCounter({ counterName });
-  const dataView = await dataViewsService.get(id);
+  const dataView = await dataViewsService.getDataViewLazy(id);
   const {
     title,
     timeFieldName,
@@ -83,7 +83,6 @@ export const updateDataView = async ({
   } = spec;
 
   let isChanged = false;
-  let doRefreshFields = false;
 
   if (title !== undefined && title !== dataView.title) {
     isChanged = true;
@@ -122,14 +121,7 @@ export const updateDataView = async ({
 
   if (fields !== undefined) {
     isChanged = true;
-    doRefreshFields = true;
-    dataView.fields.replaceAll(
-      Object.values(fields || {}).map((field) => ({
-        ...field,
-        aggregatable: true,
-        searchable: true,
-      }))
-    );
+    dataView.replaceAllScriptedFields(fields);
   }
 
   if (runtimeFieldMap !== undefined) {
@@ -138,12 +130,7 @@ export const updateDataView = async ({
   }
 
   if (isChanged) {
-    const result = (await dataViewsService.updateSavedObject(dataView)) as DataView;
-
-    if (doRefreshFields && refreshFields) {
-      await dataViewsService.refreshFields(dataView);
-    }
-    return result;
+    await dataViewsService.updateSavedObject(dataView);
   }
 
   return dataView;
@@ -218,7 +205,7 @@ const updateDataViewRouteFactory =
           });
 
           const body: Record<string, DataViewSpecRestResponse> = {
-            [serviceKey]: dataView.toSpec(),
+            [serviceKey]: await dataView.toSpec({ fieldParams: { fieldName: ['*'] } }),
           };
 
           return res.ok({
diff --git a/x-pack/plugins/observability_solution/logs_shared/server/services/log_views/log_views_client.test.ts b/x-pack/plugins/observability_solution/logs_shared/server/services/log_views/log_views_client.test.ts
index e2741bea55931..a1175432a4ac7 100644
--- a/x-pack/plugins/observability_solution/logs_shared/server/services/log_views/log_views_client.test.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/server/services/log_views/log_views_client.test.ts
@@ -301,7 +301,7 @@ describe('LogViewsClient class', () => {
               "type": "keyword",
             },
           },
-          "scriptedFields": Array [],
+          "scriptedFieldsMap": Object {},
           "setAllowHidden": [Function],
           "setEtag": [Function],
           "setFieldFormat": [Function],

From 9a139593047a08dfaca4c8ceea5a6f20be0e0ac7 Mon Sep 17 00:00:00 2001
From: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
Date: Wed, 3 Apr 2024 01:29:11 -0400
Subject: [PATCH 55/63] [api-docs] 2024-04-03 Daily api_docs build (#179886)

Generated by
https://buildkite.com/elastic/kibana-api-docs-daily/builds/662
---
 api_docs/actions.devdocs.json                 |   40 +
 api_docs/actions.mdx                          |    4 +-
 api_docs/advanced_settings.mdx                |    2 +-
 .../ai_assistant_management_selection.mdx     |    2 +-
 api_docs/aiops.mdx                            |    2 +-
 api_docs/alerting.devdocs.json                |  416 +-
 api_docs/alerting.mdx                         |    4 +-
 api_docs/apm.mdx                              |    2 +-
 api_docs/apm_data_access.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                   |    2 +-
 api_docs/cases.mdx                            |    2 +-
 api_docs/charts.mdx                           |    2 +-
 api_docs/cloud.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                |    7 +-
 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                    | 1164 +++-
 api_docs/data.mdx                             |    4 +-
 api_docs/data_query.mdx                       |    4 +-
 api_docs/data_search.devdocs.json             |   16 +-
 api_docs/data_search.mdx                      |    4 +-
 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              | 5704 +++++++++++------
 api_docs/data_views.mdx                       |    4 +-
 api_docs/data_visualizer.mdx                  |    2 +-
 api_docs/dataset_quality.devdocs.json         |   28 +-
 api_docs/dataset_quality.mdx                  |    2 +-
 api_docs/deprecations_by_api.mdx              |    6 +-
 api_docs/deprecations_by_plugin.mdx           |   22 +-
 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/elastic_assistant.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_annotation_listing.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.mdx                            |    2 +-
 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/ingest_pipelines.mdx                 |    2 +-
 api_docs/inspector.mdx                        |    2 +-
 api_docs/interactive_setup.mdx                |    2 +-
 api_docs/kbn_ace.mdx                          |    2 +-
 api_docs/kbn_actions_types.mdx                |    2 +-
 api_docs/kbn_aiops_components.mdx             |    2 +-
 api_docs/kbn_aiops_log_pattern_analysis.mdx   |    2 +-
 api_docs/kbn_aiops_log_rate_analysis.mdx      |    2 +-
 .../kbn_alerting_api_integration_helpers.mdx  |    2 +-
 api_docs/kbn_alerting_state_types.mdx         |    2 +-
 api_docs/kbn_alerting_types.mdx               |    2 +-
 api_docs/kbn_alerts_as_data_utils.mdx         |    2 +-
 api_docs/kbn_alerts_ui_shared.devdocs.json    |  162 +-
 api_docs/kbn_alerts_ui_shared.mdx             |    2 +-
 api_docs/kbn_analytics.mdx                    |    2 +-
 api_docs/kbn_analytics_client.mdx             |    2 +-
 api_docs/kbn_analytics_collection_utils.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_apm_config_loader.mdx            |    2 +-
 api_docs/kbn_apm_data_view.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_bfetch_error.mdx                 |    2 +-
 api_docs/kbn_calculate_auto.mdx               |    2 +-
 .../kbn_calculate_width_from_char_count.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_mock.mdx             |    2 +-
 api_docs/kbn_code_owners.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 +-
 ...tent_management_tabbed_table_list_view.mdx |    2 +-
 ...kbn_content_management_table_list_view.mdx |    2 +-
 ...tent_management_table_list_view_common.mdx |    2 +-
 ...ntent_management_table_list_view_table.mdx |    2 +-
 api_docs/kbn_content_management_utils.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.devdocs.json    |  114 +-
 api_docs/kbn_core_http_server.mdx             |    2 +-
 api_docs/kbn_core_http_server_internal.mdx    |    2 +-
 .../kbn_core_http_server_mocks.devdocs.json   |   10 +-
 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 +-
 .../kbn_core_plugins_contracts_browser.mdx    |    2 +-
 .../kbn_core_plugins_contracts_server.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 |    2 +-
 .../kbn_core_saved_objects_api_server.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 |    4 -
 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 |    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_security_browser.mdx        |    2 +-
 .../kbn_core_security_browser_internal.mdx    |    2 +-
 api_docs/kbn_core_security_browser_mocks.mdx  |    2 +-
 api_docs/kbn_core_security_common.mdx         |    2 +-
 api_docs/kbn_core_security_server.mdx         |    2 +-
 .../kbn_core_security_server_internal.mdx     |    2 +-
 api_docs/kbn_core_security_server_mocks.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 +-
 .../kbn_core_test_helpers_model_versions.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_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_core_user_settings_server.mdx    |    2 +-
 ...kbn_core_user_settings_server_internal.mdx |    2 +-
 .../kbn_core_user_settings_server_mocks.mdx   |    2 +-
 api_docs/kbn_crypto.mdx                       |    2 +-
 api_docs/kbn_crypto_browser.mdx               |    2 +-
 api_docs/kbn_custom_icons.mdx                 |    2 +-
 api_docs/kbn_custom_integrations.mdx          |    2 +-
 api_docs/kbn_cypress_config.mdx               |    2 +-
 api_docs/kbn_data_forge.mdx                   |    2 +-
 api_docs/kbn_data_service.mdx                 |    2 +-
 api_docs/kbn_data_stream_adapter.mdx          |    2 +-
 api_docs/kbn_data_view_utils.mdx              |    2 +-
 api_docs/kbn_datemath.mdx                     |    2 +-
 api_docs/kbn_deeplinks_analytics.devdocs.json |   15 +
 api_docs/kbn_deeplinks_analytics.mdx          |    4 +-
 api_docs/kbn_deeplinks_devtools.mdx           |    2 +-
 api_docs/kbn_deeplinks_fleet.mdx              |    2 +-
 api_docs/kbn_deeplinks_management.mdx         |    2 +-
 api_docs/kbn_deeplinks_ml.mdx                 |    2 +-
 api_docs/kbn_deeplinks_observability.mdx      |    2 +-
 api_docs/kbn_deeplinks_search.mdx             |    2 +-
 api_docs/kbn_deeplinks_security.mdx           |    2 +-
 api_docs/kbn_deeplinks_shared.mdx             |    2 +-
 api_docs/kbn_default_nav_analytics.mdx        |    2 +-
 api_docs/kbn_default_nav_devtools.mdx         |    2 +-
 api_docs/kbn_default_nav_management.mdx       |    2 +-
 api_docs/kbn_default_nav_ml.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_discover_utils.mdx               |    2 +-
 api_docs/kbn_doc_links.devdocs.json           |    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_data_quality_dashboard.mdx   |    2 +-
 api_docs/kbn_elastic_agent_utils.mdx          |    2 +-
 api_docs/kbn_elastic_assistant.mdx            |    2 +-
 .../kbn_elastic_assistant_common.devdocs.json |   12 +-
 api_docs/kbn_elastic_assistant_common.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_esql_ast.mdx                     |    2 +-
 api_docs/kbn_esql_utils.mdx                   |    2 +-
 api_docs/kbn_esql_validation_autocomplete.mdx |    2 +-
 api_docs/kbn_event_annotation_common.mdx      |    2 +-
 api_docs/kbn_event_annotation_components.mdx  |    2 +-
 api_docs/kbn_expandable_flyout.mdx            |    2 +-
 api_docs/kbn_field_types.mdx                  |    2 +-
 api_docs/kbn_field_utils.mdx                  |    2 +-
 api_docs/kbn_find_used_node_modules.mdx       |    2 +-
 api_docs/kbn_formatters.mdx                   |    2 +-
 .../kbn_ftr_common_functional_services.mdx    |    2 +-
 .../kbn_ftr_common_functional_ui_services.mdx |    2 +-
 api_docs/kbn_generate.mdx                     |    2 +-
 api_docs/kbn_generate_console_definitions.mdx |    2 +-
 api_docs/kbn_generate_csv.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_infra_forge.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_lens_embeddable_utils.mdx        |    2 +-
 api_docs/kbn_lens_formula_docs.mdx            |    2 +-
 api_docs/kbn_logging.mdx                      |    2 +-
 api_docs/kbn_logging_mocks.mdx                |    2 +-
 api_docs/kbn_managed_content_badge.mdx        |    2 +-
 api_docs/kbn_managed_vscode_config.mdx        |    2 +-
 api_docs/kbn_management_cards_navigation.mdx  |    2 +-
 .../kbn_management_settings_application.mdx   |    2 +-
 ...ent_settings_components_field_category.mdx |    2 +-
 ...gement_settings_components_field_input.mdx |    2 +-
 ...nagement_settings_components_field_row.mdx |    2 +-
 ...bn_management_settings_components_form.mdx |    2 +-
 ...n_management_settings_field_definition.mdx |    2 +-
 api_docs/kbn_management_settings_ids.mdx      |    2 +-
 ...n_management_settings_section_registry.mdx |    2 +-
 api_docs/kbn_management_settings_types.mdx    |    2 +-
 .../kbn_management_settings_utilities.mdx     |    2 +-
 api_docs/kbn_management_storybook_config.mdx  |    2 +-
 api_docs/kbn_mapbox_gl.mdx                    |    2 +-
 api_docs/kbn_maps_vector_tile_utils.mdx       |    2 +-
 api_docs/kbn_ml_agg_utils.mdx                 |    2 +-
 api_docs/kbn_ml_anomaly_utils.mdx             |    2 +-
 api_docs/kbn_ml_cancellable_search.mdx        |    2 +-
 api_docs/kbn_ml_category_validator.mdx        |    2 +-
 api_docs/kbn_ml_chi2test.mdx                  |    2 +-
 .../kbn_ml_data_frame_analytics_utils.mdx     |    2 +-
 api_docs/kbn_ml_data_grid.mdx                 |    2 +-
 api_docs/kbn_ml_date_picker.mdx               |    2 +-
 api_docs/kbn_ml_date_utils.mdx                |    2 +-
 api_docs/kbn_ml_error_utils.mdx               |    2 +-
 api_docs/kbn_ml_in_memory_table.mdx           |    2 +-
 api_docs/kbn_ml_is_defined.mdx                |    2 +-
 api_docs/kbn_ml_is_populated_object.mdx       |    2 +-
 api_docs/kbn_ml_kibana_theme.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_runtime_field_utils.mdx       |    2 +-
 api_docs/kbn_ml_string_hash.mdx               |    2 +-
 api_docs/kbn_ml_time_buckets.mdx              |    2 +-
 api_docs/kbn_ml_trained_models_utils.mdx      |    2 +-
 api_docs/kbn_ml_ui_actions.mdx                |    2 +-
 api_docs/kbn_ml_url_state.mdx                 |    2 +-
 api_docs/kbn_mock_idp_utils.mdx               |    2 +-
 api_docs/kbn_monaco.mdx                       |    2 +-
 api_docs/kbn_object_versioning.mdx            |    2 +-
 api_docs/kbn_observability_alert_details.mdx  |    2 +-
 .../kbn_observability_alerting_test_data.mdx  |    2 +-
 ...ility_get_padded_alert_time_range_util.mdx |    2 +-
 api_docs/kbn_openapi_bundler.mdx              |    2 +-
 api_docs/kbn_openapi_generator.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 +-
 api_docs/kbn_panel_loader.mdx                 |    2 +-
 ..._performance_testing_dataset_extractor.mdx |    2 +-
 api_docs/kbn_plugin_check.mdx                 |    2 +-
 api_docs/kbn_plugin_generator.mdx             |    2 +-
 api_docs/kbn_plugin_helpers.mdx               |    2 +-
 api_docs/kbn_presentation_containers.mdx      |    2 +-
 api_docs/kbn_presentation_publishing.mdx      |    2 +-
 api_docs/kbn_profiling_utils.mdx              |    2 +-
 api_docs/kbn_random_sampling.mdx              |    2 +-
 api_docs/kbn_react_field.mdx                  |    2 +-
 api_docs/kbn_react_kibana_context_common.mdx  |    2 +-
 api_docs/kbn_react_kibana_context_render.mdx  |    2 +-
 api_docs/kbn_react_kibana_context_root.mdx    |    2 +-
 api_docs/kbn_react_kibana_context_styled.mdx  |    2 +-
 api_docs/kbn_react_kibana_context_theme.mdx   |    2 +-
 api_docs/kbn_react_kibana_mount.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_reporting_export_types_csv.mdx   |    2 +-
 .../kbn_reporting_export_types_csv_common.mdx |    2 +-
 api_docs/kbn_reporting_export_types_pdf.mdx   |    2 +-
 .../kbn_reporting_export_types_pdf_common.mdx |    2 +-
 api_docs/kbn_reporting_export_types_png.mdx   |    2 +-
 .../kbn_reporting_export_types_png_common.mdx |    2 +-
 api_docs/kbn_reporting_mocks_server.mdx       |    2 +-
 api_docs/kbn_reporting_public.mdx             |    2 +-
 api_docs/kbn_reporting_server.mdx             |    2 +-
 api_docs/kbn_resizable_layout.mdx             |    2 +-
 api_docs/kbn_rison.mdx                        |    2 +-
 api_docs/kbn_router_utils.devdocs.json        |    3 +-
 api_docs/kbn_router_utils.mdx                 |    4 +-
 api_docs/kbn_rrule.devdocs.json               |    2 +-
 api_docs/kbn_rrule.mdx                        |    2 +-
 api_docs/kbn_rule_data_utils.devdocs.json     |    4 +-
 api_docs/kbn_rule_data_utils.mdx              |    2 +-
 api_docs/kbn_saved_objects_settings.mdx       |    2 +-
 api_docs/kbn_search_api_panels.mdx            |    2 +-
 api_docs/kbn_search_connectors.mdx            |    2 +-
 api_docs/kbn_search_errors.mdx                |    2 +-
 api_docs/kbn_search_index_documents.mdx       |    2 +-
 api_docs/kbn_search_response_warnings.mdx     |    2 +-
 api_docs/kbn_security_hardening.mdx           |    2 +-
 api_docs/kbn_security_plugin_types_common.mdx |    2 +-
 ..._security_plugin_types_public.devdocs.json |   78 +
 api_docs/kbn_security_plugin_types_public.mdx |    4 +-
 api_docs/kbn_security_plugin_types_server.mdx |    2 +-
 api_docs/kbn_security_solution_features.mdx   |    2 +-
 api_docs/kbn_security_solution_navigation.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 +-
 ...ion_exception_list_components.devdocs.json |    8 +-
 ...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_serverless_common_settings.mdx   |    2 +-
 .../kbn_serverless_observability_settings.mdx |    2 +-
 api_docs/kbn_serverless_project_switcher.mdx  |    2 +-
 api_docs/kbn_serverless_search_settings.mdx   |    2 +-
 api_docs/kbn_serverless_security_settings.mdx |    2 +-
 api_docs/kbn_serverless_storybook_config.mdx  |    2 +-
 api_docs/kbn_shared_svg.mdx                   |    2 +-
 api_docs/kbn_shared_ux_avatar_solution.mdx    |    2 +-
 .../kbn_shared_ux_button_exit_full_screen.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_chrome_navigation.mdx  |    2 +-
 api_docs/kbn_shared_ux_error_boundary.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 +-
 ...hared_ux_page_kibana_template.devdocs.json |    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_solution_nav_es.mdx              |    2 +-
 api_docs/kbn_solution_nav_oblt.mdx            |    2 +-
 api_docs/kbn_some_dev_log.mdx                 |    2 +-
 api_docs/kbn_sort_predicates.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.devdocs.json                |    2 +-
 api_docs/kbn_test.mdx                         |    2 +-
 api_docs/kbn_test_eui_helpers.mdx             |    2 +-
 api_docs/kbn_test_jest_helpers.mdx            |    2 +-
 api_docs/kbn_test_subj_selector.mdx           |    2 +-
 api_docs/kbn_text_based_editor.mdx            |    2 +-
 api_docs/kbn_timerange.mdx                    |    2 +-
 api_docs/kbn_tooling_log.mdx                  |    2 +-
 api_docs/kbn_triggers_actions_ui_types.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.devdocs.json  |   11 -
 api_docs/kbn_ui_shared_deps_src.mdx           |    4 +-
 api_docs/kbn_ui_theme.mdx                     |    2 +-
 api_docs/kbn_unified_data_table.devdocs.json  |   20 +-
 api_docs/kbn_unified_data_table.mdx           |    4 +-
 api_docs/kbn_unified_doc_viewer.mdx           |    2 +-
 api_docs/kbn_unified_field_list.mdx           |    2 +-
 api_docs/kbn_unsaved_changes_badge.mdx        |    2 +-
 api_docs/kbn_use_tracked_promise.mdx          |    2 +-
 .../kbn_user_profile_components.devdocs.json  |   26 +-
 api_docs/kbn_user_profile_components.mdx      |    4 +-
 api_docs/kbn_utility_types.mdx                |    2 +-
 api_docs/kbn_utility_types_jest.mdx           |    2 +-
 api_docs/kbn_utils.mdx                        |    2 +-
 ...n_visualization_ui_components.devdocs.json |    4 +-
 api_docs/kbn_visualization_ui_components.mdx  |    2 +-
 api_docs/kbn_visualization_utils.mdx          |    2 +-
 api_docs/kbn_xstate_utils.mdx                 |    2 +-
 api_docs/kbn_yarn_lock_validator.mdx          |    2 +-
 api_docs/kbn_zod_helpers.mdx                  |    2 +-
 api_docs/kibana_overview.mdx                  |    2 +-
 api_docs/kibana_react.devdocs.json            |  296 +-
 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/links.mdx                            |    2 +-
 api_docs/lists.mdx                            |    2 +-
 api_docs/logs_explorer.devdocs.json           |    2 +-
 api_docs/logs_explorer.mdx                    |    2 +-
 api_docs/logs_shared.mdx                      |    2 +-
 api_docs/management.mdx                       |    2 +-
 api_docs/maps.mdx                             |    2 +-
 api_docs/maps_ems.mdx                         |    2 +-
 api_docs/metrics_data_access.mdx              |    2 +-
 api_docs/ml.mdx                               |    2 +-
 api_docs/mock_idp_plugin.mdx                  |    2 +-
 api_docs/monitoring.mdx                       |    2 +-
 api_docs/monitoring_collection.mdx            |    2 +-
 api_docs/navigation.devdocs.json              |   17 +-
 api_docs/navigation.mdx                       |    2 +-
 api_docs/newsfeed.mdx                         |    2 +-
 api_docs/no_data_page.mdx                     |    2 +-
 api_docs/notifications.mdx                    |    2 +-
 api_docs/observability.devdocs.json           |    6 +-
 api_docs/observability.mdx                    |    2 +-
 .../observability_a_i_assistant.devdocs.json  |   95 +-
 api_docs/observability_a_i_assistant.mdx      |    7 +-
 api_docs/observability_a_i_assistant_app.mdx  |    2 +-
 .../observability_ai_assistant_management.mdx |    2 +-
 api_docs/observability_logs_explorer.mdx      |    2 +-
 api_docs/observability_onboarding.mdx         |    2 +-
 api_docs/observability_shared.devdocs.json    |   19 +-
 api_docs/observability_shared.mdx             |    4 +-
 api_docs/osquery.mdx                          |    2 +-
 api_docs/painless_lab.mdx                     |    2 +-
 api_docs/plugin_directory.mdx                 |   36 +-
 api_docs/presentation_panel.mdx               |    2 +-
 api_docs/presentation_util.mdx                |    2 +-
 api_docs/profiling.mdx                        |    2 +-
 api_docs/profiling_data_access.mdx            |    2 +-
 api_docs/remote_clusters.mdx                  |    2 +-
 api_docs/reporting.mdx                        |    2 +-
 api_docs/rollup.mdx                           |    2 +-
 api_docs/rule_registry.devdocs.json           |   20 +-
 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/search_connectors.mdx                |    2 +-
 api_docs/search_playground.mdx                |    2 +-
 api_docs/security.mdx                         |    2 +-
 api_docs/security_solution.devdocs.json       |   39 +-
 api_docs/security_solution.mdx                |    4 +-
 api_docs/security_solution_ess.mdx            |    2 +-
 api_docs/security_solution_serverless.mdx     |    2 +-
 api_docs/serverless.devdocs.json              |   23 +-
 api_docs/serverless.mdx                       |    4 +-
 api_docs/serverless_observability.mdx         |    2 +-
 api_docs/serverless_search.mdx                |    2 +-
 api_docs/session_view.mdx                     |    2 +-
 api_docs/share.mdx                            |    2 +-
 api_docs/slo.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/text_based_languages.mdx             |    2 +-
 api_docs/threat_intelligence.devdocs.json     |    6 +-
 api_docs/threat_intelligence.mdx              |    4 +-
 api_docs/timelines.devdocs.json               |    8 +
 api_docs/timelines.mdx                        |    2 +-
 api_docs/transform.mdx                        |    2 +-
 api_docs/triggers_actions_ui.devdocs.json     |  252 +-
 api_docs/triggers_actions_ui.mdx              |    4 +-
 api_docs/ui_actions.mdx                       |    2 +-
 api_docs/ui_actions_enhanced.mdx              |    2 +-
 api_docs/unified_doc_viewer.mdx               |    2 +-
 api_docs/unified_histogram.mdx                |    2 +-
 api_docs/unified_search.mdx                   |    2 +-
 api_docs/unified_search_autocomplete.mdx      |    2 +-
 api_docs/uptime.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 +-
 714 files changed, 6722 insertions(+), 3376 deletions(-)

diff --git a/api_docs/actions.devdocs.json b/api_docs/actions.devdocs.json
index 7cdb870059304..1def8581a7ef9 100644
--- a/api_docs/actions.devdocs.json
+++ b/api_docs/actions.devdocs.json
@@ -3448,6 +3448,14 @@
             "section": "def-server.ConnectorWithExtraFindData",
             "text": "ConnectorWithExtraFindData"
           },
+          "[]>; getAllSystemConnectors: () => Promise<",
+          {
+            "pluginId": "actions",
+            "scope": "server",
+            "docId": "kibActionsPluginApi",
+            "section": "def-server.ConnectorWithExtraFindData",
+            "text": "ConnectorWithExtraFindData"
+          },
           "[]>; getBulk: ({ ids, throwIfSystemAction, }: { ids: string[]; throwIfSystemAction?: boolean | undefined; }) => Promise<",
           "Connector",
           "[]>; getOAuthAccessToken: ({ type, options }: Readonly<{} & { type: \"jwt\" | \"client\"; options: Readonly<{} & { tokenUrl: string; config: Readonly<{} & { clientId: string; jwtKeyId: string; userIdentifierValue: string; }>; secrets: Readonly<{ privateKeyPassword?: string | undefined; } & { clientSecret: string; privateKey: string; }>; }> | Readonly<{} & { tokenUrl: string; config: Readonly<{} & { clientId: string; tenantId: string; }>; secrets: Readonly<{} & { clientSecret: string; }>; scope: string; }>; }>, configurationUtilities: ",
@@ -4161,6 +4169,38 @@
             }
           ],
           "returnComment": []
+        },
+        {
+          "parentPluginId": "actions",
+          "id": "def-server.PluginStartContract.isSystemActionConnector",
+          "type": "Function",
+          "tags": [],
+          "label": "isSystemActionConnector",
+          "description": [],
+          "signature": [
+            "(connectorId: string) => boolean"
+          ],
+          "path": "x-pack/plugins/actions/server/plugin.ts",
+          "deprecated": false,
+          "trackAdoption": false,
+          "children": [
+            {
+              "parentPluginId": "actions",
+              "id": "def-server.PluginStartContract.isSystemActionConnector.$1",
+              "type": "string",
+              "tags": [],
+              "label": "connectorId",
+              "description": [],
+              "signature": [
+                "string"
+              ],
+              "path": "x-pack/plugins/actions/server/plugin.ts",
+              "deprecated": false,
+              "trackAdoption": false,
+              "isRequired": true
+            }
+          ],
+          "returnComment": []
         }
       ],
       "lifecycle": "start",
diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx
index 631dc92c56f16..99df9f1c63d14 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 289 | 0 | 283 | 32 |
+| 291 | 0 | 285 | 32 |
 
 ## Client
 
diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
index 394ba0cb8e8b8..1a59d14c23338 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';
diff --git a/api_docs/ai_assistant_management_selection.mdx b/api_docs/ai_assistant_management_selection.mdx
index ab28cf9ccd3bd..6932b57b68700 100644
--- a/api_docs/ai_assistant_management_selection.mdx
+++ b/api_docs/ai_assistant_management_selection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
 title: "aiAssistantManagementSelection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiAssistantManagementSelection plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
 ---
 import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx
index 8efffe1294172..79a2a039c4ce6 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';
diff --git a/api_docs/alerting.devdocs.json b/api_docs/alerting.devdocs.json
index 2d07cb3143930..0ce66f3483bd4 100644
--- a/api_docs/alerting.devdocs.json
+++ b/api_docs/alerting.devdocs.json
@@ -1770,6 +1770,96 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "alerting",
+        "id": "def-server.ConnectorAdapter",
+        "type": "Interface",
+        "tags": [],
+        "label": "ConnectorAdapter",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "alerting",
+            "scope": "server",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-server.ConnectorAdapter",
+            "text": "ConnectorAdapter"
+          },
+          "<RuleActionParams, ConnectorParams>"
+        ],
+        "path": "x-pack/plugins/alerting/server/connector_adapters/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.ConnectorAdapter.connectorTypeId",
+            "type": "string",
+            "tags": [],
+            "label": "connectorTypeId",
+            "description": [],
+            "path": "x-pack/plugins/alerting/server/connector_adapters/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.ConnectorAdapter.ruleActionParamsSchema",
+            "type": "Object",
+            "tags": [],
+            "label": "ruleActionParamsSchema",
+            "description": [
+              "\nThe schema of the action persisted\nin the rule. The schema will be validated\nwhen a rule is created or updated.\nThe schema should be backwards compatible\nand should never introduce any breaking\nchanges."
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.ObjectType",
+                "text": "ObjectType"
+              },
+              "<any>"
+            ],
+            "path": "x-pack/plugins/alerting/server/connector_adapters/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.ConnectorAdapter.buildActionParams",
+            "type": "Function",
+            "tags": [],
+            "label": "buildActionParams",
+            "description": [],
+            "signature": [
+              "(args: BuildActionParamsArgs<RuleActionParams>) => ConnectorParams"
+            ],
+            "path": "x-pack/plugins/alerting/server/connector_adapters/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "alerting",
+                "id": "def-server.ConnectorAdapter.buildActionParams.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "args",
+                "description": [],
+                "signature": [
+                  "BuildActionParamsArgs<RuleActionParams>"
+                ],
+                "path": "x-pack/plugins/alerting/server/connector_adapters/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "alerting",
         "id": "def-server.DataStreamAdapter",
@@ -2203,6 +2293,61 @@
         "deprecated": false,
         "trackAdoption": false,
         "children": [
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.PluginSetupContract.registerConnectorAdapter",
+            "type": "Function",
+            "tags": [],
+            "label": "registerConnectorAdapter",
+            "description": [],
+            "signature": [
+              "<RuleActionParams extends ",
+              "ConnectorAdapterParams",
+              " = ",
+              "ConnectorAdapterParams",
+              ", ConnectorParams extends ",
+              "ConnectorAdapterParams",
+              " = ",
+              "ConnectorAdapterParams",
+              ">(adapter: ",
+              {
+                "pluginId": "alerting",
+                "scope": "server",
+                "docId": "kibAlertingPluginApi",
+                "section": "def-server.ConnectorAdapter",
+                "text": "ConnectorAdapter"
+              },
+              "<RuleActionParams, ConnectorParams>) => void"
+            ],
+            "path": "x-pack/plugins/alerting/server/plugin.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "alerting",
+                "id": "def-server.PluginSetupContract.registerConnectorAdapter.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "adapter",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "alerting",
+                    "scope": "server",
+                    "docId": "kibAlertingPluginApi",
+                    "section": "def-server.ConnectorAdapter",
+                    "text": "ConnectorAdapter"
+                  },
+                  "<RuleActionParams, ConnectorParams>"
+                ],
+                "path": "x-pack/plugins/alerting/server/plugin.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "alerting",
             "id": "def-server.PluginSetupContract.registerType",
@@ -2822,7 +2967,29 @@
             "label": "actions",
             "description": [],
             "signature": [
-              "Readonly<{ frequency?: Readonly<{} & { throttle: string | null; notifyWhen: \"onActionGroupChange\" | \"onActiveAlert\" | \"onThrottleInterval\"; summary: boolean; }> | undefined; alertsFilter?: Readonly<{ query?: Readonly<{ dsl?: string | undefined; } & { kql: string; filters: Readonly<{ query?: Record<string, any> | undefined; $state?: Readonly<{} & { store: \"appState\" | \"globalState\"; }> | undefined; } & { meta: Record<string, any>; }>[]; }> | undefined; timeframe?: Readonly<{} & { days: (2 | 1 | 7 | 6 | 5 | 4 | 3)[]; hours: Readonly<{} & { start: string; end: string; }>; timezone: string; }> | undefined; } & {}> | undefined; uuid?: string | undefined; useAlertDataForTemplate?: boolean | undefined; } & { params: Record<string, any>; id: string; actionTypeId: string; group: string; }>[]"
+              "Readonly<{ frequency?: Readonly<{} & { throttle: string | null; notifyWhen: \"onActionGroupChange\" | \"onActiveAlert\" | \"onThrottleInterval\"; summary: boolean; }> | undefined; alertsFilter?: Readonly<{ query?: Readonly<{ dsl?: string | undefined; } & { kql: string; filters: Readonly<{ query?: Record<string, any> | undefined; $state?: Readonly<{} & { store: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.FilterStateStore",
+                "text": "FilterStateStore"
+              },
+              "; }> | undefined; } & { meta: Record<string, any>; }>[]; }> | undefined; timeframe?: Readonly<{} & { days: (2 | 1 | 7 | 6 | 5 | 4 | 3)[]; hours: Readonly<{} & { start: string; end: string; }>; timezone: string; }> | undefined; } & {}> | undefined; uuid?: string | undefined; useAlertDataForTemplate?: boolean | undefined; } & { params: Record<string, any>; id: string; actionTypeId: string; group: string; }>[]"
+            ],
+            "path": "x-pack/plugins/alerting/server/application/rule/types/rule.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-server.Rule.systemActions",
+            "type": "Array",
+            "tags": [],
+            "label": "systemActions",
+            "description": [],
+            "signature": [
+              "Readonly<{ uuid?: string | undefined; useAlertDataAsTemplate?: boolean | undefined; } & { params: Record<string, any>; id: string; actionTypeId: string; }>[] | undefined"
             ],
             "path": "x-pack/plugins/alerting/server/application/rule/types/rule.ts",
             "deprecated": false,
@@ -3029,7 +3196,7 @@
             "label": "monitoring",
             "description": [],
             "signature": [
-              "Readonly<{} & { run: Readonly<{} & { history: Readonly<{ outcome?: Readonly<{ warning?: \"execute\" | \"unknown\" | \"license\" | \"validate\" | \"timeout\" | \"read\" | \"decrypt\" | \"disabled\" | \"maxExecutableActions\" | \"maxAlerts\" | \"maxQueuedActions\" | null | undefined; outcomeOrder?: number | undefined; outcomeMsg?: string[] | null | undefined; } & { outcome: \"warning\" | \"succeeded\" | \"failed\"; alertsCount: Readonly<{ recovered?: number | null | undefined; active?: number | null | undefined; new?: number | null | undefined; ignored?: number | null | undefined; } & {}>; }> | undefined; duration?: number | undefined; } & { timestamp: number; success: boolean; }>[]; calculated_metrics: Readonly<{ p50?: number | undefined; p95?: number | undefined; p99?: number | undefined; } & { success_ratio: number; }>; last_run: Readonly<{} & { timestamp: string; metrics: Readonly<{ duration?: number | undefined; total_search_duration_ms?: number | null | undefined; total_indexing_duration_ms?: number | null | undefined; total_alerts_detected?: number | null | undefined; total_alerts_created?: number | null | undefined; gap_duration_s?: number | null | undefined; } & {}>; }>; }>; }> | undefined"
+              "Readonly<{} & { run: Readonly<{} & { history: Readonly<{ outcome?: Readonly<{ warning?: \"execute\" | \"unknown\" | \"license\" | \"read\" | \"decrypt\" | \"timeout\" | \"disabled\" | \"validate\" | \"maxExecutableActions\" | \"maxAlerts\" | \"maxQueuedActions\" | null | undefined; outcomeOrder?: number | undefined; outcomeMsg?: string[] | null | undefined; } & { outcome: \"warning\" | \"succeeded\" | \"failed\"; alertsCount: Readonly<{ active?: number | null | undefined; new?: number | null | undefined; recovered?: number | null | undefined; ignored?: number | null | undefined; } & {}>; }> | undefined; duration?: number | undefined; } & { timestamp: number; success: boolean; }>[]; calculated_metrics: Readonly<{ p50?: number | undefined; p95?: number | undefined; p99?: number | undefined; } & { success_ratio: number; }>; last_run: Readonly<{} & { timestamp: string; metrics: Readonly<{ duration?: number | undefined; total_search_duration_ms?: number | null | undefined; total_indexing_duration_ms?: number | null | undefined; total_alerts_detected?: number | null | undefined; total_alerts_created?: number | null | undefined; gap_duration_s?: number | null | undefined; } & {}>; }>; }>; }> | undefined"
             ],
             "path": "x-pack/plugins/alerting/server/application/rule/types/rule.ts",
             "deprecated": false,
@@ -3043,7 +3210,7 @@
             "label": "snoozeSchedule",
             "description": [],
             "signature": [
-              "Readonly<{ id?: string | undefined; skipRecurrences?: string[] | undefined; } & { duration: number; rRule: Readonly<{ count?: number | undefined; interval?: number | undefined; freq?: 0 | 2 | 1 | 6 | 5 | 4 | 3 | undefined; until?: string | undefined; byweekday?: (string | number)[] | undefined; bymonthday?: number[] | undefined; bymonth?: number[] | undefined; wkst?: \"MO\" | \"TU\" | \"WE\" | \"TH\" | \"FR\" | \"SA\" | \"SU\" | undefined; bysetpos?: number[] | undefined; byyearday?: number[] | undefined; byweekno?: number[] | undefined; byhour?: number[] | undefined; byminute?: number[] | undefined; bysecond?: number[] | undefined; } & { dtstart: string; tzid: string; }>; }>[] | undefined"
+              "Readonly<{ id?: string | undefined; skipRecurrences?: string[] | undefined; } & { duration: number; rRule: Readonly<{ count?: number | undefined; interval?: number | undefined; freq?: 0 | 2 | 1 | 6 | 5 | 4 | 3 | undefined; until?: string | undefined; wkst?: \"MO\" | \"TU\" | \"WE\" | \"TH\" | \"FR\" | \"SA\" | \"SU\" | undefined; byweekday?: (string | number)[] | undefined; bymonth?: number[] | undefined; bysetpos?: number[] | undefined; bymonthday?: number[] | undefined; byyearday?: number[] | undefined; byweekno?: number[] | undefined; byhour?: number[] | undefined; byminute?: number[] | undefined; bysecond?: number[] | undefined; } & { dtstart: string; tzid: string; }>; }>[] | undefined"
             ],
             "path": "x-pack/plugins/alerting/server/application/rule/types/rule.ts",
             "deprecated": false,
@@ -3085,7 +3252,7 @@
             "label": "lastRun",
             "description": [],
             "signature": [
-              "Readonly<{ warning?: \"execute\" | \"unknown\" | \"license\" | \"validate\" | \"timeout\" | \"read\" | \"decrypt\" | \"disabled\" | \"maxExecutableActions\" | \"maxAlerts\" | \"maxQueuedActions\" | null | undefined; outcomeOrder?: number | undefined; outcomeMsg?: string[] | null | undefined; } & { outcome: \"warning\" | \"succeeded\" | \"failed\"; alertsCount: Readonly<{ recovered?: number | null | undefined; active?: number | null | undefined; new?: number | null | undefined; ignored?: number | null | undefined; } & {}>; }> | null | undefined"
+              "Readonly<{ warning?: \"execute\" | \"unknown\" | \"license\" | \"read\" | \"decrypt\" | \"timeout\" | \"disabled\" | \"validate\" | \"maxExecutableActions\" | \"maxAlerts\" | \"maxQueuedActions\" | null | undefined; outcomeOrder?: number | undefined; outcomeMsg?: string[] | null | undefined; } & { outcome: \"warning\" | \"succeeded\" | \"failed\"; alertsCount: Readonly<{ active?: number | null | undefined; new?: number | null | undefined; recovered?: number | null | undefined; ignored?: number | null | undefined; } & {}>; }> | null | undefined"
             ],
             "path": "x-pack/plugins/alerting/server/application/rule/types/rule.ts",
             "deprecated": false,
@@ -3717,6 +3884,14 @@
                 "section": "def-common.DataViewListItem",
                 "text": "DataViewListItem"
               },
+              "[]>; getAllDataViewLazy: (refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
               "[]>; clearCache: () => void; clearInstanceCache: (id?: string | undefined) => void; getCache: () => Promise<",
               {
                 "pluginId": "@kbn/core-saved-objects-common",
@@ -3845,7 +4020,47 @@
                 "section": "def-common.DataViewSpec",
                 "text": "DataViewSpec"
               },
-              "; createAndSave: (spec: ",
+              "; getDataViewLazy: (id: string) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createDataViewLazy: (spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createAndSaveDataViewLazy: (spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ", overwrite?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createAndSave: (spec: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -3862,14 +4077,18 @@
                 "text": "DataView"
               },
               ">; createSavedObject: (dataView: ",
+              "AbstractDataView",
+              ", overwrite?: boolean) => Promise<void>; updateSavedObject: (indexPattern: ",
+              "AbstractDataView",
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>; defaultDataViewExists: () => Promise<boolean>; getDefaultDataViewLazy: () => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
-              ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
+              " | null>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -3877,15 +4096,15 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              ">; updateSavedObject: (indexPattern: ",
+              " | null>; toDataView: (dataViewLazy: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
+              ") => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -3893,7 +4112,7 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              ">; defaultDataViewExists: () => Promise<boolean>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+              ">; toDataViewLazy: (dataView: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -3901,7 +4120,15 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              " | null>; }"
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; }"
             ],
             "path": "x-pack/plugins/alerting/server/types.ts",
             "deprecated": false,
@@ -4558,7 +4785,7 @@
         "label": "AlertingRulesConfig",
         "description": [],
         "signature": [
-          "Pick<Readonly<{ overwriteProducer?: \"siem\" | \"observability\" | \"stackAlerts\" | undefined; } & { minimumScheduleInterval: Readonly<{} & { value: string; enforce: boolean; }>; maxScheduledPerMinute: number; run: Readonly<{ timeout?: string | undefined; ruleTypeOverrides?: Readonly<{ timeout?: string | undefined; } & { id: string; }>[] | undefined; } & { actions: Readonly<{ connectorTypeOverrides?: Readonly<{ max?: number | undefined; } & { id: string; }>[] | undefined; } & { max: number; }>; alerts: Readonly<{} & { max: number; }>; }>; }>, \"minimumScheduleInterval\" | \"maxScheduledPerMinute\"> & { isUsingSecurity: boolean; }"
+          "Pick<Readonly<{ overwriteProducer?: \"siem\" | \"observability\" | \"stackAlerts\" | undefined; } & { run: Readonly<{ timeout?: string | undefined; ruleTypeOverrides?: Readonly<{ timeout?: string | undefined; } & { id: string; }>[] | undefined; } & { actions: Readonly<{ connectorTypeOverrides?: Readonly<{ max?: number | undefined; } & { id: string; }>[] | undefined; } & { max: number; }>; alerts: Readonly<{} & { max: number; }>; }>; minimumScheduleInterval: Readonly<{} & { value: string; enforce: boolean; }>; maxScheduledPerMinute: number; }>, \"minimumScheduleInterval\" | \"maxScheduledPerMinute\"> & { isUsingSecurity: boolean; }"
         ],
         "path": "x-pack/plugins/alerting/server/config.ts",
         "deprecated": false,
@@ -4588,7 +4815,15 @@
         "label": "BulkEditOperation",
         "description": [],
         "signature": [
-          "Readonly<{} & { value: string[]; operation: \"delete\" | \"add\" | \"set\"; field: \"tags\"; }> | Readonly<{} & { value: Readonly<{ frequency?: Readonly<{} & { throttle: string | null; notifyWhen: \"onActionGroupChange\" | \"onActiveAlert\" | \"onThrottleInterval\"; summary: boolean; }> | undefined; uuid?: string | undefined; } & { params: Record<string, any>; id: string; group: string; }>[]; operation: \"add\" | \"set\"; field: \"actions\"; }> | Readonly<{} & { value: Readonly<{} & { interval: string; }>; operation: \"set\"; field: \"schedule\"; }> | Readonly<{} & { value: string | null; operation: \"set\"; field: \"throttle\"; }> | Readonly<{} & { value: \"onActionGroupChange\" | \"onActiveAlert\" | \"onThrottleInterval\"; operation: \"set\"; field: \"notifyWhen\"; }> | Readonly<{} & { value: Readonly<{ id?: string | undefined; } & { duration: number; rRule: Readonly<{ count?: number | undefined; interval?: number | undefined; freq?: 0 | 2 | 1 | 3 | undefined; until?: string | undefined; byweekday?: string[] | undefined; bymonthday?: number[] | undefined; bymonth?: number[] | undefined; } & { dtstart: string; tzid: string; }>; }>; operation: \"set\"; field: \"snoozeSchedule\"; }> | Readonly<{ value?: string[] | undefined; } & { operation: \"delete\"; field: \"snoozeSchedule\"; }> | Readonly<{} & { operation: \"set\"; field: \"apiKey\"; }>"
+          "Readonly<{} & { value: string[]; operation: \"delete\" | \"add\" | \"set\"; field: \"tags\"; }> | Readonly<{} & { value: (Readonly<{ frequency?: Readonly<{} & { throttle: string | null; notifyWhen: \"onActionGroupChange\" | \"onActiveAlert\" | \"onThrottleInterval\"; summary: boolean; }> | undefined; alertsFilter?: Readonly<{ query?: Readonly<{ dsl?: string | undefined; } & { kql: string; filters: Readonly<{ query?: Record<string, any> | undefined; $state?: Readonly<{} & { store: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.FilterStateStore",
+            "text": "FilterStateStore"
+          },
+          "; }> | undefined; } & { meta: Record<string, any>; }>[]; }> | undefined; timeframe?: Readonly<{} & { days: (2 | 1 | 7 | 6 | 5 | 4 | 3)[]; hours: Readonly<{} & { start: string; end: string; }>; timezone: string; }> | undefined; } & {}> | undefined; uuid?: string | undefined; } & { params: Record<string, any>; id: string; group: string; }> | Readonly<{ uuid?: string | undefined; } & { params: Record<string, any>; id: string; }>)[]; operation: \"add\" | \"set\"; field: \"actions\"; }> | Readonly<{} & { value: Readonly<{} & { interval: string; }>; operation: \"set\"; field: \"schedule\"; }> | Readonly<{} & { value: string | null; operation: \"set\"; field: \"throttle\"; }> | Readonly<{} & { value: \"onActionGroupChange\" | \"onActiveAlert\" | \"onThrottleInterval\"; operation: \"set\"; field: \"notifyWhen\"; }> | Readonly<{} & { value: Readonly<{ id?: string | undefined; } & { duration: number; rRule: Readonly<{ count?: number | undefined; interval?: number | undefined; freq?: 0 | 2 | 1 | 3 | undefined; until?: string | undefined; byweekday?: string[] | undefined; bymonth?: number[] | undefined; bymonthday?: number[] | undefined; } & { dtstart: string; tzid: string; }>; }>; operation: \"set\"; field: \"snoozeSchedule\"; }> | Readonly<{ value?: string[] | undefined; } & { operation: \"delete\"; field: \"snoozeSchedule\"; }> | Readonly<{} & { operation: \"set\"; field: \"apiKey\"; }>"
         ],
         "path": "x-pack/plugins/alerting/server/application/rule/methods/bulk_edit/types/bulk_edit_rules_options.ts",
         "deprecated": false,
@@ -5042,17 +5277,15 @@
             "section": "def-server.BulkOperationError",
             "text": "BulkOperationError"
           },
-          "[]; rules: (",
+          "[]; rules: ",
           {
             "pluginId": "alerting",
-            "scope": "common",
+            "scope": "server",
             "docId": "kibAlertingPluginApi",
-            "section": "def-common.Rule",
+            "section": "def-server.Rule",
             "text": "Rule"
           },
-          "<never> | ",
-          "RuleWithLegacyId",
-          "<never>)[]; total: number; taskIdsFailedToBeEnabled: string[]; }>; bulkDisableRules: (options: Readonly<{ filter?: string | undefined; ids?: string[] | undefined; untrack?: boolean | undefined; } & {}>) => Promise<",
+          "<Record<string, any>>[]; total: number; taskIdsFailedToBeEnabled: string[]; }>; bulkDisableRules: (options: Readonly<{ filter?: string | undefined; ids?: string[] | undefined; untrack?: boolean | undefined; } & {}>) => Promise<",
           "BulkDisableRulesResult",
           "<Record<string, any>>>; updateApiKey: (options: { id: string; }) => Promise<void>; enable: (options: { id: string; }) => Promise<void>; disable: (options: { id: string; untrack?: boolean | undefined; }) => Promise<void>; snooze: (options: ",
           "SnoozeRuleOptions",
@@ -7990,6 +8223,27 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.Rule.systemActions",
+            "type": "Array",
+            "tags": [],
+            "label": "systemActions",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "alerting",
+                "scope": "common",
+                "docId": "kibAlertingPluginApi",
+                "section": "def-common.RuleSystemAction",
+                "text": "RuleSystemAction"
+              },
+              "[] | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/common/rule.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "alerting",
             "id": "def-common.Rule.params",
@@ -9509,6 +9763,76 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "alerting",
+        "id": "def-common.RuleSystemAction",
+        "type": "Interface",
+        "tags": [],
+        "label": "RuleSystemAction",
+        "description": [],
+        "path": "x-pack/plugins/alerting/common/rule.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.RuleSystemAction.uuid",
+            "type": "string",
+            "tags": [],
+            "label": "uuid",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/plugins/alerting/common/rule.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.RuleSystemAction.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "path": "x-pack/plugins/alerting/common/rule.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.RuleSystemAction.actionTypeId",
+            "type": "string",
+            "tags": [],
+            "label": "actionTypeId",
+            "description": [],
+            "path": "x-pack/plugins/alerting/common/rule.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "alerting",
+            "id": "def-common.RuleSystemAction.params",
+            "type": "Object",
+            "tags": [],
+            "label": "params",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-saved-objects-common",
+                "scope": "common",
+                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
+                "section": "def-common.SavedObjectAttributes",
+                "text": "SavedObjectAttributes"
+              }
+            ],
+            "path": "x-pack/plugins/alerting/common/rule.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "alerting",
         "id": "def-common.RuleTagsAggregationFormattedResult",
@@ -10995,7 +11319,7 @@
         "label": "ReservedActionGroups",
         "description": [],
         "signature": [
-          "RecoveryActionGroupId | \"recovered\""
+          "\"recovered\" | RecoveryActionGroupId"
         ],
         "path": "x-pack/plugins/alerting/common/builtin_action_groups.ts",
         "deprecated": false,
@@ -11082,7 +11406,7 @@
         "signature": [
           "Omit<",
           "Options",
-          ", \"dtstart\" | \"until\" | \"byweekday\" | \"wkst\"> & { dtstart: string; byweekday?: (string | number)[] | undefined; wkst?: ",
+          ", \"dtstart\" | \"until\" | \"wkst\" | \"byweekday\"> & { dtstart: string; byweekday?: (string | number)[] | undefined; wkst?: ",
           {
             "pluginId": "@kbn/rrule",
             "scope": "common",
@@ -11126,6 +11450,28 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "alerting",
+        "id": "def-common.RuleActionKey",
+        "type": "Type",
+        "tags": [],
+        "label": "RuleActionKey",
+        "description": [],
+        "signature": [
+          "keyof ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.RuleAction",
+            "text": "RuleAction"
+          }
+        ],
+        "path": "x-pack/plugins/alerting/common/rule.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "alerting",
         "id": "def-common.RuleActionParam",
@@ -11408,6 +11754,28 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "alerting",
+        "id": "def-common.RuleSystemActionKey",
+        "type": "Type",
+        "tags": [],
+        "label": "RuleSystemActionKey",
+        "description": [],
+        "signature": [
+          "keyof ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.RuleSystemAction",
+            "text": "RuleSystemAction"
+          }
+        ],
+        "path": "x-pack/plugins/alerting/common/rule.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "alerting",
         "id": "def-common.RuleTagsAggregationOptions",
diff --git a/api_docs/alerting.mdx b/api_docs/alerting.mdx
index c19509f12d214..82aa80f79b97f 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: 2024-04-02
+date: 2024-04-03
 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 |
 |-------------------|-----------|------------------------|-----------------|
-| 838 | 1 | 807 | 53 |
+| 854 | 1 | 822 | 54 |
 
 ## Client
 
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
index 6cc5e9ad084c2..eff2316de4811 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
 ---
 import apmObj from './apm.devdocs.json';
diff --git a/api_docs/apm_data_access.mdx b/api_docs/apm_data_access.mdx
index c5f3e3b8c4b0e..35b1bf3876522 100644
--- a/api_docs/apm_data_access.mdx
+++ b/api_docs/apm_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apmDataAccess
 title: "apmDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apmDataAccess plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmDataAccess']
 ---
 import apmDataAccessObj from './apm_data_access.devdocs.json';
diff --git a/api_docs/asset_manager.mdx b/api_docs/asset_manager.mdx
index 9e50ccf6149f8..dd7c208fd08d9 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: 2024-04-02
+date: 2024-04-03
 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 befc77fdda141..44811817b0241 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: 2024-04-02
+date: 2024-04-03
 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 90915494620b2..66abd4e577fb0 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: 2024-04-02
+date: 2024-04-03
 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 5873c2a9a5ad1..854408a5d3da5 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: 2024-04-02
+date: 2024-04-03
 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 962b23af31884..b825f602adab6 100644
--- a/api_docs/cases.devdocs.json
+++ b/api_docs/cases.devdocs.json
@@ -483,7 +483,7 @@
               "section": "def-common.CaseSeverity",
               "text": "CaseSeverity"
             },
-            "[] | undefined; assignees?: string | string[] | undefined; reporters?: string | string[] | undefined; defaultSearchOperator?: \"AND\" | \"OR\" | undefined; from?: string | undefined; search?: string | undefined; searchFields?: \"title\" | \"description\" | (\"title\" | \"description\")[] | undefined; sortField?: \"title\" | \"createdAt\" | \"updatedAt\" | \"category\" | \"status\" | \"severity\" | \"closedAt\" | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; to?: string | undefined; owner?: string | string[] | undefined; category?: string | string[] | undefined; } & Partial<",
+            "[] | undefined; assignees?: string | string[] | undefined; reporters?: string | string[] | undefined; defaultSearchOperator?: \"AND\" | \"OR\" | undefined; from?: string | undefined; search?: string | undefined; searchFields?: \"title\" | \"description\" | (\"title\" | \"description\")[] | undefined; sortField?: \"title\" | \"createdAt\" | \"updatedAt\" | \"status\" | \"category\" | \"severity\" | \"closedAt\" | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; to?: string | undefined; owner?: string | string[] | undefined; category?: string | string[] | undefined; } & Partial<",
             "Pagination",
             ">, signal?: AbortSignal | undefined) => Promise<",
             {
diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx
index 97068d9c57ceb..981f0f24d0570 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: 2024-04-02
+date: 2024-04-03
 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 65235a10fbb71..5dbfad70517b9 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: 2024-04-02
+date: 2024-04-03
 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 822b0057acff3..f5c04f505fb87 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud']
 ---
 import cloudObj from './cloud.devdocs.json';
diff --git a/api_docs/cloud_data_migration.mdx b/api_docs/cloud_data_migration.mdx
index 11a35a2e00f35..1f108dbdda3c1 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: 2024-04-02
+date: 2024-04-03
 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 897437871d0be..24dd7cc74d2bd 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: 2024-04-02
+date: 2024-04-03
 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 03015b8ce3057..0e77e9893e2e5 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: 2024-04-02
+date: 2024-04-03
 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 0d3f5ba24308a..902eb0ea59ce3 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: 2024-04-02
+date: 2024-04-03
 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 92e8036110422..3095433d06675 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: 2024-04-02
+date: 2024-04-03
 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 72134b1fe5e39..30ec154466de9 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: 2024-04-02
+date: 2024-04-03
 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 705cd0439d21f..999f42ac6d3c0 100644
--- a/api_docs/controls.devdocs.json
+++ b/api_docs/controls.devdocs.json
@@ -560,7 +560,7 @@
                 "section": "def-common.PersistableControlGroupInput",
                 "text": "PersistableControlGroupInput"
               },
-              ") => void"
+              " | undefined) => void"
             ],
             "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
             "deprecated": false,
@@ -580,12 +580,13 @@
                     "docId": "kibControlsPluginApi",
                     "section": "def-common.PersistableControlGroupInput",
                     "text": "PersistableControlGroupInput"
-                  }
+                  },
+                  " | undefined"
                 ],
                 "path": "src/plugins/controls/public/control_group/embeddable/control_group_container.tsx",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": true
+                "isRequired": false
               }
             ],
             "returnComment": []
diff --git a/api_docs/controls.mdx b/api_docs/controls.mdx
index ae79b543c1ae1..ed1de22950de2 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: 2024-04-02
+date: 2024-04-03
 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 e79f3cd69823c..1f0e17e326204 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: 2024-04-02
+date: 2024-04-03
 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 8e499c2fd20b0..e362bf279016b 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: 2024-04-02
+date: 2024-04-03
 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 342aca738dc0c..6f8654caa1009 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: 2024-04-02
+date: 2024-04-03
 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 1cef5b87888b0..16bdf0bf86ab5 100644
--- a/api_docs/data.devdocs.json
+++ b/api_docs/data.devdocs.json
@@ -7421,20 +7421,6 @@
             "deprecated": false,
             "trackAdoption": false
           },
-          {
-            "parentPluginId": "data",
-            "id": "def-public.GetFieldsOptions.lookBack",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "lookBack",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "path": "src/plugins/data_views/common/types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "data",
             "id": "def-public.GetFieldsOptions.metaFields",
@@ -8323,7 +8309,7 @@
             "tags": [],
             "label": "type",
             "description": [
-              " The type of Saved Object. Each plugin can define it's own custom Saved Object types."
+              " The type of Saved Object. Each plugin can define its own custom Saved Object types."
             ],
             "path": "packages/core/saved-objects/core-saved-objects-common/src/server_types.ts",
             "deprecated": false,
@@ -10144,7 +10130,9 @@
             "section": "def-common.SearchSource",
             "text": "SearchSource"
           },
-          "; fetch: (options?: ",
+          "; history: ",
+          "SearchRequest",
+          "[]; fetch: (options?: ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -10156,9 +10144,7 @@
           "SearchResponse",
           "<unknown, Record<string, ",
           "AggregationsAggregate",
-          ">>>; history: ",
-          "SearchRequest",
-          "[]; setField: <K extends keyof ",
+          ">>>; setField: <K extends keyof ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -12907,6 +12893,24 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-server.DataView.getScriptedFieldsForQuery",
+            "type": "Function",
+            "tags": [],
+            "label": "getScriptedFieldsForQuery",
+            "description": [],
+            "signature": [
+              "() => Record<string, ",
+              "ScriptField",
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-server.DataView.getEtag",
@@ -13094,7 +13098,11 @@
             "references": [
               {
                 "plugin": "dataViews",
-                "path": "src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts"
+                "path": "src/plugins/data_views/common/data_views/abstract_data_views.ts"
+              },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/abstract_data_views.ts"
               },
               {
                 "plugin": "dataViewManagement",
@@ -13107,6 +13115,18 @@
               {
                 "plugin": "dataViews",
                 "path": "src/plugins/data_views/common/data_views/data_view.test.ts"
+              },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts"
+              },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts"
+              },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.test.ts"
               }
             ],
             "children": [
@@ -13242,6 +13262,10 @@
                 "plugin": "dataViews",
                 "path": "src/plugins/data_views/common/data_views/data_view.ts"
               },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/data_view.ts"
+              },
               {
                 "plugin": "dataViews",
                 "path": "src/plugins/data_views/common/data_views/data_views.ts"
@@ -13533,58 +13557,6 @@
               "map of DataViewFields (that are runtime fields) by field name"
             ]
           },
-          {
-            "parentPluginId": "data",
-            "id": "def-server.DataView.replaceAllRuntimeFields",
-            "type": "Function",
-            "tags": [],
-            "label": "replaceAllRuntimeFields",
-            "description": [
-              "\nReplaces all existing runtime fields with new fields."
-            ],
-            "signature": [
-              "(newFields: Record<string, ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.RuntimeField",
-                "text": "RuntimeField"
-              },
-              ">) => void"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_view.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "data",
-                "id": "def-server.DataView.replaceAllRuntimeFields.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "newFields",
-                "description": [
-                  "Map of runtime field definitions by field name"
-                ],
-                "signature": [
-                  "Record<string, ",
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.RuntimeField",
-                    "text": "RuntimeField"
-                  },
-                  ">"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_view.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
           {
             "parentPluginId": "data",
             "id": "def-server.DataView.removeRuntimeField",
@@ -14111,6 +14083,46 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-server.DataViewsService.getAllDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getAllDataViewLazy",
+            "description": [],
+            "signature": [
+              "(refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-server.DataViewsService.getAllDataViewLazy.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "refresh",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-server.DataViewsService.clearCache",
@@ -14775,6 +14787,46 @@
               "DataViewSpec"
             ]
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-server.DataViewsService.getDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDataViewLazy",
+            "description": [],
+            "signature": [
+              "(id: string) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-server.DataViewsService.getDataViewLazy.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-server.DataViewsService.get",
@@ -14947,12 +14999,12 @@
           },
           {
             "parentPluginId": "data",
-            "id": "def-server.DataViewsService.createAndSave",
+            "id": "def-server.DataViewsService.createDataViewLazy",
             "type": "Function",
             "tags": [],
-            "label": "createAndSave",
+            "label": "createDataViewLazy",
             "description": [
-              "\nCreate a new data view and save it right away."
+              "\nCreate data view lazy instance."
             ],
             "signature": [
               "(spec: ",
@@ -14963,13 +15015,13 @@
                 "section": "def-common.DataViewSpec",
                 "text": "DataViewSpec"
               },
-              ", overwrite?: boolean, skipFetchFields?: boolean, displayErrors?: boolean) => Promise<",
+              ") => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
               ">"
             ],
@@ -14979,7 +15031,7 @@
             "children": [
               {
                 "parentPluginId": "data",
-                "id": "def-server.DataViewsService.createAndSave.$1",
+                "id": "def-server.DataViewsService.createDataViewLazy.$1",
                 "type": "Object",
                 "tags": [],
                 "label": "spec",
@@ -14999,33 +15051,61 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
+              }
+            ],
+            "returnComment": [
+              "DataViewLazy"
+            ]
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-server.DataViewsService.createAndSaveDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "createAndSaveDataViewLazy",
+            "description": [
+              "\nCreate a new data view lazy and save it right away."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
+              ", overwrite?: boolean) => Promise<",
               {
-                "parentPluginId": "data",
-                "id": "def-server.DataViewsService.createAndSave.$2",
-                "type": "boolean",
-                "tags": [],
-                "label": "overwrite",
-                "description": [],
-                "signature": [
-                  "boolean"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
               {
                 "parentPluginId": "data",
-                "id": "def-server.DataViewsService.createAndSave.$3",
-                "type": "boolean",
+                "id": "def-server.DataViewsService.createAndSaveDataViewLazy.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "skipFetchFields",
+                "label": "spec",
                 "description": [
-                  "Whether to skip field refresh step."
+                  "data view spec"
                 ],
                 "signature": [
-                  "boolean"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -15034,13 +15114,11 @@
               },
               {
                 "parentPluginId": "data",
-                "id": "def-server.DataViewsService.createAndSave.$4",
+                "id": "def-server.DataViewsService.createAndSaveDataViewLazy.$2",
                 "type": "boolean",
                 "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
+                "label": "overwrite",
+                "description": [],
                 "signature": [
                   "boolean"
                 ],
@@ -15054,23 +15132,23 @@
           },
           {
             "parentPluginId": "data",
-            "id": "def-server.DataViewsService.createSavedObject",
+            "id": "def-server.DataViewsService.createAndSave",
             "type": "Function",
             "tags": [],
-            "label": "createSavedObject",
+            "label": "createAndSave",
             "description": [
-              "\nSave a new data view."
+              "\nCreate a new data view and save it right away."
             ],
             "signature": [
-              "(dataView: ",
+              "(spec: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
-              ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
+              ", overwrite?: boolean, skipFetchFields?: boolean, displayErrors?: boolean) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -15086,20 +15164,20 @@
             "children": [
               {
                 "parentPluginId": "data",
-                "id": "def-server.DataViewsService.createSavedObject.$1",
+                "id": "def-server.DataViewsService.createAndSave.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "dataView",
+                "label": "spec",
                 "description": [
-                  "data view instance"
+                  "data view spec"
                 ],
                 "signature": [
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
                   }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
@@ -15109,7 +15187,7 @@
               },
               {
                 "parentPluginId": "data",
-                "id": "def-server.DataViewsService.createSavedObject.$2",
+                "id": "def-server.DataViewsService.createAndSave.$2",
                 "type": "boolean",
                 "tags": [],
                 "label": "overwrite",
@@ -15124,7 +15202,24 @@
               },
               {
                 "parentPluginId": "data",
-                "id": "def-server.DataViewsService.createSavedObject.$3",
+                "id": "def-server.DataViewsService.createAndSave.$3",
+                "type": "boolean",
+                "tags": [],
+                "label": "skipFetchFields",
+                "description": [
+                  "Whether to skip field refresh step."
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-server.DataViewsService.createAndSave.$4",
                 "type": "boolean",
                 "tags": [],
                 "label": "displayErrors",
@@ -15142,6 +15237,59 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-server.DataViewsService.createSavedObject",
+            "type": "Function",
+            "tags": [],
+            "label": "createSavedObject",
+            "description": [
+              "\nSave a new data view."
+            ],
+            "signature": [
+              "(dataView: ",
+              "AbstractDataView",
+              ", overwrite?: boolean) => Promise<void>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-server.DataViewsService.createSavedObject.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [
+                  "data view instance"
+                ],
+                "signature": [
+                  "AbstractDataView"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-server.DataViewsService.createSavedObject.$2",
+                "type": "boolean",
+                "tags": [],
+                "label": "overwrite",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-server.DataViewsService.updateSavedObject",
@@ -15153,22 +15301,8 @@
             ],
             "signature": [
               "(indexPattern: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+              "AbstractDataView",
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -15182,13 +15316,7 @@
                 "label": "indexPattern",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
+                  "AbstractDataView"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -15299,6 +15427,34 @@
             "children": [],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-server.DataViewsService.getDefaultDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataViewLazy",
+            "description": [
+              "\nReturns the default data view as a DataViewLazy.\nIf no default is found, or it is missing\nanother data view is selected as default and returned.\nIf no possible data view found to become a default returns null.\n"
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              " | null>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": [
+              "default data view lazy"
+            ]
+          },
           {
             "parentPluginId": "data",
             "id": "def-server.DataViewsService.getDefaultDataView",
@@ -15368,6 +15524,114 @@
             "returnComment": [
               "default data view"
             ]
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-server.DataViewsService.toDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataView",
+            "description": [],
+            "signature": [
+              "(dataViewLazy: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-server.DataViewsService.toDataView.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataViewLazy",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewLazy",
+                    "text": "DataViewLazy"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-server.DataViewsService.toDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataViewLazy",
+            "description": [],
+            "signature": [
+              "(dataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-server.DataViewsService.toDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
@@ -19292,6 +19556,24 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataView.getScriptedFieldsForQuery",
+            "type": "Function",
+            "tags": [],
+            "label": "getScriptedFieldsForQuery",
+            "description": [],
+            "signature": [
+              "() => Record<string, ",
+              "ScriptField",
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-common.DataView.getEtag",
@@ -19479,7 +19761,11 @@
             "references": [
               {
                 "plugin": "dataViews",
-                "path": "src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts"
+                "path": "src/plugins/data_views/common/data_views/abstract_data_views.ts"
+              },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/abstract_data_views.ts"
               },
               {
                 "plugin": "dataViewManagement",
@@ -19492,6 +19778,18 @@
               {
                 "plugin": "dataViews",
                 "path": "src/plugins/data_views/common/data_views/data_view.test.ts"
+              },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts"
+              },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts"
+              },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.test.ts"
               }
             ],
             "children": [
@@ -19627,6 +19925,10 @@
                 "plugin": "dataViews",
                 "path": "src/plugins/data_views/common/data_views/data_view.ts"
               },
+              {
+                "plugin": "dataViews",
+                "path": "src/plugins/data_views/common/data_views/data_view.ts"
+              },
               {
                 "plugin": "dataViews",
                 "path": "src/plugins/data_views/common/data_views/data_views.ts"
@@ -19920,23 +20222,15 @@
           },
           {
             "parentPluginId": "data",
-            "id": "def-common.DataView.replaceAllRuntimeFields",
+            "id": "def-common.DataView.removeRuntimeField",
             "type": "Function",
             "tags": [],
-            "label": "replaceAllRuntimeFields",
+            "label": "removeRuntimeField",
             "description": [
-              "\nReplaces all existing runtime fields with new fields."
+              "\nRemove a runtime field - removed from mapped field or removed unmapped\nfield as appropriate. Doesn't clear associated field attributes."
             ],
             "signature": [
-              "(newFields: Record<string, ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.RuntimeField",
-                "text": "RuntimeField"
-              },
-              ">) => void"
+              "(name: string) => void"
             ],
             "path": "src/plugins/data_views/common/data_views/data_view.ts",
             "deprecated": false,
@@ -19944,56 +20238,12 @@
             "children": [
               {
                 "parentPluginId": "data",
-                "id": "def-common.DataView.replaceAllRuntimeFields.$1",
-                "type": "Object",
+                "id": "def-common.DataView.removeRuntimeField.$1",
+                "type": "string",
                 "tags": [],
-                "label": "newFields",
+                "label": "name",
                 "description": [
-                  "Map of runtime field definitions by field name"
-                ],
-                "signature": [
-                  "Record<string, ",
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.RuntimeField",
-                    "text": "RuntimeField"
-                  },
-                  ">"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_view.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "data",
-            "id": "def-common.DataView.removeRuntimeField",
-            "type": "Function",
-            "tags": [],
-            "label": "removeRuntimeField",
-            "description": [
-              "\nRemove a runtime field - removed from mapped field or removed unmapped\nfield as appropriate. Doesn't clear associated field attributes."
-            ],
-            "signature": [
-              "(name: string) => void"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_view.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "data",
-                "id": "def-common.DataView.removeRuntimeField.$1",
-                "type": "string",
-                "tags": [],
-                "label": "name",
-                "description": [
-                  "- Field name to remove"
+                  "- Field name to remove"
                 ],
                 "signature": [
                   "string"
@@ -21426,6 +21676,46 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataViewsService.getAllDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getAllDataViewLazy",
+            "description": [],
+            "signature": [
+              "(refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.DataViewsService.getAllDataViewLazy.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "refresh",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-common.DataViewsService.clearCache",
@@ -22090,6 +22380,46 @@
               "DataViewSpec"
             ]
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataViewsService.getDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDataViewLazy",
+            "description": [],
+            "signature": [
+              "(id: string) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.DataViewsService.getDataViewLazy.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-common.DataViewsService.get",
@@ -22260,6 +22590,139 @@
               "DataView"
             ]
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataViewsService.createDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "createDataViewLazy",
+            "description": [
+              "\nCreate data view lazy instance."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.DataViewsService.createDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "spec",
+                "description": [
+                  "data view spec"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": [
+              "DataViewLazy"
+            ]
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataViewsService.createAndSaveDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "createAndSaveDataViewLazy",
+            "description": [
+              "\nCreate a new data view lazy and save it right away."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ", overwrite?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.DataViewsService.createAndSaveDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "spec",
+                "description": [
+                  "data view spec"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-common.DataViewsService.createAndSaveDataViewLazy.$2",
+                "type": "boolean",
+                "tags": [],
+                "label": "overwrite",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-common.DataViewsService.createAndSave",
@@ -22378,22 +22841,8 @@
             ],
             "signature": [
               "(dataView: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+              "AbstractDataView",
+              ", overwrite?: boolean) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -22409,13 +22858,7 @@
                   "data view instance"
                 ],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
+                  "AbstractDataView"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -22436,23 +22879,6 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
-              },
-              {
-                "parentPluginId": "data",
-                "id": "def-common.DataViewsService.createSavedObject.$3",
-                "type": "boolean",
-                "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
-                "signature": [
-                  "boolean"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
               }
             ],
             "returnComment": []
@@ -22468,22 +22894,8 @@
             ],
             "signature": [
               "(indexPattern: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+              "AbstractDataView",
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -22497,13 +22909,7 @@
                 "label": "indexPattern",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
+                  "AbstractDataView"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -22614,6 +23020,34 @@
             "children": [],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataViewsService.getDefaultDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataViewLazy",
+            "description": [
+              "\nReturns the default data view as a DataViewLazy.\nIf no default is found, or it is missing\nanother data view is selected as default and returned.\nIf no possible data view found to become a default returns null.\n"
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              " | null>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": [
+              "default data view lazy"
+            ]
+          },
           {
             "parentPluginId": "data",
             "id": "def-common.DataViewsService.getDefaultDataView",
@@ -22683,6 +23117,114 @@
             "returnComment": [
               "default data view"
             ]
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataViewsService.toDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataView",
+            "description": [],
+            "signature": [
+              "(dataViewLazy: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.DataViewsService.toDataView.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataViewLazy",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewLazy",
+                    "text": "DataViewLazy"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DataViewsService.toDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataViewLazy",
+            "description": [],
+            "signature": [
+              "(dataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.DataViewsService.toDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
@@ -23989,20 +24531,6 @@
             "deprecated": false,
             "trackAdoption": false
           },
-          {
-            "parentPluginId": "data",
-            "id": "def-common.GetFieldsOptions.lookBack",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "lookBack",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "path": "src/plugins/data_views/common/types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "data",
             "id": "def-common.GetFieldsOptions.metaFields",
@@ -24440,7 +24968,7 @@
             "tags": [],
             "label": "type",
             "description": [
-              " The type of Saved Object. Each plugin can define it's own custom Saved Object types."
+              " The type of Saved Object. Each plugin can define its own custom Saved Object types."
             ],
             "path": "packages/core/saved-objects/core-saved-objects-common/src/server_types.ts",
             "deprecated": false,
@@ -25190,6 +25718,14 @@
             "section": "def-common.DataViewListItem",
             "text": "DataViewListItem"
           },
+          "[]>; getAllDataViewLazy: (refresh?: boolean) => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
           "[]>; clearCache: () => void; clearInstanceCache: (id?: string | undefined) => void; getCache: () => Promise<",
           {
             "pluginId": "@kbn/core-saved-objects-common",
@@ -25318,7 +25854,47 @@
             "section": "def-common.DataViewSpec",
             "text": "DataViewSpec"
           },
-          "; createAndSave: (spec: ",
+          "; getDataViewLazy: (id: string) => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
+          ">; createDataViewLazy: (spec: ",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
+          },
+          ") => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
+          ">; createAndSaveDataViewLazy: (spec: ",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
+          },
+          ", overwrite?: boolean) => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
+          ">; createAndSave: (spec: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -25335,14 +25911,18 @@
             "text": "DataView"
           },
           ">; createSavedObject: (dataView: ",
+          "AbstractDataView",
+          ", overwrite?: boolean) => Promise<void>; updateSavedObject: (indexPattern: ",
+          "AbstractDataView",
+          ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>; defaultDataViewExists: () => Promise<boolean>; getDefaultDataViewLazy: () => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
           },
-          ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
+          " | null>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -25350,15 +25930,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; updateSavedObject: (indexPattern: ",
+          " | null>; toDataView: (dataViewLazy: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
           },
-          ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
+          ") => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -25366,7 +25946,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; defaultDataViewExists: () => Promise<boolean>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+          ">; toDataViewLazy: (dataView: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -25374,7 +25954,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          " | null>; }"
+          ") => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
+          ">; }"
         ],
         "path": "src/plugins/data_views/common/data_views/data_views.ts",
         "deprecated": false,
diff --git a/api_docs/data.mdx b/api_docs/data.mdx
index d3db433dafa14..de57c2d70aae4 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data']
 ---
 import dataObj from './data.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 3261 | 31 | 2601 | 23 |
+| 3283 | 31 | 2619 | 23 |
 
 ## Client
 
diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx
index a388cd0c346ee..5418393cab857 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.query']
 ---
 import dataQueryObj from './data_query.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 3261 | 31 | 2601 | 23 |
+| 3283 | 31 | 2619 | 23 |
 
 ## Client
 
diff --git a/api_docs/data_search.devdocs.json b/api_docs/data_search.devdocs.json
index 177e3cf4d8c75..6c23e455f0893 100644
--- a/api_docs/data_search.devdocs.json
+++ b/api_docs/data_search.devdocs.json
@@ -6991,7 +6991,9 @@
                     "section": "def-common.SearchSource",
                     "text": "SearchSource"
                   },
-                  "; fetch: (options?: ",
+                  "; history: ",
+                  "SearchRequest",
+                  "[]; fetch: (options?: ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -7003,9 +7005,7 @@
                   "SearchResponse",
                   "<unknown, Record<string, ",
                   "AggregationsAggregate",
-                  ">>>; history: ",
-                  "SearchRequest",
-                  "[]; setField: <K extends keyof ",
+                  ">>>; setField: <K extends keyof ",
                   {
                     "pluginId": "data",
                     "scope": "common",
@@ -34040,7 +34040,9 @@
             "section": "def-common.SearchSource",
             "text": "SearchSource"
           },
-          "; fetch: (options?: ",
+          "; history: ",
+          "SearchRequest",
+          "[]; fetch: (options?: ",
           {
             "pluginId": "data",
             "scope": "common",
@@ -34052,9 +34054,7 @@
           "SearchResponse",
           "<unknown, Record<string, ",
           "AggregationsAggregate",
-          ">>>; history: ",
-          "SearchRequest",
-          "[]; setField: <K extends keyof ",
+          ">>>; setField: <K extends keyof ",
           {
             "pluginId": "data",
             "scope": "common",
diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx
index d8a8fbb2657b1..5ff62766cff45 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.search']
 ---
 import dataSearchObj from './data_search.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 3261 | 31 | 2601 | 23 |
+| 3283 | 31 | 2619 | 23 |
 
 ## Client
 
diff --git a/api_docs/data_view_editor.mdx b/api_docs/data_view_editor.mdx
index ca9165187428a..d0f0ae9dc50da 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: 2024-04-02
+date: 2024-04-03
 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 97bb00a38e7c2..467b80bce6aba 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: 2024-04-02
+date: 2024-04-03
 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 3dd4ecef75921..7b783be3fb879 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: 2024-04-02
+date: 2024-04-03
 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 e9aea1f707c76..dc66b8c4752cc 100644
--- a/api_docs/data_views.devdocs.json
+++ b/api_docs/data_views.devdocs.json
@@ -158,6 +158,24 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataView.getScriptedFieldsForQuery",
+            "type": "Function",
+            "tags": [],
+            "label": "getScriptedFieldsForQuery",
+            "description": [],
+            "signature": [
+              "() => Record<string, ",
+              "ScriptField",
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-public.DataView.getEtag",
@@ -740,58 +758,6 @@
               "map of DataViewFields (that are runtime fields) by field name"
             ]
           },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-public.DataView.replaceAllRuntimeFields",
-            "type": "Function",
-            "tags": [],
-            "label": "replaceAllRuntimeFields",
-            "description": [
-              "\nReplaces all existing runtime fields with new fields."
-            ],
-            "signature": [
-              "(newFields: Record<string, ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.RuntimeField",
-                "text": "RuntimeField"
-              },
-              ">) => void"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_view.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-public.DataView.replaceAllRuntimeFields.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "newFields",
-                "description": [
-                  "Map of runtime field definitions by field name"
-                ],
-                "signature": [
-                  "Record<string, ",
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.RuntimeField",
-                    "text": "RuntimeField"
-                  },
-                  ">"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_view.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
           {
             "parentPluginId": "dataViews",
             "id": "def-public.DataView.removeRuntimeField",
@@ -2028,15 +1994,7 @@
                 "section": "def-common.GetFieldsOptions",
                 "text": "GetFieldsOptions"
               },
-              ") => Promise<{ indices: string[]; fields: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldSpec",
-                "text": "FieldSpec"
-              },
-              "[]; etag: string; }>"
+              ") => Promise<{ indices: string[]; fields: FieldsForWildcardSpec[]; etag: string; }>"
             ],
             "path": "src/plugins/data_views/public/data_views/data_views_api_client.ts",
             "deprecated": false,
@@ -2730,6 +2688,46 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataViewsService.getAllDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getAllDataViewLazy",
+            "description": [],
+            "signature": [
+              "(refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-public.DataViewsService.getAllDataViewLazy.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "refresh",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-public.DataViewsService.clearCache",
@@ -3394,6 +3392,46 @@
               "DataViewSpec"
             ]
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataViewsService.getDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDataViewLazy",
+            "description": [],
+            "signature": [
+              "(id: string) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-public.DataViewsService.getDataViewLazy.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-public.DataViewsService.get",
@@ -3566,12 +3604,12 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-public.DataViewsService.createAndSave",
+            "id": "def-public.DataViewsService.createDataViewLazy",
             "type": "Function",
             "tags": [],
-            "label": "createAndSave",
+            "label": "createDataViewLazy",
             "description": [
-              "\nCreate a new data view and save it right away."
+              "\nCreate data view lazy instance."
             ],
             "signature": [
               "(spec: ",
@@ -3582,13 +3620,13 @@
                 "section": "def-common.DataViewSpec",
                 "text": "DataViewSpec"
               },
-              ", overwrite?: boolean, skipFetchFields?: boolean, displayErrors?: boolean) => Promise<",
+              ") => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
               ">"
             ],
@@ -3598,7 +3636,7 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-public.DataViewsService.createAndSave.$1",
+                "id": "def-public.DataViewsService.createDataViewLazy.$1",
                 "type": "Object",
                 "tags": [],
                 "label": "spec",
@@ -3618,33 +3656,61 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
+              }
+            ],
+            "returnComment": [
+              "DataViewLazy"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataViewsService.createAndSaveDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "createAndSaveDataViewLazy",
+            "description": [
+              "\nCreate a new data view lazy and save it right away."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
+              ", overwrite?: boolean) => Promise<",
               {
-                "parentPluginId": "dataViews",
-                "id": "def-public.DataViewsService.createAndSave.$2",
-                "type": "boolean",
-                "tags": [],
-                "label": "overwrite",
-                "description": [],
-                "signature": [
-                  "boolean"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-public.DataViewsService.createAndSave.$3",
-                "type": "boolean",
+                "id": "def-public.DataViewsService.createAndSaveDataViewLazy.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "skipFetchFields",
+                "label": "spec",
                 "description": [
-                  "Whether to skip field refresh step."
+                  "data view spec"
                 ],
                 "signature": [
-                  "boolean"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -3653,13 +3719,11 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-public.DataViewsService.createAndSave.$4",
+                "id": "def-public.DataViewsService.createAndSaveDataViewLazy.$2",
                 "type": "boolean",
                 "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
+                "label": "overwrite",
+                "description": [],
                 "signature": [
                   "boolean"
                 ],
@@ -3673,23 +3737,23 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-public.DataViewsService.createSavedObject",
+            "id": "def-public.DataViewsService.createAndSave",
             "type": "Function",
             "tags": [],
-            "label": "createSavedObject",
+            "label": "createAndSave",
             "description": [
-              "\nSave a new data view."
+              "\nCreate a new data view and save it right away."
             ],
             "signature": [
-              "(dataView: ",
+              "(spec: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
-              ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
+              ", overwrite?: boolean, skipFetchFields?: boolean, displayErrors?: boolean) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -3705,20 +3769,20 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-public.DataViewsService.createSavedObject.$1",
+                "id": "def-public.DataViewsService.createAndSave.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "dataView",
+                "label": "spec",
                 "description": [
-                  "data view instance"
+                  "data view spec"
                 ],
                 "signature": [
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
                   }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
@@ -3728,7 +3792,7 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-public.DataViewsService.createSavedObject.$2",
+                "id": "def-public.DataViewsService.createAndSave.$2",
                 "type": "boolean",
                 "tags": [],
                 "label": "overwrite",
@@ -3743,7 +3807,24 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-public.DataViewsService.createSavedObject.$3",
+                "id": "def-public.DataViewsService.createAndSave.$3",
+                "type": "boolean",
+                "tags": [],
+                "label": "skipFetchFields",
+                "description": [
+                  "Whether to skip field refresh step."
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-public.DataViewsService.createAndSave.$4",
                 "type": "boolean",
                 "tags": [],
                 "label": "displayErrors",
@@ -3763,31 +3844,70 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-public.DataViewsService.updateSavedObject",
+            "id": "def-public.DataViewsService.createSavedObject",
             "type": "Function",
             "tags": [],
-            "label": "updateSavedObject",
+            "label": "createSavedObject",
             "description": [
-              "\nSave existing data view. Will attempt to merge differences if there are conflicts."
+              "\nSave a new data view."
             ],
             "signature": [
-              "(indexPattern: ",
+              "(dataView: ",
+              "AbstractDataView",
+              ", overwrite?: boolean) => Promise<void>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
               {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "parentPluginId": "dataViews",
+                "id": "def-public.DataViewsService.createSavedObject.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [
+                  "data view instance"
+                ],
+                "signature": [
+                  "AbstractDataView"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
               },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
               {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+                "parentPluginId": "dataViews",
+                "id": "def-public.DataViewsService.createSavedObject.$2",
+                "type": "boolean",
+                "tags": [],
+                "label": "overwrite",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataViewsService.updateSavedObject",
+            "type": "Function",
+            "tags": [],
+            "label": "updateSavedObject",
+            "description": [
+              "\nSave existing data view. Will attempt to merge differences if there are conflicts."
+            ],
+            "signature": [
+              "(indexPattern: ",
+              "AbstractDataView",
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -3801,13 +3921,7 @@
                 "label": "indexPattern",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
+                  "AbstractDataView"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -3918,6 +4032,34 @@
             "children": [],
             "returnComment": []
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataViewsService.getDefaultDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataViewLazy",
+            "description": [
+              "\nReturns the default data view as a DataViewLazy.\nIf no default is found, or it is missing\nanother data view is selected as default and returned.\nIf no possible data view found to become a default returns null.\n"
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              " | null>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": [
+              "default data view lazy"
+            ]
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-public.DataViewsService.getDefaultDataView",
@@ -3987,6 +4129,114 @@
             "returnComment": [
               "default data view"
             ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataViewsService.toDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataView",
+            "description": [],
+            "signature": [
+              "(dataViewLazy: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-public.DataViewsService.toDataView.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataViewLazy",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewLazy",
+                    "text": "DataViewLazy"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-public.DataViewsService.toDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataViewLazy",
+            "description": [],
+            "signature": [
+              "(dataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-public.DataViewsService.toDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
@@ -6836,6 +7086,24 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-server.DataView.getScriptedFieldsForQuery",
+            "type": "Function",
+            "tags": [],
+            "label": "getScriptedFieldsForQuery",
+            "description": [],
+            "signature": [
+              "() => Record<string, ",
+              "ScriptField",
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-server.DataView.getEtag",
@@ -7418,58 +7686,6 @@
               "map of DataViewFields (that are runtime fields) by field name"
             ]
           },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-server.DataView.replaceAllRuntimeFields",
-            "type": "Function",
-            "tags": [],
-            "label": "replaceAllRuntimeFields",
-            "description": [
-              "\nReplaces all existing runtime fields with new fields."
-            ],
-            "signature": [
-              "(newFields: Record<string, ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.RuntimeField",
-                "text": "RuntimeField"
-              },
-              ">) => void"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_view.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-server.DataView.replaceAllRuntimeFields.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "newFields",
-                "description": [
-                  "Map of runtime field definitions by field name"
-                ],
-                "signature": [
-                  "Record<string, ",
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.RuntimeField",
-                    "text": "RuntimeField"
-                  },
-                  ">"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_view.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
           {
             "parentPluginId": "dataViews",
             "id": "def-server.DataView.removeRuntimeField",
@@ -8332,20 +8548,60 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-server.DataViewsService.clearCache",
+            "id": "def-server.DataViewsService.getAllDataViewLazy",
             "type": "Function",
             "tags": [],
-            "label": "clearCache",
-            "description": [
-              "\nClear index pattern saved objects cache."
-            ],
+            "label": "getAllDataViewLazy",
+            "description": [],
             "signature": [
-              "() => void"
+              "(refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              "[]>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "children": [],
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-server.DataViewsService.getAllDataViewLazy.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "refresh",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-server.DataViewsService.clearCache",
+            "type": "Function",
+            "tags": [],
+            "label": "clearCache",
+            "description": [
+              "\nClear index pattern saved objects cache."
+            ],
+            "signature": [
+              "() => void"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
             "returnComment": []
           },
           {
@@ -8994,6 +9250,46 @@
               "DataViewSpec"
             ]
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-server.DataViewsService.getDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDataViewLazy",
+            "description": [],
+            "signature": [
+              "(id: string) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-server.DataViewsService.getDataViewLazy.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-server.DataViewsService.get",
@@ -9164,6 +9460,139 @@
               "DataView"
             ]
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-server.DataViewsService.createDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "createDataViewLazy",
+            "description": [
+              "\nCreate data view lazy instance."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-server.DataViewsService.createDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "spec",
+                "description": [
+                  "data view spec"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": [
+              "DataViewLazy"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-server.DataViewsService.createAndSaveDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "createAndSaveDataViewLazy",
+            "description": [
+              "\nCreate a new data view lazy and save it right away."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ", overwrite?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-server.DataViewsService.createAndSaveDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "spec",
+                "description": [
+                  "data view spec"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-server.DataViewsService.createAndSaveDataViewLazy.$2",
+                "type": "boolean",
+                "tags": [],
+                "label": "overwrite",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-server.DataViewsService.createAndSave",
@@ -9282,22 +9711,8 @@
             ],
             "signature": [
               "(dataView: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+              "AbstractDataView",
+              ", overwrite?: boolean) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -9313,13 +9728,7 @@
                   "data view instance"
                 ],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
+                  "AbstractDataView"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -9340,23 +9749,6 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-server.DataViewsService.createSavedObject.$3",
-                "type": "boolean",
-                "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
-                "signature": [
-                  "boolean"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
               }
             ],
             "returnComment": []
@@ -9372,22 +9764,8 @@
             ],
             "signature": [
               "(indexPattern: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+              "AbstractDataView",
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -9401,13 +9779,7 @@
                 "label": "indexPattern",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
+                  "AbstractDataView"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -9520,29 +9892,57 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-server.DataViewsService.getDefaultDataView",
+            "id": "def-server.DataViewsService.getDefaultDataViewLazy",
             "type": "Function",
             "tags": [],
-            "label": "getDefaultDataView",
+            "label": "getDefaultDataViewLazy",
             "description": [
-              "\nReturns the default data view as an object.\nIf no default is found, or it is missing\nanother data view is selected as default and returned.\nIf no possible data view found to become a default returns null.\n"
+              "\nReturns the default data view as a DataViewLazy.\nIf no default is found, or it is missing\nanother data view is selected as default and returned.\nIf no possible data view found to become a default returns null.\n"
             ],
             "signature": [
-              "(options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+              "() => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
               " | null>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "children": [
-              {
+            "children": [],
+            "returnComment": [
+              "default data view lazy"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-server.DataViewsService.getDefaultDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataView",
+            "description": [
+              "\nReturns the default data view as an object.\nIf no default is found, or it is missing\nanother data view is selected as default and returned.\nIf no possible data view found to become a default returns null.\n"
+            ],
+            "signature": [
+              "(options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              " | null>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
                 "parentPluginId": "dataViews",
                 "id": "def-server.DataViewsService.getDefaultDataView.$1",
                 "type": "Object",
@@ -9587,6 +9987,114 @@
             "returnComment": [
               "default data view"
             ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-server.DataViewsService.toDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataView",
+            "description": [],
+            "signature": [
+              "(dataViewLazy: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-server.DataViewsService.toDataView.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataViewLazy",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewLazy",
+                    "text": "DataViewLazy"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-server.DataViewsService.toDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataViewLazy",
+            "description": [],
+            "signature": [
+              "(dataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-server.DataViewsService.toDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
@@ -12502,6 +13010,24 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataView.getScriptedFieldsForQuery",
+            "type": "Function",
+            "tags": [],
+            "label": "getScriptedFieldsForQuery",
+            "description": [],
+            "signature": [
+              "() => Record<string, ",
+              "ScriptField",
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-common.DataView.getEtag",
@@ -13084,58 +13610,6 @@
               "map of DataViewFields (that are runtime fields) by field name"
             ]
           },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataView.replaceAllRuntimeFields",
-            "type": "Function",
-            "tags": [],
-            "label": "replaceAllRuntimeFields",
-            "description": [
-              "\nReplaces all existing runtime fields with new fields."
-            ],
-            "signature": [
-              "(newFields: Record<string, ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.RuntimeField",
-                "text": "RuntimeField"
-              },
-              ">) => void"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_view.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataView.replaceAllRuntimeFields.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "newFields",
-                "description": [
-                  "Map of runtime field definitions by field name"
-                ],
-                "signature": [
-                  "Record<string, ",
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.RuntimeField",
-                    "text": "RuntimeField"
-                  },
-                  ">"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_view.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
           {
             "parentPluginId": "dataViews",
             "id": "def-common.DataView.removeRuntimeField",
@@ -14331,37 +14805,42 @@
       },
       {
         "parentPluginId": "dataViews",
-        "id": "def-common.DataViewMissingIndices",
+        "id": "def-common.DataViewLazy",
         "type": "Class",
         "tags": [],
-        "label": "DataViewMissingIndices",
-        "description": [
-          "\nTried to call a method that relies on SearchSource having an indexPattern assigned"
-        ],
+        "label": "DataViewLazy",
+        "description": [],
         "signature": [
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewMissingIndices",
-            "text": "DataViewMissingIndices"
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
           },
           " extends ",
-          {
-            "pluginId": "kibanaUtils",
-            "scope": "common",
-            "docId": "kibKibanaUtilsPluginApi",
-            "section": "def-common.KbnError",
-            "text": "KbnError"
-          }
+          "AbstractDataView"
         ],
-        "path": "src/plugins/data_views/common/lib/errors.ts",
+        "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewMissingIndices.Unnamed",
+            "id": "def-common.DataViewLazy.scriptedFieldsEnabled",
+            "type": "boolean",
+            "tags": [],
+            "label": "scriptedFieldsEnabled",
+            "description": [
+              "\nReturns true if scripted fields are enabled"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewLazy.Unnamed",
             "type": "Function",
             "tags": [],
             "label": "Constructor",
@@ -14369,170 +14848,93 @@
             "signature": [
               "any"
             ],
-            "path": "src/plugins/data_views/common/lib/errors.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewMissingIndices.Unnamed.$1",
-                "type": "string",
+                "id": "def-common.DataViewLazy.Unnamed.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "message",
+                "label": "config",
                 "description": [],
                 "signature": [
-                  "string"
+                  "DataViewDeps"
                 ],
-                "path": "src/plugins/data_views/common/lib/errors.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
               }
             ],
             "returnComment": []
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "dataViews",
-        "id": "def-common.DataViewSavedObjectConflictError",
-        "type": "Class",
-        "tags": [],
-        "label": "DataViewSavedObjectConflictError",
-        "description": [
-          "\nError thrown when saved object has been changed when attempting to save."
-        ],
-        "signature": [
-          {
-            "pluginId": "dataViews",
-            "scope": "common",
-            "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewSavedObjectConflictError",
-            "text": "DataViewSavedObjectConflictError"
           },
-          " extends Error"
-        ],
-        "path": "src/plugins/data_views/common/errors/data_view_saved_object_conflict.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewSavedObjectConflictError.Unnamed",
+            "id": "def-common.DataViewLazy.getFields",
             "type": "Function",
             "tags": [],
-            "label": "Constructor",
-            "description": [
-              "\nconstructor"
-            ],
+            "label": "getFields",
+            "description": [],
             "signature": [
-              "any"
-            ],
-            "path": "src/plugins/data_views/common/errors/data_view_saved_object_conflict.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
+              "({ mapped, scripted, runtime, fieldName, forceRefresh, unmapped, indexFilter, metaFields, }: GetFieldsParams) => Promise<{ getFieldMap: () => { [x: string]: ",
               {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewSavedObjectConflictError.Unnamed.$1",
-                "type": "string",
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewField",
+                "text": "DataViewField"
+              },
+              "; }; getFieldMapSorted: () => {}; }>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewLazy.getFields.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "savedObjectId",
-                "description": [
-                  "saved object id with conflict"
-                ],
+                "label": "{\n    mapped = true,\n    scripted = true,\n    runtime = true,\n    fieldName,\n    forceRefresh = false,\n    unmapped,\n    indexFilter,\n    metaFields = true,\n  }",
+                "description": [],
                 "signature": [
-                  "string"
+                  "GetFieldsParams"
                 ],
-                "path": "src/plugins/data_views/common/errors/data_view_saved_object_conflict.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
               }
             ],
             "returnComment": []
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "dataViews",
-        "id": "def-common.DataViewsService",
-        "type": "Class",
-        "tags": [],
-        "label": "DataViewsService",
-        "description": [
-          "\nData views service, providing CRUD operations for data views."
-        ],
-        "path": "src/plugins/data_views/common/data_views/data_views.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getCanSave",
-            "type": "Function",
-            "tags": [],
-            "label": "getCanSave",
-            "description": [
-              "\nCan the user save data views?"
-            ],
-            "signature": [
-              "() => Promise<boolean>"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.scriptedFieldsEnabled",
-            "type": "boolean",
-            "tags": [],
-            "label": "scriptedFieldsEnabled",
-            "description": [],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.Unnamed",
+            "id": "def-common.DataViewLazy.getRuntimeFields",
             "type": "Function",
             "tags": [],
-            "label": "Constructor",
-            "description": [
-              "\nDataViewsService constructor"
-            ],
+            "label": "getRuntimeFields",
+            "description": [],
             "signature": [
-              "any"
+              "({ fieldName }: Pick<GetFieldsParams, \"fieldName\">) => DataViewFieldMap"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.Unnamed.$1",
+                "id": "def-common.DataViewLazy.getRuntimeFields.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "deps",
-                "description": [
-                  "Service dependencies"
-                ],
+                "label": "{ fieldName = ['*'] }",
+                "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataViewsServiceDeps",
-                    "text": "DataViewsServiceDeps"
-                  }
+                  "Pick<GetFieldsParams, \"fieldName\">"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -14542,69 +14944,72 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getIds",
+            "id": "def-common.DataViewLazy.addRuntimeField",
             "type": "Function",
             "tags": [],
-            "label": "getIds",
+            "label": "addRuntimeField",
             "description": [
-              "\nGets list of index pattern ids."
+              "\nAdd a runtime field - Appended to existing mapped field or a new field is\ncreated as appropriate."
             ],
             "signature": [
-              "(refresh?: boolean) => Promise<string[]>"
+              "(name: string, runtimeField: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.RuntimeField",
+                "text": "RuntimeField"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewField",
+                "text": "DataViewField"
+              },
+              "[]>"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.getIds.$1",
-                "type": "boolean",
+                "id": "def-common.DataViewLazy.addRuntimeField.$1",
+                "type": "string",
                 "tags": [],
-                "label": "refresh",
+                "label": "name",
                 "description": [
-                  "Force refresh of index pattern list"
+                  "Field name"
                 ],
                 "signature": [
-                  "boolean"
+                  "string"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getTitles",
-            "type": "Function",
-            "tags": [],
-            "label": "getTitles",
-            "description": [
-              "\nGets list of index pattern titles."
-            ],
-            "signature": [
-              "(refresh?: boolean) => Promise<string[]>"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
+              },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.getTitles.$1",
-                "type": "boolean",
+                "id": "def-common.DataViewLazy.addRuntimeField.$2",
+                "type": "Object",
                 "tags": [],
-                "label": "refresh",
+                "label": "runtimeField",
                 "description": [
-                  "Force refresh of index pattern list"
+                  "Runtime field definition"
                 ],
                 "signature": [
-                  "boolean"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.RuntimeField",
+                    "text": "RuntimeField"
+                  }
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -14614,104 +15019,73 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.find",
+            "id": "def-common.DataViewLazy.removeRuntimeField",
             "type": "Function",
             "tags": [],
-            "label": "find",
+            "label": "removeRuntimeField",
             "description": [
-              "\nFind and load index patterns by title."
+              "\nRemove a runtime field - removed from mapped field or removed unmapped\nfield as appropriate. Doesn't clear associated field attributes."
             ],
             "signature": [
-              "(search: string, size?: number) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              "[]>"
+              "(name: string) => void"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.find.$1",
+                "id": "def-common.DataViewLazy.removeRuntimeField.$1",
                 "type": "string",
                 "tags": [],
-                "label": "search",
+                "label": "name",
                 "description": [
-                  "Search string"
+                  "- Field name to remove"
                 ],
                 "signature": [
                   "string"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.find.$2",
-                "type": "number",
-                "tags": [],
-                "label": "size",
-                "description": [
-                  "Number of data views to return"
-                ],
-                "signature": [
-                  "number"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
               }
             ],
-            "returnComment": [
-              "DataView[]"
-            ]
+            "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getIdsWithTitle",
+            "id": "def-common.DataViewLazy.getScriptedFields",
             "type": "Function",
             "tags": [],
-            "label": "getIdsWithTitle",
-            "description": [
-              "\nGets list of index pattern ids with titles."
-            ],
+            "label": "getScriptedFields",
+            "description": [],
             "signature": [
-              "(refresh?: boolean) => Promise<",
+              "({ fieldName }: Pick<GetFieldsParams, \"fieldName\">) => Record<string, ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewListItem",
-                "text": "DataViewListItem"
+                "section": "def-common.DataViewField",
+                "text": "DataViewField"
               },
-              "[]>"
+              ">"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.getIdsWithTitle.$1",
-                "type": "boolean",
+                "id": "def-common.DataViewLazy.getScriptedFields.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "refresh",
-                "description": [
-                  "Force refresh of index pattern list"
-                ],
+                "label": "{ fieldName = ['*'] }",
+                "description": [],
                 "signature": [
-                  "boolean"
+                  "Pick<GetFieldsParams, \"fieldName\">"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -14721,17 +15095,17 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.clearCache",
+            "id": "def-common.DataViewLazy.getScriptedFieldsForQuery",
             "type": "Function",
             "tags": [],
-            "label": "clearCache",
-            "description": [
-              "\nClear index pattern saved objects cache."
-            ],
+            "label": "getScriptedFieldsForQuery",
+            "description": [],
             "signature": [
-              "() => void"
+              "() => Record<string, ",
+              "ScriptField",
+              ">"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -14739,129 +15113,190 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.clearInstanceCache",
+            "id": "def-common.DataViewLazy.getComputedFields",
             "type": "Function",
             "tags": [],
-            "label": "clearInstanceCache",
-            "description": [
-              "\nClear index pattern instance cache"
-            ],
+            "label": "getComputedFields",
+            "description": [],
             "signature": [
-              "(id?: string | undefined) => void"
+              "({ fieldName }: { fieldName: string[]; }) => Promise<{ scriptFields: Record<string, ",
+              "ScriptField",
+              ">; docvalueFields: { field: string; format: string; }[]; runtimeFields: ",
+              "MappingRuntimeFields",
+              "; }>"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.clearInstanceCache.$1",
-                "type": "string",
+                "id": "def-common.DataViewLazy.getComputedFields.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "id",
+                "label": "{ fieldName = ['*'] }",
                 "description": [],
-                "signature": [
-                  "string | undefined"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": false
+                "children": [
+                  {
+                    "parentPluginId": "dataViews",
+                    "id": "def-common.DataViewLazy.getComputedFields.$1.fieldName",
+                    "type": "Array",
+                    "tags": [],
+                    "label": "fieldName",
+                    "description": [],
+                    "signature": [
+                      "string[]"
+                    ],
+                    "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getCache",
+            "id": "def-common.DataViewLazy.getRuntimeMappings",
             "type": "Function",
             "tags": [],
-            "label": "getCache",
+            "label": "getRuntimeMappings",
+            "description": [],
+            "signature": [
+              "() => ",
+              "MappingRuntimeFields"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewLazy.toSpec",
+            "type": "Function",
+            "tags": [],
+            "label": "toSpec",
             "description": [
-              "\nGet cache, contains data view saved objects."
+              "\nCreates static representation of the data view."
             ],
             "signature": [
-              "() => Promise<",
-              {
-                "pluginId": "@kbn/core-saved-objects-common",
-                "scope": "common",
-                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                "section": "def-common.SavedObject",
-                "text": "SavedObject"
-              },
-              "<",
+              "(params?: { fieldParams?: GetFieldsParams | undefined; } | undefined) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSavedObjectAttrs",
-                "text": "DataViewSavedObjectAttrs"
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
-              ">[] | null | undefined>"
+              ">"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "children": [],
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewLazy.toSpec.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "params",
+                "description": [],
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "dataViews",
+                    "id": "def-common.DataViewLazy.toSpec.$1.fieldParams",
+                    "type": "Object",
+                    "tags": [],
+                    "label": "fieldParams",
+                    "description": [],
+                    "signature": [
+                      "GetFieldsParams | undefined"
+                    ],
+                    "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              }
+            ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getDefault",
+            "id": "def-common.DataViewLazy.toMinimalSpec",
             "type": "Function",
             "tags": [],
-            "label": "getDefault",
+            "label": "toMinimalSpec",
             "description": [
-              "\nGet default index pattern"
+              "\nCreates a minimal static representation of the data view. Fields and popularity scores will be omitted."
             ],
             "signature": [
-              "(displayErrors?: boolean) => Promise<",
+              "(params?: { keepFieldAttrs?: (\"customLabel\" | \"customDescription\")[] | undefined; } | undefined) => Omit<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
-              " | null>"
+              ", \"fields\">"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.getDefault.$1",
-                "type": "boolean",
+                "id": "def-common.DataViewLazy.toMinimalSpec.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
-                "signature": [
-                  "boolean"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "label": "params",
+                "description": [],
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": true
+                "children": [
+                  {
+                    "parentPluginId": "dataViews",
+                    "id": "def-common.DataViewLazy.toMinimalSpec.$1.keepFieldAttrs",
+                    "type": "Array",
+                    "tags": [],
+                    "label": "keepFieldAttrs",
+                    "description": [],
+                    "signature": [
+                      "(\"customLabel\" | \"customDescription\")[] | undefined"
+                    ],
+                    "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getDefaultId",
+            "id": "def-common.DataViewLazy.isTSDBMode",
             "type": "Function",
             "tags": [],
-            "label": "getDefaultId",
+            "label": "isTSDBMode",
             "description": [
-              "\nGet default index pattern id"
+              "\nreturns true if dataview contains TSDB fields"
             ],
             "signature": [
-              "() => Promise<string | null>"
+              "() => Promise<boolean>"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -14869,50 +15304,75 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.setDefault",
+            "id": "def-common.DataViewLazy.removeScriptedField",
             "type": "Function",
             "tags": [],
-            "label": "setDefault",
-            "description": [
-              "\nOptionally set default index pattern, unless force = true"
-            ],
+            "label": "removeScriptedField",
+            "description": [],
             "signature": [
-              "(id: string | null, force?: boolean) => Promise<void>"
+              "(fieldName: string) => void"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.setDefault.$1",
-                "type": "CompoundType",
+                "id": "def-common.DataViewLazy.removeScriptedField.$1",
+                "type": "string",
                 "tags": [],
-                "label": "id",
-                "description": [
-                  "data view id"
-                ],
+                "label": "fieldName",
+                "description": [],
                 "signature": [
-                  "string | null"
+                  "string"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": false
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewLazy.upsertScriptedField",
+            "type": "Function",
+            "tags": [],
+            "label": "upsertScriptedField",
+            "description": [],
+            "signature": [
+              "(field: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
               },
+              ") => void"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.setDefault.$2",
-                "type": "boolean",
+                "id": "def-common.DataViewLazy.upsertScriptedField.$1",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "force",
-                "description": [
-                  "set default data view even if there's an existing default"
-                ],
+                "label": "field",
+                "description": [],
                 "signature": [
-                  "boolean"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.FieldSpec",
+                    "text": "FieldSpec"
+                  }
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -14922,17 +15382,15 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.hasUserDataView",
+            "id": "def-common.DataViewLazy.isTimeBased",
             "type": "Function",
             "tags": [],
-            "label": "hasUserDataView",
-            "description": [
-              "\nChecks if current user has a user created index pattern ignoring fleet's server default index patterns."
-            ],
+            "label": "isTimeBased",
+            "description": [],
             "signature": [
               "() => Promise<boolean>"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -14940,15 +15398,15 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getMetaFields",
+            "id": "def-common.DataViewLazy.isTimeNanosBased",
             "type": "Function",
             "tags": [],
-            "label": "getMetaFields",
+            "label": "isTimeNanosBased",
             "description": [],
             "signature": [
-              "() => Promise<string[] | undefined>"
+              "() => Promise<boolean>"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -14956,15 +15414,23 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getShortDotsEnable",
+            "id": "def-common.DataViewLazy.getTimeField",
             "type": "Function",
             "tags": [],
-            "label": "getShortDotsEnable",
+            "label": "getTimeField",
             "description": [],
             "signature": [
-              "() => Promise<boolean | undefined>"
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewField",
+                "text": "DataViewField"
+              },
+              "> | undefined"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -14972,357 +15438,1243 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getFieldsForWildcard",
+            "id": "def-common.DataViewLazy.getFieldByName",
             "type": "Function",
             "tags": [],
-            "label": "getFieldsForWildcard",
-            "description": [
-              "\nGet field list by providing { pattern }."
-            ],
+            "label": "getFieldByName",
+            "description": [],
             "signature": [
-              "(options: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.GetFieldsOptions",
-                "text": "GetFieldsOptions"
-              },
-              ") => Promise<",
+              "(name: string, forceRefresh?: boolean) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldSpec",
-                "text": "FieldSpec"
+                "section": "def-common.DataViewField",
+                "text": "DataViewField"
               },
-              "[]>"
+              ">"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.getFieldsForWildcard.$1",
-                "type": "Object",
+                "id": "def-common.DataViewLazy.getFieldByName.$1",
+                "type": "string",
                 "tags": [],
-                "label": "options",
-                "description": [
-                  "options for getting field list"
-                ],
+                "label": "name",
+                "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.GetFieldsOptions",
-                    "text": "GetFieldsOptions"
-                  }
+                  "string"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewLazy.getFieldByName.$2",
+                "type": "boolean",
+                "tags": [],
+                "label": "forceRefresh",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
               }
             ],
-            "returnComment": [
-              "FieldSpec[]"
-            ]
+            "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.getFieldsForIndexPattern",
+            "id": "def-common.DataViewLazy.setFieldCustomLabel",
             "type": "Function",
             "tags": [],
-            "label": "getFieldsForIndexPattern",
+            "label": "setFieldCustomLabel",
             "description": [
-              "\nGet field list by providing an index patttern (or spec)."
+              "\nSet field custom label"
             ],
             "signature": [
-              "(indexPattern: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              " | ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSpec",
-                "text": "DataViewSpec"
-              },
-              ", options?: Omit<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.GetFieldsOptions",
-                "text": "GetFieldsOptions"
-              },
-              ", \"allowNoIndex\"> | undefined) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldSpec",
-                "text": "FieldSpec"
-              },
-              "[]>"
+              "(fieldName: string, customLabel: string | null | undefined) => void"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.getFieldsForIndexPattern.$1",
-                "type": "CompoundType",
+                "id": "def-common.DataViewLazy.setFieldCustomLabel.$1",
+                "type": "string",
                 "tags": [],
-                "label": "indexPattern",
-                "description": [],
+                "label": "fieldName",
+                "description": [
+                  "name of field to set custom label on"
+                ],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  },
-                  " | ",
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataViewSpec",
-                    "text": "DataViewSpec"
-                  }
+                  "string"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.getFieldsForIndexPattern.$2",
-                "type": "Object",
+                "id": "def-common.DataViewLazy.setFieldCustomLabel.$2",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "options",
+                "label": "customLabel",
                 "description": [
-                  "options for getting field list"
+                  "custom label value. If undefined, custom label is removed"
                 ],
                 "signature": [
-                  "Omit<",
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.GetFieldsOptions",
-                    "text": "GetFieldsOptions"
-                  },
-                  ", \"allowNoIndex\"> | undefined"
+                  "string | null | undefined"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": false
               }
             ],
-            "returnComment": [
-              "FieldSpec[]"
-            ]
+            "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.refreshFields",
+            "id": "def-common.DataViewLazy.setFieldCount",
             "type": "Function",
             "tags": [],
-            "label": "refreshFields",
-            "description": [
-              "\nRefresh field list for a given data view."
-            ],
+            "label": "setFieldCount",
+            "description": [],
             "signature": [
-              "(dataView: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ", displayErrors?: boolean, forceRefresh?: boolean) => Promise<void>"
+              "(fieldName: string, count: number | null | undefined) => void"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.refreshFields.$1",
-                "type": "Object",
+                "id": "def-common.DataViewLazy.setFieldCount.$1",
+                "type": "string",
                 "tags": [],
-                "label": "dataView",
+                "label": "fieldName",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.refreshFields.$2",
-                "type": "boolean",
-                "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
-                "signature": [
-                  "boolean"
+                  "string"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.refreshFields.$3",
-                "type": "boolean",
+                "id": "def-common.DataViewLazy.setFieldCount.$2",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "forceRefresh",
+                "label": "count",
                 "description": [],
                 "signature": [
-                  "boolean"
+                  "number | null | undefined"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": true
+                "isRequired": false
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.fieldArrayToMap",
+            "id": "def-common.DataViewLazy.setFieldCustomDescription",
             "type": "Function",
             "tags": [],
-            "label": "fieldArrayToMap",
-            "description": [
-              "\nConverts field array to map."
-            ],
+            "label": "setFieldCustomDescription",
+            "description": [],
             "signature": [
-              "(fields: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldSpec",
-                "text": "FieldSpec"
-              },
-              "[], fieldAttrs?: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldAttrs",
-                "text": "FieldAttrs"
-              },
-              " | undefined) => ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewFieldMap",
-                "text": "DataViewFieldMap"
-              }
+              "(fieldName: string, customDescription: string | null | undefined) => void"
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.fieldArrayToMap.$1",
-                "type": "Array",
+                "id": "def-common.DataViewLazy.setFieldCustomDescription.$1",
+                "type": "string",
                 "tags": [],
-                "label": "fields",
-                "description": [
-                  ": FieldSpec[]"
-                ],
+                "label": "fieldName",
+                "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.FieldSpec",
-                    "text": "FieldSpec"
-                  },
-                  "[]"
+                  "string"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.fieldArrayToMap.$2",
-                "type": "Object",
+                "id": "def-common.DataViewLazy.setFieldCustomDescription.$2",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "fieldAttrs",
-                "description": [
-                  ": FieldAttrs"
-                ],
+                "label": "customDescription",
+                "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.FieldAttrs",
-                    "text": "FieldAttrs"
-                  },
-                  " | undefined"
+                  "string | null | undefined"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "path": "src/plugins/data_views/common/data_views/data_view_lazy.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": false
               }
             ],
-            "returnComment": [
-              "Record<string, FieldSpec>"
-            ]
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.savedObjectToSpec",
-            "type": "Function",
-            "tags": [],
-            "label": "savedObjectToSpec",
-            "description": [
-              "\nConverts data view saved object to data view spec."
-            ],
-            "signature": [
-              "(savedObject: ",
-              {
-                "pluginId": "@kbn/core-saved-objects-common",
-                "scope": "common",
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataViews",
+        "id": "def-common.DataViewMissingIndices",
+        "type": "Class",
+        "tags": [],
+        "label": "DataViewMissingIndices",
+        "description": [
+          "\nTried to call a method that relies on SearchSource having an indexPattern assigned"
+        ],
+        "signature": [
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewMissingIndices",
+            "text": "DataViewMissingIndices"
+          },
+          " extends ",
+          {
+            "pluginId": "kibanaUtils",
+            "scope": "common",
+            "docId": "kibKibanaUtilsPluginApi",
+            "section": "def-common.KbnError",
+            "text": "KbnError"
+          }
+        ],
+        "path": "src/plugins/data_views/common/lib/errors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewMissingIndices.Unnamed",
+            "type": "Function",
+            "tags": [],
+            "label": "Constructor",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "path": "src/plugins/data_views/common/lib/errors.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewMissingIndices.Unnamed.$1",
+                "type": "string",
+                "tags": [],
+                "label": "message",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "src/plugins/data_views/common/lib/errors.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataViews",
+        "id": "def-common.DataViewSavedObjectConflictError",
+        "type": "Class",
+        "tags": [],
+        "label": "DataViewSavedObjectConflictError",
+        "description": [
+          "\nError thrown when saved object has been changed when attempting to save."
+        ],
+        "signature": [
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewSavedObjectConflictError",
+            "text": "DataViewSavedObjectConflictError"
+          },
+          " extends Error"
+        ],
+        "path": "src/plugins/data_views/common/errors/data_view_saved_object_conflict.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewSavedObjectConflictError.Unnamed",
+            "type": "Function",
+            "tags": [],
+            "label": "Constructor",
+            "description": [
+              "\nconstructor"
+            ],
+            "signature": [
+              "any"
+            ],
+            "path": "src/plugins/data_views/common/errors/data_view_saved_object_conflict.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewSavedObjectConflictError.Unnamed.$1",
+                "type": "string",
+                "tags": [],
+                "label": "savedObjectId",
+                "description": [
+                  "saved object id with conflict"
+                ],
+                "signature": [
+                  "string"
+                ],
+                "path": "src/plugins/data_views/common/errors/data_view_saved_object_conflict.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataViews",
+        "id": "def-common.DataViewsService",
+        "type": "Class",
+        "tags": [],
+        "label": "DataViewsService",
+        "description": [
+          "\nData views service, providing CRUD operations for data views."
+        ],
+        "path": "src/plugins/data_views/common/data_views/data_views.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getCanSave",
+            "type": "Function",
+            "tags": [],
+            "label": "getCanSave",
+            "description": [
+              "\nCan the user save data views?"
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.scriptedFieldsEnabled",
+            "type": "boolean",
+            "tags": [],
+            "label": "scriptedFieldsEnabled",
+            "description": [],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.Unnamed",
+            "type": "Function",
+            "tags": [],
+            "label": "Constructor",
+            "description": [
+              "\nDataViewsService constructor"
+            ],
+            "signature": [
+              "any"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.Unnamed.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "deps",
+                "description": [
+                  "Service dependencies"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewsServiceDeps",
+                    "text": "DataViewsServiceDeps"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getIds",
+            "type": "Function",
+            "tags": [],
+            "label": "getIds",
+            "description": [
+              "\nGets list of index pattern ids."
+            ],
+            "signature": [
+              "(refresh?: boolean) => Promise<string[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getIds.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "refresh",
+                "description": [
+                  "Force refresh of index pattern list"
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getTitles",
+            "type": "Function",
+            "tags": [],
+            "label": "getTitles",
+            "description": [
+              "\nGets list of index pattern titles."
+            ],
+            "signature": [
+              "(refresh?: boolean) => Promise<string[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getTitles.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "refresh",
+                "description": [
+                  "Force refresh of index pattern list"
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.find",
+            "type": "Function",
+            "tags": [],
+            "label": "find",
+            "description": [
+              "\nFind and load index patterns by title."
+            ],
+            "signature": [
+              "(search: string, size?: number) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.find.$1",
+                "type": "string",
+                "tags": [],
+                "label": "search",
+                "description": [
+                  "Search string"
+                ],
+                "signature": [
+                  "string"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.find.$2",
+                "type": "number",
+                "tags": [],
+                "label": "size",
+                "description": [
+                  "Number of data views to return"
+                ],
+                "signature": [
+                  "number"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": [
+              "DataView[]"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getIdsWithTitle",
+            "type": "Function",
+            "tags": [],
+            "label": "getIdsWithTitle",
+            "description": [
+              "\nGets list of index pattern ids with titles."
+            ],
+            "signature": [
+              "(refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewListItem",
+                "text": "DataViewListItem"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getIdsWithTitle.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "refresh",
+                "description": [
+                  "Force refresh of index pattern list"
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getAllDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getAllDataViewLazy",
+            "description": [],
+            "signature": [
+              "(refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getAllDataViewLazy.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "refresh",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.clearCache",
+            "type": "Function",
+            "tags": [],
+            "label": "clearCache",
+            "description": [
+              "\nClear index pattern saved objects cache."
+            ],
+            "signature": [
+              "() => void"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.clearInstanceCache",
+            "type": "Function",
+            "tags": [],
+            "label": "clearInstanceCache",
+            "description": [
+              "\nClear index pattern instance cache"
+            ],
+            "signature": [
+              "(id?: string | undefined) => void"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.clearInstanceCache.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getCache",
+            "type": "Function",
+            "tags": [],
+            "label": "getCache",
+            "description": [
+              "\nGet cache, contains data view saved objects."
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "@kbn/core-saved-objects-common",
+                "scope": "common",
+                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
+                "section": "def-common.SavedObject",
+                "text": "SavedObject"
+              },
+              "<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSavedObjectAttrs",
+                "text": "DataViewSavedObjectAttrs"
+              },
+              ">[] | null | undefined>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getDefault",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefault",
+            "description": [
+              "\nGet default index pattern"
+            ],
+            "signature": [
+              "(displayErrors?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              " | null>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getDefault.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "displayErrors",
+                "description": [
+                  "- If set false, API consumer is responsible for displaying and handling errors."
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getDefaultId",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultId",
+            "description": [
+              "\nGet default index pattern id"
+            ],
+            "signature": [
+              "() => Promise<string | null>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.setDefault",
+            "type": "Function",
+            "tags": [],
+            "label": "setDefault",
+            "description": [
+              "\nOptionally set default index pattern, unless force = true"
+            ],
+            "signature": [
+              "(id: string | null, force?: boolean) => Promise<void>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.setDefault.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "id",
+                "description": [
+                  "data view id"
+                ],
+                "signature": [
+                  "string | null"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.setDefault.$2",
+                "type": "boolean",
+                "tags": [],
+                "label": "force",
+                "description": [
+                  "set default data view even if there's an existing default"
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.hasUserDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "hasUserDataView",
+            "description": [
+              "\nChecks if current user has a user created index pattern ignoring fleet's server default index patterns."
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getMetaFields",
+            "type": "Function",
+            "tags": [],
+            "label": "getMetaFields",
+            "description": [],
+            "signature": [
+              "() => Promise<string[] | undefined>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getShortDotsEnable",
+            "type": "Function",
+            "tags": [],
+            "label": "getShortDotsEnable",
+            "description": [],
+            "signature": [
+              "() => Promise<boolean | undefined>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getFieldsForWildcard",
+            "type": "Function",
+            "tags": [],
+            "label": "getFieldsForWildcard",
+            "description": [
+              "\nGet field list by providing { pattern }."
+            ],
+            "signature": [
+              "(options: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.GetFieldsOptions",
+                "text": "GetFieldsOptions"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getFieldsForWildcard.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [
+                  "options for getting field list"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.GetFieldsOptions",
+                    "text": "GetFieldsOptions"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": [
+              "FieldSpec[]"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getFieldsForIndexPattern",
+            "type": "Function",
+            "tags": [],
+            "label": "getFieldsForIndexPattern",
+            "description": [
+              "\nGet field list by providing an index patttern (or spec)."
+            ],
+            "signature": [
+              "(indexPattern: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              " | ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ", options?: Omit<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.GetFieldsOptions",
+                "text": "GetFieldsOptions"
+              },
+              ", \"allowNoIndex\"> | undefined) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getFieldsForIndexPattern.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "indexPattern",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  },
+                  " | ",
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getFieldsForIndexPattern.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [
+                  "options for getting field list"
+                ],
+                "signature": [
+                  "Omit<",
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.GetFieldsOptions",
+                    "text": "GetFieldsOptions"
+                  },
+                  ", \"allowNoIndex\"> | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": [
+              "FieldSpec[]"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.refreshFields",
+            "type": "Function",
+            "tags": [],
+            "label": "refreshFields",
+            "description": [
+              "\nRefresh field list for a given data view."
+            ],
+            "signature": [
+              "(dataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ", displayErrors?: boolean, forceRefresh?: boolean) => Promise<void>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.refreshFields.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.refreshFields.$2",
+                "type": "boolean",
+                "tags": [],
+                "label": "displayErrors",
+                "description": [
+                  "- If set false, API consumer is responsible for displaying and handling errors."
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.refreshFields.$3",
+                "type": "boolean",
+                "tags": [],
+                "label": "forceRefresh",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.fieldArrayToMap",
+            "type": "Function",
+            "tags": [],
+            "label": "fieldArrayToMap",
+            "description": [
+              "\nConverts field array to map."
+            ],
+            "signature": [
+              "(fields: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
+              },
+              "[], fieldAttrs?: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldAttrs",
+                "text": "FieldAttrs"
+              },
+              " | undefined) => ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewFieldMap",
+                "text": "DataViewFieldMap"
+              }
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.fieldArrayToMap.$1",
+                "type": "Array",
+                "tags": [],
+                "label": "fields",
+                "description": [
+                  ": FieldSpec[]"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.FieldSpec",
+                    "text": "FieldSpec"
+                  },
+                  "[]"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.fieldArrayToMap.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "fieldAttrs",
+                "description": [
+                  ": FieldAttrs"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.FieldAttrs",
+                    "text": "FieldAttrs"
+                  },
+                  " | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": [
+              "Record<string, FieldSpec>"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.savedObjectToSpec",
+            "type": "Function",
+            "tags": [],
+            "label": "savedObjectToSpec",
+            "description": [
+              "\nConverts data view saved object to data view spec."
+            ],
+            "signature": [
+              "(savedObject: ",
+              {
+                "pluginId": "@kbn/core-saved-objects-common",
+                "scope": "common",
                 "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
                 "section": "def-common.SavedObject",
                 "text": "SavedObject"
@@ -15383,6 +16735,46 @@
               "DataViewSpec"
             ]
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDataViewLazy",
+            "description": [],
+            "signature": [
+              "(id: string) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.getDataViewLazy.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-common.DataViewsService.get",
@@ -15441,15 +16833,167 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.get.$3",
-                "type": "boolean",
+                "id": "def-common.DataViewsService.get.$3",
+                "type": "boolean",
+                "tags": [],
+                "label": "refreshFields",
+                "description": [
+                  "- If set true, will fetch fields from the index pattern"
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.create",
+            "type": "Function",
+            "tags": [],
+            "label": "create",
+            "description": [
+              "\nCreate data view instance."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ", skipFetchFields?: boolean, displayErrors?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.create.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "spec",
+                "description": [
+                  "data view spec"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.create.$2",
+                "type": "boolean",
+                "tags": [],
+                "label": "skipFetchFields",
+                "description": [
+                  "if true, will not fetch fields"
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.create.$3",
+                "type": "boolean",
+                "tags": [],
+                "label": "displayErrors",
+                "description": [
+                  "- If set false, API consumer is responsible for displaying and handling errors."
+                ],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": [
+              "DataView"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.createDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "createDataViewLazy",
+            "description": [
+              "\nCreate data view lazy instance."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.createDataViewLazy.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "refreshFields",
+                "label": "spec",
                 "description": [
-                  "- If set true, will fetch fields from the index pattern"
+                  "data view spec"
                 ],
                 "signature": [
-                  "boolean"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -15457,16 +17001,18 @@
                 "isRequired": true
               }
             ],
-            "returnComment": []
+            "returnComment": [
+              "DataViewLazy"
+            ]
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsService.create",
+            "id": "def-common.DataViewsService.createAndSaveDataViewLazy",
             "type": "Function",
             "tags": [],
-            "label": "create",
+            "label": "createAndSaveDataViewLazy",
             "description": [
-              "\nCreate data view instance."
+              "\nCreate a new data view lazy and save it right away."
             ],
             "signature": [
               "(spec: ",
@@ -15477,13 +17023,13 @@
                 "section": "def-common.DataViewSpec",
                 "text": "DataViewSpec"
               },
-              ", skipFetchFields?: boolean, displayErrors?: boolean) => Promise<",
+              ", overwrite?: boolean) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
               ">"
             ],
@@ -15493,7 +17039,7 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.create.$1",
+                "id": "def-common.DataViewsService.createAndSaveDataViewLazy.$1",
                 "type": "Object",
                 "tags": [],
                 "label": "spec",
@@ -15516,30 +17062,11 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.create.$2",
-                "type": "boolean",
-                "tags": [],
-                "label": "skipFetchFields",
-                "description": [
-                  "if true, will not fetch fields"
-                ],
-                "signature": [
-                  "boolean"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.create.$3",
+                "id": "def-common.DataViewsService.createAndSaveDataViewLazy.$2",
                 "type": "boolean",
                 "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
+                "label": "overwrite",
+                "description": [],
                 "signature": [
                   "boolean"
                 ],
@@ -15549,9 +17076,7 @@
                 "isRequired": true
               }
             ],
-            "returnComment": [
-              "DataView"
-            ]
+            "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
@@ -15671,22 +17196,8 @@
             ],
             "signature": [
               "(dataView: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+              "AbstractDataView",
+              ", overwrite?: boolean) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -15702,13 +17213,7 @@
                   "data view instance"
                 ],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
+                  "AbstractDataView"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -15729,23 +17234,6 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsService.createSavedObject.$3",
-                "type": "boolean",
-                "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
-                "signature": [
-                  "boolean"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
               }
             ],
             "returnComment": []
@@ -15761,22 +17249,8 @@
             ],
             "signature": [
               "(indexPattern: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+              "AbstractDataView",
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -15790,13 +17264,7 @@
                 "label": "indexPattern",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
+                  "AbstractDataView"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -15907,6 +17375,34 @@
             "children": [],
             "returnComment": []
           },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.getDefaultDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataViewLazy",
+            "description": [
+              "\nReturns the default data view as a DataViewLazy.\nIf no default is found, or it is missing\nanother data view is selected as default and returned.\nIf no possible data view found to become a default returns null.\n"
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              " | null>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": [
+              "default data view lazy"
+            ]
+          },
           {
             "parentPluginId": "dataViews",
             "id": "def-common.DataViewsService.getDefaultDataView",
@@ -15941,41 +17437,149 @@
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "children": [
-                  {
-                    "parentPluginId": "dataViews",
-                    "id": "def-common.DataViewsService.getDefaultDataView.$1.displayErrors",
-                    "type": "CompoundType",
-                    "tags": [],
-                    "label": "displayErrors",
-                    "description": [],
-                    "signature": [
-                      "boolean | undefined"
-                    ],
-                    "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                    "deprecated": false,
-                    "trackAdoption": false
-                  },
-                  {
-                    "parentPluginId": "dataViews",
-                    "id": "def-common.DataViewsService.getDefaultDataView.$1.refreshFields",
-                    "type": "CompoundType",
-                    "tags": [],
-                    "label": "refreshFields",
-                    "description": [],
-                    "signature": [
-                      "boolean | undefined"
-                    ],
-                    "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                    "deprecated": false,
-                    "trackAdoption": false
-                  }
-                ]
+                "children": [
+                  {
+                    "parentPluginId": "dataViews",
+                    "id": "def-common.DataViewsService.getDefaultDataView.$1.displayErrors",
+                    "type": "CompoundType",
+                    "tags": [],
+                    "label": "displayErrors",
+                    "description": [],
+                    "signature": [
+                      "boolean | undefined"
+                    ],
+                    "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "dataViews",
+                    "id": "def-common.DataViewsService.getDefaultDataView.$1.refreshFields",
+                    "type": "CompoundType",
+                    "tags": [],
+                    "label": "refreshFields",
+                    "description": [],
+                    "signature": [
+                      "boolean | undefined"
+                    ],
+                    "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              }
+            ],
+            "returnComment": [
+              "default data view"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.toDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataView",
+            "description": [],
+            "signature": [
+              "(dataViewLazy: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.toDataView.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataViewLazy",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewLazy",
+                    "text": "DataViewLazy"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsService.toDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataViewLazy",
+            "description": [],
+            "signature": [
+              "(dataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsService.toDataViewLazy.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
               }
             ],
-            "returnComment": [
-              "default data view"
-            ]
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
@@ -17013,260 +18617,546 @@
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
-            "trackAdoption": false
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServiceDeps.onNotification",
+            "type": "Function",
+            "tags": [],
+            "label": "onNotification",
+            "description": [
+              "\nHandler for service notifications"
+            ],
+            "signature": [
+              "(toastInputFields: ",
+              {
+                "pluginId": "@kbn/core-notifications-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                "section": "def-common.ToastInputFields",
+                "text": "ToastInputFields"
+              },
+              ", key: string) => void"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServiceDeps.onNotification.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "toastInputFields",
+                "description": [],
+                "signature": [
+                  "Pick<",
+                  "Toast",
+                  ", \"prefix\" | \"defaultValue\" | \"security\" | \"onChange\" | \"defaultChecked\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"color\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"children\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDown\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClick\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"data-test-subj\" | \"css\" | \"iconType\" | \"onClose\" | \"toastLifeTimeMs\"> & { title?: string | ",
+                  {
+                    "pluginId": "@kbn/core-mount-utils-browser",
+                    "scope": "common",
+                    "docId": "kibKbnCoreMountUtilsBrowserPluginApi",
+                    "section": "def-common.MountPoint",
+                    "text": "MountPoint"
+                  },
+                  "<HTMLElement> | undefined; text?: string | ",
+                  {
+                    "pluginId": "@kbn/core-mount-utils-browser",
+                    "scope": "common",
+                    "docId": "kibKbnCoreMountUtilsBrowserPluginApi",
+                    "section": "def-common.MountPoint",
+                    "text": "MountPoint"
+                  },
+                  "<HTMLElement> | undefined; }"
+                ],
+                "path": "src/plugins/data_views/common/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServiceDeps.onNotification.$2",
+                "type": "string",
+                "tags": [],
+                "label": "key",
+                "description": [],
+                "path": "src/plugins/data_views/common/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServiceDeps.onError",
+            "type": "Function",
+            "tags": [],
+            "label": "onError",
+            "description": [
+              "\nHandler for service errors"
+            ],
+            "signature": [
+              "(error: Error, toastInputFields: ",
+              {
+                "pluginId": "@kbn/core-notifications-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                "section": "def-common.ErrorToastOptions",
+                "text": "ErrorToastOptions"
+              },
+              ", key: string) => void"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServiceDeps.onError.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "error",
+                "description": [],
+                "signature": [
+                  "Error"
+                ],
+                "path": "src/plugins/data_views/common/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServiceDeps.onError.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "toastInputFields",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-notifications-browser",
+                    "scope": "common",
+                    "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                    "section": "def-common.ErrorToastOptions",
+                    "text": "ErrorToastOptions"
+                  }
+                ],
+                "path": "src/plugins/data_views/common/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServiceDeps.onError.$3",
+                "type": "string",
+                "tags": [],
+                "label": "key",
+                "description": [],
+                "path": "src/plugins/data_views/common/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServiceDeps.onRedirectNoIndexPattern",
+            "type": "Function",
+            "tags": [],
+            "label": "onRedirectNoIndexPattern",
+            "description": [
+              "\nRedirects when there's no data view. only used on client"
+            ],
+            "signature": [
+              "(() => void) | undefined"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServiceDeps.getCanSave",
+            "type": "Function",
+            "tags": [],
+            "label": "getCanSave",
+            "description": [
+              "\nDetermines whether the user can save data views"
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServiceDeps.getCanSaveAdvancedSettings",
+            "type": "Function",
+            "tags": [],
+            "label": "getCanSaveAdvancedSettings",
+            "description": [
+              "\nDetermines whether the user can save advancedSettings (used for defaultIndex)"
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServiceDeps.scriptedFieldsEnabled",
+            "type": "boolean",
+            "tags": [],
+            "label": "scriptedFieldsEnabled",
+            "description": [],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataViews",
+        "id": "def-common.DataViewsServicePublicMethods",
+        "type": "Interface",
+        "tags": [],
+        "label": "DataViewsServicePublicMethods",
+        "description": [
+          "\nData views API service methods"
+        ],
+        "path": "src/plugins/data_views/common/data_views/data_views.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.clearCache",
+            "type": "Function",
+            "tags": [],
+            "label": "clearCache",
+            "description": [
+              "\nClear the cache of data view saved objects."
+            ],
+            "signature": [
+              "() => void"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServiceDeps.onNotification",
+            "id": "def-common.DataViewsServicePublicMethods.clearInstanceCache",
             "type": "Function",
             "tags": [],
-            "label": "onNotification",
+            "label": "clearInstanceCache",
             "description": [
-              "\nHandler for service notifications"
+              "\nClear the cache of data view instances."
             ],
             "signature": [
-              "(toastInputFields: ",
+              "(id?: string | undefined) => void"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
               {
-                "pluginId": "@kbn/core-notifications-browser",
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.clearInstanceCache.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.create",
+            "type": "Function",
+            "tags": [],
+            "label": "create",
+            "description": [
+              "\nCreate data view based on the provided spec."
+            ],
+            "signature": [
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
                 "scope": "common",
-                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
-                "section": "def-common.ToastInputFields",
-                "text": "ToastInputFields"
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
-              ", key: string) => void"
+              ", skipFetchFields?: boolean | undefined, displayErrors?: boolean | undefined) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "returnComment": [],
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServiceDeps.onNotification.$1",
-                "type": "CompoundType",
+                "id": "def-common.DataViewsServicePublicMethods.create.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "toastInputFields",
-                "description": [],
+                "label": "spec",
+                "description": [
+                  "- Data view spec."
+                ],
                 "signature": [
-                  "Pick<",
-                  "Toast",
-                  ", \"prefix\" | \"defaultValue\" | \"security\" | \"onChange\" | \"defaultChecked\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"color\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"children\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDown\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClick\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"data-test-subj\" | \"css\" | \"iconType\" | \"onClose\" | \"toastLifeTimeMs\"> & { title?: string | ",
-                  {
-                    "pluginId": "@kbn/core-mount-utils-browser",
-                    "scope": "common",
-                    "docId": "kibKbnCoreMountUtilsBrowserPluginApi",
-                    "section": "def-common.MountPoint",
-                    "text": "MountPoint"
-                  },
-                  "<HTMLElement> | undefined; text?: string | ",
                   {
-                    "pluginId": "@kbn/core-mount-utils-browser",
+                    "pluginId": "dataViews",
                     "scope": "common",
-                    "docId": "kibKbnCoreMountUtilsBrowserPluginApi",
-                    "section": "def-common.MountPoint",
-                    "text": "MountPoint"
-                  },
-                  "<HTMLElement> | undefined; }"
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
                 ],
-                "path": "src/plugins/data_views/common/types.ts",
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
-                "trackAdoption": false
+                "trackAdoption": false,
+                "isRequired": true
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServiceDeps.onNotification.$2",
-                "type": "string",
+                "id": "def-common.DataViewsServicePublicMethods.create.$2",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "key",
-                "description": [],
-                "path": "src/plugins/data_views/common/types.ts",
+                "label": "skipFetchFields",
+                "description": [
+                  "- If true, do not fetch fields."
+                ],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
-                "trackAdoption": false
+                "trackAdoption": false,
+                "isRequired": false
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.create.$3",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "displayErrors",
+                "description": [
+                  "- If set false, API consumer is responsible for displaying and handling errors."
+                ],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
               }
-            ]
+            ],
+            "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServiceDeps.onError",
+            "id": "def-common.DataViewsServicePublicMethods.createAndSave",
             "type": "Function",
             "tags": [],
-            "label": "onError",
+            "label": "createAndSave",
             "description": [
-              "\nHandler for service errors"
+              "\nCreate and save data view based on provided spec."
             ],
             "signature": [
-              "(error: Error, toastInputFields: ",
+              "(spec: ",
               {
-                "pluginId": "@kbn/core-notifications-browser",
+                "pluginId": "dataViews",
                 "scope": "common",
-                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
-                "section": "def-common.ErrorToastOptions",
-                "text": "ErrorToastOptions"
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
-              ", key: string) => void"
+              ", override?: boolean | undefined, skipFetchFields?: boolean | undefined, displayErrors?: boolean | undefined) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "returnComment": [],
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServiceDeps.onError.$1",
+                "id": "def-common.DataViewsServicePublicMethods.createAndSave.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "error",
-                "description": [],
+                "label": "spec",
+                "description": [
+                  "- Data view spec."
+                ],
                 "signature": [
-                  "Error"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
                 ],
-                "path": "src/plugins/data_views/common/types.ts",
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
-                "trackAdoption": false
+                "trackAdoption": false,
+                "isRequired": true
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServiceDeps.onError.$2",
-                "type": "Object",
+                "id": "def-common.DataViewsServicePublicMethods.createAndSave.$2",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "toastInputFields",
-                "description": [],
+                "label": "override",
+                "description": [
+                  "- If true, save over existing data view"
+                ],
                 "signature": [
-                  {
-                    "pluginId": "@kbn/core-notifications-browser",
-                    "scope": "common",
-                    "docId": "kibKbnCoreNotificationsBrowserPluginApi",
-                    "section": "def-common.ErrorToastOptions",
-                    "text": "ErrorToastOptions"
-                  }
+                  "boolean | undefined"
                 ],
-                "path": "src/plugins/data_views/common/types.ts",
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
-                "trackAdoption": false
+                "trackAdoption": false,
+                "isRequired": false
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServiceDeps.onError.$3",
-                "type": "string",
+                "id": "def-common.DataViewsServicePublicMethods.createAndSave.$3",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "skipFetchFields",
+                "description": [
+                  "- If true, do not fetch fields."
+                ],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.createAndSave.$4",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "key",
-                "description": [],
-                "path": "src/plugins/data_views/common/types.ts",
+                "label": "displayErrors",
+                "description": [
+                  "- If set false, API consumer is responsible for displaying and handling errors."
+                ],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
-                "trackAdoption": false
+                "trackAdoption": false,
+                "isRequired": false
               }
-            ]
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServiceDeps.onRedirectNoIndexPattern",
-            "type": "Function",
-            "tags": [],
-            "label": "onRedirectNoIndexPattern",
-            "description": [
-              "\nRedirects when there's no data view. only used on client"
-            ],
-            "signature": [
-              "(() => void) | undefined"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServiceDeps.getCanSave",
-            "type": "Function",
-            "tags": [],
-            "label": "getCanSave",
-            "description": [
-              "\nDetermines whether the user can save data views"
             ],
-            "signature": [
-              "() => Promise<boolean>"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServiceDeps.getCanSaveAdvancedSettings",
+            "id": "def-common.DataViewsServicePublicMethods.createSavedObject",
             "type": "Function",
             "tags": [],
-            "label": "getCanSaveAdvancedSettings",
+            "label": "createSavedObject",
             "description": [
-              "\nDetermines whether the user can save advancedSettings (used for defaultIndex)"
+              "\nSave data view"
             ],
             "signature": [
-              "() => Promise<boolean>"
+              "(indexPattern: ",
+              "AbstractDataView",
+              ", overwrite?: boolean | undefined) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServiceDeps.scriptedFieldsEnabled",
-            "type": "boolean",
-            "tags": [],
-            "label": "scriptedFieldsEnabled",
-            "description": [],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "dataViews",
-        "id": "def-common.DataViewsServicePublicMethods",
-        "type": "Interface",
-        "tags": [],
-        "label": "DataViewsServicePublicMethods",
-        "description": [
-          "\nData views API service methods"
-        ],
-        "path": "src/plugins/data_views/common/data_views/data_views.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.clearCache",
-            "type": "Function",
-            "tags": [],
-            "label": "clearCache",
-            "description": [
-              "\nClear the cache of data view saved objects."
-            ],
-            "signature": [
-              "() => void"
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.createSavedObject.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "indexPattern",
+                "description": [],
+                "signature": [
+                  "AbstractDataView"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.createSavedObject.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "overwrite",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.clearInstanceCache",
+            "id": "def-common.DataViewsServicePublicMethods.delete",
             "type": "Function",
             "tags": [],
-            "label": "clearInstanceCache",
+            "label": "delete",
             "description": [
-              "\nClear the cache of data view instances."
+              "\nDelete data view"
             ],
             "signature": [
-              "(id?: string | undefined) => void"
+              "(indexPatternId: string) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17274,49 +19164,60 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.clearInstanceCache.$1",
+                "id": "def-common.DataViewsServicePublicMethods.delete.$1",
                 "type": "string",
                 "tags": [],
-                "label": "id",
-                "description": [],
+                "label": "indexPatternId",
+                "description": [
+                  "- Id of the data view to delete."
+                ],
                 "signature": [
-                  "string | undefined"
+                  "string"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": false
+                "isRequired": true
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.create",
+            "id": "def-common.DataViewsServicePublicMethods.fieldArrayToMap",
             "type": "Function",
-            "tags": [],
-            "label": "create",
+            "tags": [
+              "params"
+            ],
+            "label": "fieldArrayToMap",
             "description": [
-              "\nCreate data view based on the provided spec."
+              "\nTakes field array and field attributes and returns field map by name."
             ],
             "signature": [
-              "(spec: ",
+              "(fields: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSpec",
-                "text": "DataViewSpec"
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
               },
-              ", skipFetchFields?: boolean | undefined, displayErrors?: boolean | undefined) => Promise<",
+              "[], fieldAttrs?: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.FieldAttrs",
+                "text": "FieldAttrs"
               },
-              ">"
+              " | undefined) => ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewFieldMap",
+                "text": "DataViewFieldMap"
+              }
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17324,21 +19225,22 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.create.$1",
-                "type": "Object",
+                "id": "def-common.DataViewsServicePublicMethods.fieldArrayToMap.$1",
+                "type": "Array",
                 "tags": [],
-                "label": "spec",
+                "label": "fields",
                 "description": [
-                  "- Data view spec."
+                  "- Array of fieldspecs"
                 ],
                 "signature": [
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataViewSpec",
-                    "text": "DataViewSpec"
-                  }
+                    "section": "def-common.FieldSpec",
+                    "text": "FieldSpec"
+                  },
+                  "[]"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -17347,32 +19249,83 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.create.$2",
-                "type": "CompoundType",
+                "id": "def-common.DataViewsServicePublicMethods.fieldArrayToMap.$2",
+                "type": "Object",
                 "tags": [],
-                "label": "skipFetchFields",
+                "label": "fieldAttrs",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.FieldAttrs",
+                    "text": "FieldAttrs"
+                  },
+                  " | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": [
+              "Field map by name"
+            ]
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.find",
+            "type": "Function",
+            "tags": [],
+            "label": "find",
+            "description": [
+              "\nSearch for data views based on title"
+            ],
+            "signature": [
+              "(search: string, size?: number | undefined) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.find.$1",
+                "type": "string",
+                "tags": [],
+                "label": "search",
                 "description": [
-                  "- If true, do not fetch fields."
+                  "- Search string"
                 ],
                 "signature": [
-                  "boolean | undefined"
+                  "string"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": false
+                "isRequired": true
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.create.$3",
-                "type": "CompoundType",
+                "id": "def-common.DataViewsServicePublicMethods.find.$2",
+                "type": "number",
                 "tags": [],
-                "label": "displayErrors",
+                "label": "size",
                 "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
+                  "- Number of results to return"
                 ],
                 "signature": [
-                  "boolean | undefined"
+                  "number | undefined"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -17384,23 +19337,15 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.createAndSave",
+            "id": "def-common.DataViewsServicePublicMethods.get",
             "type": "Function",
             "tags": [],
-            "label": "createAndSave",
+            "label": "get",
             "description": [
-              "\nCreate and save data view based on provided spec."
+              "\nGet data view by id."
             ],
             "signature": [
-              "(spec: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSpec",
-                "text": "DataViewSpec"
-              },
-              ", override?: boolean | undefined, skipFetchFields?: boolean | undefined, displayErrors?: boolean | undefined) => Promise<",
+              "(id: string, displayErrors?: boolean | undefined, refreshFields?: boolean | undefined) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -17416,21 +19361,15 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.createAndSave.$1",
-                "type": "Object",
+                "id": "def-common.DataViewsServicePublicMethods.get.$1",
+                "type": "string",
                 "tags": [],
-                "label": "spec",
+                "label": "id",
                 "description": [
-                  "- Data view spec."
+                  "- Id of the data view to get."
                 ],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataViewSpec",
-                    "text": "DataViewSpec"
-                  }
+                  "string"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -17439,29 +19378,12 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.createAndSave.$2",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "override",
-                "description": [
-                  "- If true, save over existing data view"
-                ],
-                "signature": [
-                  "boolean | undefined"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.createAndSave.$3",
+                "id": "def-common.DataViewsServicePublicMethods.get.$2",
                 "type": "CompoundType",
                 "tags": [],
-                "label": "skipFetchFields",
+                "label": "displayErrors",
                 "description": [
-                  "- If true, do not fetch fields."
+                  "- If set false, API consumer is responsible for displaying and handling errors."
                 ],
                 "signature": [
                   "boolean | undefined"
@@ -17473,13 +19395,11 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.createAndSave.$4",
+                "id": "def-common.DataViewsServicePublicMethods.get.$3",
                 "type": "CompoundType",
                 "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
+                "label": "refreshFields",
+                "description": [],
                 "signature": [
                   "boolean | undefined"
                 ],
@@ -17493,23 +19413,67 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.createSavedObject",
+            "id": "def-common.DataViewsServicePublicMethods.getCache",
             "type": "Function",
             "tags": [],
-            "label": "createSavedObject",
+            "label": "getCache",
             "description": [
-              "\nSave data view"
+              "\nGet populated data view saved object cache."
             ],
             "signature": [
-              "(indexPattern: ",
+              "() => Promise<",
+              {
+                "pluginId": "@kbn/core-saved-objects-common",
+                "scope": "common",
+                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
+                "section": "def-common.SavedObject",
+                "text": "SavedObject"
+              },
+              "<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewSavedObjectAttrs",
+                "text": "DataViewSavedObjectAttrs"
               },
-              ", overwrite?: boolean | undefined, displayErrors?: boolean | undefined) => Promise<",
+              ">[] | null | undefined>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.getCanSave",
+            "type": "Function",
+            "tags": [],
+            "label": "getCanSave",
+            "description": [
+              "\nIf user can save data view, return true."
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.getDefault",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefault",
+            "description": [
+              "\nGet default data view as data view instance."
+            ],
+            "signature": [
+              "(displayErrors?: boolean | undefined) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -17517,7 +19481,7 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              ">"
+              " | null>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17525,43 +19489,7 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.createSavedObject.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "indexPattern",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
-                  }
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.createSavedObject.$2",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "overwrite",
-                "description": [],
-                "signature": [
-                  "boolean | undefined"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.createSavedObject.$3",
+                "id": "def-common.DataViewsServicePublicMethods.getDefault.$1",
                 "type": "CompoundType",
                 "tags": [],
                 "label": "displayErrors",
@@ -17581,15 +19509,41 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.delete",
+            "id": "def-common.DataViewsServicePublicMethods.getDefaultId",
             "type": "Function",
             "tags": [],
-            "label": "delete",
+            "label": "getDefaultId",
             "description": [
-              "\nDelete data view"
+              "\nGet default data view id."
             ],
             "signature": [
-              "(indexPatternId: string) => Promise<void>"
+              "() => Promise<string | null>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.getDefaultDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "getDefaultDataView",
+            "description": [
+              "\nGet default data view, if it doesn't exist, choose and save new default data view and return it."
+            ],
+            "signature": [
+              "(options?: { refreshFields?: boolean | undefined; displayErrors?: boolean | undefined; } | undefined) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              " | null>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17597,60 +19551,91 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.delete.$1",
-                "type": "string",
+                "id": "def-common.DataViewsServicePublicMethods.getDefaultDataView.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "indexPatternId",
-                "description": [
-                  "- Id of the data view to delete."
-                ],
-                "signature": [
-                  "string"
-                ],
+                "label": "options",
+                "description": [],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": true
+                "children": [
+                  {
+                    "parentPluginId": "dataViews",
+                    "id": "def-common.DataViewsServicePublicMethods.getDefaultDataView.$1.refreshFields",
+                    "type": "CompoundType",
+                    "tags": [],
+                    "label": "refreshFields",
+                    "description": [],
+                    "signature": [
+                      "boolean | undefined"
+                    ],
+                    "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "dataViews",
+                    "id": "def-common.DataViewsServicePublicMethods.getDefaultDataView.$1.displayErrors",
+                    "type": "CompoundType",
+                    "tags": [],
+                    "label": "displayErrors",
+                    "description": [],
+                    "signature": [
+                      "boolean | undefined"
+                    ],
+                    "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.fieldArrayToMap",
+            "id": "def-common.DataViewsServicePublicMethods.getFieldsForIndexPattern",
             "type": "Function",
-            "tags": [
-              "params"
-            ],
-            "label": "fieldArrayToMap",
+            "tags": [],
+            "label": "getFieldsForIndexPattern",
             "description": [
-              "\nTakes field array and field attributes and returns field map by name."
+              "\nGet fields for data view"
             ],
             "signature": [
-              "(fields: ",
+              "(indexPattern: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldSpec",
-                "text": "FieldSpec"
+                "section": "def-common.DataView",
+                "text": "DataView"
               },
-              "[], fieldAttrs?: ",
+              " | ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldAttrs",
-                "text": "FieldAttrs"
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
-              " | undefined) => ",
+              ", options?: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewFieldMap",
-                "text": "DataViewFieldMap"
-              }
+                "section": "def-common.GetFieldsOptions",
+                "text": "GetFieldsOptions"
+              },
+              " | undefined) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
+              },
+              "[]>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17658,22 +19643,27 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.fieldArrayToMap.$1",
-                "type": "Array",
+                "id": "def-common.DataViewsServicePublicMethods.getFieldsForIndexPattern.$1",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "fields",
-                "description": [
-                  "- Array of fieldspecs"
-                ],
+                "label": "indexPattern",
+                "description": [],
                 "signature": [
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.FieldSpec",
-                    "text": "FieldSpec"
+                    "section": "def-common.DataView",
+                    "text": "DataView"
                   },
-                  "[]"
+                  " | ",
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -17682,18 +19672,20 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.fieldArrayToMap.$2",
+                "id": "def-common.DataViewsServicePublicMethods.getFieldsForIndexPattern.$2",
                 "type": "Object",
                 "tags": [],
-                "label": "fieldAttrs",
-                "description": [],
+                "label": "options",
+                "description": [
+                  "- Options for getting fields"
+                ],
                 "signature": [
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.FieldAttrs",
-                    "text": "FieldAttrs"
+                    "section": "def-common.GetFieldsOptions",
+                    "text": "GetFieldsOptions"
                   },
                   " | undefined"
                 ],
@@ -17704,26 +19696,34 @@
               }
             ],
             "returnComment": [
-              "Field map by name"
+              "FieldSpec array"
             ]
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.find",
+            "id": "def-common.DataViewsServicePublicMethods.getFieldsForWildcard",
             "type": "Function",
             "tags": [],
-            "label": "find",
+            "label": "getFieldsForWildcard",
             "description": [
-              "\nSearch for data views based on title"
+              "\nGet fields for index pattern string"
             ],
             "signature": [
-              "(search: string, size?: number | undefined) => Promise<",
+              "(options: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.GetFieldsOptions",
+                "text": "GetFieldsOptions"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.FieldSpec",
+                "text": "FieldSpec"
               },
               "[]>"
             ],
@@ -17733,60 +19733,41 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.find.$1",
-                "type": "string",
+                "id": "def-common.DataViewsServicePublicMethods.getFieldsForWildcard.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "search",
+                "label": "options",
                 "description": [
-                  "- Search string"
+                  "- options for getting fields"
                 ],
                 "signature": [
-                  "string"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.GetFieldsOptions",
+                    "text": "GetFieldsOptions"
+                  }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.find.$2",
-                "type": "number",
-                "tags": [],
-                "label": "size",
-                "description": [
-                  "- Number of results to return"
-                ],
-                "signature": [
-                  "number | undefined"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.get",
+            "id": "def-common.DataViewsServicePublicMethods.getIds",
             "type": "Function",
             "tags": [],
-            "label": "get",
+            "label": "getIds",
             "description": [
-              "\nGet data view by id."
+              "\nGet list of data view ids."
             ],
             "signature": [
-              "(id: string, displayErrors?: boolean | undefined, refreshFields?: boolean | undefined) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">"
+              "(refresh?: boolean | undefined) => Promise<string[]>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17794,45 +19775,13 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.get.$1",
-                "type": "string",
-                "tags": [],
-                "label": "id",
-                "description": [
-                  "- Id of the data view to get."
-                ],
-                "signature": [
-                  "string"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.get.$2",
+                "id": "def-common.DataViewsServicePublicMethods.getIds.$1",
                 "type": "CompoundType",
                 "tags": [],
-                "label": "displayErrors",
+                "label": "refresh",
                 "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
-                "signature": [
-                  "boolean | undefined"
+                  "- clear cache and fetch from server"
                 ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.get.$3",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "refreshFields",
-                "description": [],
                 "signature": [
                   "boolean | undefined"
                 ],
@@ -17846,75 +19795,59 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getCache",
+            "id": "def-common.DataViewsServicePublicMethods.getIdsWithTitle",
             "type": "Function",
             "tags": [],
-            "label": "getCache",
+            "label": "getIdsWithTitle",
             "description": [
-              "\nGet populated data view saved object cache."
+              "\nGet list of data view ids and title (and more) for each data view."
             ],
             "signature": [
-              "() => Promise<",
-              {
-                "pluginId": "@kbn/core-saved-objects-common",
-                "scope": "common",
-                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                "section": "def-common.SavedObject",
-                "text": "SavedObject"
-              },
-              "<",
+              "(refresh?: boolean | undefined) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSavedObjectAttrs",
-                "text": "DataViewSavedObjectAttrs"
+                "section": "def-common.DataViewListItem",
+                "text": "DataViewListItem"
               },
-              ">[] | null | undefined>"
+              "[]>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getCanSave",
-            "type": "Function",
-            "tags": [],
-            "label": "getCanSave",
-            "description": [
-              "\nIf user can save data view, return true."
-            ],
-            "signature": [
-              "() => Promise<boolean>"
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.getIdsWithTitle.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "refresh",
+                "description": [
+                  "- clear cache and fetch from server"
+                ],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
             ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getDefault",
-            "type": "Function",
-            "tags": [],
-            "label": "getDefault",
-            "description": [
-              "\nGet default data view as data view instance."
-            ],
-            "signature": [
-              "(displayErrors?: boolean | undefined) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              " | null>"
+            "id": "def-common.DataViewsServicePublicMethods.getTitles",
+            "type": "Function",
+            "tags": [],
+            "label": "getTitles",
+            "description": [
+              "\nGet list of data view ids and title (and more) for each data view."
+            ],
+            "signature": [
+              "(refresh?: boolean | undefined) => Promise<string[]>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17922,12 +19855,12 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.getDefault.$1",
+                "id": "def-common.DataViewsServicePublicMethods.getTitles.$1",
                 "type": "CompoundType",
                 "tags": [],
-                "label": "displayErrors",
+                "label": "refresh",
                 "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
+                  "- clear cache and fetch from server"
                 ],
                 "signature": [
                   "boolean | undefined"
@@ -17942,15 +19875,15 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getDefaultId",
+            "id": "def-common.DataViewsServicePublicMethods.hasUserDataView",
             "type": "Function",
             "tags": [],
-            "label": "getDefaultId",
+            "label": "hasUserDataView",
             "description": [
-              "\nGet default data view id."
+              "\nReturns true if user has access to view a data view."
             ],
             "signature": [
-              "() => Promise<string | null>"
+              "() => Promise<boolean>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17960,15 +19893,17 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getDefaultDataView",
+            "id": "def-common.DataViewsServicePublicMethods.refreshFields",
             "type": "Function",
-            "tags": [],
-            "label": "getDefaultDataView",
+            "tags": [
+              "params"
+            ],
+            "label": "refreshFields",
             "description": [
-              "\nGet default data view, if it doesn't exist, choose and save new default data view and return it."
+              "\nRefresh fields for data view instance"
             ],
             "signature": [
-              "(options?: { refreshFields?: boolean | undefined; displayErrors?: boolean | undefined; } | undefined) => Promise<",
+              "(indexPattern: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -17976,7 +19911,7 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              " | null>"
+              ", displayErrors?: boolean | undefined, forceRefresh?: boolean | undefined) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -17984,91 +19919,94 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.getDefaultDataView.$1",
+                "id": "def-common.DataViewsServicePublicMethods.refreshFields.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "options",
+                "label": "indexPattern",
                 "description": [],
+                "signature": [
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  }
+                ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "children": [
-                  {
-                    "parentPluginId": "dataViews",
-                    "id": "def-common.DataViewsServicePublicMethods.getDefaultDataView.$1.refreshFields",
-                    "type": "CompoundType",
-                    "tags": [],
-                    "label": "refreshFields",
-                    "description": [],
-                    "signature": [
-                      "boolean | undefined"
-                    ],
-                    "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                    "deprecated": false,
-                    "trackAdoption": false
-                  },
-                  {
-                    "parentPluginId": "dataViews",
-                    "id": "def-common.DataViewsServicePublicMethods.getDefaultDataView.$1.displayErrors",
-                    "type": "CompoundType",
-                    "tags": [],
-                    "label": "displayErrors",
-                    "description": [],
-                    "signature": [
-                      "boolean | undefined"
-                    ],
-                    "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                    "deprecated": false,
-                    "trackAdoption": false
-                  }
-                ]
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.refreshFields.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "displayErrors",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              },
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.refreshFields.$3",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "forceRefresh",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getFieldsForIndexPattern",
+            "id": "def-common.DataViewsServicePublicMethods.savedObjectToSpec",
             "type": "Function",
-            "tags": [],
-            "label": "getFieldsForIndexPattern",
+            "tags": [
+              "params"
+            ],
+            "label": "savedObjectToSpec",
             "description": [
-              "\nGet fields for data view"
+              "\nConverts data view saved object to spec"
             ],
             "signature": [
-              "(indexPattern: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              " | ",
+              "(savedObject: ",
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-saved-objects-common",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSpec",
-                "text": "DataViewSpec"
+                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
+                "section": "def-common.SavedObject",
+                "text": "SavedObject"
               },
-              ", options?: ",
+              "<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.GetFieldsOptions",
-                "text": "GetFieldsOptions"
+                "section": "def-common.DataViewAttributes",
+                "text": "DataViewAttributes"
               },
-              " | undefined) => Promise<",
+              ">) => ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldSpec",
-                "text": "FieldSpec"
-              },
-              "[]>"
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              }
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -18076,51 +20014,81 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.getFieldsForIndexPattern.$1",
-                "type": "CompoundType",
+                "id": "def-common.DataViewsServicePublicMethods.savedObjectToSpec.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "indexPattern",
+                "label": "savedObject",
                 "description": [],
                 "signature": [
                   {
-                    "pluginId": "dataViews",
+                    "pluginId": "@kbn/core-saved-objects-common",
                     "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
+                    "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
+                    "section": "def-common.SavedObject",
+                    "text": "SavedObject"
                   },
-                  " | ",
+                  "<",
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataViewSpec",
-                    "text": "DataViewSpec"
-                  }
+                    "section": "def-common.DataViewAttributes",
+                    "text": "DataViewAttributes"
+                  },
+                  ">"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.setDefault",
+            "type": "Function",
+            "tags": [],
+            "label": "setDefault",
+            "description": [
+              "\nSet default data view."
+            ],
+            "signature": [
+              "(id: string | null, force?: boolean | undefined) => Promise<void>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "dataViews",
+                "id": "def-common.DataViewsServicePublicMethods.setDefault.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "id",
+                "description": [
+                  "- Id of the data view to set as default."
+                ],
+                "signature": [
+                  "string | null"
+                ],
+                "path": "src/plugins/data_views/common/data_views/data_views.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.getFieldsForIndexPattern.$2",
-                "type": "Object",
+                "id": "def-common.DataViewsServicePublicMethods.setDefault.$2",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "options",
+                "label": "force",
                 "description": [
-                  "- Options for getting fields"
+                  "- Overwrite if true"
                 ],
                 "signature": [
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.GetFieldsOptions",
-                    "text": "GetFieldsOptions"
-                  },
-                  " | undefined"
+                  "boolean | undefined"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -18128,37 +20096,29 @@
                 "isRequired": false
               }
             ],
-            "returnComment": [
-              "FieldSpec array"
-            ]
+            "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getFieldsForWildcard",
+            "id": "def-common.DataViewsServicePublicMethods.updateSavedObject",
             "type": "Function",
-            "tags": [],
-            "label": "getFieldsForWildcard",
+            "tags": [
+              "oaram"
+            ],
+            "label": "updateSavedObject",
             "description": [
-              "\nGet fields for index pattern string"
+              "\nSave saved object"
             ],
             "signature": [
-              "(options: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.GetFieldsOptions",
-                "text": "GetFieldsOptions"
-              },
-              ") => Promise<",
+              "(indexPattern: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.FieldSpec",
-                "text": "FieldSpec"
+                "section": "def-common.DataView",
+                "text": "DataView"
               },
-              "[]>"
+              ", saveAttempts?: number | undefined, ignoreErrors?: boolean | undefined, displayErrors?: boolean | undefined) => Promise<void>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -18166,99 +20126,51 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.getFieldsForWildcard.$1",
+                "id": "def-common.DataViewsServicePublicMethods.updateSavedObject.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "options",
+                "label": "indexPattern",
                 "description": [
-                  "- options for getting fields"
+                  "- data view instance"
                 ],
                 "signature": [
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.GetFieldsOptions",
-                    "text": "GetFieldsOptions"
+                    "section": "def-common.DataView",
+                    "text": "DataView"
                   }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getIds",
-            "type": "Function",
-            "tags": [],
-            "label": "getIds",
-            "description": [
-              "\nGet list of data view ids."
-            ],
-            "signature": [
-              "(refresh?: boolean | undefined) => Promise<string[]>"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
+              },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.getIds.$1",
-                "type": "CompoundType",
+                "id": "def-common.DataViewsServicePublicMethods.updateSavedObject.$2",
+                "type": "number",
                 "tags": [],
-                "label": "refresh",
+                "label": "saveAttempts",
                 "description": [
-                  "- clear cache and fetch from server"
+                  "- number of times to try saving"
                 ],
                 "signature": [
-                  "boolean | undefined"
+                  "number | undefined"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": false
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getIdsWithTitle",
-            "type": "Function",
-            "tags": [],
-            "label": "getIdsWithTitle",
-            "description": [
-              "\nGet list of data view ids and title (and more) for each data view."
-            ],
-            "signature": [
-              "(refresh?: boolean | undefined) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewListItem",
-                "text": "DataViewListItem"
               },
-              "[]>"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.getIdsWithTitle.$1",
+                "id": "def-common.DataViewsServicePublicMethods.updateSavedObject.$3",
                 "type": "CompoundType",
                 "tags": [],
-                "label": "refresh",
-                "description": [
-                  "- clear cache and fetch from server"
-                ],
+                "label": "ignoreErrors",
+                "description": [],
                 "signature": [
                   "boolean | undefined"
                 ],
@@ -18266,34 +20178,15 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": false
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getTitles",
-            "type": "Function",
-            "tags": [],
-            "label": "getTitles",
-            "description": [
-              "\nGet list of data view ids and title (and more) for each data view."
-            ],
-            "signature": [
-              "(refresh?: boolean | undefined) => Promise<string[]>"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
+              },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.getTitles.$1",
+                "id": "def-common.DataViewsServicePublicMethods.updateSavedObject.$4",
                 "type": "CompoundType",
                 "tags": [],
-                "label": "refresh",
+                "label": "displayErrors",
                 "description": [
-                  "- clear cache and fetch from server"
+                  "- If set false, API consumer is responsible for displaying and handling errors."
                 ],
                 "signature": [
                   "boolean | undefined"
@@ -18308,12 +20201,12 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.hasUserDataView",
+            "id": "def-common.DataViewsServicePublicMethods.defaultDataViewExists",
             "type": "Function",
             "tags": [],
-            "label": "hasUserDataView",
+            "label": "defaultDataViewExists",
             "description": [
-              "\nReturns true if user has access to view a data view."
+              "\nReturns whether a default data view exists."
             ],
             "signature": [
               "() => Promise<boolean>"
@@ -18326,17 +20219,53 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.refreshFields",
+            "id": "def-common.DataViewsServicePublicMethods.getMetaFields",
             "type": "Function",
-            "tags": [
-              "params"
+            "tags": [],
+            "label": "getMetaFields",
+            "description": [],
+            "signature": [
+              "() => Promise<string[] | undefined>"
             ],
-            "label": "refreshFields",
-            "description": [
-              "\nRefresh fields for data view instance"
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.getShortDotsEnable",
+            "type": "Function",
+            "tags": [],
+            "label": "getShortDotsEnable",
+            "description": [],
+            "signature": [
+              "() => Promise<boolean | undefined>"
             ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.toDataView",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataView",
+            "description": [],
             "signature": [
-              "(indexPattern: ",
+              "(toDataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ") => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -18344,7 +20273,7 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              ", displayErrors?: boolean | undefined, forceRefresh?: boolean | undefined) => Promise<void>"
+              ">"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -18352,94 +20281,123 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.refreshFields.$1",
+                "id": "def-common.DataViewsServicePublicMethods.toDataView.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "indexPattern",
+                "label": "toDataView",
                 "description": [],
                 "signature": [
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
+                    "section": "def-common.DataViewLazy",
+                    "text": "DataViewLazy"
                   }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.toDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "toDataViewLazy",
+            "description": [],
+            "signature": [
+              "(dataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
               },
+              ") => Promise<",
               {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.refreshFields.$2",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "displayErrors",
-                "description": [],
-                "signature": [
-                  "boolean | undefined"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
+              ">"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.refreshFields.$3",
-                "type": "CompoundType",
+                "id": "def-common.DataViewsServicePublicMethods.toDataViewLazy.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "forceRefresh",
+                "label": "dataView",
                 "description": [],
                 "signature": [
-                  "boolean | undefined"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataView",
+                    "text": "DataView"
+                  }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": false
+                "isRequired": true
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.savedObjectToSpec",
+            "id": "def-common.DataViewsServicePublicMethods.getAllDataViewLazy",
             "type": "Function",
-            "tags": [
-              "params"
-            ],
-            "label": "savedObjectToSpec",
-            "description": [
-              "\nConverts data view saved object to spec"
-            ],
+            "tags": [],
+            "label": "getAllDataViewLazy",
+            "description": [],
             "signature": [
-              "(savedObject: ",
-              {
-                "pluginId": "@kbn/core-saved-objects-common",
-                "scope": "common",
-                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                "section": "def-common.SavedObject",
-                "text": "SavedObject"
-              },
-              "<",
+              "() => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewAttributes",
-                "text": "DataViewAttributes"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
-              ">) => ",
+              "[]>"
+            ],
+            "path": "src/plugins/data_views/common/data_views/data_views.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "dataViews",
+            "id": "def-common.DataViewsServicePublicMethods.getDataViewLazy",
+            "type": "Function",
+            "tags": [],
+            "label": "getDataViewLazy",
+            "description": [],
+            "signature": [
+              "(id: string) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSpec",
-                "text": "DataViewSpec"
-              }
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -18447,28 +20405,13 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.savedObjectToSpec.$1",
-                "type": "Object",
+                "id": "def-common.DataViewsServicePublicMethods.getDataViewLazy.$1",
+                "type": "string",
                 "tags": [],
-                "label": "savedObject",
+                "label": "id",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "@kbn/core-saved-objects-common",
-                    "scope": "common",
-                    "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                    "section": "def-common.SavedObject",
-                    "text": "SavedObject"
-                  },
-                  "<",
-                  {
-                    "pluginId": "dataViews",
-                    "scope": "common",
-                    "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataViewAttributes",
-                    "text": "DataViewAttributes"
-                  },
-                  ">"
+                  "string"
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
@@ -18480,15 +20423,29 @@
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.setDefault",
+            "id": "def-common.DataViewsServicePublicMethods.createDataViewLazy",
             "type": "Function",
             "tags": [],
-            "label": "setDefault",
-            "description": [
-              "\nSet default data view."
-            ],
+            "label": "createDataViewLazy",
+            "description": [],
             "signature": [
-              "(id: string | null, force?: boolean | undefined) => Promise<void>"
+              "(spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -18496,68 +20453,51 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.setDefault.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "id",
-                "description": [
-                  "- Id of the data view to set as default."
-                ],
-                "signature": [
-                  "string | null"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.setDefault.$2",
-                "type": "CompoundType",
+                "id": "def-common.DataViewsServicePublicMethods.createDataViewLazy.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "force",
-                "description": [
-                  "- Overwrite if true"
-                ],
+                "label": "spec",
+                "description": [],
                 "signature": [
-                  "boolean | undefined"
+                  {
+                    "pluginId": "dataViews",
+                    "scope": "common",
+                    "docId": "kibDataViewsPluginApi",
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
+                  }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": false
+                "isRequired": true
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.updateSavedObject",
+            "id": "def-common.DataViewsServicePublicMethods.createAndSaveDataViewLazy",
             "type": "Function",
-            "tags": [
-              "oaram"
-            ],
-            "label": "updateSavedObject",
-            "description": [
-              "\nSave saved object"
-            ],
+            "tags": [],
+            "label": "createAndSaveDataViewLazy",
+            "description": [],
             "signature": [
-              "(indexPattern: ",
+              "(spec: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
               },
-              ", saveAttempts?: number | undefined, ignoreErrors?: boolean | undefined, displayErrors?: boolean | undefined) => Promise<void | Error | ",
+              ", override?: boolean | undefined) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
               ">"
             ],
@@ -18567,20 +20507,18 @@
             "children": [
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.updateSavedObject.$1",
+                "id": "def-common.DataViewsServicePublicMethods.createAndSaveDataViewLazy.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "indexPattern",
-                "description": [
-                  "- data view instance"
-                ],
+                "label": "spec",
+                "description": [],
                 "signature": [
                   {
                     "pluginId": "dataViews",
                     "scope": "common",
                     "docId": "kibDataViewsPluginApi",
-                    "section": "def-common.DataView",
-                    "text": "DataView"
+                    "section": "def-common.DataViewSpec",
+                    "text": "DataViewSpec"
                   }
                 ],
                 "path": "src/plugins/data_views/common/data_views/data_views.ts",
@@ -18590,27 +20528,10 @@
               },
               {
                 "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.updateSavedObject.$2",
-                "type": "number",
-                "tags": [],
-                "label": "saveAttempts",
-                "description": [
-                  "- number of times to try saving"
-                ],
-                "signature": [
-                  "number | undefined"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.updateSavedObject.$3",
+                "id": "def-common.DataViewsServicePublicMethods.createAndSaveDataViewLazy.$2",
                 "type": "CompoundType",
                 "tags": [],
-                "label": "ignoreErrors",
+                "label": "override",
                 "description": [],
                 "signature": [
                   "boolean | undefined"
@@ -18619,70 +20540,27 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": false
-              },
-              {
-                "parentPluginId": "dataViews",
-                "id": "def-common.DataViewsServicePublicMethods.updateSavedObject.$4",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "displayErrors",
-                "description": [
-                  "- If set false, API consumer is responsible for displaying and handling errors."
-                ],
-                "signature": [
-                  "boolean | undefined"
-                ],
-                "path": "src/plugins/data_views/common/data_views/data_views.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.defaultDataViewExists",
-            "type": "Function",
-            "tags": [],
-            "label": "defaultDataViewExists",
-            "description": [
-              "\nReturns whether a default data view exists."
-            ],
-            "signature": [
-              "() => Promise<boolean>"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getMetaFields",
-            "type": "Function",
-            "tags": [],
-            "label": "getMetaFields",
-            "description": [],
-            "signature": [
-              "() => Promise<string[] | undefined>"
-            ],
-            "path": "src/plugins/data_views/common/data_views/data_views.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.DataViewsServicePublicMethods.getShortDotsEnable",
+            "id": "def-common.DataViewsServicePublicMethods.getDefaultDataViewLazy",
             "type": "Function",
             "tags": [],
-            "label": "getShortDotsEnable",
+            "label": "getDefaultDataViewLazy",
             "description": [],
             "signature": [
-              "() => Promise<boolean | undefined>"
+              "() => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              " | null>"
             ],
             "path": "src/plugins/data_views/common/data_views/data_views.ts",
             "deprecated": false,
@@ -18824,20 +20702,6 @@
             "deprecated": false,
             "trackAdoption": false
           },
-          {
-            "parentPluginId": "dataViews",
-            "id": "def-common.GetFieldsOptions.lookBack",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "lookBack",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "path": "src/plugins/data_views/common/types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "dataViews",
             "id": "def-common.GetFieldsOptions.metaFields",
@@ -20208,7 +22072,7 @@
             "tags": [],
             "label": "type",
             "description": [
-              " The type of Saved Object. Each plugin can define it's own custom Saved Object types."
+              " The type of Saved Object. Each plugin can define its own custom Saved Object types."
             ],
             "path": "packages/core/saved-objects/core-saved-objects-common/src/server_types.ts",
             "deprecated": false,
@@ -21126,6 +22990,14 @@
             "section": "def-common.DataViewListItem",
             "text": "DataViewListItem"
           },
+          "[]>; getAllDataViewLazy: (refresh?: boolean) => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
           "[]>; clearCache: () => void; clearInstanceCache: (id?: string | undefined) => void; getCache: () => Promise<",
           {
             "pluginId": "@kbn/core-saved-objects-common",
@@ -21254,7 +23126,47 @@
             "section": "def-common.DataViewSpec",
             "text": "DataViewSpec"
           },
-          "; createAndSave: (spec: ",
+          "; getDataViewLazy: (id: string) => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
+          ">; createDataViewLazy: (spec: ",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
+          },
+          ") => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
+          ">; createAndSaveDataViewLazy: (spec: ",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewSpec",
+            "text": "DataViewSpec"
+          },
+          ", overwrite?: boolean) => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
+          ">; createAndSave: (spec: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -21271,14 +23183,18 @@
             "text": "DataView"
           },
           ">; createSavedObject: (dataView: ",
+          "AbstractDataView",
+          ", overwrite?: boolean) => Promise<void>; updateSavedObject: (indexPattern: ",
+          "AbstractDataView",
+          ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>; defaultDataViewExists: () => Promise<boolean>; getDefaultDataViewLazy: () => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
           },
-          ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
+          " | null>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -21286,15 +23202,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; updateSavedObject: (indexPattern: ",
+          " | null>; toDataView: (dataViewLazy: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
             "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataView",
-            "text": "DataView"
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
           },
-          ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
+          ") => Promise<",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -21302,7 +23218,7 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          ">; defaultDataViewExists: () => Promise<boolean>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+          ">; toDataViewLazy: (dataView: ",
           {
             "pluginId": "dataViews",
             "scope": "common",
@@ -21310,7 +23226,15 @@
             "section": "def-common.DataView",
             "text": "DataView"
           },
-          " | null>; }"
+          ") => Promise<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.DataViewLazy",
+            "text": "DataViewLazy"
+          },
+          ">; }"
         ],
         "path": "src/plugins/data_views/common/data_views/data_views.ts",
         "deprecated": false,
diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx
index 4da9a290b7728..6549d4eff9da9 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViews']
 ---
 import dataViewsObj from './data_views.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 976 | 0 | 294 | 4 |
+| 1069 | 0 | 370 | 4 |
 
 ## Client
 
diff --git a/api_docs/data_visualizer.mdx b/api_docs/data_visualizer.mdx
index 8cd24d4faf063..3df3725d72d46 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataVisualizer']
 ---
 import dataVisualizerObj from './data_visualizer.devdocs.json';
diff --git a/api_docs/dataset_quality.devdocs.json b/api_docs/dataset_quality.devdocs.json
index 87130855ff41c..54002d0b284e8 100644
--- a/api_docs/dataset_quality.devdocs.json
+++ b/api_docs/dataset_quality.devdocs.json
@@ -141,7 +141,17 @@
         "label": "APIClientRequestParamsOf",
         "description": [],
         "signature": [
-          "{ \"GET /internal/dataset_quality/data_streams/estimated_data\": { endpoint: \"GET /internal/dataset_quality/data_streams/estimated_data\"; params?: ",
+          "{ \"GET /internal/dataset_quality/integrations/{integration}/dashboards\": { endpoint: \"GET /internal/dataset_quality/integrations/{integration}/dashboards\"; params?: ",
+          "TypeC",
+          "<{ path: ",
+          "TypeC",
+          "<{ integration: ",
+          "StringC",
+          "; }>; }> | undefined; handler: ({}: ",
+          "DatasetQualityRouteHandlerResources",
+          " & { params: { path: { integration: string; }; }; }) => Promise<{ dashboards: { id: string; title: string; }[]; }>; } & ",
+          "DatasetQualityRouteCreateOptions",
+          "; \"GET /internal/dataset_quality/data_streams/estimated_data\": { endpoint: \"GET /internal/dataset_quality/data_streams/estimated_data\"; params?: ",
           "TypeC",
           "<{ query: ",
           "IntersectionC",
@@ -205,7 +215,7 @@
           "StringC",
           "; }>]>; }> | undefined; handler: ({}: ",
           "DatasetQualityRouteHandlerResources",
-          " & { params: { query: { type?: \"metrics\" | \"synthetics\" | \"traces\" | \"logs\" | \"profiling\" | undefined; } & { datasetQuery?: string | undefined; }; }; }) => Promise<{ dataStreamsStats: ({ name: string; } & { size?: string | undefined; sizeBytes?: number | undefined; lastActivity?: number | undefined; integration?: string | undefined; })[]; integrations: ({ name: string; } & { title?: string | undefined; version?: string | undefined; icons?: ({ path: string; src: string; } & { title?: string | undefined; size?: string | undefined; type?: string | undefined; })[] | undefined; datasets?: { [x: string]: string; } | undefined; })[]; }>; } & ",
+          " & { params: { query: { type?: \"metrics\" | \"synthetics\" | \"traces\" | \"logs\" | \"profiling\" | undefined; } & { datasetQuery?: string | undefined; }; }; }) => Promise<{ dataStreamsStats: ({ name: string; } & { size?: string | undefined; sizeBytes?: number | undefined; lastActivity?: number | undefined; integration?: string | undefined; })[]; integrations: ({ name: string; } & { title?: string | undefined; version?: string | undefined; icons?: ({ path: string; src: string; } & { title?: string | undefined; size?: string | undefined; type?: string | undefined; })[] | undefined; datasets?: { [x: string]: string; } | undefined; dashboards?: { id: string; title: string; }[] | undefined; })[]; }>; } & ",
           "DatasetQualityRouteCreateOptions",
           "; }[TEndpoint] extends { endpoint: any; params?: infer TRouteParamsRT extends ",
           {
@@ -240,7 +250,17 @@
         "label": "APIReturnType",
         "description": [],
         "signature": [
-          "{ \"GET /internal/dataset_quality/data_streams/estimated_data\": { endpoint: \"GET /internal/dataset_quality/data_streams/estimated_data\"; params?: ",
+          "{ \"GET /internal/dataset_quality/integrations/{integration}/dashboards\": { endpoint: \"GET /internal/dataset_quality/integrations/{integration}/dashboards\"; params?: ",
+          "TypeC",
+          "<{ path: ",
+          "TypeC",
+          "<{ integration: ",
+          "StringC",
+          "; }>; }> | undefined; handler: ({}: ",
+          "DatasetQualityRouteHandlerResources",
+          " & { params: { path: { integration: string; }; }; }) => Promise<{ dashboards: { id: string; title: string; }[]; }>; } & ",
+          "DatasetQualityRouteCreateOptions",
+          "; \"GET /internal/dataset_quality/data_streams/estimated_data\": { endpoint: \"GET /internal/dataset_quality/data_streams/estimated_data\"; params?: ",
           "TypeC",
           "<{ query: ",
           "IntersectionC",
@@ -304,7 +324,7 @@
           "StringC",
           "; }>]>; }> | undefined; handler: ({}: ",
           "DatasetQualityRouteHandlerResources",
-          " & { params: { query: { type?: \"metrics\" | \"synthetics\" | \"traces\" | \"logs\" | \"profiling\" | undefined; } & { datasetQuery?: string | undefined; }; }; }) => Promise<{ dataStreamsStats: ({ name: string; } & { size?: string | undefined; sizeBytes?: number | undefined; lastActivity?: number | undefined; integration?: string | undefined; })[]; integrations: ({ name: string; } & { title?: string | undefined; version?: string | undefined; icons?: ({ path: string; src: string; } & { title?: string | undefined; size?: string | undefined; type?: string | undefined; })[] | undefined; datasets?: { [x: string]: string; } | undefined; })[]; }>; } & ",
+          " & { params: { query: { type?: \"metrics\" | \"synthetics\" | \"traces\" | \"logs\" | \"profiling\" | undefined; } & { datasetQuery?: string | undefined; }; }; }) => Promise<{ dataStreamsStats: ({ name: string; } & { size?: string | undefined; sizeBytes?: number | undefined; lastActivity?: number | undefined; integration?: string | undefined; })[]; integrations: ({ name: string; } & { title?: string | undefined; version?: string | undefined; icons?: ({ path: string; src: string; } & { title?: string | undefined; size?: string | undefined; type?: string | undefined; })[] | undefined; datasets?: { [x: string]: string; } | undefined; dashboards?: { id: string; title: string; }[] | undefined; })[]; }>; } & ",
           "DatasetQualityRouteCreateOptions",
           "; }[TEndpoint] extends { endpoint: any; params?: any; handler: ({}: any) => Promise<infer TReturnType>; } & ",
           "ServerRouteCreateOptions",
diff --git a/api_docs/dataset_quality.mdx b/api_docs/dataset_quality.mdx
index 2ec18e198635c..8f396a1feccc6 100644
--- a/api_docs/dataset_quality.mdx
+++ b/api_docs/dataset_quality.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/datasetQuality
 title: "datasetQuality"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the datasetQuality plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'datasetQuality']
 ---
 import datasetQualityObj from './dataset_quality.devdocs.json';
diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx
index 0755ce0b98be7..84932cefae9e8 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -17,7 +17,7 @@ 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="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | share, uiActions, guidedOnboarding, home, serverless, management, spaces, savedObjects, indexManagement, devTools, console, visualizations, savedObjectsTagging, expressionXY, lens, expressionMetricVis, expressionGauge, security, alerting, dashboard, triggersActionsUi, aiops, maps, expressionImage, expressionMetric, expressionError, expressionRevealImage, expressionRepeatImage, expressionShape, licenseManagement, dataVisualizer, ml, fleet, crossClusterReplication, graph, grokdebugger, indexLifecycleManagement, ingestPipelines, logstash, metricsDataAccess, exploratoryView, osquery, infra, monitoring, painlessLab, remoteClusters, rollup, searchprofiler, newsfeed, securitySolution, snapshotRestore, transform, upgradeAssistant, watcher, cloudDataMigration, profiling, apm, observabilityOnboarding, synthetics, uptime, ux, filesManagement, kibanaOverview, visDefaultEditor, expressionHeatmap, expressionLegacyMetricVis, expressionPartitionVis, expressionTagcloud, visTypeTable, visTypeTimelion, visTypeTimeseries, visTypeVega, visTypeVislib | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | share, uiActions, guidedOnboarding, home, serverless, management, spaces, savedObjects, indexManagement, devTools, console, security, visualizations, savedObjectsTagging, expressionXY, lens, expressionMetricVis, expressionGauge, alerting, dashboard, triggersActionsUi, aiops, maps, expressionImage, expressionMetric, expressionError, expressionRevealImage, expressionRepeatImage, expressionShape, licenseManagement, dataVisualizer, ml, fleet, crossClusterReplication, graph, grokdebugger, indexLifecycleManagement, ingestPipelines, logstash, metricsDataAccess, exploratoryView, osquery, infra, monitoring, painlessLab, remoteClusters, rollup, searchprofiler, newsfeed, securitySolution, snapshotRestore, transform, upgradeAssistant, watcher, cloudDataMigration, profiling, apm, observabilityOnboarding, synthetics, uptime, ux, filesManagement, kibanaOverview, visDefaultEditor, expressionHeatmap, expressionLegacyMetricVis, expressionPartitionVis, expressionTagcloud, visTypeTable, visTypeTimelion, visTypeTimeseries, visTypeVega, visTypeVislib | - |
 | <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="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SimpleSavedObject" text="SimpleSavedObject"/> | @kbn/core-saved-objects-browser-internal, @kbn/core, savedObjects, visualizations, aiops, ml, dataVisualizer, dashboardEnhanced, graph, lens, securitySolution, eventAnnotation, @kbn/core-saved-objects-browser-mocks | - |
@@ -28,7 +28,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | dashboard, dataVisualizer, stackAlerts, expressionPartitionVis | - |
 | <DocLink id="kibDataPluginApi" section="def-common.SearchSource.fetch" text="fetch"/> | stackAlerts, alerting, securitySolution, inputControlVis | - |
 | <DocLink id="kibAlertingPluginApi" section="def-common.MaintenanceWindow" text="MaintenanceWindow"/> | triggersActionsUi | - |
-| <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | inspector, data, savedObjects, console, runtimeFields, indexManagement, dataViewEditor, unifiedSearch, embeddable, visualizations, licensing, savedObjectsTagging, dataViewFieldEditor, lens, security, dashboard, triggersActionsUi, cases, observabilityShared, banners, maps, @kbn/reporting-public, reporting, timelines, fleet, telemetry, cloudSecurityPosture, dashboardEnhanced, imageEmbeddable, graph, exploratoryView, monitoring, securitySolution, cloudLinks, synthetics, uptime, dataViewManagement, eventAnnotationListing, filesManagement, uiActions, visTypeVislib | - |
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | inspector, data, savedObjects, console, runtimeFields, indexManagement, dataViewEditor, unifiedSearch, embeddable, licensing, security, navigation, visualizations, savedObjectsTagging, dataViewFieldEditor, lens, dashboard, triggersActionsUi, cases, observabilityShared, banners, maps, @kbn/reporting-public, reporting, timelines, fleet, telemetry, cloudSecurityPosture, dashboardEnhanced, imageEmbeddable, graph, exploratoryView, monitoring, securitySolution, cloudLinks, synthetics, uptime, dataViewManagement, eventAnnotationListing, filesManagement, uiActions, visTypeVislib | - |
 | <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectAttribute" text="SavedObjectAttribute"/> | @kbn/core, visualizations, triggersActionsUi | - |
 | <DocLink id="kibAlertingPluginApi" section="def-server.RuleExecutorServices.alertFactory" text="alertFactory"/> | ruleRegistry, securitySolution, synthetics, uptime, slo | - |
 | <DocLink id="kibDataPluginApi" section="def-public.SearchSource.create" text="create"/> | alerting, discover, securitySolution | - |
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index 10783c63f2b7c..391a685bd2da0 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -643,13 +643,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.flattenHit" text="flattenHit"/> | [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=flattenHit) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.DataView.removeScriptedField" text="removeScriptedField"/> | [delete_scripted_field.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts#:~:text=removeScriptedField), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=removeScriptedField) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataView.removeScriptedField" text="removeScriptedField"/> | [abstract_data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/abstract_data_views.ts#:~:text=removeScriptedField), [abstract_data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/abstract_data_views.ts#:~:text=removeScriptedField), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=removeScriptedField), [data_view_lazy.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view_lazy.ts#:~:text=removeScriptedField), [delete_scripted_field.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts#:~:text=removeScriptedField), [data_view_lazy.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view_lazy.test.ts#:~:text=removeScriptedField) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.getNonScriptedFields" text="getNonScriptedFields"/> | [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getNonScriptedFields) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.DataView.getScriptedFields" text="getScriptedFields"/> | [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_views.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataView.getScriptedFields" text="getScriptedFields"/> | [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_views.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.flattenHit" text="flattenHit"/> | [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=flattenHit) | - |
-| <DocLink id="kibDataPluginApi" section="def-server.DataView.removeScriptedField" text="removeScriptedField"/> | [delete_scripted_field.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts#:~:text=removeScriptedField), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=removeScriptedField) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.DataView.removeScriptedField" text="removeScriptedField"/> | [abstract_data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/abstract_data_views.ts#:~:text=removeScriptedField), [abstract_data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/abstract_data_views.ts#:~:text=removeScriptedField), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=removeScriptedField), [data_view_lazy.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view_lazy.ts#:~:text=removeScriptedField), [delete_scripted_field.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/server/rest_api_routes/public/scripted_fields/delete_scripted_field.ts#:~:text=removeScriptedField), [data_view_lazy.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view_lazy.test.ts#:~:text=removeScriptedField) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.getNonScriptedFields" text="getNonScriptedFields"/> | [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getNonScriptedFields) | - |
-| <DocLink id="kibDataPluginApi" section="def-server.DataView.getScriptedFields" text="getScriptedFields"/> | [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_views.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.DataView.getScriptedFields" text="getScriptedFields"/> | [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_view.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.ts#:~:text=getScriptedFields), [data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_views.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields), [data_view.test.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/common/data_views/data_view.test.ts#:~:text=getScriptedFields) | - |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.migrations" text="migrations"/> | [data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/server/saved_objects/data_views.ts#:~:text=migrations) | - |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | [data_views.ts](https://github.com/elastic/kibana/tree/main/src/plugins/data_views/server/saved_objects/data_views.ts#:~:text=convertToMultiNamespaceTypeVersion) | - |
 
@@ -1199,6 +1199,14 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 
 
+## navigation
+
+| Deprecated API | Reference location(s) | Remove By |
+| ---------------|-----------|-----------|
+| <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | [solution_nav_userprofile_toggle.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.tsx#:~:text=toMountPoint), [solution_nav_userprofile_toggle.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.tsx#:~:text=toMountPoint) | - |
+
+
+
 ## newsfeed
 
 | Deprecated API | Reference location(s) | Remove By |
@@ -1446,7 +1454,7 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 | <DocLink id="kibTimelinesPluginApi" section="def-common.DeprecatedRowRenderer" text="DeprecatedRowRenderer"/> | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx#:~:text=DeprecatedRowRenderer), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx#:~:text=DeprecatedRowRenderer) | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.BeatFields" text="BeatFields"/> | [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#:~:text=BeatFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=BeatFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=BeatFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=BeatFields) | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.BrowserField" text="BrowserField"/> | [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#:~:text=BrowserField), [helpers.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts#:~:text=BrowserField), [helpers.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts#:~:text=BrowserField), [helpers.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts#:~:text=BrowserField), [helpers.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts#:~:text=BrowserField), [columns.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/event_details/columns.tsx#:~:text=BrowserField), [columns.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/event_details/columns.tsx#:~:text=BrowserField), [enrichment_summary.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/enrichment_summary.tsx#:~:text=BrowserField), [enrichment_summary.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/enrichment_summary.tsx#:~:text=BrowserField), [table_tab.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/flyout/document_details/right/tabs/table_tab.tsx#:~:text=BrowserField)+ 33 more | - |
-| <DocLink id="kibTimelinesPluginApi" section="def-common.BrowserFields" text="BrowserFields"/> | [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/types/header_actions/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/types/header_actions/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields)+ 107 more | - |
+| <DocLink id="kibTimelinesPluginApi" section="def-common.BrowserFields" text="BrowserFields"/> | [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/types/timeline/cells/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/types/header_actions/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/types/header_actions/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts#:~:text=BrowserFields)+ 109 more | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.IndexFieldsStrategyRequest" text="IndexFieldsStrategyRequest"/> | [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#:~:text=IndexFieldsStrategyRequest), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=IndexFieldsStrategyRequest), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=IndexFieldsStrategyRequest), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=IndexFieldsStrategyRequest), [middleware.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#:~:text=IndexFieldsStrategyRequest), [middleware.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#:~:text=IndexFieldsStrategyRequest) | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.IndexFieldsStrategyResponse" text="IndexFieldsStrategyResponse"/> | [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#:~:text=IndexFieldsStrategyResponse), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=IndexFieldsStrategyResponse), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=IndexFieldsStrategyResponse), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/search_strategy/endpoint_fields/index.ts#:~:text=IndexFieldsStrategyResponse), [middleware.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#:~:text=IndexFieldsStrategyResponse), [middleware.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#:~:text=IndexFieldsStrategyResponse) | - |
 | <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) | - |
@@ -1587,7 +1595,7 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 | <DocLink id="kibAlertingPluginApi" section="def-common.MaintenanceWindow" text="MaintenanceWindow"/> | [bulk_get_maintenance_windows.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/apis/bulk_get_maintenance_windows.ts#:~:text=MaintenanceWindow), [bulk_get_maintenance_windows.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/apis/bulk_get_maintenance_windows.ts#:~:text=MaintenanceWindow), [bulk_get_maintenance_windows.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/apis/bulk_get_maintenance_windows.ts#:~:text=MaintenanceWindow), [bulk_get_maintenance_windows.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/apis/bulk_get_maintenance_windows.ts#:~:text=MaintenanceWindow), [bulk_get_maintenance_windows.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/apis/bulk_get_maintenance_windows.ts#:~:text=MaintenanceWindow), [use_bulk_get_maintenance_windows.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_maintenance_windows.tsx#:~:text=MaintenanceWindow), [use_bulk_get_maintenance_windows.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_bulk_get_maintenance_windows.tsx#:~:text=MaintenanceWindow), [tooltip_content.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/maintenance_windows/tooltip_content.tsx#:~:text=MaintenanceWindow), [tooltip_content.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/maintenance_windows/tooltip_content.tsx#:~:text=MaintenanceWindow), [cell.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/maintenance_windows/cell.tsx#:~:text=MaintenanceWindow)+ 11 more | - |
 | <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | [use_bulk_edit_response.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_response.tsx#:~:text=toMountPoint), [use_bulk_edit_response.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_response.tsx#:~:text=toMountPoint), [use_bulk_edit_response.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_edit_response.tsx#:~:text=toMountPoint), [use_bulk_operation_toast.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_operation_toast.tsx#:~:text=toMountPoint), [use_bulk_operation_toast.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_operation_toast.tsx#:~:text=toMountPoint), [use_bulk_operation_toast.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/hooks/use_bulk_operation_toast.tsx#:~:text=toMountPoint), [rule_add.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.tsx#:~:text=toMountPoint), [rule_add.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_add.tsx#:~:text=toMountPoint), [rule_edit.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx#:~:text=toMountPoint), [rule_edit.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx#:~:text=toMountPoint)+ 6 more | - |
 | <DocLink id="kibKibanaReactPluginApi" section="def-public.KibanaThemeProvider" text="KibanaThemeProvider"/> | [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/app.tsx#:~:text=KibanaThemeProvider), [app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/app.tsx#:~:text=KibanaThemeProvider), [connectors_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/connectors_app.tsx#:~:text=KibanaThemeProvider), [connectors_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/connectors_app.tsx#:~:text=KibanaThemeProvider), [connectors_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/connectors_app.tsx#:~:text=KibanaThemeProvider), [alerts_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/alerts_app.tsx#:~:text=KibanaThemeProvider), [alerts_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/alerts_app.tsx#:~:text=KibanaThemeProvider), [alerts_app.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/alerts_app.tsx#:~:text=KibanaThemeProvider), [test_utils.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/test_utils.tsx#:~:text=KibanaThemeProvider)+ 2 more | - |
-| <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectAttribute" text="SavedObjectAttribute"/> | [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute), [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute), [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute), [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute), [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute) | - |
+| <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectAttribute" text="SavedObjectAttribute"/> | [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute), [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute), [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute), [rule_reducer.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts#:~:text=SavedObjectAttribute) | - |
 
 
 
diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx
index 88889623e317e..6f5eaf2078086 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
diff --git a/api_docs/dev_tools.mdx b/api_docs/dev_tools.mdx
index 101691abc47c7..302a16e84337c 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: 2024-04-02
+date: 2024-04-03
 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 edb34363efa51..9f18cbb55c5e2 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: 2024-04-02
+date: 2024-04-03
 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 589b8cc46a603..3fda51a17ace7 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: 2024-04-02
+date: 2024-04-03
 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 fc99774496b13..46e7423ba9779 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ecsDataQualityDashboard']
 ---
 import ecsDataQualityDashboardObj from './ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/elastic_assistant.mdx b/api_docs/elastic_assistant.mdx
index 184d43e71f9ad..2f78d0524c8c2 100644
--- a/api_docs/elastic_assistant.mdx
+++ b/api_docs/elastic_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/elasticAssistant
 title: "elasticAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the elasticAssistant plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'elasticAssistant']
 ---
 import elasticAssistantObj from './elastic_assistant.devdocs.json';
diff --git a/api_docs/embeddable.mdx b/api_docs/embeddable.mdx
index 0abec445fc2c7..ed3ac63ee25b3 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: 2024-04-02
+date: 2024-04-03
 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 236632a4c5540..785c3a4aa1eba 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: 2024-04-02
+date: 2024-04-03
 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 295ee0f8b7d70..d17873788d816 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: 2024-04-02
+date: 2024-04-03
 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 2eb6d8c012e3a..af1b888d85291 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: 2024-04-02
+date: 2024-04-03
 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 8e572bbb72ca0..ab6b4fc209465 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: 2024-04-02
+date: 2024-04-03
 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 e71094ac98fae..6993c5702b139 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotation']
 ---
 import eventAnnotationObj from './event_annotation.devdocs.json';
diff --git a/api_docs/event_annotation_listing.mdx b/api_docs/event_annotation_listing.mdx
index dd632b8f50d32..a4114452f271d 100644
--- a/api_docs/event_annotation_listing.mdx
+++ b/api_docs/event_annotation_listing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotationListing
 title: "eventAnnotationListing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventAnnotationListing plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotationListing']
 ---
 import eventAnnotationListingObj from './event_annotation_listing.devdocs.json';
diff --git a/api_docs/event_log.devdocs.json b/api_docs/event_log.devdocs.json
index fff36d7a36df6..326ff5aae0c64 100644
--- a/api_docs/event_log.devdocs.json
+++ b/api_docs/event_log.devdocs.json
@@ -1450,7 +1450,7 @@
             "label": "data",
             "description": [],
             "signature": [
-              "(Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ id?: string | undefined; type?: 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; license?: string | undefined; uuid?: string | undefined; version?: string | undefined; category?: string | undefined; description?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; gen_ai?: Readonly<{ usage?: Readonly<{ prompt_tokens?: string | number | undefined; completion_tokens?: string | number | undefined; total_tokens?: string | number | undefined; } & {}> | undefined; } & {}> | 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; revision?: string | number | undefined; execution?: Readonly<{ uuid?: string | undefined; status?: string | undefined; metrics?: Readonly<{ total_search_duration_ms?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; 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_delayed_alerts?: string | number | undefined; number_of_searches?: string | number | undefined; es_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; persist_alerts_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_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; saved_objects?: Readonly<{ id?: string | undefined; type?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ id?: string | undefined; type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; start?: string | undefined; end?: string | undefined; outcome?: string | undefined; category?: string[] | undefined; duration?: string | number | undefined; timezone?: string | undefined; risk_score?: number | undefined; severity?: string | number | undefined; url?: string | undefined; created?: string | undefined; dataset?: string | undefined; code?: 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_norm?: number | undefined; sequence?: string | number | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ id?: string | undefined; name?: string | undefined; } & {}> | undefined; } & {}> | undefined)[]"
+              "(Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ id?: string | undefined; type?: 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; license?: string | undefined; uuid?: string | undefined; version?: string | undefined; category?: string | undefined; description?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; gen_ai?: Readonly<{ usage?: Readonly<{ prompt_tokens?: string | number | undefined; completion_tokens?: string | number | undefined; total_tokens?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; recovered?: 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; revision?: string | number | undefined; execution?: Readonly<{ uuid?: string | undefined; status?: string | undefined; metrics?: Readonly<{ total_search_duration_ms?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ active?: string | number | undefined; new?: string | number | undefined; recovered?: string | number | undefined; } & {}> | undefined; number_of_delayed_alerts?: string | number | undefined; number_of_searches?: string | number | undefined; es_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; persist_alerts_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_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; saved_objects?: Readonly<{ id?: string | undefined; type?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ id?: string | undefined; type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; start?: string | undefined; end?: string | undefined; outcome?: string | undefined; timezone?: string | undefined; duration?: string | number | undefined; category?: string[] | undefined; risk_score?: number | undefined; severity?: string | number | undefined; url?: string | undefined; created?: string | undefined; dataset?: string | undefined; code?: 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_norm?: number | undefined; sequence?: string | number | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ id?: string | undefined; name?: string | undefined; } & {}> | undefined; } & {}> | undefined)[]"
             ],
             "path": "x-pack/plugins/event_log/server/es/cluster_client_adapter.ts",
             "deprecated": false,
@@ -1470,7 +1470,7 @@
         "label": "IEvent",
         "description": [],
         "signature": [
-          "DeepPartial<DeepWriteable<Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ id?: string | undefined; type?: 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; license?: string | undefined; uuid?: string | undefined; version?: string | undefined; category?: string | undefined; description?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; gen_ai?: Readonly<{ usage?: Readonly<{ prompt_tokens?: string | number | undefined; completion_tokens?: string | number | undefined; total_tokens?: string | number | undefined; } & {}> | undefined; } & {}> | 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; revision?: string | number | undefined; execution?: Readonly<{ uuid?: string | undefined; status?: string | undefined; metrics?: Readonly<{ total_search_duration_ms?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; 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_delayed_alerts?: string | number | undefined; number_of_searches?: string | number | undefined; es_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; persist_alerts_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_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; saved_objects?: Readonly<{ id?: string | undefined; type?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ id?: string | undefined; type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; start?: string | undefined; end?: string | undefined; outcome?: string | undefined; category?: string[] | undefined; duration?: string | number | undefined; timezone?: string | undefined; risk_score?: number | undefined; severity?: string | number | undefined; url?: string | undefined; created?: string | undefined; dataset?: string | undefined; code?: 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_norm?: number | undefined; sequence?: string | number | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ id?: string | undefined; name?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+          "DeepPartial<DeepWriteable<Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ id?: string | undefined; type?: 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; license?: string | undefined; uuid?: string | undefined; version?: string | undefined; category?: string | undefined; description?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; gen_ai?: Readonly<{ usage?: Readonly<{ prompt_tokens?: string | number | undefined; completion_tokens?: string | number | undefined; total_tokens?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; recovered?: 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; revision?: string | number | undefined; execution?: Readonly<{ uuid?: string | undefined; status?: string | undefined; metrics?: Readonly<{ total_search_duration_ms?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ active?: string | number | undefined; new?: string | number | undefined; recovered?: string | number | undefined; } & {}> | undefined; number_of_delayed_alerts?: string | number | undefined; number_of_searches?: string | number | undefined; es_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; persist_alerts_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_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; saved_objects?: Readonly<{ id?: string | undefined; type?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ id?: string | undefined; type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; start?: string | undefined; end?: string | undefined; outcome?: string | undefined; timezone?: string | undefined; duration?: string | number | undefined; category?: string[] | undefined; risk_score?: number | undefined; severity?: string | number | undefined; url?: string | undefined; created?: string | undefined; dataset?: string | undefined; code?: 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_norm?: number | undefined; sequence?: string | number | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ id?: string | undefined; name?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
         ],
         "path": "x-pack/plugins/event_log/generated/schemas.ts",
         "deprecated": false,
@@ -1485,7 +1485,7 @@
         "label": "IValidatedEvent",
         "description": [],
         "signature": [
-          "Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ id?: string | undefined; type?: 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; license?: string | undefined; uuid?: string | undefined; version?: string | undefined; category?: string | undefined; description?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; gen_ai?: Readonly<{ usage?: Readonly<{ prompt_tokens?: string | number | undefined; completion_tokens?: string | number | undefined; total_tokens?: string | number | undefined; } & {}> | undefined; } & {}> | 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; revision?: string | number | undefined; execution?: Readonly<{ uuid?: string | undefined; status?: string | undefined; metrics?: Readonly<{ total_search_duration_ms?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; 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_delayed_alerts?: string | number | undefined; number_of_searches?: string | number | undefined; es_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; persist_alerts_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_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; saved_objects?: Readonly<{ id?: string | undefined; type?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ id?: string | undefined; type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; start?: string | undefined; end?: string | undefined; outcome?: string | undefined; category?: string[] | undefined; duration?: string | number | undefined; timezone?: string | undefined; risk_score?: number | undefined; severity?: string | number | undefined; url?: string | undefined; created?: string | undefined; dataset?: string | undefined; code?: 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_norm?: number | undefined; sequence?: string | number | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ id?: string | undefined; name?: string | undefined; } & {}> | undefined; } & {}> | undefined"
+          "Readonly<{ log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; error?: Readonly<{ id?: string | undefined; type?: 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; license?: string | undefined; uuid?: string | undefined; version?: string | undefined; category?: string | undefined; description?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; } & {}> | undefined; kibana?: Readonly<{ task?: Readonly<{ id?: string | undefined; schedule_delay?: string | number | undefined; scheduled?: string | undefined; } & {}> | undefined; action?: Readonly<{ id?: string | undefined; name?: string | undefined; execution?: Readonly<{ source?: string | undefined; uuid?: string | undefined; gen_ai?: Readonly<{ usage?: Readonly<{ prompt_tokens?: string | number | undefined; completion_tokens?: string | number | undefined; total_tokens?: string | number | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; } & {}> | undefined; alerting?: Readonly<{ outcome?: string | undefined; summary?: Readonly<{ new?: Readonly<{ count?: string | number | undefined; } & {}> | undefined; recovered?: 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; revision?: string | number | undefined; execution?: Readonly<{ uuid?: string | undefined; status?: string | undefined; metrics?: Readonly<{ total_search_duration_ms?: string | number | undefined; total_indexing_duration_ms?: string | number | undefined; number_of_triggered_actions?: string | number | undefined; number_of_generated_actions?: string | number | undefined; alert_counts?: Readonly<{ active?: string | number | undefined; new?: string | number | undefined; recovered?: string | number | undefined; } & {}> | undefined; number_of_delayed_alerts?: string | number | undefined; number_of_searches?: string | number | undefined; es_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; persist_alerts_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_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; saved_objects?: Readonly<{ id?: string | undefined; type?: string | undefined; namespace?: string | undefined; rel?: string | undefined; type_id?: string | undefined; space_agnostic?: boolean | undefined; } & {}>[] | undefined; space_ids?: string[] | undefined; } & {}> | undefined; event?: Readonly<{ id?: string | undefined; type?: string[] | undefined; reason?: string | undefined; action?: string | undefined; start?: string | undefined; end?: string | undefined; outcome?: string | undefined; timezone?: string | undefined; duration?: string | number | undefined; category?: string[] | undefined; risk_score?: number | undefined; severity?: string | number | undefined; url?: string | undefined; created?: string | undefined; dataset?: string | undefined; code?: 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_norm?: number | undefined; sequence?: string | number | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; user?: Readonly<{ id?: string | undefined; 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 ed077c15aedf9..86b3c9b374c4c 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: 2024-04-02
+date: 2024-04-03
 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 adeea6d27dbd9..e7b00c014fd3f 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: 2024-04-02
+date: 2024-04-03
 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 9e6f89e5e165b..f4d7156cd58d0 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: 2024-04-02
+date: 2024-04-03
 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 2bdde44513ab6..f7efa1b20e8a1 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: 2024-04-02
+date: 2024-04-03
 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 8c0e4531a0f17..e106f28564b22 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: 2024-04-02
+date: 2024-04-03
 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 4cef6bdb944c0..0011e7f1e8071 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: 2024-04-02
+date: 2024-04-03
 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 4ff48dba9f45d..96018066e2681 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: 2024-04-02
+date: 2024-04-03
 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 35ed642a920be..1a9d480379259 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: 2024-04-02
+date: 2024-04-03
 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 0bc10d2c86aa1..78537b910494f 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: 2024-04-02
+date: 2024-04-03
 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 535b50dc7a2a5..0f0fb7f991626 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: 2024-04-02
+date: 2024-04-03
 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 f81c24d7e3788..cc4bbbccf1151 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: 2024-04-02
+date: 2024-04-03
 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 369c04f6c5de3..80af18886c8b0 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: 2024-04-02
+date: 2024-04-03
 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 b433f343e1d72..80360167574b8 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: 2024-04-02
+date: 2024-04-03
 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 bf9950b1c836c..bf47e5dcdbb38 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: 2024-04-02
+date: 2024-04-03
 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 553df1de43671..d4583d5953cd5 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: 2024-04-02
+date: 2024-04-03
 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 4b0f465918676..b6fb56e39ae30 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: 2024-04-02
+date: 2024-04-03
 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 6d0d197c4ec9c..f8a4bcb04f9c4 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: 2024-04-02
+date: 2024-04-03
 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 0c6da51bc62d7..54430b8699426 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: 2024-04-02
+date: 2024-04-03
 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 c00b8a36aaf9e..2c12f2ef3565f 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: 2024-04-02
+date: 2024-04-03
 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 866d792cbe922..c91f1fb64a00f 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: 2024-04-02
+date: 2024-04-03
 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 5536a5a99222c..7acf9415037bc 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'filesManagement']
 ---
 import filesManagementObj from './files_management.devdocs.json';
diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx
index 3faee1d60ffdc..6eb1fb9ce0dd1 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fleet']
 ---
 import fleetObj from './fleet.devdocs.json';
diff --git a/api_docs/global_search.mdx b/api_docs/global_search.mdx
index da83c5d45488a..56b29305a57b1 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: 2024-04-02
+date: 2024-04-03
 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 3639bb26e62f3..6507223299577 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: 2024-04-02
+date: 2024-04-03
 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 a64c619d3c0e1..803cce78b4b16 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: 2024-04-02
+date: 2024-04-03
 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 8581ba261643c..b416db2bc20f8 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: 2024-04-02
+date: 2024-04-03
 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 869c4fa18eafd..fc0480fd1a31c 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: 2024-04-02
+date: 2024-04-03
 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 b5c40f9efcc7e..0e308ce469c56 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: 2024-04-02
+date: 2024-04-03
 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 e06bb1f03db1c..423619f5cc2a1 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'infra']
 ---
 import infraObj from './infra.devdocs.json';
diff --git a/api_docs/ingest_pipelines.mdx b/api_docs/ingest_pipelines.mdx
index d49741d65175d..6e460a4b4317f 100644
--- a/api_docs/ingest_pipelines.mdx
+++ b/api_docs/ingest_pipelines.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ingestPipelines
 title: "ingestPipelines"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ingestPipelines plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ingestPipelines']
 ---
 import ingestPipelinesObj from './ingest_pipelines.devdocs.json';
diff --git a/api_docs/inspector.mdx b/api_docs/inspector.mdx
index 707f720ea447d..397cc7b3db7d6 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: 2024-04-02
+date: 2024-04-03
 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 74df6e526f776..48f95a17e1315 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: 2024-04-02
+date: 2024-04-03
 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 f322ce994b8ed..c7794f13677ff 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ace']
 ---
 import kbnAceObj from './kbn_ace.devdocs.json';
diff --git a/api_docs/kbn_actions_types.mdx b/api_docs/kbn_actions_types.mdx
index 8c8158a018898..d42bbe702b97d 100644
--- a/api_docs/kbn_actions_types.mdx
+++ b/api_docs/kbn_actions_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-actions-types
 title: "@kbn/actions-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/actions-types plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/actions-types']
 ---
 import kbnActionsTypesObj from './kbn_actions_types.devdocs.json';
diff --git a/api_docs/kbn_aiops_components.mdx b/api_docs/kbn_aiops_components.mdx
index ab0cfd23cd05c..be82d8d106fcb 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-components']
 ---
 import kbnAiopsComponentsObj from './kbn_aiops_components.devdocs.json';
diff --git a/api_docs/kbn_aiops_log_pattern_analysis.mdx b/api_docs/kbn_aiops_log_pattern_analysis.mdx
index b019cb755cc25..b9ff8e8dd968e 100644
--- a/api_docs/kbn_aiops_log_pattern_analysis.mdx
+++ b/api_docs/kbn_aiops_log_pattern_analysis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-log-pattern-analysis
 title: "@kbn/aiops-log-pattern-analysis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-log-pattern-analysis plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-log-pattern-analysis']
 ---
 import kbnAiopsLogPatternAnalysisObj from './kbn_aiops_log_pattern_analysis.devdocs.json';
diff --git a/api_docs/kbn_aiops_log_rate_analysis.mdx b/api_docs/kbn_aiops_log_rate_analysis.mdx
index 29f7dee71be48..aba118af16462 100644
--- a/api_docs/kbn_aiops_log_rate_analysis.mdx
+++ b/api_docs/kbn_aiops_log_rate_analysis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-log-rate-analysis
 title: "@kbn/aiops-log-rate-analysis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-log-rate-analysis plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-log-rate-analysis']
 ---
 import kbnAiopsLogRateAnalysisObj from './kbn_aiops_log_rate_analysis.devdocs.json';
diff --git a/api_docs/kbn_alerting_api_integration_helpers.mdx b/api_docs/kbn_alerting_api_integration_helpers.mdx
index 2bec052e57921..1d194752b994f 100644
--- a/api_docs/kbn_alerting_api_integration_helpers.mdx
+++ b/api_docs/kbn_alerting_api_integration_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-api-integration-helpers
 title: "@kbn/alerting-api-integration-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-api-integration-helpers plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-api-integration-helpers']
 ---
 import kbnAlertingApiIntegrationHelpersObj from './kbn_alerting_api_integration_helpers.devdocs.json';
diff --git a/api_docs/kbn_alerting_state_types.mdx b/api_docs/kbn_alerting_state_types.mdx
index 7bffe0acea2b5..4e562b5619bad 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-state-types']
 ---
 import kbnAlertingStateTypesObj from './kbn_alerting_state_types.devdocs.json';
diff --git a/api_docs/kbn_alerting_types.mdx b/api_docs/kbn_alerting_types.mdx
index 4c62d87911cc5..e642ed38fc3b4 100644
--- a/api_docs/kbn_alerting_types.mdx
+++ b/api_docs/kbn_alerting_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-types
 title: "@kbn/alerting-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-types plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-types']
 ---
 import kbnAlertingTypesObj from './kbn_alerting_types.devdocs.json';
diff --git a/api_docs/kbn_alerts_as_data_utils.mdx b/api_docs/kbn_alerts_as_data_utils.mdx
index b3988a5ec3f81..4a11e200d7276 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: 2024-04-02
+date: 2024-04-03
 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.devdocs.json b/api_docs/kbn_alerts_ui_shared.devdocs.json
index 7f552c036458d..dcbb4e598a7a2 100644
--- a/api_docs/kbn_alerts_ui_shared.devdocs.json
+++ b/api_docs/kbn_alerts_ui_shared.devdocs.json
@@ -836,7 +836,7 @@
             "label": "alertStatus",
             "description": [],
             "signature": [
-              "\"recovered\" | \"active\" | \"untracked\""
+              "\"active\" | \"recovered\" | \"untracked\""
             ],
             "path": "packages/kbn-alerts-ui-shared/src/alert_lifecycle_status_badge/index.tsx",
             "deprecated": false,
@@ -1381,6 +1381,14 @@
                 "section": "def-common.DataViewListItem",
                 "text": "DataViewListItem"
               },
+              "[]>; getAllDataViewLazy: (refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
               "[]>; clearCache: () => void; clearInstanceCache: (id?: string | undefined) => void; getCache: () => Promise<",
               {
                 "pluginId": "@kbn/core-saved-objects-common",
@@ -1509,7 +1517,47 @@
                 "section": "def-common.DataViewSpec",
                 "text": "DataViewSpec"
               },
-              "; createAndSave: (spec: ",
+              "; getDataViewLazy: (id: string) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createDataViewLazy: (spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createAndSaveDataViewLazy: (spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ", overwrite?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createAndSave: (spec: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -1526,14 +1574,18 @@
                 "text": "DataView"
               },
               ">; createSavedObject: (dataView: ",
+              "AbstractDataView",
+              ", overwrite?: boolean) => Promise<void>; updateSavedObject: (indexPattern: ",
+              "AbstractDataView",
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>; defaultDataViewExists: () => Promise<boolean>; getDefaultDataViewLazy: () => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
-              ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
+              " | null>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -1541,15 +1593,15 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              ">; updateSavedObject: (indexPattern: ",
+              " | null>; toDataView: (dataViewLazy: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
+              ") => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -1557,7 +1609,7 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              ">; defaultDataViewExists: () => Promise<boolean>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+              ">; toDataViewLazy: (dataView: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -1565,7 +1617,15 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              " | null>; }"
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; }"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
             "deprecated": false,
@@ -1674,6 +1734,14 @@
                 "section": "def-common.DataViewListItem",
                 "text": "DataViewListItem"
               },
+              "[]>; getAllDataViewLazy: (refresh?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
               "[]>; clearCache: () => void; clearInstanceCache: (id?: string | undefined) => void; getCache: () => Promise<",
               {
                 "pluginId": "@kbn/core-saved-objects-common",
@@ -1802,7 +1870,47 @@
                 "section": "def-common.DataViewSpec",
                 "text": "DataViewSpec"
               },
-              "; createAndSave: (spec: ",
+              "; getDataViewLazy: (id: string) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createDataViewLazy: (spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createAndSaveDataViewLazy: (spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ", overwrite?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; createAndSave: (spec: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -1819,14 +1927,18 @@
                 "text": "DataView"
               },
               ">; createSavedObject: (dataView: ",
+              "AbstractDataView",
+              ", overwrite?: boolean) => Promise<void>; updateSavedObject: (indexPattern: ",
+              "AbstractDataView",
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>; defaultDataViewExists: () => Promise<boolean>; getDefaultDataViewLazy: () => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
-              ", overwrite?: boolean, displayErrors?: boolean) => Promise<",
+              " | null>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -1834,15 +1946,15 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              ">; updateSavedObject: (indexPattern: ",
+              " | null>; toDataView: (dataViewLazy: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
                 "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
               },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void | Error | ",
+              ") => Promise<",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -1850,7 +1962,7 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              ">; defaultDataViewExists: () => Promise<boolean>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+              ">; toDataViewLazy: (dataView: ",
               {
                 "pluginId": "dataViews",
                 "scope": "common",
@@ -1858,7 +1970,15 @@
                 "section": "def-common.DataView",
                 "text": "DataView"
               },
-              " | null>; }"
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; }"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_alerts_ui_shared.mdx b/api_docs/kbn_alerts_ui_shared.mdx
index f76abb640f048..5bdaf5b948c40 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: 2024-04-02
+date: 2024-04-03
 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 444460e8e63c3..a11c85d00810a 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: 2024-04-02
+date: 2024-04-03
 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 b1c29ff35e00f..7df3844a30cb9 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-client']
 ---
 import kbnAnalyticsClientObj from './kbn_analytics_client.devdocs.json';
diff --git a/api_docs/kbn_analytics_collection_utils.mdx b/api_docs/kbn_analytics_collection_utils.mdx
index 45fab9dfd2769..a3376e7927810 100644
--- a/api_docs/kbn_analytics_collection_utils.mdx
+++ b/api_docs/kbn_analytics_collection_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-collection-utils
 title: "@kbn/analytics-collection-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-collection-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-collection-utils']
 ---
 import kbnAnalyticsCollectionUtilsObj from './kbn_analytics_collection_utils.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 35bf6721c1cda..9ef890c121fa5 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: 2024-04-02
+date: 2024-04-03
 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 f1581d6419a56..3e3d45d7ec0ef 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: 2024-04-02
+date: 2024-04-03
 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 fdd51d7e8c417..c73983d58ff48 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: 2024-04-02
+date: 2024-04-03
 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 7c6d42ba9352a..2533716bdd5cc 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-fullstory']
 ---
 import kbnAnalyticsShippersFullstoryObj from './kbn_analytics_shippers_fullstory.devdocs.json';
diff --git a/api_docs/kbn_apm_config_loader.mdx b/api_docs/kbn_apm_config_loader.mdx
index 4a66486e6422a..f9eebedfdc335 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: 2024-04-02
+date: 2024-04-03
 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_data_view.mdx b/api_docs/kbn_apm_data_view.mdx
index 387fa104c73f0..b71d5ea09f579 100644
--- a/api_docs/kbn_apm_data_view.mdx
+++ b/api_docs/kbn_apm_data_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-data-view
 title: "@kbn/apm-data-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-data-view plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-data-view']
 ---
 import kbnApmDataViewObj from './kbn_apm_data_view.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace.mdx b/api_docs/kbn_apm_synthtrace.mdx
index d9adc623e6dae..cf7fcdecfefc8 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: 2024-04-02
+date: 2024-04-03
 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 1512fdbfab978..1d221604f513a 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: 2024-04-02
+date: 2024-04-03
 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 e4d9c238e457f..868b604b87d9b 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: 2024-04-02
+date: 2024-04-03
 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 f3e279c14c22f..902f3090ba3a7 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/axe-config']
 ---
 import kbnAxeConfigObj from './kbn_axe_config.devdocs.json';
diff --git a/api_docs/kbn_bfetch_error.mdx b/api_docs/kbn_bfetch_error.mdx
index 1630c3ff0e4ee..c3151c912077c 100644
--- a/api_docs/kbn_bfetch_error.mdx
+++ b/api_docs/kbn_bfetch_error.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-bfetch-error
 title: "@kbn/bfetch-error"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/bfetch-error plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/bfetch-error']
 ---
 import kbnBfetchErrorObj from './kbn_bfetch_error.devdocs.json';
diff --git a/api_docs/kbn_calculate_auto.mdx b/api_docs/kbn_calculate_auto.mdx
index 09c887bd64230..9719536ef0f60 100644
--- a/api_docs/kbn_calculate_auto.mdx
+++ b/api_docs/kbn_calculate_auto.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-calculate-auto
 title: "@kbn/calculate-auto"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/calculate-auto plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/calculate-auto']
 ---
 import kbnCalculateAutoObj from './kbn_calculate_auto.devdocs.json';
diff --git a/api_docs/kbn_calculate_width_from_char_count.mdx b/api_docs/kbn_calculate_width_from_char_count.mdx
index 81c482139b9ec..4874cbd6167d7 100644
--- a/api_docs/kbn_calculate_width_from_char_count.mdx
+++ b/api_docs/kbn_calculate_width_from_char_count.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-calculate-width-from-char-count
 title: "@kbn/calculate-width-from-char-count"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/calculate-width-from-char-count plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/calculate-width-from-char-count']
 ---
 import kbnCalculateWidthFromCharCountObj from './kbn_calculate_width_from_char_count.devdocs.json';
diff --git a/api_docs/kbn_cases_components.mdx b/api_docs/kbn_cases_components.mdx
index e235456e669a4..8413edd0dc6cb 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: 2024-04-02
+date: 2024-04-03
 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 a9739c024a894..42fbce9620c74 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: 2024-04-02
+date: 2024-04-03
 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 e219ca987ea43..6057d08ddb4b4 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: 2024-04-02
+date: 2024-04-03
 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 fc5726f150c02..a3d0f400ffb1f 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: 2024-04-02
+date: 2024-04-03
 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 1ecf6a0eebbd4..c40f09e5dac1c 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: 2024-04-02
+date: 2024-04-03
 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 ad384a8f79c08..c42eccb19f3fe 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: 2024-04-02
+date: 2024-04-03
 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 567e04140d39f..faa0704a3552c 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: 2024-04-02
+date: 2024-04-03
 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 4ca58ed18582d..3a98b5bcfc7fc 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: 2024-04-02
+date: 2024-04-03
 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 b437f3100e149..f825dd4b78d17 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor']
 ---
 import kbnCodeEditorObj from './kbn_code_editor.devdocs.json';
diff --git a/api_docs/kbn_code_editor_mock.mdx b/api_docs/kbn_code_editor_mock.mdx
index afbfc0e375c6c..d378d9db3e862 100644
--- a/api_docs/kbn_code_editor_mock.mdx
+++ b/api_docs/kbn_code_editor_mock.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor-mock
 title: "@kbn/code-editor-mock"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor-mock plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor-mock']
 ---
 import kbnCodeEditorMockObj from './kbn_code_editor_mock.devdocs.json';
diff --git a/api_docs/kbn_code_owners.mdx b/api_docs/kbn_code_owners.mdx
index 0e337dcaf7c58..31f8ce5dd0bc7 100644
--- a/api_docs/kbn_code_owners.mdx
+++ b/api_docs/kbn_code_owners.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-owners
 title: "@kbn/code-owners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-owners plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-owners']
 ---
 import kbnCodeOwnersObj from './kbn_code_owners.devdocs.json';
diff --git a/api_docs/kbn_coloring.mdx b/api_docs/kbn_coloring.mdx
index 3a6a7c9fbbccc..5da277767783a 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: 2024-04-02
+date: 2024-04-03
 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 930890659d801..0e58c143324d8 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: 2024-04-02
+date: 2024-04-03
 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 ca0ffcb2439d0..e18ca727bf83a 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: 2024-04-02
+date: 2024-04-03
 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 206c6d907cfed..4c90a2aa0057d 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: 2024-04-02
+date: 2024-04-03
 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 51b35efbb1d02..d24e8ee2d1ee0 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: 2024-04-02
+date: 2024-04-03
 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_tabbed_table_list_view.mdx b/api_docs/kbn_content_management_tabbed_table_list_view.mdx
index 0a119aa16cfdf..6bf9b0212bcd0 100644
--- a/api_docs/kbn_content_management_tabbed_table_list_view.mdx
+++ b/api_docs/kbn_content_management_tabbed_table_list_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-tabbed-table-list-view
 title: "@kbn/content-management-tabbed-table-list-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-tabbed-table-list-view plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-tabbed-table-list-view']
 ---
 import kbnContentManagementTabbedTableListViewObj from './kbn_content_management_tabbed_table_list_view.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view.mdx b/api_docs/kbn_content_management_table_list_view.mdx
index 21f894eff5fdc..db7f45be95a09 100644
--- a/api_docs/kbn_content_management_table_list_view.mdx
+++ b/api_docs/kbn_content_management_table_list_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view
 title: "@kbn/content-management-table-list-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view']
 ---
 import kbnContentManagementTableListViewObj from './kbn_content_management_table_list_view.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view_common.mdx b/api_docs/kbn_content_management_table_list_view_common.mdx
index 17a96c67469a1..78b61c3d69827 100644
--- a/api_docs/kbn_content_management_table_list_view_common.mdx
+++ b/api_docs/kbn_content_management_table_list_view_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view-common
 title: "@kbn/content-management-table-list-view-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view-common']
 ---
 import kbnContentManagementTableListViewCommonObj from './kbn_content_management_table_list_view_common.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view_table.mdx b/api_docs/kbn_content_management_table_list_view_table.mdx
index 55609bfe70386..654d856c26295 100644
--- a/api_docs/kbn_content_management_table_list_view_table.mdx
+++ b/api_docs/kbn_content_management_table_list_view_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view-table
 title: "@kbn/content-management-table-list-view-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view-table plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view-table']
 ---
 import kbnContentManagementTableListViewTableObj from './kbn_content_management_table_list_view_table.devdocs.json';
diff --git a/api_docs/kbn_content_management_utils.mdx b/api_docs/kbn_content_management_utils.mdx
index 4e2341abf7f9f..3073a2eafd562 100644
--- a/api_docs/kbn_content_management_utils.mdx
+++ b/api_docs/kbn_content_management_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-utils
 title: "@kbn/content-management-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-utils']
 ---
 import kbnContentManagementUtilsObj from './kbn_content_management_utils.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser.mdx b/api_docs/kbn_core_analytics_browser.mdx
index 078940b489ecf..af74a6fb096d4 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: 2024-04-02
+date: 2024-04-03
 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 f02879855f95d..95207e5c68e64 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: 2024-04-02
+date: 2024-04-03
 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 51e2a825de031..0e1f10b882010 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: 2024-04-02
+date: 2024-04-03
 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 6e9e4a2108d24..4b605bf59e33f 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: 2024-04-02
+date: 2024-04-03
 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 1876f3e73bd0d..be8eefa562a35 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: 2024-04-02
+date: 2024-04-03
 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 3a940aff25fa5..ec2e876cc9188 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: 2024-04-02
+date: 2024-04-03
 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 a008c0d5318bd..17ffc3a01bb51 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: 2024-04-02
+date: 2024-04-03
 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 74a8a03389c00..d2a229228918f 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: 2024-04-02
+date: 2024-04-03
 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 35df5ec08dcfc..8cca16dbea902 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: 2024-04-02
+date: 2024-04-03
 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 03da7b572026b..cd45fdaef5fdd 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: 2024-04-02
+date: 2024-04-03
 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 aabf5a2226ed5..19c8f8b00aafc 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: 2024-04-02
+date: 2024-04-03
 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 9e687fbee4caf..e69d6179b2bc2 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: 2024-04-02
+date: 2024-04-03
 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 a6f1501f46771..be52c28247633 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: 2024-04-02
+date: 2024-04-03
 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 16643e7f2f7f8..45617cad477bd 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: 2024-04-02
+date: 2024-04-03
 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 b199f26bc695e..cbbce414324ad 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: 2024-04-02
+date: 2024-04-03
 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 1f84bd1db4017..e7b524b7a08f0 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: 2024-04-02
+date: 2024-04-03
 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 fc7aa3bb31953..442329bf7cc0d 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: 2024-04-02
+date: 2024-04-03
 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 dce22c1dbee51..7372d405e8bcb 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: 2024-04-02
+date: 2024-04-03
 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 19838ef72a1bc..e9d8e4f17d7fd 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: 2024-04-02
+date: 2024-04-03
 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 830bcf9a8edb7..76bcc5b228ace 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: 2024-04-02
+date: 2024-04-03
 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 6dfe7d1a5dde7..4bdc26070dc5e 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: 2024-04-02
+date: 2024-04-03
 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 064ebc7daed9d..388c9b49df664 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: 2024-04-02
+date: 2024-04-03
 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 4eeb357f29744..b130a206f0e66 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: 2024-04-02
+date: 2024-04-03
 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 2a264f6d429db..3b38f8054886a 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: 2024-04-02
+date: 2024-04-03
 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 54fcfe0fde3db..e2c6560356685 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: 2024-04-02
+date: 2024-04-03
 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 647b10232b8c7..0e6a3162a13bc 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: 2024-04-02
+date: 2024-04-03
 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 d5069c70bd30f..0741b1b5aaf62 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: 2024-04-02
+date: 2024-04-03
 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 36d3f425f5805..f05abefb56065 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: 2024-04-02
+date: 2024-04-03
 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 d564729253285..564e7a6de0e7a 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: 2024-04-02
+date: 2024-04-03
 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 39bdd563e0431..13bd2c6f5edd7 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: 2024-04-02
+date: 2024-04-03
 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 61aa4c1535c9a..72e626d28044c 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: 2024-04-02
+date: 2024-04-03
 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 7dd7a0c16d25c..5339e5a9e57d9 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: 2024-04-02
+date: 2024-04-03
 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 2f96104352776..35cc4f5aa6762 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: 2024-04-02
+date: 2024-04-03
 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 e025563eb2730..541bd564364ce 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: 2024-04-02
+date: 2024-04-03
 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 78abc52c3833f..99a1b71206a66 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: 2024-04-02
+date: 2024-04-03
 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 37db444a34ca1..c3de0c5c352ad 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: 2024-04-02
+date: 2024-04-03
 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 e275702dd2979..af1d9fa77f26d 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: 2024-04-02
+date: 2024-04-03
 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 84b05559dbed3..d5b1255043ae0 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: 2024-04-02
+date: 2024-04-03
 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 35786cba4ee0a..c118cca6394c9 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: 2024-04-02
+date: 2024-04-03
 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 356381d30555f..3de75b72568be 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: 2024-04-02
+date: 2024-04-03
 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 483a15fa5d7b9..87b0612f1be92 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: 2024-04-02
+date: 2024-04-03
 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 dd23eb4e60c19..fac5e4264b8df 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: 2024-04-02
+date: 2024-04-03
 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 641e297454943..b738dfa9bd50f 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: 2024-04-02
+date: 2024-04-03
 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 b702ab9166ede..0eabac71a172e 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: 2024-04-02
+date: 2024-04-03
 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 99529933fe363..a879bc8c38576 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: 2024-04-02
+date: 2024-04-03
 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 c7000227c5d1f..d1f8c37eecbd6 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: 2024-04-02
+date: 2024-04-03
 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 eb2889aeda878..b0f846d4692bb 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: 2024-04-02
+date: 2024-04-03
 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 78f1180195988..b3512fd6f3430 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: 2024-04-02
+date: 2024-04-03
 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 6d128c60cd68b..87785354d86c5 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: 2024-04-02
+date: 2024-04-03
 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 6cefe8aa4f698..f034732fae411 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: 2024-04-02
+date: 2024-04-03
 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 60bcff8262758..de5ae16a2c504 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: 2024-04-02
+date: 2024-04-03
 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 ecdde9335a62c..45e71bf0f8d3e 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: 2024-04-02
+date: 2024-04-03
 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 62e65d9a35043..fbef677a36910 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: 2024-04-02
+date: 2024-04-03
 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 0bb690f541ca4..4c8eb69104c89 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: 2024-04-02
+date: 2024-04-03
 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 63ab3847a822e..0e590a7637e85 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: 2024-04-02
+date: 2024-04-03
 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 80aa4dcbf756e..05d7bfd38dac9 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: 2024-04-02
+date: 2024-04-03
 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 ca03665c218f3..6fac328af4fa2 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: 2024-04-02
+date: 2024-04-03
 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 774606f68ebf8..475d152dcd248 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: 2024-04-02
+date: 2024-04-03
 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 351e29f26f9be..4e01fe90fc5bc 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: 2024-04-02
+date: 2024-04-03
 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 d79d94ba9e29a..dcee0f39db53b 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: 2024-04-02
+date: 2024-04-03
 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 695f6f909e5e7..a552d417b863d 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: 2024-04-02
+date: 2024-04-03
 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 8c04cf5bc2cca..be44774220f3e 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: 2024-04-02
+date: 2024-04-03
 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 abf3fb29a8ea1..36d1448aa85cf 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: 2024-04-02
+date: 2024-04-03
 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 2a7cd7c1872fb..74838f5b4b4bb 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: 2024-04-02
+date: 2024-04-03
 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 07bf4a436d783..13ab21ce17cb6 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: 2024-04-02
+date: 2024-04-03
 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 04114991d7474..0b8ce0f371b9d 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: 2024-04-02
+date: 2024-04-03
 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 b414446548c60..426c0451f530a 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: 2024-04-02
+date: 2024-04-03
 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 c4d466848ef97..c644f2a5edcb3 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: 2024-04-02
+date: 2024-04-03
 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 eda908a41e1cf..e62be9926d05c 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: 2024-04-02
+date: 2024-04-03
 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.devdocs.json b/api_docs/kbn_core_http_server.devdocs.json
index 4c91692a562a0..a9dcf5ae7ffac 100644
--- a/api_docs/kbn_core_http_server.devdocs.json
+++ b/api_docs/kbn_core_http_server.devdocs.json
@@ -1567,7 +1567,7 @@
               "\nCreates cookie based session storage factory {@link SessionStorageFactory}"
             ],
             "signature": [
-              "<T>(cookieOptions: ",
+              "<T extends object>(cookieOptions: ",
               {
                 "pluginId": "@kbn/core-http-server",
                 "scope": "common",
@@ -3571,10 +3571,18 @@
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/routes/connector/get_all/get_all.ts"
               },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/get_all_system/get_all_system.ts"
+              },
               {
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/routes/connector/list_types/list_types.ts"
               },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.ts"
+              },
               {
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/routes/connector/get/get.ts"
@@ -4875,6 +4883,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/find_rules.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/find_rules.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/get_action_error_log.test.ts"
@@ -4907,6 +4919,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/get_rule.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/get_rule.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/get_rule_alert_summary.test.ts"
@@ -5171,6 +5187,14 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/legacy/find.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/legacy/find.test.ts"
+              },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/legacy/get.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/legacy/get.test.ts"
@@ -5323,6 +5347,18 @@
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/routes/connector/get_all/get_all.test.ts"
               },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/get_all_system/get_all_system.test.ts"
+              },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/get_all_system/get_all_system.test.ts"
+              },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/get_all_system/get_all_system.test.ts"
+              },
               {
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/routes/connector/list_types/list_types.test.ts"
@@ -5339,6 +5375,22 @@
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/routes/connector/list_types/list_types.test.ts"
               },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.test.ts"
+              },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.test.ts"
+              },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.test.ts"
+              },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/connector/list_types_system/list_types_system.test.ts"
+              },
               {
                 "plugin": "crossClusterReplication",
                 "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.test.ts"
@@ -5451,6 +5503,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/rule/apis/resolve/resolve_rule_route.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/resolve/resolve_rule_route.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/rule/apis/tags/get_rule_tags.test.ts"
@@ -7237,6 +7293,10 @@
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/routes/execute.test.ts"
               },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/routes/execute.test.ts"
+              },
               {
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/routes/get_global_execution_kpi.test.ts"
@@ -7277,6 +7337,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/clone_rule.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/clone_rule.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/disable_rule.test.ts"
@@ -7433,6 +7497,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/legacy/create.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/legacy/create.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/legacy/disable.test.ts"
@@ -7689,6 +7757,18 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_edit/bulk_edit_rules_route.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_edit/bulk_edit_rules_route.test.ts"
+              },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_edit/bulk_edit_rules_route.test.ts"
+              },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_edit/bulk_edit_rules_route.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_untrack/bulk_untrack_alerts_route.test.ts"
@@ -7725,6 +7805,18 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/rule/apis/create/create_rule_route.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/create/create_rule_route.test.ts"
+              },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/create/create_rule_route.test.ts"
+              },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/create/create_rule_route.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/rule/apis/mute_alert/mute_alert.test.ts"
@@ -8495,6 +8587,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/update_rule.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/update_rule.test.ts"
+              },
               {
                 "plugin": "globalSearch",
                 "path": "x-pack/plugins/global_search/server/routes/index.test.ts"
@@ -8543,6 +8639,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/legacy/update.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/legacy/update.test.ts"
+              },
               {
                 "plugin": "remoteClusters",
                 "path": "x-pack/plugins/remote_clusters/server/routes/api/update_route.test.ts"
@@ -8841,6 +8941,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/bulk_enable_rules.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/bulk_enable_rules.test.ts"
+              },
               {
                 "plugin": "ruleRegistry",
                 "path": "x-pack/plugins/rule_registry/server/routes/__mocks__/server.ts"
@@ -8861,6 +8965,14 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_delete/bulk_delete_rules_route.test.ts"
               },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_delete/bulk_delete_rules_route.test.ts"
+              },
+              {
+                "plugin": "alerting",
+                "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_disable/bulk_disable_rules_route.test.ts"
+              },
               {
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/rule/apis/bulk_disable/bulk_disable_rules_route.test.ts"
diff --git a/api_docs/kbn_core_http_server.mdx b/api_docs/kbn_core_http_server.mdx
index 91ac2c7f54f63..5571836d1a12d 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: 2024-04-02
+date: 2024-04-03
 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 6a9502726327f..f09ff380f7d64 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: 2024-04-02
+date: 2024-04-03
 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.devdocs.json b/api_docs/kbn_core_http_server_mocks.devdocs.json
index 8d17ac315a33d..ddb6de38a236e 100644
--- a/api_docs/kbn_core_http_server_mocks.devdocs.json
+++ b/api_docs/kbn_core_http_server_mocks.devdocs.json
@@ -292,7 +292,7 @@
             "section": "def-common.SessionStorageFactory",
             "text": "SessionStorageFactory"
           },
-          "<unknown>>, [cookieOptions: ",
+          "<object>>, [cookieOptions: ",
           {
             "pluginId": "@kbn/core-http-server",
             "scope": "common",
@@ -300,7 +300,7 @@
             "section": "def-common.SessionStorageCookieOptions",
             "text": "SessionStorageCookieOptions"
           },
-          "<unknown>], unknown>; registerOnPreRouting: jest.MockInstance<void, [handler: ",
+          "<object>], unknown>; registerOnPreRouting: jest.MockInstance<void, [handler: ",
           {
             "pluginId": "@kbn/core-http-server",
             "scope": "common",
@@ -575,7 +575,7 @@
             "section": "def-common.SessionStorageFactory",
             "text": "SessionStorageFactory"
           },
-          "<unknown>>, [cookieOptions: ",
+          "<object>>, [cookieOptions: ",
           {
             "pluginId": "@kbn/core-http-server",
             "scope": "common",
@@ -583,7 +583,7 @@
             "section": "def-common.SessionStorageCookieOptions",
             "text": "SessionStorageCookieOptions"
           },
-          "<unknown>], unknown>; registerOnPreRouting: jest.MockInstance<void, [handler: ",
+          "<object>], unknown>; registerOnPreRouting: jest.MockInstance<void, [handler: ",
           {
             "pluginId": "@kbn/core-http-server",
             "scope": "common",
@@ -1783,7 +1783,7 @@
             "label": "createFactory",
             "description": [],
             "signature": [
-              "<T>() => DeepMocked<",
+              "<T extends object>() => DeepMocked<",
               {
                 "pluginId": "@kbn/core-http-server",
                 "scope": "common",
diff --git a/api_docs/kbn_core_http_server_mocks.mdx b/api_docs/kbn_core_http_server_mocks.mdx
index d18ee2108bbf6..4ab7cf212ed48 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: 2024-04-02
+date: 2024-04-03
 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 3c6cc33928401..ddb6c02cb8352 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: 2024-04-02
+date: 2024-04-03
 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 d453358329cd9..7b88371d0c2ef 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: 2024-04-02
+date: 2024-04-03
 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 36abb3afe0cbb..188151be28b3f 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: 2024-04-02
+date: 2024-04-03
 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 a2fbb4f692a6f..ba2a2973e42ad 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: 2024-04-02
+date: 2024-04-03
 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 807ddf84c63c1..1ab849dff8d5d 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: 2024-04-02
+date: 2024-04-03
 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 04ed682e70975..b8838dfa43aa6 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: 2024-04-02
+date: 2024-04-03
 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 2706b1ffa74b0..6ff2d8e2814f4 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: 2024-04-02
+date: 2024-04-03
 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 4399d08b11515..3989fbf5a01f1 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: 2024-04-02
+date: 2024-04-03
 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 b757af0f00a44..01714636ab41d 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: 2024-04-02
+date: 2024-04-03
 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 1494bfef8a88e..a52af09c83b44 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: 2024-04-02
+date: 2024-04-03
 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 b92ad5374ae6d..e5c42f07509b3 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: 2024-04-02
+date: 2024-04-03
 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 42efc8d85db30..80c216e54943b 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: 2024-04-02
+date: 2024-04-03
 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 db9114659fbdf..6885bafa925d6 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: 2024-04-02
+date: 2024-04-03
 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 04be04d4d34a5..e1080a7ff6f6d 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: 2024-04-02
+date: 2024-04-03
 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 406626cd074f5..f50ad1b09cb51 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: 2024-04-02
+date: 2024-04-03
 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 a1515c895c659..042b72f8ed939 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: 2024-04-02
+date: 2024-04-03
 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 4311e3348ff76..cd6240f4cb8c1 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: 2024-04-02
+date: 2024-04-03
 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 0e0e10181e7e1..d7064c78deef4 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: 2024-04-02
+date: 2024-04-03
 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 51e88965692ff..07d4c3887ab18 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: 2024-04-02
+date: 2024-04-03
 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 6e2b695e1b59e..1a4cac28881b8 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: 2024-04-02
+date: 2024-04-03
 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 8632cc59a6d95..047e33578aa84 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: 2024-04-02
+date: 2024-04-03
 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 8d554e81d0ef9..d31e695ac57ae 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: 2024-04-02
+date: 2024-04-03
 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 95c603302f085..eb21a6b29a621 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: 2024-04-02
+date: 2024-04-03
 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 6bcf0062fadc1..9fc885add57f5 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: 2024-04-02
+date: 2024-04-03
 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 43f26352e00a6..046580dfb7bd0 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: 2024-04-02
+date: 2024-04-03
 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 d7d3cdfa96eaf..1ecd0226d250d 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: 2024-04-02
+date: 2024-04-03
 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 e9a4ad7cbd889..bb78e6c0c08b3 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: 2024-04-02
+date: 2024-04-03
 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 2b16e0e96c6a1..1d4d4f7237026 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: 2024-04-02
+date: 2024-04-03
 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 dc54672e7f941..0eac75b576eb0 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: 2024-04-02
+date: 2024-04-03
 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 3f209dfd79e97..e083d5a26d0b2 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: 2024-04-02
+date: 2024-04-03
 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 e11ce8f1708b8..ddacfad85120d 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: 2024-04-02
+date: 2024-04-03
 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 0dde477f28ac7..79c70b84a658a 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: 2024-04-02
+date: 2024-04-03
 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 e70aa947e7916..a33ace55c29bb 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: 2024-04-02
+date: 2024-04-03
 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 b9ae103463375..66e69dfb84e74 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: 2024-04-02
+date: 2024-04-03
 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_contracts_browser.mdx b/api_docs/kbn_core_plugins_contracts_browser.mdx
index 609cd97c1e92c..73af7d94dc7a7 100644
--- a/api_docs/kbn_core_plugins_contracts_browser.mdx
+++ b/api_docs/kbn_core_plugins_contracts_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-contracts-browser
 title: "@kbn/core-plugins-contracts-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-contracts-browser plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-contracts-browser']
 ---
 import kbnCorePluginsContractsBrowserObj from './kbn_core_plugins_contracts_browser.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_contracts_server.mdx b/api_docs/kbn_core_plugins_contracts_server.mdx
index 7f6b502d7106c..8af10650eea70 100644
--- a/api_docs/kbn_core_plugins_contracts_server.mdx
+++ b/api_docs/kbn_core_plugins_contracts_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-contracts-server
 title: "@kbn/core-plugins-contracts-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-contracts-server plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-contracts-server']
 ---
 import kbnCorePluginsContractsServerObj from './kbn_core_plugins_contracts_server.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server.mdx b/api_docs/kbn_core_plugins_server.mdx
index e566627a33b1b..1a55238c0c56b 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: 2024-04-02
+date: 2024-04-03
 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 261b4b85263de..a17e18e3c3c13 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: 2024-04-02
+date: 2024-04-03
 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 e966ab7fc14c1..3a59719f4235d 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: 2024-04-02
+date: 2024-04-03
 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 645ed71158a6f..7feed383ac069 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: 2024-04-02
+date: 2024-04-03
 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 e2bf482e01e9e..74da216aa4752 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: 2024-04-02
+date: 2024-04-03
 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 9e1e518b5aaf5..f666dfdaef9b4 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: 2024-04-02
+date: 2024-04-03
 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 af737dd0586bf..281119c538b42 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: 2024-04-02
+date: 2024-04-03
 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 9a921e384b034..16ce60a7f985b 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: 2024-04-02
+date: 2024-04-03
 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 674e6f0228c34..b71fd4dadf683 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: 2024-04-02
+date: 2024-04-03
 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 3b1b515c44655..e7c756b1cdfa1 100644
--- a/api_docs/kbn_core_saved_objects_api_server.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_api_server.devdocs.json
@@ -2153,7 +2153,7 @@
             "tags": [],
             "label": "type",
             "description": [
-              " The type of Saved Object. Each plugin can define it's own custom Saved Object types."
+              " The type of Saved Object. Each plugin can define its own custom Saved Object types."
             ],
             "path": "packages/core/saved-objects/core-saved-objects-common/src/server_types.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_core_saved_objects_api_server.mdx b/api_docs/kbn_core_saved_objects_api_server.mdx
index cb66819eb4141..06cf875d48a76 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: 2024-04-02
+date: 2024-04-03
 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_mocks.mdx b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
index 7c8e83c9985c6..aca27bba7edee 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: 2024-04-02
+date: 2024-04-03
 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 671f4a5fa710d..a5e1c876ec2de 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: 2024-04-02
+date: 2024-04-03
 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 e14796d96be3f..8d4757d1120b4 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: 2024-04-02
+date: 2024-04-03
 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 be4f0d7f2fa50..5d3d3ccaf840a 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: 2024-04-02
+date: 2024-04-03
 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 7d830b86d7efd..c46212aff02ac 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: 2024-04-02
+date: 2024-04-03
 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 607935714c7e4..11474eeaba260 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: 2024-04-02
+date: 2024-04-03
 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 5efe47ef36899..0ea3d3dfa2bb7 100644
--- a/api_docs/kbn_core_saved_objects_common.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_common.devdocs.json
@@ -1547,10 +1547,6 @@
             "plugin": "triggersActionsUi",
             "path": "x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts"
           },
-          {
-            "plugin": "triggersActionsUi",
-            "path": "x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_reducer.ts"
-          },
           {
             "plugin": "@kbn/core",
             "path": "src/core/types/index.ts"
diff --git a/api_docs/kbn_core_saved_objects_common.mdx b/api_docs/kbn_core_saved_objects_common.mdx
index 8c3e514ebab6e..5cb3a2c6a1c81 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: 2024-04-02
+date: 2024-04-03
 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 78af3f0996da6..12102c41001b1 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: 2024-04-02
+date: 2024-04-03
 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 840ef176c02bb..cd424adc42400 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: 2024-04-02
+date: 2024-04-03
 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 0a22c0e02ce36..fd417ee7d0f26 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: 2024-04-02
+date: 2024-04-03
 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 c847840ef62cf..5cca71cd84885 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: 2024-04-02
+date: 2024-04-03
 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 dcef12108ba2e..83494416de512 100644
--- a/api_docs/kbn_core_saved_objects_server.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_server.devdocs.json
@@ -5618,7 +5618,7 @@
             "tags": [],
             "label": "type",
             "description": [
-              " The type of Saved Object. Each plugin can define it's own custom Saved Object types."
+              " The type of Saved Object. Each plugin can define its own custom Saved Object types."
             ],
             "path": "packages/core/saved-objects/core-saved-objects-common/src/server_types.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_core_saved_objects_server.mdx b/api_docs/kbn_core_saved_objects_server.mdx
index 6aa3ccb1ece1b..a71682e8c4647 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: 2024-04-02
+date: 2024-04-03
 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 262a18d72b47a..8541e6e860f2b 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: 2024-04-02
+date: 2024-04-03
 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 dd300a769f493..c4b756b2d1844 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: 2024-04-02
+date: 2024-04-03
 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 2fc92ef4199b8..edf62acadd820 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: 2024-04-02
+date: 2024-04-03
 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_security_browser.mdx b/api_docs/kbn_core_security_browser.mdx
index fbeb64b47b6f1..f587a8b84a389 100644
--- a/api_docs/kbn_core_security_browser.mdx
+++ b/api_docs/kbn_core_security_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser
 title: "@kbn/core-security-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser']
 ---
 import kbnCoreSecurityBrowserObj from './kbn_core_security_browser.devdocs.json';
diff --git a/api_docs/kbn_core_security_browser_internal.mdx b/api_docs/kbn_core_security_browser_internal.mdx
index 12d19b338c42d..2195f2053e217 100644
--- a/api_docs/kbn_core_security_browser_internal.mdx
+++ b/api_docs/kbn_core_security_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser-internal
 title: "@kbn/core-security-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser-internal plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser-internal']
 ---
 import kbnCoreSecurityBrowserInternalObj from './kbn_core_security_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_security_browser_mocks.mdx b/api_docs/kbn_core_security_browser_mocks.mdx
index dc03ad29fbb23..867bfb2c0a4f9 100644
--- a/api_docs/kbn_core_security_browser_mocks.mdx
+++ b/api_docs/kbn_core_security_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser-mocks
 title: "@kbn/core-security-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser-mocks plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser-mocks']
 ---
 import kbnCoreSecurityBrowserMocksObj from './kbn_core_security_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_security_common.mdx b/api_docs/kbn_core_security_common.mdx
index 7c553bc634d37..98ed36d0a1428 100644
--- a/api_docs/kbn_core_security_common.mdx
+++ b/api_docs/kbn_core_security_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-common
 title: "@kbn/core-security-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-common']
 ---
 import kbnCoreSecurityCommonObj from './kbn_core_security_common.devdocs.json';
diff --git a/api_docs/kbn_core_security_server.mdx b/api_docs/kbn_core_security_server.mdx
index a8dc1025b788a..18a43b18abd08 100644
--- a/api_docs/kbn_core_security_server.mdx
+++ b/api_docs/kbn_core_security_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server
 title: "@kbn/core-security-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server']
 ---
 import kbnCoreSecurityServerObj from './kbn_core_security_server.devdocs.json';
diff --git a/api_docs/kbn_core_security_server_internal.mdx b/api_docs/kbn_core_security_server_internal.mdx
index f3f95c8cc035d..f46929900d142 100644
--- a/api_docs/kbn_core_security_server_internal.mdx
+++ b/api_docs/kbn_core_security_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server-internal
 title: "@kbn/core-security-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server-internal plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server-internal']
 ---
 import kbnCoreSecurityServerInternalObj from './kbn_core_security_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_security_server_mocks.mdx b/api_docs/kbn_core_security_server_mocks.mdx
index 4c81e6cd11856..75b997071da82 100644
--- a/api_docs/kbn_core_security_server_mocks.mdx
+++ b/api_docs/kbn_core_security_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server-mocks
 title: "@kbn/core-security-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server-mocks plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server-mocks']
 ---
 import kbnCoreSecurityServerMocksObj from './kbn_core_security_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_status_common.mdx b/api_docs/kbn_core_status_common.mdx
index a3c91921006fb..92352b722c9ec 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: 2024-04-02
+date: 2024-04-03
 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 75ee5b4fe6c11..bec8728a7c270 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: 2024-04-02
+date: 2024-04-03
 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 94a4e3fc40cdb..f47c353d5cfc6 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: 2024-04-02
+date: 2024-04-03
 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 9979bb996fc12..87e65a94673a7 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: 2024-04-02
+date: 2024-04-03
 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 91600ade0108d..0d78aa37fafd4 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: 2024-04-02
+date: 2024-04-03
 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 fbdea73d4de0a..bac019ea7e6fb 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: 2024-04-02
+date: 2024-04-03
 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 70fc29754f1a6..860fb1c14675c 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: 2024-04-02
+date: 2024-04-03
 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 018b1d7e06bd4..0a82ef570c57b 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: 2024-04-02
+date: 2024-04-03
 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_model_versions.mdx b/api_docs/kbn_core_test_helpers_model_versions.mdx
index 134b8f6aa7b21..1ee7dc649729a 100644
--- a/api_docs/kbn_core_test_helpers_model_versions.mdx
+++ b/api_docs/kbn_core_test_helpers_model_versions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-model-versions
 title: "@kbn/core-test-helpers-model-versions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-model-versions plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-model-versions']
 ---
 import kbnCoreTestHelpersModelVersionsObj from './kbn_core_test_helpers_model_versions.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 994a21c026e9a..2eb275e8a6b3c 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: 2024-04-02
+date: 2024-04-03
 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 6c9b0bdb4713c..5be99439f62b0 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: 2024-04-02
+date: 2024-04-03
 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 417a16b8f5ba6..c480be9fcdb9c 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: 2024-04-02
+date: 2024-04-03
 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_mocks.mdx b/api_docs/kbn_core_theme_browser_mocks.mdx
index 4c7a53c550ad7..e97c39d810736 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: 2024-04-02
+date: 2024-04-03
 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 a8f707262cbf7..986b9445070dc 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: 2024-04-02
+date: 2024-04-03
 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 cf6ebd9361fe7..406bbec7be647 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: 2024-04-02
+date: 2024-04-03
 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 4265fbc95dbea..1efb948436781 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: 2024-04-02
+date: 2024-04-03
 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 458517148b5b3..12ca9f9ab8cf4 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: 2024-04-02
+date: 2024-04-03
 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 479e35e56295d..d14b16854f0e3 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: 2024-04-02
+date: 2024-04-03
 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 cdb3331b2a1b3..e6725a2bce5d9 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: 2024-04-02
+date: 2024-04-03
 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 8e5e3e2c7ead3..e815993d414f3 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: 2024-04-02
+date: 2024-04-03
 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 3ad8fddfb0498..07e7687287d81 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: 2024-04-02
+date: 2024-04-03
 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 4ac1a91e89187..e6226b75a185e 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: 2024-04-02
+date: 2024-04-03
 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 62f3ee2cd78b2..df6fae35557a2 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: 2024-04-02
+date: 2024-04-03
 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_core_user_settings_server.mdx b/api_docs/kbn_core_user_settings_server.mdx
index fd38f2c762426..148eb237a2634 100644
--- a/api_docs/kbn_core_user_settings_server.mdx
+++ b/api_docs/kbn_core_user_settings_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-settings-server
 title: "@kbn/core-user-settings-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-settings-server plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-settings-server']
 ---
 import kbnCoreUserSettingsServerObj from './kbn_core_user_settings_server.devdocs.json';
diff --git a/api_docs/kbn_core_user_settings_server_internal.mdx b/api_docs/kbn_core_user_settings_server_internal.mdx
index b11900a402b7e..bdb9d2a8901b1 100644
--- a/api_docs/kbn_core_user_settings_server_internal.mdx
+++ b/api_docs/kbn_core_user_settings_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-settings-server-internal
 title: "@kbn/core-user-settings-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-settings-server-internal plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-settings-server-internal']
 ---
 import kbnCoreUserSettingsServerInternalObj from './kbn_core_user_settings_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_user_settings_server_mocks.mdx b/api_docs/kbn_core_user_settings_server_mocks.mdx
index 15ef1e4715a28..a908ec716ef30 100644
--- a/api_docs/kbn_core_user_settings_server_mocks.mdx
+++ b/api_docs/kbn_core_user_settings_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-settings-server-mocks
 title: "@kbn/core-user-settings-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-settings-server-mocks plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-settings-server-mocks']
 ---
 import kbnCoreUserSettingsServerMocksObj from './kbn_core_user_settings_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_crypto.mdx b/api_docs/kbn_crypto.mdx
index 56088dd86c092..d8b76b02c5cf1 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: 2024-04-02
+date: 2024-04-03
 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 3b34fbeea4952..755cc9b82aec7 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto-browser']
 ---
 import kbnCryptoBrowserObj from './kbn_crypto_browser.devdocs.json';
diff --git a/api_docs/kbn_custom_icons.mdx b/api_docs/kbn_custom_icons.mdx
index 8d727a51047f6..e77e91c4cd0bb 100644
--- a/api_docs/kbn_custom_icons.mdx
+++ b/api_docs/kbn_custom_icons.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-custom-icons
 title: "@kbn/custom-icons"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/custom-icons plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/custom-icons']
 ---
 import kbnCustomIconsObj from './kbn_custom_icons.devdocs.json';
diff --git a/api_docs/kbn_custom_integrations.mdx b/api_docs/kbn_custom_integrations.mdx
index 09da776b6b1a7..6b57f832520fa 100644
--- a/api_docs/kbn_custom_integrations.mdx
+++ b/api_docs/kbn_custom_integrations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-custom-integrations
 title: "@kbn/custom-integrations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/custom-integrations plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/custom-integrations']
 ---
 import kbnCustomIntegrationsObj from './kbn_custom_integrations.devdocs.json';
diff --git a/api_docs/kbn_cypress_config.mdx b/api_docs/kbn_cypress_config.mdx
index 1c72b505bf151..99302b7f950f6 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cypress-config']
 ---
 import kbnCypressConfigObj from './kbn_cypress_config.devdocs.json';
diff --git a/api_docs/kbn_data_forge.mdx b/api_docs/kbn_data_forge.mdx
index 87ed4480b1ede..9a2b6fb068191 100644
--- a/api_docs/kbn_data_forge.mdx
+++ b/api_docs/kbn_data_forge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-forge
 title: "@kbn/data-forge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-forge plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-forge']
 ---
 import kbnDataForgeObj from './kbn_data_forge.devdocs.json';
diff --git a/api_docs/kbn_data_service.mdx b/api_docs/kbn_data_service.mdx
index de631656f8daa..3b44099fbcba7 100644
--- a/api_docs/kbn_data_service.mdx
+++ b/api_docs/kbn_data_service.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-service
 title: "@kbn/data-service"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-service plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-service']
 ---
 import kbnDataServiceObj from './kbn_data_service.devdocs.json';
diff --git a/api_docs/kbn_data_stream_adapter.mdx b/api_docs/kbn_data_stream_adapter.mdx
index a9b1cce4d8825..3f27804cef59e 100644
--- a/api_docs/kbn_data_stream_adapter.mdx
+++ b/api_docs/kbn_data_stream_adapter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-stream-adapter
 title: "@kbn/data-stream-adapter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-stream-adapter plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-stream-adapter']
 ---
 import kbnDataStreamAdapterObj from './kbn_data_stream_adapter.devdocs.json';
diff --git a/api_docs/kbn_data_view_utils.mdx b/api_docs/kbn_data_view_utils.mdx
index 7dbefe2347c68..bc2ee75410ffb 100644
--- a/api_docs/kbn_data_view_utils.mdx
+++ b/api_docs/kbn_data_view_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-view-utils
 title: "@kbn/data-view-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-view-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-view-utils']
 ---
 import kbnDataViewUtilsObj from './kbn_data_view_utils.devdocs.json';
diff --git a/api_docs/kbn_datemath.mdx b/api_docs/kbn_datemath.mdx
index 690edfb682c0b..21f86ba77ba6c 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/datemath']
 ---
 import kbnDatemathObj from './kbn_datemath.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_analytics.devdocs.json b/api_docs/kbn_deeplinks_analytics.devdocs.json
index c5671f4ab84c4..4b31136ecabf4 100644
--- a/api_docs/kbn_deeplinks_analytics.devdocs.json
+++ b/api_docs/kbn_deeplinks_analytics.devdocs.json
@@ -52,6 +52,21 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/deeplinks-analytics",
+        "id": "def-common.DASHBOARD_APP_LOCATOR",
+        "type": "string",
+        "tags": [],
+        "label": "DASHBOARD_APP_LOCATOR",
+        "description": [],
+        "signature": [
+          "\"DASHBOARD_APP_LOCATOR\""
+        ],
+        "path": "packages/deeplinks/analytics/constants.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/deeplinks-analytics",
         "id": "def-common.DeepLinkId",
diff --git a/api_docs/kbn_deeplinks_analytics.mdx b/api_docs/kbn_deeplinks_analytics.mdx
index 8892b453d5a4a..1a49b2730c9eb 100644
--- a/api_docs/kbn_deeplinks_analytics.mdx
+++ b/api_docs/kbn_deeplinks_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-analytics
 title: "@kbn/deeplinks-analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-analytics plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-analytics']
 ---
 import kbnDeeplinksAnalyticsObj from './kbn_deeplinks_analytics.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 6 | 0 | 6 | 0 |
+| 7 | 0 | 7 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_deeplinks_devtools.mdx b/api_docs/kbn_deeplinks_devtools.mdx
index c6f1d233cce24..bed1f4fe95911 100644
--- a/api_docs/kbn_deeplinks_devtools.mdx
+++ b/api_docs/kbn_deeplinks_devtools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-devtools
 title: "@kbn/deeplinks-devtools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-devtools plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-devtools']
 ---
 import kbnDeeplinksDevtoolsObj from './kbn_deeplinks_devtools.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_fleet.mdx b/api_docs/kbn_deeplinks_fleet.mdx
index 714df593c3ddb..d88fea4fd2a44 100644
--- a/api_docs/kbn_deeplinks_fleet.mdx
+++ b/api_docs/kbn_deeplinks_fleet.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-fleet
 title: "@kbn/deeplinks-fleet"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-fleet plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-fleet']
 ---
 import kbnDeeplinksFleetObj from './kbn_deeplinks_fleet.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_management.mdx b/api_docs/kbn_deeplinks_management.mdx
index e044e7f27a2f4..798a5d579b9d5 100644
--- a/api_docs/kbn_deeplinks_management.mdx
+++ b/api_docs/kbn_deeplinks_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-management
 title: "@kbn/deeplinks-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-management plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-management']
 ---
 import kbnDeeplinksManagementObj from './kbn_deeplinks_management.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_ml.mdx b/api_docs/kbn_deeplinks_ml.mdx
index 926a0ff6d1aad..17811374b04aa 100644
--- a/api_docs/kbn_deeplinks_ml.mdx
+++ b/api_docs/kbn_deeplinks_ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-ml
 title: "@kbn/deeplinks-ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-ml plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-ml']
 ---
 import kbnDeeplinksMlObj from './kbn_deeplinks_ml.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_observability.mdx b/api_docs/kbn_deeplinks_observability.mdx
index 00af00d6c1576..760cd98e519b4 100644
--- a/api_docs/kbn_deeplinks_observability.mdx
+++ b/api_docs/kbn_deeplinks_observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-observability
 title: "@kbn/deeplinks-observability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-observability plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-observability']
 ---
 import kbnDeeplinksObservabilityObj from './kbn_deeplinks_observability.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_search.mdx b/api_docs/kbn_deeplinks_search.mdx
index a3c00cc2ecd1d..c06c702043a38 100644
--- a/api_docs/kbn_deeplinks_search.mdx
+++ b/api_docs/kbn_deeplinks_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-search
 title: "@kbn/deeplinks-search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-search plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-search']
 ---
 import kbnDeeplinksSearchObj from './kbn_deeplinks_search.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_security.mdx b/api_docs/kbn_deeplinks_security.mdx
index e99d45fa7ea6c..64a1a52633c65 100644
--- a/api_docs/kbn_deeplinks_security.mdx
+++ b/api_docs/kbn_deeplinks_security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-security
 title: "@kbn/deeplinks-security"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-security plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-security']
 ---
 import kbnDeeplinksSecurityObj from './kbn_deeplinks_security.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_shared.mdx b/api_docs/kbn_deeplinks_shared.mdx
index cba16e6a38cda..8234c85b4dd49 100644
--- a/api_docs/kbn_deeplinks_shared.mdx
+++ b/api_docs/kbn_deeplinks_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-shared
 title: "@kbn/deeplinks-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-shared plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-shared']
 ---
 import kbnDeeplinksSharedObj from './kbn_deeplinks_shared.devdocs.json';
diff --git a/api_docs/kbn_default_nav_analytics.mdx b/api_docs/kbn_default_nav_analytics.mdx
index 59f9635aac38a..9b72b205f23bf 100644
--- a/api_docs/kbn_default_nav_analytics.mdx
+++ b/api_docs/kbn_default_nav_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-analytics
 title: "@kbn/default-nav-analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-analytics plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-analytics']
 ---
 import kbnDefaultNavAnalyticsObj from './kbn_default_nav_analytics.devdocs.json';
diff --git a/api_docs/kbn_default_nav_devtools.mdx b/api_docs/kbn_default_nav_devtools.mdx
index c3849979490a8..31b44b76a0ca6 100644
--- a/api_docs/kbn_default_nav_devtools.mdx
+++ b/api_docs/kbn_default_nav_devtools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-devtools
 title: "@kbn/default-nav-devtools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-devtools plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-devtools']
 ---
 import kbnDefaultNavDevtoolsObj from './kbn_default_nav_devtools.devdocs.json';
diff --git a/api_docs/kbn_default_nav_management.mdx b/api_docs/kbn_default_nav_management.mdx
index ac7667ddf0b93..7cdd2459b3829 100644
--- a/api_docs/kbn_default_nav_management.mdx
+++ b/api_docs/kbn_default_nav_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-management
 title: "@kbn/default-nav-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-management plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-management']
 ---
 import kbnDefaultNavManagementObj from './kbn_default_nav_management.devdocs.json';
diff --git a/api_docs/kbn_default_nav_ml.mdx b/api_docs/kbn_default_nav_ml.mdx
index 4cf7c01f06ddf..0749be5a68766 100644
--- a/api_docs/kbn_default_nav_ml.mdx
+++ b/api_docs/kbn_default_nav_ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-ml
 title: "@kbn/default-nav-ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-ml plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-ml']
 ---
 import kbnDefaultNavMlObj from './kbn_default_nav_ml.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_errors.mdx b/api_docs/kbn_dev_cli_errors.mdx
index 6588ecada0883..b04c2cfedfd87 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: 2024-04-02
+date: 2024-04-03
 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 dad9fe02cd564..e87cd91bba57d 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: 2024-04-02
+date: 2024-04-03
 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 e46658a3a14cb..88f8e35305c56 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: 2024-04-02
+date: 2024-04-03
 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 7ce231db11210..09cf7e3c823fc 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-utils']
 ---
 import kbnDevUtilsObj from './kbn_dev_utils.devdocs.json';
diff --git a/api_docs/kbn_discover_utils.mdx b/api_docs/kbn_discover_utils.mdx
index c1f8dc1cfea26..63aea593768b0 100644
--- a/api_docs/kbn_discover_utils.mdx
+++ b/api_docs/kbn_discover_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-discover-utils
 title: "@kbn/discover-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/discover-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/discover-utils']
 ---
 import kbnDiscoverUtilsObj from './kbn_discover_utils.devdocs.json';
diff --git a/api_docs/kbn_doc_links.devdocs.json b/api_docs/kbn_doc_links.devdocs.json
index fe5c044505ad8..1ee7a1633befd 100644
--- a/api_docs/kbn_doc_links.devdocs.json
+++ b/api_docs/kbn_doc_links.devdocs.json
@@ -300,7 +300,7 @@
             "label": "enterpriseSearch",
             "description": [],
             "signature": [
-              "{ readonly aiSearchDoc: string; readonly aiSearchHelp: string; readonly apiKeys: string; readonly behavioralAnalytics: string; readonly behavioralAnalyticsCORS: string; readonly behavioralAnalyticsEvents: string; readonly buildConnector: string; readonly bulkApi: string; readonly configuration: string; readonly connectors: string; readonly connectorsMappings: string; readonly connectorsAzureBlobStorage: string; readonly connectorsBox: string; readonly connectorsClients: string; readonly connectorsConfluence: string; readonly connectorsContentExtraction: string; readonly connectorsDropbox: string; readonly connectorsGithub: string; readonly connectorsGoogleCloudStorage: string; readonly connectorsGoogleDrive: string; readonly connectorsGmail: string; readonly connectorsJira: string; readonly connectorsMicrosoftSQL: string; readonly connectorsMongoDB: string; readonly connectorsMySQL: string; readonly connectorsNative: string; readonly connectorsNetworkDrive: string; readonly connectorsNotion: string; readonly connectorsOneDrive: string; readonly connectorsOracle: string; readonly connectorsOutlook: string; readonly connectorsPostgreSQL: string; readonly connectorsRedis: string; readonly connectorsS3: string; readonly connectorsSalesforce: string; readonly connectorsServiceNow: string; readonly connectorsSharepoint: string; readonly connectorsSharepointOnline: string; readonly connectorsTeams: string; readonly connectorsSlack: string; readonly connectorsZoom: string; readonly crawlerExtractionRules: string; readonly crawlerManaging: string; readonly crawlerOverview: string; readonly deployTrainedModels: string; readonly documentLevelSecurity: string; readonly elser: string; readonly engines: string; readonly indexApi: string; readonly ingestionApis: string; readonly ingestPipelines: string; readonly knnSearch: string; readonly knnSearchCombine: string; readonly languageAnalyzers: string; readonly languageClients: string; readonly licenseManagement: string; readonly machineLearningStart: string; readonly mailService: string; readonly mlDocumentEnrichment: string; readonly searchApplicationsTemplates: string; readonly searchApplicationsSearchApi: string; readonly searchApplications: string; readonly searchApplicationsSearch: string; readonly searchLabs: string; readonly searchLabsRepo: string; readonly searchTemplates: string; readonly start: string; readonly supportedNlpModels: string; readonly syncRules: string; readonly trainedModels: string; readonly textEmbedding: string; readonly troubleshootSetup: string; readonly usersAccess: string; }"
+              "{ readonly aiSearchDoc: string; readonly aiSearchHelp: string; readonly apiKeys: string; readonly behavioralAnalytics: string; readonly behavioralAnalyticsCORS: string; readonly behavioralAnalyticsEvents: string; readonly buildConnector: string; readonly bulkApi: string; readonly configuration: string; readonly connectors: string; readonly connectorsClientDeploy: string; readonly connectorsMappings: string; readonly connectorsAzureBlobStorage: string; readonly connectorsBox: string; readonly connectorsClients: string; readonly connectorsConfluence: string; readonly connectorsContentExtraction: string; readonly connectorsDropbox: string; readonly connectorsGithub: string; readonly connectorsGoogleCloudStorage: string; readonly connectorsGoogleDrive: string; readonly connectorsGmail: string; readonly connectorsJira: string; readonly connectorsMicrosoftSQL: string; readonly connectorsMongoDB: string; readonly connectorsMySQL: string; readonly connectorsNative: string; readonly connectorsNetworkDrive: string; readonly connectorsNotion: string; readonly connectorsOneDrive: string; readonly connectorsOracle: string; readonly connectorsOutlook: string; readonly connectorsPostgreSQL: string; readonly connectorsRedis: string; readonly connectorsS3: string; readonly connectorsSalesforce: string; readonly connectorsServiceNow: string; readonly connectorsSharepoint: string; readonly connectorsSharepointOnline: string; readonly connectorsTeams: string; readonly connectorsSlack: string; readonly connectorsZoom: string; readonly crawlerExtractionRules: string; readonly crawlerManaging: string; readonly crawlerOverview: string; readonly deployTrainedModels: string; readonly documentLevelSecurity: string; readonly elser: string; readonly engines: string; readonly indexApi: string; readonly ingestionApis: string; readonly ingestPipelines: string; readonly knnSearch: string; readonly knnSearchCombine: string; readonly languageAnalyzers: string; readonly languageClients: string; readonly licenseManagement: string; readonly machineLearningStart: string; readonly mailService: string; readonly mlDocumentEnrichment: string; readonly searchApplicationsTemplates: string; readonly searchApplicationsSearchApi: string; readonly searchApplications: string; readonly searchApplicationsSearch: string; readonly searchLabs: string; readonly searchLabsRepo: string; readonly searchTemplates: string; readonly start: string; readonly supportedNlpModels: string; readonly syncRules: string; readonly trainedModels: string; readonly textEmbedding: string; readonly troubleshootSetup: string; readonly usersAccess: string; }"
             ],
             "path": "packages/kbn-doc-links/src/types.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_doc_links.mdx b/api_docs/kbn_doc_links.mdx
index cff17854e89a1..6eff8c7df947b 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: 2024-04-02
+date: 2024-04-03
 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 1482e7eaabfe8..8e72cb41cb1ce 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: 2024-04-02
+date: 2024-04-03
 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 38e83d2a27fff..d4442e3dce6df 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: 2024-04-02
+date: 2024-04-03
 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 b6d45a087c189..f4f3158505534 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt-tools']
 ---
 import kbnEbtToolsObj from './kbn_ebt_tools.devdocs.json';
diff --git a/api_docs/kbn_ecs_data_quality_dashboard.mdx b/api_docs/kbn_ecs_data_quality_dashboard.mdx
index 5198b9e195bee..170604d6dac57 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: 2024-04-02
+date: 2024-04-03
 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_elastic_agent_utils.mdx b/api_docs/kbn_elastic_agent_utils.mdx
index 354fd0f4fd897..9c1483783439c 100644
--- a/api_docs/kbn_elastic_agent_utils.mdx
+++ b/api_docs/kbn_elastic_agent_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-agent-utils
 title: "@kbn/elastic-agent-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-agent-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-agent-utils']
 ---
 import kbnElasticAgentUtilsObj from './kbn_elastic_agent_utils.devdocs.json';
diff --git a/api_docs/kbn_elastic_assistant.mdx b/api_docs/kbn_elastic_assistant.mdx
index d618b77256805..ae0a4f904972d 100644
--- a/api_docs/kbn_elastic_assistant.mdx
+++ b/api_docs/kbn_elastic_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-assistant
 title: "@kbn/elastic-assistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-assistant plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-assistant']
 ---
 import kbnElasticAssistantObj from './kbn_elastic_assistant.devdocs.json';
diff --git a/api_docs/kbn_elastic_assistant_common.devdocs.json b/api_docs/kbn_elastic_assistant_common.devdocs.json
index 3f88d87da04e5..afcd039c81537 100644
--- a/api_docs/kbn_elastic_assistant_common.devdocs.json
+++ b/api_docs/kbn_elastic_assistant_common.devdocs.json
@@ -850,7 +850,7 @@
         "label": "BulkCrudActionResponse",
         "description": [],
         "signature": [
-          "{ attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }"
+          "{ attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/conversations/bulk_crud_conversations_route.gen.ts",
         "deprecated": false,
@@ -880,7 +880,7 @@
         "label": "BulkCrudActionSummary",
         "description": [],
         "signature": [
-          "{ total: number; succeeded: number; failed: number; skipped: number; }"
+          "{ succeeded: number; failed: number; total: number; skipped: number; }"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/conversations/bulk_crud_conversations_route.gen.ts",
         "deprecated": false,
@@ -1834,7 +1834,7 @@
         "label": "PerformBulkActionResponse",
         "description": [],
         "signature": [
-          "{ attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }"
+          "{ attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/conversations/bulk_crud_conversations_route.gen.ts",
         "deprecated": false,
@@ -2433,7 +2433,7 @@
         "label": "BulkCrudActionResponse",
         "description": [],
         "signature": [
-          "Zod.ZodObject<{ success: Zod.ZodOptional<Zod.ZodBoolean>; status_code: Zod.ZodOptional<Zod.ZodNumber>; message: Zod.ZodOptional<Zod.ZodString>; conversations_count: Zod.ZodOptional<Zod.ZodNumber>; attributes: Zod.ZodObject<{ results: Zod.ZodObject<{ updated: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodUnion<[Zod.ZodString, Zod.ZodString]>; title: Zod.ZodString; category: Zod.ZodEnum<[\"assistant\", \"insights\"]>; summary: Zod.ZodOptional<Zod.ZodObject<{ content: Zod.ZodOptional<Zod.ZodString>; timestamp: Zod.ZodOptional<Zod.ZodString>; public: Zod.ZodOptional<Zod.ZodBoolean>; confidence: Zod.ZodOptional<Zod.ZodEnum<[\"low\", \"medium\", \"high\"]>>; }, \"strip\", Zod.ZodTypeAny, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }>>; timestamp: Zod.ZodOptional<Zod.ZodString>; updatedAt: Zod.ZodOptional<Zod.ZodString>; createdAt: Zod.ZodString; replacements: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodString, Zod.objectOutputType<{}, Zod.ZodString, \"strip\">, Zod.objectInputType<{}, Zod.ZodString, \"strip\">>>; users: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodOptional<Zod.ZodString>; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id?: string | undefined; name?: string | undefined; }, { id?: string | undefined; name?: string | undefined; }>, \"many\">; messages: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ content: Zod.ZodString; reader: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodUnknown, Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\">, Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\">>>; role: Zod.ZodEnum<[\"system\", \"user\", \"assistant\"]>; timestamp: Zod.ZodString; isError: Zod.ZodOptional<Zod.ZodBoolean>; traceData: Zod.ZodOptional<Zod.ZodObject<{ transactionId: Zod.ZodOptional<Zod.ZodString>; traceId: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { transactionId?: string | undefined; traceId?: string | undefined; }, { transactionId?: string | undefined; traceId?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }>, \"many\">>; apiConfig: Zod.ZodOptional<Zod.ZodObject<{ connectorId: Zod.ZodString; defaultSystemPromptId: Zod.ZodOptional<Zod.ZodString>; provider: Zod.ZodOptional<Zod.ZodEnum<[\"OpenAI\", \"Azure OpenAI\"]>>; model: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }>>; isDefault: Zod.ZodOptional<Zod.ZodBoolean>; excludeFromLastConversationStorage: Zod.ZodOptional<Zod.ZodBoolean>; namespace: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }>, \"many\">; created: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodUnion<[Zod.ZodString, Zod.ZodString]>; title: Zod.ZodString; category: Zod.ZodEnum<[\"assistant\", \"insights\"]>; summary: Zod.ZodOptional<Zod.ZodObject<{ content: Zod.ZodOptional<Zod.ZodString>; timestamp: Zod.ZodOptional<Zod.ZodString>; public: Zod.ZodOptional<Zod.ZodBoolean>; confidence: Zod.ZodOptional<Zod.ZodEnum<[\"low\", \"medium\", \"high\"]>>; }, \"strip\", Zod.ZodTypeAny, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }>>; timestamp: Zod.ZodOptional<Zod.ZodString>; updatedAt: Zod.ZodOptional<Zod.ZodString>; createdAt: Zod.ZodString; replacements: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodString, Zod.objectOutputType<{}, Zod.ZodString, \"strip\">, Zod.objectInputType<{}, Zod.ZodString, \"strip\">>>; users: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodOptional<Zod.ZodString>; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id?: string | undefined; name?: string | undefined; }, { id?: string | undefined; name?: string | undefined; }>, \"many\">; messages: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ content: Zod.ZodString; reader: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodUnknown, Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\">, Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\">>>; role: Zod.ZodEnum<[\"system\", \"user\", \"assistant\"]>; timestamp: Zod.ZodString; isError: Zod.ZodOptional<Zod.ZodBoolean>; traceData: Zod.ZodOptional<Zod.ZodObject<{ transactionId: Zod.ZodOptional<Zod.ZodString>; traceId: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { transactionId?: string | undefined; traceId?: string | undefined; }, { transactionId?: string | undefined; traceId?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }>, \"many\">>; apiConfig: Zod.ZodOptional<Zod.ZodObject<{ connectorId: Zod.ZodString; defaultSystemPromptId: Zod.ZodOptional<Zod.ZodString>; provider: Zod.ZodOptional<Zod.ZodEnum<[\"OpenAI\", \"Azure OpenAI\"]>>; model: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }>>; isDefault: Zod.ZodOptional<Zod.ZodBoolean>; excludeFromLastConversationStorage: Zod.ZodOptional<Zod.ZodBoolean>; namespace: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }>, \"many\">; deleted: Zod.ZodArray<Zod.ZodString, \"many\">; skipped: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodOptional<Zod.ZodString>; skip_reason: Zod.ZodLiteral<\"CONVERSATION_NOT_MODIFIED\">; }, \"strip\", Zod.ZodTypeAny, { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }, { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }>, \"many\">; }, \"strip\", Zod.ZodTypeAny, { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }, { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }>; summary: Zod.ZodObject<{ failed: Zod.ZodNumber; skipped: Zod.ZodNumber; succeeded: Zod.ZodNumber; total: Zod.ZodNumber; }, \"strip\", Zod.ZodTypeAny, { total: number; succeeded: number; failed: number; skipped: number; }, { total: number; succeeded: number; failed: number; skipped: number; }>; errors: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ message: Zod.ZodString; status_code: Zod.ZodNumber; err_code: Zod.ZodOptional<Zod.ZodString>; conversations: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id: string; name?: string | undefined; }, { id: string; name?: string | undefined; }>, \"many\">; }, \"strip\", Zod.ZodTypeAny, { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }, { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }>, \"many\">>; }, \"strip\", Zod.ZodTypeAny, { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }, { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }>; }, \"strip\", Zod.ZodTypeAny, { attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }, { attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }>"
+          "Zod.ZodObject<{ success: Zod.ZodOptional<Zod.ZodBoolean>; status_code: Zod.ZodOptional<Zod.ZodNumber>; message: Zod.ZodOptional<Zod.ZodString>; conversations_count: Zod.ZodOptional<Zod.ZodNumber>; attributes: Zod.ZodObject<{ results: Zod.ZodObject<{ updated: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodUnion<[Zod.ZodString, Zod.ZodString]>; title: Zod.ZodString; category: Zod.ZodEnum<[\"assistant\", \"insights\"]>; summary: Zod.ZodOptional<Zod.ZodObject<{ content: Zod.ZodOptional<Zod.ZodString>; timestamp: Zod.ZodOptional<Zod.ZodString>; public: Zod.ZodOptional<Zod.ZodBoolean>; confidence: Zod.ZodOptional<Zod.ZodEnum<[\"low\", \"medium\", \"high\"]>>; }, \"strip\", Zod.ZodTypeAny, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }>>; timestamp: Zod.ZodOptional<Zod.ZodString>; updatedAt: Zod.ZodOptional<Zod.ZodString>; createdAt: Zod.ZodString; replacements: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodString, Zod.objectOutputType<{}, Zod.ZodString, \"strip\">, Zod.objectInputType<{}, Zod.ZodString, \"strip\">>>; users: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodOptional<Zod.ZodString>; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id?: string | undefined; name?: string | undefined; }, { id?: string | undefined; name?: string | undefined; }>, \"many\">; messages: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ content: Zod.ZodString; reader: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodUnknown, Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\">, Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\">>>; role: Zod.ZodEnum<[\"system\", \"user\", \"assistant\"]>; timestamp: Zod.ZodString; isError: Zod.ZodOptional<Zod.ZodBoolean>; traceData: Zod.ZodOptional<Zod.ZodObject<{ transactionId: Zod.ZodOptional<Zod.ZodString>; traceId: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { transactionId?: string | undefined; traceId?: string | undefined; }, { transactionId?: string | undefined; traceId?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }>, \"many\">>; apiConfig: Zod.ZodOptional<Zod.ZodObject<{ connectorId: Zod.ZodString; defaultSystemPromptId: Zod.ZodOptional<Zod.ZodString>; provider: Zod.ZodOptional<Zod.ZodEnum<[\"OpenAI\", \"Azure OpenAI\"]>>; model: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }>>; isDefault: Zod.ZodOptional<Zod.ZodBoolean>; excludeFromLastConversationStorage: Zod.ZodOptional<Zod.ZodBoolean>; namespace: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }>, \"many\">; created: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodUnion<[Zod.ZodString, Zod.ZodString]>; title: Zod.ZodString; category: Zod.ZodEnum<[\"assistant\", \"insights\"]>; summary: Zod.ZodOptional<Zod.ZodObject<{ content: Zod.ZodOptional<Zod.ZodString>; timestamp: Zod.ZodOptional<Zod.ZodString>; public: Zod.ZodOptional<Zod.ZodBoolean>; confidence: Zod.ZodOptional<Zod.ZodEnum<[\"low\", \"medium\", \"high\"]>>; }, \"strip\", Zod.ZodTypeAny, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }>>; timestamp: Zod.ZodOptional<Zod.ZodString>; updatedAt: Zod.ZodOptional<Zod.ZodString>; createdAt: Zod.ZodString; replacements: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodString, Zod.objectOutputType<{}, Zod.ZodString, \"strip\">, Zod.objectInputType<{}, Zod.ZodString, \"strip\">>>; users: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodOptional<Zod.ZodString>; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id?: string | undefined; name?: string | undefined; }, { id?: string | undefined; name?: string | undefined; }>, \"many\">; messages: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ content: Zod.ZodString; reader: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodUnknown, Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\">, Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\">>>; role: Zod.ZodEnum<[\"system\", \"user\", \"assistant\"]>; timestamp: Zod.ZodString; isError: Zod.ZodOptional<Zod.ZodBoolean>; traceData: Zod.ZodOptional<Zod.ZodObject<{ transactionId: Zod.ZodOptional<Zod.ZodString>; traceId: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { transactionId?: string | undefined; traceId?: string | undefined; }, { transactionId?: string | undefined; traceId?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }>, \"many\">>; apiConfig: Zod.ZodOptional<Zod.ZodObject<{ connectorId: Zod.ZodString; defaultSystemPromptId: Zod.ZodOptional<Zod.ZodString>; provider: Zod.ZodOptional<Zod.ZodEnum<[\"OpenAI\", \"Azure OpenAI\"]>>; model: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }>>; isDefault: Zod.ZodOptional<Zod.ZodBoolean>; excludeFromLastConversationStorage: Zod.ZodOptional<Zod.ZodBoolean>; namespace: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }>, \"many\">; deleted: Zod.ZodArray<Zod.ZodString, \"many\">; skipped: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodOptional<Zod.ZodString>; skip_reason: Zod.ZodLiteral<\"CONVERSATION_NOT_MODIFIED\">; }, \"strip\", Zod.ZodTypeAny, { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }, { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }>, \"many\">; }, \"strip\", Zod.ZodTypeAny, { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }, { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }>; summary: Zod.ZodObject<{ failed: Zod.ZodNumber; skipped: Zod.ZodNumber; succeeded: Zod.ZodNumber; total: Zod.ZodNumber; }, \"strip\", Zod.ZodTypeAny, { succeeded: number; failed: number; total: number; skipped: number; }, { succeeded: number; failed: number; total: number; skipped: number; }>; errors: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ message: Zod.ZodString; status_code: Zod.ZodNumber; err_code: Zod.ZodOptional<Zod.ZodString>; conversations: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id: string; name?: string | undefined; }, { id: string; name?: string | undefined; }>, \"many\">; }, \"strip\", Zod.ZodTypeAny, { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }, { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }>, \"many\">>; }, \"strip\", Zod.ZodTypeAny, { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }, { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }>; }, \"strip\", Zod.ZodTypeAny, { attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }, { attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }>"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/conversations/bulk_crud_conversations_route.gen.ts",
         "deprecated": false,
@@ -2463,7 +2463,7 @@
         "label": "BulkCrudActionSummary",
         "description": [],
         "signature": [
-          "Zod.ZodObject<{ failed: Zod.ZodNumber; skipped: Zod.ZodNumber; succeeded: Zod.ZodNumber; total: Zod.ZodNumber; }, \"strip\", Zod.ZodTypeAny, { total: number; succeeded: number; failed: number; skipped: number; }, { total: number; succeeded: number; failed: number; skipped: number; }>"
+          "Zod.ZodObject<{ failed: Zod.ZodNumber; skipped: Zod.ZodNumber; succeeded: Zod.ZodNumber; total: Zod.ZodNumber; }, \"strip\", Zod.ZodTypeAny, { succeeded: number; failed: number; total: number; skipped: number; }, { succeeded: number; failed: number; total: number; skipped: number; }>"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/conversations/bulk_crud_conversations_route.gen.ts",
         "deprecated": false,
@@ -3095,7 +3095,7 @@
         "label": "PerformBulkActionResponse",
         "description": [],
         "signature": [
-          "Zod.ZodObject<{ success: Zod.ZodOptional<Zod.ZodBoolean>; status_code: Zod.ZodOptional<Zod.ZodNumber>; message: Zod.ZodOptional<Zod.ZodString>; conversations_count: Zod.ZodOptional<Zod.ZodNumber>; attributes: Zod.ZodObject<{ results: Zod.ZodObject<{ updated: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodUnion<[Zod.ZodString, Zod.ZodString]>; title: Zod.ZodString; category: Zod.ZodEnum<[\"assistant\", \"insights\"]>; summary: Zod.ZodOptional<Zod.ZodObject<{ content: Zod.ZodOptional<Zod.ZodString>; timestamp: Zod.ZodOptional<Zod.ZodString>; public: Zod.ZodOptional<Zod.ZodBoolean>; confidence: Zod.ZodOptional<Zod.ZodEnum<[\"low\", \"medium\", \"high\"]>>; }, \"strip\", Zod.ZodTypeAny, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }>>; timestamp: Zod.ZodOptional<Zod.ZodString>; updatedAt: Zod.ZodOptional<Zod.ZodString>; createdAt: Zod.ZodString; replacements: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodString, Zod.objectOutputType<{}, Zod.ZodString, \"strip\">, Zod.objectInputType<{}, Zod.ZodString, \"strip\">>>; users: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodOptional<Zod.ZodString>; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id?: string | undefined; name?: string | undefined; }, { id?: string | undefined; name?: string | undefined; }>, \"many\">; messages: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ content: Zod.ZodString; reader: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodUnknown, Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\">, Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\">>>; role: Zod.ZodEnum<[\"system\", \"user\", \"assistant\"]>; timestamp: Zod.ZodString; isError: Zod.ZodOptional<Zod.ZodBoolean>; traceData: Zod.ZodOptional<Zod.ZodObject<{ transactionId: Zod.ZodOptional<Zod.ZodString>; traceId: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { transactionId?: string | undefined; traceId?: string | undefined; }, { transactionId?: string | undefined; traceId?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }>, \"many\">>; apiConfig: Zod.ZodOptional<Zod.ZodObject<{ connectorId: Zod.ZodString; defaultSystemPromptId: Zod.ZodOptional<Zod.ZodString>; provider: Zod.ZodOptional<Zod.ZodEnum<[\"OpenAI\", \"Azure OpenAI\"]>>; model: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }>>; isDefault: Zod.ZodOptional<Zod.ZodBoolean>; excludeFromLastConversationStorage: Zod.ZodOptional<Zod.ZodBoolean>; namespace: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }>, \"many\">; created: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodUnion<[Zod.ZodString, Zod.ZodString]>; title: Zod.ZodString; category: Zod.ZodEnum<[\"assistant\", \"insights\"]>; summary: Zod.ZodOptional<Zod.ZodObject<{ content: Zod.ZodOptional<Zod.ZodString>; timestamp: Zod.ZodOptional<Zod.ZodString>; public: Zod.ZodOptional<Zod.ZodBoolean>; confidence: Zod.ZodOptional<Zod.ZodEnum<[\"low\", \"medium\", \"high\"]>>; }, \"strip\", Zod.ZodTypeAny, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }>>; timestamp: Zod.ZodOptional<Zod.ZodString>; updatedAt: Zod.ZodOptional<Zod.ZodString>; createdAt: Zod.ZodString; replacements: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodString, Zod.objectOutputType<{}, Zod.ZodString, \"strip\">, Zod.objectInputType<{}, Zod.ZodString, \"strip\">>>; users: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodOptional<Zod.ZodString>; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id?: string | undefined; name?: string | undefined; }, { id?: string | undefined; name?: string | undefined; }>, \"many\">; messages: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ content: Zod.ZodString; reader: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodUnknown, Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\">, Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\">>>; role: Zod.ZodEnum<[\"system\", \"user\", \"assistant\"]>; timestamp: Zod.ZodString; isError: Zod.ZodOptional<Zod.ZodBoolean>; traceData: Zod.ZodOptional<Zod.ZodObject<{ transactionId: Zod.ZodOptional<Zod.ZodString>; traceId: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { transactionId?: string | undefined; traceId?: string | undefined; }, { transactionId?: string | undefined; traceId?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }>, \"many\">>; apiConfig: Zod.ZodOptional<Zod.ZodObject<{ connectorId: Zod.ZodString; defaultSystemPromptId: Zod.ZodOptional<Zod.ZodString>; provider: Zod.ZodOptional<Zod.ZodEnum<[\"OpenAI\", \"Azure OpenAI\"]>>; model: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }>>; isDefault: Zod.ZodOptional<Zod.ZodBoolean>; excludeFromLastConversationStorage: Zod.ZodOptional<Zod.ZodBoolean>; namespace: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }>, \"many\">; deleted: Zod.ZodArray<Zod.ZodString, \"many\">; skipped: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodOptional<Zod.ZodString>; skip_reason: Zod.ZodLiteral<\"CONVERSATION_NOT_MODIFIED\">; }, \"strip\", Zod.ZodTypeAny, { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }, { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }>, \"many\">; }, \"strip\", Zod.ZodTypeAny, { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }, { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }>; summary: Zod.ZodObject<{ failed: Zod.ZodNumber; skipped: Zod.ZodNumber; succeeded: Zod.ZodNumber; total: Zod.ZodNumber; }, \"strip\", Zod.ZodTypeAny, { total: number; succeeded: number; failed: number; skipped: number; }, { total: number; succeeded: number; failed: number; skipped: number; }>; errors: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ message: Zod.ZodString; status_code: Zod.ZodNumber; err_code: Zod.ZodOptional<Zod.ZodString>; conversations: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id: string; name?: string | undefined; }, { id: string; name?: string | undefined; }>, \"many\">; }, \"strip\", Zod.ZodTypeAny, { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }, { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }>, \"many\">>; }, \"strip\", Zod.ZodTypeAny, { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }, { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }>; }, \"strip\", Zod.ZodTypeAny, { attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }, { attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { total: number; succeeded: number; failed: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }>"
+          "Zod.ZodObject<{ success: Zod.ZodOptional<Zod.ZodBoolean>; status_code: Zod.ZodOptional<Zod.ZodNumber>; message: Zod.ZodOptional<Zod.ZodString>; conversations_count: Zod.ZodOptional<Zod.ZodNumber>; attributes: Zod.ZodObject<{ results: Zod.ZodObject<{ updated: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodUnion<[Zod.ZodString, Zod.ZodString]>; title: Zod.ZodString; category: Zod.ZodEnum<[\"assistant\", \"insights\"]>; summary: Zod.ZodOptional<Zod.ZodObject<{ content: Zod.ZodOptional<Zod.ZodString>; timestamp: Zod.ZodOptional<Zod.ZodString>; public: Zod.ZodOptional<Zod.ZodBoolean>; confidence: Zod.ZodOptional<Zod.ZodEnum<[\"low\", \"medium\", \"high\"]>>; }, \"strip\", Zod.ZodTypeAny, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }>>; timestamp: Zod.ZodOptional<Zod.ZodString>; updatedAt: Zod.ZodOptional<Zod.ZodString>; createdAt: Zod.ZodString; replacements: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodString, Zod.objectOutputType<{}, Zod.ZodString, \"strip\">, Zod.objectInputType<{}, Zod.ZodString, \"strip\">>>; users: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodOptional<Zod.ZodString>; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id?: string | undefined; name?: string | undefined; }, { id?: string | undefined; name?: string | undefined; }>, \"many\">; messages: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ content: Zod.ZodString; reader: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodUnknown, Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\">, Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\">>>; role: Zod.ZodEnum<[\"system\", \"user\", \"assistant\"]>; timestamp: Zod.ZodString; isError: Zod.ZodOptional<Zod.ZodBoolean>; traceData: Zod.ZodOptional<Zod.ZodObject<{ transactionId: Zod.ZodOptional<Zod.ZodString>; traceId: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { transactionId?: string | undefined; traceId?: string | undefined; }, { transactionId?: string | undefined; traceId?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }>, \"many\">>; apiConfig: Zod.ZodOptional<Zod.ZodObject<{ connectorId: Zod.ZodString; defaultSystemPromptId: Zod.ZodOptional<Zod.ZodString>; provider: Zod.ZodOptional<Zod.ZodEnum<[\"OpenAI\", \"Azure OpenAI\"]>>; model: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }>>; isDefault: Zod.ZodOptional<Zod.ZodBoolean>; excludeFromLastConversationStorage: Zod.ZodOptional<Zod.ZodBoolean>; namespace: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }>, \"many\">; created: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodUnion<[Zod.ZodString, Zod.ZodString]>; title: Zod.ZodString; category: Zod.ZodEnum<[\"assistant\", \"insights\"]>; summary: Zod.ZodOptional<Zod.ZodObject<{ content: Zod.ZodOptional<Zod.ZodString>; timestamp: Zod.ZodOptional<Zod.ZodString>; public: Zod.ZodOptional<Zod.ZodBoolean>; confidence: Zod.ZodOptional<Zod.ZodEnum<[\"low\", \"medium\", \"high\"]>>; }, \"strip\", Zod.ZodTypeAny, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }, { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; }>>; timestamp: Zod.ZodOptional<Zod.ZodString>; updatedAt: Zod.ZodOptional<Zod.ZodString>; createdAt: Zod.ZodString; replacements: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodString, Zod.objectOutputType<{}, Zod.ZodString, \"strip\">, Zod.objectInputType<{}, Zod.ZodString, \"strip\">>>; users: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodOptional<Zod.ZodString>; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id?: string | undefined; name?: string | undefined; }, { id?: string | undefined; name?: string | undefined; }>, \"many\">; messages: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ content: Zod.ZodString; reader: Zod.ZodOptional<Zod.ZodObject<{}, \"strip\", Zod.ZodUnknown, Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\">, Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\">>>; role: Zod.ZodEnum<[\"system\", \"user\", \"assistant\"]>; timestamp: Zod.ZodString; isError: Zod.ZodOptional<Zod.ZodBoolean>; traceData: Zod.ZodOptional<Zod.ZodObject<{ transactionId: Zod.ZodOptional<Zod.ZodString>; traceId: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { transactionId?: string | undefined; traceId?: string | undefined; }, { transactionId?: string | undefined; traceId?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }, { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }>, \"many\">>; apiConfig: Zod.ZodOptional<Zod.ZodObject<{ connectorId: Zod.ZodString; defaultSystemPromptId: Zod.ZodOptional<Zod.ZodString>; provider: Zod.ZodOptional<Zod.ZodEnum<[\"OpenAI\", \"Azure OpenAI\"]>>; model: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }, { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; }>>; isDefault: Zod.ZodOptional<Zod.ZodBoolean>; excludeFromLastConversationStorage: Zod.ZodOptional<Zod.ZodBoolean>; namespace: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }, { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }>, \"many\">; deleted: Zod.ZodArray<Zod.ZodString, \"many\">; skipped: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodOptional<Zod.ZodString>; skip_reason: Zod.ZodLiteral<\"CONVERSATION_NOT_MODIFIED\">; }, \"strip\", Zod.ZodTypeAny, { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }, { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }>, \"many\">; }, \"strip\", Zod.ZodTypeAny, { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }, { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }>; summary: Zod.ZodObject<{ failed: Zod.ZodNumber; skipped: Zod.ZodNumber; succeeded: Zod.ZodNumber; total: Zod.ZodNumber; }, \"strip\", Zod.ZodTypeAny, { succeeded: number; failed: number; total: number; skipped: number; }, { succeeded: number; failed: number; total: number; skipped: number; }>; errors: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ message: Zod.ZodString; status_code: Zod.ZodNumber; err_code: Zod.ZodOptional<Zod.ZodString>; conversations: Zod.ZodArray<Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { id: string; name?: string | undefined; }, { id: string; name?: string | undefined; }>, \"many\">; }, \"strip\", Zod.ZodTypeAny, { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }, { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }>, \"many\">>; }, \"strip\", Zod.ZodTypeAny, { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }, { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }>; }, \"strip\", Zod.ZodTypeAny, { attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectOutputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectOutputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }, { attributes: { results: { created: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; updated: { id: string; namespace: string; title: string; createdAt: string; category: \"assistant\" | \"insights\"; users: { id?: string | undefined; name?: string | undefined; }[]; summary?: { content?: string | undefined; timestamp?: string | undefined; public?: boolean | undefined; confidence?: \"medium\" | \"low\" | \"high\" | undefined; } | undefined; timestamp?: string | undefined; updatedAt?: string | undefined; replacements?: Zod.objectInputType<{}, Zod.ZodString, \"strip\"> | undefined; messages?: { timestamp: string; role: \"user\" | \"system\" | \"assistant\"; content: string; reader?: Zod.objectInputType<{}, Zod.ZodUnknown, \"strip\"> | undefined; isError?: boolean | undefined; traceData?: { transactionId?: string | undefined; traceId?: string | undefined; } | undefined; }[] | undefined; apiConfig?: { connectorId: string; defaultSystemPromptId?: string | undefined; provider?: \"OpenAI\" | \"Azure OpenAI\" | undefined; model?: string | undefined; } | undefined; isDefault?: boolean | undefined; excludeFromLastConversationStorage?: boolean | undefined; }[]; skipped: { id: string; skip_reason: \"CONVERSATION_NOT_MODIFIED\"; name?: string | undefined; }[]; deleted: string[]; }; summary: { succeeded: number; failed: number; total: number; skipped: number; }; errors?: { message: string; status_code: number; conversations: { id: string; name?: string | undefined; }[]; err_code?: string | undefined; }[] | undefined; }; success?: boolean | undefined; status_code?: number | undefined; message?: string | undefined; conversations_count?: number | undefined; }>"
         ],
         "path": "x-pack/packages/kbn-elastic-assistant-common/impl/schemas/conversations/bulk_crud_conversations_route.gen.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_elastic_assistant_common.mdx b/api_docs/kbn_elastic_assistant_common.mdx
index 49ecc85a6523d..bb672da577e47 100644
--- a/api_docs/kbn_elastic_assistant_common.mdx
+++ b/api_docs/kbn_elastic_assistant_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-assistant-common
 title: "@kbn/elastic-assistant-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-assistant-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-assistant-common']
 ---
 import kbnElasticAssistantCommonObj from './kbn_elastic_assistant_common.devdocs.json';
diff --git a/api_docs/kbn_es.mdx b/api_docs/kbn_es.mdx
index 6eebc7cf480a2..4e027b3f5a3c2 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: 2024-04-02
+date: 2024-04-03
 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 b0719f8e6c918..0c71a00e4e9a6 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: 2024-04-02
+date: 2024-04-03
 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 5f205dfce335a..793105e40e14a 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: 2024-04-02
+date: 2024-04-03
 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 e02b0c5adee4d..489a7853ce428 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: 2024-04-02
+date: 2024-04-03
 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 4be01e672aea5..5e54ef942f34b 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: 2024-04-02
+date: 2024-04-03
 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 4ca234e0fd4cb..b27ef278231e1 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/eslint-plugin-imports']
 ---
 import kbnEslintPluginImportsObj from './kbn_eslint_plugin_imports.devdocs.json';
diff --git a/api_docs/kbn_esql_ast.mdx b/api_docs/kbn_esql_ast.mdx
index a0cc20bb35144..f7f2548494c78 100644
--- a/api_docs/kbn_esql_ast.mdx
+++ b/api_docs/kbn_esql_ast.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-ast
 title: "@kbn/esql-ast"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-ast plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-ast']
 ---
 import kbnEsqlAstObj from './kbn_esql_ast.devdocs.json';
diff --git a/api_docs/kbn_esql_utils.mdx b/api_docs/kbn_esql_utils.mdx
index 0f47e8cdc9d24..4b17f39f817e6 100644
--- a/api_docs/kbn_esql_utils.mdx
+++ b/api_docs/kbn_esql_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-utils
 title: "@kbn/esql-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-utils']
 ---
 import kbnEsqlUtilsObj from './kbn_esql_utils.devdocs.json';
diff --git a/api_docs/kbn_esql_validation_autocomplete.mdx b/api_docs/kbn_esql_validation_autocomplete.mdx
index 1a6912d109db1..166928441372b 100644
--- a/api_docs/kbn_esql_validation_autocomplete.mdx
+++ b/api_docs/kbn_esql_validation_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-validation-autocomplete
 title: "@kbn/esql-validation-autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-validation-autocomplete plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-validation-autocomplete']
 ---
 import kbnEsqlValidationAutocompleteObj from './kbn_esql_validation_autocomplete.devdocs.json';
diff --git a/api_docs/kbn_event_annotation_common.mdx b/api_docs/kbn_event_annotation_common.mdx
index 14d9cfdc218f4..1a4df47ecde72 100644
--- a/api_docs/kbn_event_annotation_common.mdx
+++ b/api_docs/kbn_event_annotation_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-event-annotation-common
 title: "@kbn/event-annotation-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/event-annotation-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/event-annotation-common']
 ---
 import kbnEventAnnotationCommonObj from './kbn_event_annotation_common.devdocs.json';
diff --git a/api_docs/kbn_event_annotation_components.mdx b/api_docs/kbn_event_annotation_components.mdx
index 0e8c59a9be708..6205aeb8b15de 100644
--- a/api_docs/kbn_event_annotation_components.mdx
+++ b/api_docs/kbn_event_annotation_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-event-annotation-components
 title: "@kbn/event-annotation-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/event-annotation-components plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/event-annotation-components']
 ---
 import kbnEventAnnotationComponentsObj from './kbn_event_annotation_components.devdocs.json';
diff --git a/api_docs/kbn_expandable_flyout.mdx b/api_docs/kbn_expandable_flyout.mdx
index eecc038cda84a..3df13d9007229 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: 2024-04-02
+date: 2024-04-03
 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 b457fb764c6dc..e268c7389e9cd 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-types']
 ---
 import kbnFieldTypesObj from './kbn_field_types.devdocs.json';
diff --git a/api_docs/kbn_field_utils.mdx b/api_docs/kbn_field_utils.mdx
index c9b04ef646ba1..29e2a1469790e 100644
--- a/api_docs/kbn_field_utils.mdx
+++ b/api_docs/kbn_field_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-utils
 title: "@kbn/field-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/field-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-utils']
 ---
 import kbnFieldUtilsObj from './kbn_field_utils.devdocs.json';
diff --git a/api_docs/kbn_find_used_node_modules.mdx b/api_docs/kbn_find_used_node_modules.mdx
index b2ef36feb93bd..700b20bc0875d 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: 2024-04-02
+date: 2024-04-03
 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_formatters.mdx b/api_docs/kbn_formatters.mdx
index be6f54f010a4b..d145cb211cf69 100644
--- a/api_docs/kbn_formatters.mdx
+++ b/api_docs/kbn_formatters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-formatters
 title: "@kbn/formatters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/formatters plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/formatters']
 ---
 import kbnFormattersObj from './kbn_formatters.devdocs.json';
diff --git a/api_docs/kbn_ftr_common_functional_services.mdx b/api_docs/kbn_ftr_common_functional_services.mdx
index 7a366195a90f3..b9b454e445157 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: 2024-04-02
+date: 2024-04-03
 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_ftr_common_functional_ui_services.mdx b/api_docs/kbn_ftr_common_functional_ui_services.mdx
index 74b9dad033d73..6a99d2701085f 100644
--- a/api_docs/kbn_ftr_common_functional_ui_services.mdx
+++ b/api_docs/kbn_ftr_common_functional_ui_services.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-ui-services
 title: "@kbn/ftr-common-functional-ui-services"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ftr-common-functional-ui-services plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-ui-services']
 ---
 import kbnFtrCommonFunctionalUiServicesObj from './kbn_ftr_common_functional_ui_services.devdocs.json';
diff --git a/api_docs/kbn_generate.mdx b/api_docs/kbn_generate.mdx
index 249e4acd63253..29c33c6b3a6d1 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate']
 ---
 import kbnGenerateObj from './kbn_generate.devdocs.json';
diff --git a/api_docs/kbn_generate_console_definitions.mdx b/api_docs/kbn_generate_console_definitions.mdx
index 8b58637938255..9b4556841d478 100644
--- a/api_docs/kbn_generate_console_definitions.mdx
+++ b/api_docs/kbn_generate_console_definitions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-console-definitions
 title: "@kbn/generate-console-definitions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-console-definitions plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-console-definitions']
 ---
 import kbnGenerateConsoleDefinitionsObj from './kbn_generate_console_definitions.devdocs.json';
diff --git a/api_docs/kbn_generate_csv.mdx b/api_docs/kbn_generate_csv.mdx
index 18246e0386154..68a5ee181bf0c 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv']
 ---
 import kbnGenerateCsvObj from './kbn_generate_csv.devdocs.json';
diff --git a/api_docs/kbn_guided_onboarding.mdx b/api_docs/kbn_guided_onboarding.mdx
index db69157609023..87390e36821f1 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: 2024-04-02
+date: 2024-04-03
 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 ec4748d5c1cbe..75e1a41a19750 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: 2024-04-02
+date: 2024-04-03
 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 4a6b1ec03dad9..a0ae8cfa14894 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: 2024-04-02
+date: 2024-04-03
 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 66fcc3f06de8c..685d5cbeefba4 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: 2024-04-02
+date: 2024-04-03
 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 01485c1a4211c..3d5279cf78bdf 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: 2024-04-02
+date: 2024-04-03
 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 ebb3c05b2db3e..228a79d4feb84 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: 2024-04-02
+date: 2024-04-03
 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 6428a6f5dc59f..dd6f71f04f2b4 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: 2024-04-02
+date: 2024-04-03
 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 212b850a43ce6..37218664aacd0 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: 2024-04-02
+date: 2024-04-03
 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 01f1f213d6e1c..051922d445b50 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/import-resolver']
 ---
 import kbnImportResolverObj from './kbn_import_resolver.devdocs.json';
diff --git a/api_docs/kbn_infra_forge.mdx b/api_docs/kbn_infra_forge.mdx
index d4cf9bcc609e6..fa4c769207b08 100644
--- a/api_docs/kbn_infra_forge.mdx
+++ b/api_docs/kbn_infra_forge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-infra-forge
 title: "@kbn/infra-forge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/infra-forge plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/infra-forge']
 ---
 import kbnInfraForgeObj from './kbn_infra_forge.devdocs.json';
diff --git a/api_docs/kbn_interpreter.mdx b/api_docs/kbn_interpreter.mdx
index d52e417f76f8d..444d338ffc884 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: 2024-04-02
+date: 2024-04-03
 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 1c368ce4491fb..2924d0fc4b91d 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: 2024-04-02
+date: 2024-04-03
 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 708585bffaa45..15aa0a9282fbd 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: 2024-04-02
+date: 2024-04-03
 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 4d697f1c0d8bb..f53757c614479 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: 2024-04-02
+date: 2024-04-03
 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 a9c36cd833c76..da74c14db8e62 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: 2024-04-02
+date: 2024-04-03
 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 155d9ee0f1014..594a0d968d785 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: 2024-04-02
+date: 2024-04-03
 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 1c2e8950db86e..c31d178e2e073 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/language-documentation-popover']
 ---
 import kbnLanguageDocumentationPopoverObj from './kbn_language_documentation_popover.devdocs.json';
diff --git a/api_docs/kbn_lens_embeddable_utils.mdx b/api_docs/kbn_lens_embeddable_utils.mdx
index 4e03ec2c4062e..d2ac52e2cc6a7 100644
--- a/api_docs/kbn_lens_embeddable_utils.mdx
+++ b/api_docs/kbn_lens_embeddable_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-lens-embeddable-utils
 title: "@kbn/lens-embeddable-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/lens-embeddable-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/lens-embeddable-utils']
 ---
 import kbnLensEmbeddableUtilsObj from './kbn_lens_embeddable_utils.devdocs.json';
diff --git a/api_docs/kbn_lens_formula_docs.mdx b/api_docs/kbn_lens_formula_docs.mdx
index 5572e3bcc4f0c..01d4a5df68888 100644
--- a/api_docs/kbn_lens_formula_docs.mdx
+++ b/api_docs/kbn_lens_formula_docs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-lens-formula-docs
 title: "@kbn/lens-formula-docs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/lens-formula-docs plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/lens-formula-docs']
 ---
 import kbnLensFormulaDocsObj from './kbn_lens_formula_docs.devdocs.json';
diff --git a/api_docs/kbn_logging.mdx b/api_docs/kbn_logging.mdx
index 2e77a9e4c1f31..9db7b5f677b1d 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: 2024-04-02
+date: 2024-04-03
 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 5cc97e832e7a4..8f299e3deb359 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging-mocks']
 ---
 import kbnLoggingMocksObj from './kbn_logging_mocks.devdocs.json';
diff --git a/api_docs/kbn_managed_content_badge.mdx b/api_docs/kbn_managed_content_badge.mdx
index f73eefca3de9c..cc45c1a681e39 100644
--- a/api_docs/kbn_managed_content_badge.mdx
+++ b/api_docs/kbn_managed_content_badge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-content-badge
 title: "@kbn/managed-content-badge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/managed-content-badge plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-content-badge']
 ---
 import kbnManagedContentBadgeObj from './kbn_managed_content_badge.devdocs.json';
diff --git a/api_docs/kbn_managed_vscode_config.mdx b/api_docs/kbn_managed_vscode_config.mdx
index 673ff84a2e25a..68df011d2abf6 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-vscode-config']
 ---
 import kbnManagedVscodeConfigObj from './kbn_managed_vscode_config.devdocs.json';
diff --git a/api_docs/kbn_management_cards_navigation.mdx b/api_docs/kbn_management_cards_navigation.mdx
index 7817f8022a422..90495caff8cfa 100644
--- a/api_docs/kbn_management_cards_navigation.mdx
+++ b/api_docs/kbn_management_cards_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-cards-navigation
 title: "@kbn/management-cards-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-cards-navigation plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-cards-navigation']
 ---
 import kbnManagementCardsNavigationObj from './kbn_management_cards_navigation.devdocs.json';
diff --git a/api_docs/kbn_management_settings_application.mdx b/api_docs/kbn_management_settings_application.mdx
index 6d78e93568da3..c5bacc058c0bf 100644
--- a/api_docs/kbn_management_settings_application.mdx
+++ b/api_docs/kbn_management_settings_application.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-application
 title: "@kbn/management-settings-application"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-application plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-application']
 ---
 import kbnManagementSettingsApplicationObj from './kbn_management_settings_application.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_category.mdx b/api_docs/kbn_management_settings_components_field_category.mdx
index 8a67a6dc2a9f8..12b22d9d199fa 100644
--- a/api_docs/kbn_management_settings_components_field_category.mdx
+++ b/api_docs/kbn_management_settings_components_field_category.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-category
 title: "@kbn/management-settings-components-field-category"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-category plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-category']
 ---
 import kbnManagementSettingsComponentsFieldCategoryObj from './kbn_management_settings_components_field_category.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_input.mdx b/api_docs/kbn_management_settings_components_field_input.mdx
index cc429f2ca6b8d..2bf478844cb39 100644
--- a/api_docs/kbn_management_settings_components_field_input.mdx
+++ b/api_docs/kbn_management_settings_components_field_input.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-input
 title: "@kbn/management-settings-components-field-input"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-input plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-input']
 ---
 import kbnManagementSettingsComponentsFieldInputObj from './kbn_management_settings_components_field_input.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_row.mdx b/api_docs/kbn_management_settings_components_field_row.mdx
index fe808b3846645..ffccb937d5fe5 100644
--- a/api_docs/kbn_management_settings_components_field_row.mdx
+++ b/api_docs/kbn_management_settings_components_field_row.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-row
 title: "@kbn/management-settings-components-field-row"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-row plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-row']
 ---
 import kbnManagementSettingsComponentsFieldRowObj from './kbn_management_settings_components_field_row.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_form.mdx b/api_docs/kbn_management_settings_components_form.mdx
index 30c0187bd4804..4e5374560a452 100644
--- a/api_docs/kbn_management_settings_components_form.mdx
+++ b/api_docs/kbn_management_settings_components_form.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-form
 title: "@kbn/management-settings-components-form"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-form plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-form']
 ---
 import kbnManagementSettingsComponentsFormObj from './kbn_management_settings_components_form.devdocs.json';
diff --git a/api_docs/kbn_management_settings_field_definition.mdx b/api_docs/kbn_management_settings_field_definition.mdx
index 9be409fc03feb..4c34ee97c6e36 100644
--- a/api_docs/kbn_management_settings_field_definition.mdx
+++ b/api_docs/kbn_management_settings_field_definition.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-field-definition
 title: "@kbn/management-settings-field-definition"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-field-definition plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-field-definition']
 ---
 import kbnManagementSettingsFieldDefinitionObj from './kbn_management_settings_field_definition.devdocs.json';
diff --git a/api_docs/kbn_management_settings_ids.mdx b/api_docs/kbn_management_settings_ids.mdx
index 47cd33618b43e..83c5ceaf1c240 100644
--- a/api_docs/kbn_management_settings_ids.mdx
+++ b/api_docs/kbn_management_settings_ids.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-ids
 title: "@kbn/management-settings-ids"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-ids plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-ids']
 ---
 import kbnManagementSettingsIdsObj from './kbn_management_settings_ids.devdocs.json';
diff --git a/api_docs/kbn_management_settings_section_registry.mdx b/api_docs/kbn_management_settings_section_registry.mdx
index dc18e4057cab8..b95405eccc516 100644
--- a/api_docs/kbn_management_settings_section_registry.mdx
+++ b/api_docs/kbn_management_settings_section_registry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-section-registry
 title: "@kbn/management-settings-section-registry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-section-registry plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-section-registry']
 ---
 import kbnManagementSettingsSectionRegistryObj from './kbn_management_settings_section_registry.devdocs.json';
diff --git a/api_docs/kbn_management_settings_types.mdx b/api_docs/kbn_management_settings_types.mdx
index 5f2983bf9d87e..83827d44df7b1 100644
--- a/api_docs/kbn_management_settings_types.mdx
+++ b/api_docs/kbn_management_settings_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-types
 title: "@kbn/management-settings-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-types plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-types']
 ---
 import kbnManagementSettingsTypesObj from './kbn_management_settings_types.devdocs.json';
diff --git a/api_docs/kbn_management_settings_utilities.mdx b/api_docs/kbn_management_settings_utilities.mdx
index fc24d3c36b031..57ed6924c2934 100644
--- a/api_docs/kbn_management_settings_utilities.mdx
+++ b/api_docs/kbn_management_settings_utilities.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-utilities
 title: "@kbn/management-settings-utilities"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-utilities plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-utilities']
 ---
 import kbnManagementSettingsUtilitiesObj from './kbn_management_settings_utilities.devdocs.json';
diff --git a/api_docs/kbn_management_storybook_config.mdx b/api_docs/kbn_management_storybook_config.mdx
index 66c8d3dea5c1b..d82d20f2dbbc6 100644
--- a/api_docs/kbn_management_storybook_config.mdx
+++ b/api_docs/kbn_management_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-storybook-config
 title: "@kbn/management-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-storybook-config plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-storybook-config']
 ---
 import kbnManagementStorybookConfigObj from './kbn_management_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_mapbox_gl.mdx b/api_docs/kbn_mapbox_gl.mdx
index 3ae7e76d0556d..e67de52ae6790 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mapbox-gl']
 ---
 import kbnMapboxGlObj from './kbn_mapbox_gl.devdocs.json';
diff --git a/api_docs/kbn_maps_vector_tile_utils.mdx b/api_docs/kbn_maps_vector_tile_utils.mdx
index 59e944d86598a..3d5bde28d0d14 100644
--- a/api_docs/kbn_maps_vector_tile_utils.mdx
+++ b/api_docs/kbn_maps_vector_tile_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-maps-vector-tile-utils
 title: "@kbn/maps-vector-tile-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/maps-vector-tile-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/maps-vector-tile-utils']
 ---
 import kbnMapsVectorTileUtilsObj from './kbn_maps_vector_tile_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_agg_utils.mdx b/api_docs/kbn_ml_agg_utils.mdx
index 79b7324e402af..a4dead5408155 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: 2024-04-02
+date: 2024-04-03
 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_anomaly_utils.mdx b/api_docs/kbn_ml_anomaly_utils.mdx
index 46bf1631c26cd..3d937e3d639dc 100644
--- a/api_docs/kbn_ml_anomaly_utils.mdx
+++ b/api_docs/kbn_ml_anomaly_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-anomaly-utils
 title: "@kbn/ml-anomaly-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-anomaly-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-anomaly-utils']
 ---
 import kbnMlAnomalyUtilsObj from './kbn_ml_anomaly_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_cancellable_search.mdx b/api_docs/kbn_ml_cancellable_search.mdx
index f9c5864ff7f20..7ee7ffc808678 100644
--- a/api_docs/kbn_ml_cancellable_search.mdx
+++ b/api_docs/kbn_ml_cancellable_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-cancellable-search
 title: "@kbn/ml-cancellable-search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-cancellable-search plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-cancellable-search']
 ---
 import kbnMlCancellableSearchObj from './kbn_ml_cancellable_search.devdocs.json';
diff --git a/api_docs/kbn_ml_category_validator.mdx b/api_docs/kbn_ml_category_validator.mdx
index ac656394c1685..e3643d27e7568 100644
--- a/api_docs/kbn_ml_category_validator.mdx
+++ b/api_docs/kbn_ml_category_validator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-category-validator
 title: "@kbn/ml-category-validator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-category-validator plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-category-validator']
 ---
 import kbnMlCategoryValidatorObj from './kbn_ml_category_validator.devdocs.json';
diff --git a/api_docs/kbn_ml_chi2test.mdx b/api_docs/kbn_ml_chi2test.mdx
index e46bedde403d3..9c63e3c8fa977 100644
--- a/api_docs/kbn_ml_chi2test.mdx
+++ b/api_docs/kbn_ml_chi2test.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-chi2test
 title: "@kbn/ml-chi2test"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-chi2test plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-chi2test']
 ---
 import kbnMlChi2testObj from './kbn_ml_chi2test.devdocs.json';
diff --git a/api_docs/kbn_ml_data_frame_analytics_utils.mdx b/api_docs/kbn_ml_data_frame_analytics_utils.mdx
index 7ee5e36494f5a..4cea22de58bb4 100644
--- a/api_docs/kbn_ml_data_frame_analytics_utils.mdx
+++ b/api_docs/kbn_ml_data_frame_analytics_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-data-frame-analytics-utils
 title: "@kbn/ml-data-frame-analytics-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-data-frame-analytics-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-data-frame-analytics-utils']
 ---
 import kbnMlDataFrameAnalyticsUtilsObj from './kbn_ml_data_frame_analytics_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_data_grid.mdx b/api_docs/kbn_ml_data_grid.mdx
index e215e71e5b602..019c9725fcc59 100644
--- a/api_docs/kbn_ml_data_grid.mdx
+++ b/api_docs/kbn_ml_data_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-data-grid
 title: "@kbn/ml-data-grid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-data-grid plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-data-grid']
 ---
 import kbnMlDataGridObj from './kbn_ml_data_grid.devdocs.json';
diff --git a/api_docs/kbn_ml_date_picker.mdx b/api_docs/kbn_ml_date_picker.mdx
index e294cb2bb69d3..a55545e46a185 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: 2024-04-02
+date: 2024-04-03
 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_date_utils.mdx b/api_docs/kbn_ml_date_utils.mdx
index 4ddd098037f37..ed6cb55b2eab9 100644
--- a/api_docs/kbn_ml_date_utils.mdx
+++ b/api_docs/kbn_ml_date_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-date-utils
 title: "@kbn/ml-date-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-date-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-date-utils']
 ---
 import kbnMlDateUtilsObj from './kbn_ml_date_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_error_utils.mdx b/api_docs/kbn_ml_error_utils.mdx
index 2f723510e76d0..25d333dee641b 100644
--- a/api_docs/kbn_ml_error_utils.mdx
+++ b/api_docs/kbn_ml_error_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-error-utils
 title: "@kbn/ml-error-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-error-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-error-utils']
 ---
 import kbnMlErrorUtilsObj from './kbn_ml_error_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_in_memory_table.mdx b/api_docs/kbn_ml_in_memory_table.mdx
index aef0f7d34606c..eb023833e37e9 100644
--- a/api_docs/kbn_ml_in_memory_table.mdx
+++ b/api_docs/kbn_ml_in_memory_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-in-memory-table
 title: "@kbn/ml-in-memory-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-in-memory-table plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-in-memory-table']
 ---
 import kbnMlInMemoryTableObj from './kbn_ml_in_memory_table.devdocs.json';
diff --git a/api_docs/kbn_ml_is_defined.mdx b/api_docs/kbn_ml_is_defined.mdx
index ce75f63499c75..548ce0bc5d0b8 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: 2024-04-02
+date: 2024-04-03
 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 3b15d10db4188..6042713865841 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: 2024-04-02
+date: 2024-04-03
 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_kibana_theme.mdx b/api_docs/kbn_ml_kibana_theme.mdx
index 9fe2bca54d0ea..5441479f1d505 100644
--- a/api_docs/kbn_ml_kibana_theme.mdx
+++ b/api_docs/kbn_ml_kibana_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-kibana-theme
 title: "@kbn/ml-kibana-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-kibana-theme plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-kibana-theme']
 ---
 import kbnMlKibanaThemeObj from './kbn_ml_kibana_theme.devdocs.json';
diff --git a/api_docs/kbn_ml_local_storage.mdx b/api_docs/kbn_ml_local_storage.mdx
index 531bb536f583d..4280896d1cf21 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: 2024-04-02
+date: 2024-04-03
 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 1a2a1ffd526e6..e91735ed194fd 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: 2024-04-02
+date: 2024-04-03
 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 54614866cbf41..40126ae09b081 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: 2024-04-02
+date: 2024-04-03
 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 327cf26ebcb0d..9fdbf14c41efb 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: 2024-04-02
+date: 2024-04-03
 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 6c559a31bb49c..a7b2cb05e25d7 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: 2024-04-02
+date: 2024-04-03
 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 23a66c54fcc4b..a7e053715874a 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: 2024-04-02
+date: 2024-04-03
 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_runtime_field_utils.mdx b/api_docs/kbn_ml_runtime_field_utils.mdx
index e66de132c3657..34c16698d406c 100644
--- a/api_docs/kbn_ml_runtime_field_utils.mdx
+++ b/api_docs/kbn_ml_runtime_field_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-runtime-field-utils
 title: "@kbn/ml-runtime-field-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-runtime-field-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-runtime-field-utils']
 ---
 import kbnMlRuntimeFieldUtilsObj from './kbn_ml_runtime_field_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_string_hash.mdx b/api_docs/kbn_ml_string_hash.mdx
index 719d8daba32ec..f9f87015adacf 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: 2024-04-02
+date: 2024-04-03
 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_time_buckets.mdx b/api_docs/kbn_ml_time_buckets.mdx
index 19aaca5deff3a..0714338bf007c 100644
--- a/api_docs/kbn_ml_time_buckets.mdx
+++ b/api_docs/kbn_ml_time_buckets.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-time-buckets
 title: "@kbn/ml-time-buckets"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-time-buckets plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-time-buckets']
 ---
 import kbnMlTimeBucketsObj from './kbn_ml_time_buckets.devdocs.json';
diff --git a/api_docs/kbn_ml_trained_models_utils.mdx b/api_docs/kbn_ml_trained_models_utils.mdx
index 2310b017d671d..857659fecfe33 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: 2024-04-02
+date: 2024-04-03
 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_ui_actions.mdx b/api_docs/kbn_ml_ui_actions.mdx
index ef320acf6ea14..13d167fef01cf 100644
--- a/api_docs/kbn_ml_ui_actions.mdx
+++ b/api_docs/kbn_ml_ui_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-ui-actions
 title: "@kbn/ml-ui-actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-ui-actions plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-ui-actions']
 ---
 import kbnMlUiActionsObj from './kbn_ml_ui_actions.devdocs.json';
diff --git a/api_docs/kbn_ml_url_state.mdx b/api_docs/kbn_ml_url_state.mdx
index 688f9871942b5..4b97fe44a1f45 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-url-state']
 ---
 import kbnMlUrlStateObj from './kbn_ml_url_state.devdocs.json';
diff --git a/api_docs/kbn_mock_idp_utils.mdx b/api_docs/kbn_mock_idp_utils.mdx
index b03729a7edf75..d7953842353c5 100644
--- a/api_docs/kbn_mock_idp_utils.mdx
+++ b/api_docs/kbn_mock_idp_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mock-idp-utils
 title: "@kbn/mock-idp-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/mock-idp-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mock-idp-utils']
 ---
 import kbnMockIdpUtilsObj from './kbn_mock_idp_utils.devdocs.json';
diff --git a/api_docs/kbn_monaco.mdx b/api_docs/kbn_monaco.mdx
index 82bb8f512da6d..5ee479185a975 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: 2024-04-02
+date: 2024-04-03
 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 5e167afbbb4fb..6cf9121d5462b 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: 2024-04-02
+date: 2024-04-03
 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 f354086da59fd..02abf771620a5 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alert-details']
 ---
 import kbnObservabilityAlertDetailsObj from './kbn_observability_alert_details.devdocs.json';
diff --git a/api_docs/kbn_observability_alerting_test_data.mdx b/api_docs/kbn_observability_alerting_test_data.mdx
index 54f45a496b4d6..14027658002c5 100644
--- a/api_docs/kbn_observability_alerting_test_data.mdx
+++ b/api_docs/kbn_observability_alerting_test_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alerting-test-data
 title: "@kbn/observability-alerting-test-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alerting-test-data plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alerting-test-data']
 ---
 import kbnObservabilityAlertingTestDataObj from './kbn_observability_alerting_test_data.devdocs.json';
diff --git a/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx b/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
index ecde82e5f8823..6d5bb48193c56 100644
--- a/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
+++ b/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-get-padded-alert-time-range-util
 title: "@kbn/observability-get-padded-alert-time-range-util"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-get-padded-alert-time-range-util plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-get-padded-alert-time-range-util']
 ---
 import kbnObservabilityGetPaddedAlertTimeRangeUtilObj from './kbn_observability_get_padded_alert_time_range_util.devdocs.json';
diff --git a/api_docs/kbn_openapi_bundler.mdx b/api_docs/kbn_openapi_bundler.mdx
index 03233e6c74a42..15b8e3900410a 100644
--- a/api_docs/kbn_openapi_bundler.mdx
+++ b/api_docs/kbn_openapi_bundler.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-openapi-bundler
 title: "@kbn/openapi-bundler"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/openapi-bundler plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/openapi-bundler']
 ---
 import kbnOpenapiBundlerObj from './kbn_openapi_bundler.devdocs.json';
diff --git a/api_docs/kbn_openapi_generator.mdx b/api_docs/kbn_openapi_generator.mdx
index 448ce7adc05d0..60b96ace890c7 100644
--- a/api_docs/kbn_openapi_generator.mdx
+++ b/api_docs/kbn_openapi_generator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-openapi-generator
 title: "@kbn/openapi-generator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/openapi-generator plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/openapi-generator']
 ---
 import kbnOpenapiGeneratorObj from './kbn_openapi_generator.devdocs.json';
diff --git a/api_docs/kbn_optimizer.mdx b/api_docs/kbn_optimizer.mdx
index 4596ff03f344f..da0447c09e684 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: 2024-04-02
+date: 2024-04-03
 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 f02fae6bdb47b..1622d8043fdd4 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: 2024-04-02
+date: 2024-04-03
 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 a77eeb5e7a4c7..33ef36189ea33 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: 2024-04-02
+date: 2024-04-03
 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_panel_loader.mdx b/api_docs/kbn_panel_loader.mdx
index 913216f083529..a57943aea5431 100644
--- a/api_docs/kbn_panel_loader.mdx
+++ b/api_docs/kbn_panel_loader.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-panel-loader
 title: "@kbn/panel-loader"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/panel-loader plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/panel-loader']
 ---
 import kbnPanelLoaderObj from './kbn_panel_loader.devdocs.json';
diff --git a/api_docs/kbn_performance_testing_dataset_extractor.mdx b/api_docs/kbn_performance_testing_dataset_extractor.mdx
index 87fadce2b3b01..01beb618d082f 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: 2024-04-02
+date: 2024-04-03
 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_check.mdx b/api_docs/kbn_plugin_check.mdx
index 69ad8c806c4eb..3e9ec528ac9c3 100644
--- a/api_docs/kbn_plugin_check.mdx
+++ b/api_docs/kbn_plugin_check.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-check
 title: "@kbn/plugin-check"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-check plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-check']
 ---
 import kbnPluginCheckObj from './kbn_plugin_check.devdocs.json';
diff --git a/api_docs/kbn_plugin_generator.mdx b/api_docs/kbn_plugin_generator.mdx
index 04e16baf5a7d4..b7372ccbdd3ee 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: 2024-04-02
+date: 2024-04-03
 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 126717e6015ae..6c2984a6edc24 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-helpers']
 ---
 import kbnPluginHelpersObj from './kbn_plugin_helpers.devdocs.json';
diff --git a/api_docs/kbn_presentation_containers.mdx b/api_docs/kbn_presentation_containers.mdx
index fff6ffeb4c7c3..411d61840fc92 100644
--- a/api_docs/kbn_presentation_containers.mdx
+++ b/api_docs/kbn_presentation_containers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-presentation-containers
 title: "@kbn/presentation-containers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/presentation-containers plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/presentation-containers']
 ---
 import kbnPresentationContainersObj from './kbn_presentation_containers.devdocs.json';
diff --git a/api_docs/kbn_presentation_publishing.mdx b/api_docs/kbn_presentation_publishing.mdx
index 6532382c78090..2a7335a58dc24 100644
--- a/api_docs/kbn_presentation_publishing.mdx
+++ b/api_docs/kbn_presentation_publishing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-presentation-publishing
 title: "@kbn/presentation-publishing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/presentation-publishing plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/presentation-publishing']
 ---
 import kbnPresentationPublishingObj from './kbn_presentation_publishing.devdocs.json';
diff --git a/api_docs/kbn_profiling_utils.mdx b/api_docs/kbn_profiling_utils.mdx
index 4c400274d9028..0e0672952d3fe 100644
--- a/api_docs/kbn_profiling_utils.mdx
+++ b/api_docs/kbn_profiling_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-profiling-utils
 title: "@kbn/profiling-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/profiling-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/profiling-utils']
 ---
 import kbnProfilingUtilsObj from './kbn_profiling_utils.devdocs.json';
diff --git a/api_docs/kbn_random_sampling.mdx b/api_docs/kbn_random_sampling.mdx
index 5602b96c43c80..e1ff76d4664f0 100644
--- a/api_docs/kbn_random_sampling.mdx
+++ b/api_docs/kbn_random_sampling.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-random-sampling
 title: "@kbn/random-sampling"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/random-sampling plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/random-sampling']
 ---
 import kbnRandomSamplingObj from './kbn_random_sampling.devdocs.json';
diff --git a/api_docs/kbn_react_field.mdx b/api_docs/kbn_react_field.mdx
index a0ce16844256b..a28321806fd7a 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-field']
 ---
 import kbnReactFieldObj from './kbn_react_field.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_common.mdx b/api_docs/kbn_react_kibana_context_common.mdx
index a6343f11c862b..ec71d54cea5cd 100644
--- a/api_docs/kbn_react_kibana_context_common.mdx
+++ b/api_docs/kbn_react_kibana_context_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-common
 title: "@kbn/react-kibana-context-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-common']
 ---
 import kbnReactKibanaContextCommonObj from './kbn_react_kibana_context_common.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_render.mdx b/api_docs/kbn_react_kibana_context_render.mdx
index 4e0ae5db70eae..681950c2be621 100644
--- a/api_docs/kbn_react_kibana_context_render.mdx
+++ b/api_docs/kbn_react_kibana_context_render.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-render
 title: "@kbn/react-kibana-context-render"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-render plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-render']
 ---
 import kbnReactKibanaContextRenderObj from './kbn_react_kibana_context_render.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_root.mdx b/api_docs/kbn_react_kibana_context_root.mdx
index af49a4b63dc12..8c2450029d7c1 100644
--- a/api_docs/kbn_react_kibana_context_root.mdx
+++ b/api_docs/kbn_react_kibana_context_root.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-root
 title: "@kbn/react-kibana-context-root"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-root plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-root']
 ---
 import kbnReactKibanaContextRootObj from './kbn_react_kibana_context_root.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_styled.mdx b/api_docs/kbn_react_kibana_context_styled.mdx
index d36f9b0a84ba4..1ffbd222a2bdb 100644
--- a/api_docs/kbn_react_kibana_context_styled.mdx
+++ b/api_docs/kbn_react_kibana_context_styled.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-styled
 title: "@kbn/react-kibana-context-styled"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-styled plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-styled']
 ---
 import kbnReactKibanaContextStyledObj from './kbn_react_kibana_context_styled.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_theme.mdx b/api_docs/kbn_react_kibana_context_theme.mdx
index b21de9cb3c7bb..f5d01c977f837 100644
--- a/api_docs/kbn_react_kibana_context_theme.mdx
+++ b/api_docs/kbn_react_kibana_context_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-theme
 title: "@kbn/react-kibana-context-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-theme plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-theme']
 ---
 import kbnReactKibanaContextThemeObj from './kbn_react_kibana_context_theme.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_mount.mdx b/api_docs/kbn_react_kibana_mount.mdx
index 95e7df92e57ac..3b6e27316a68c 100644
--- a/api_docs/kbn_react_kibana_mount.mdx
+++ b/api_docs/kbn_react_kibana_mount.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-mount
 title: "@kbn/react-kibana-mount"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-mount plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-mount']
 ---
 import kbnReactKibanaMountObj from './kbn_react_kibana_mount.devdocs.json';
diff --git a/api_docs/kbn_repo_file_maps.mdx b/api_docs/kbn_repo_file_maps.mdx
index 2ea696afb9fcf..a0ba19e923569 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: 2024-04-02
+date: 2024-04-03
 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 6cdc8e048fd2f..1642eeabb47bb 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: 2024-04-02
+date: 2024-04-03
 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 086333d35a9d3..1447f6e4cf14d 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: 2024-04-02
+date: 2024-04-03
 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 c9637922522c7..fe200477bd185 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: 2024-04-02
+date: 2024-04-03
 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 f23a3e9830db5..8a192aa253d4a 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-common']
 ---
 import kbnReportingCommonObj from './kbn_reporting_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_csv.mdx b/api_docs/kbn_reporting_export_types_csv.mdx
index d45301324491c..c992dfcf9f8ba 100644
--- a/api_docs/kbn_reporting_export_types_csv.mdx
+++ b/api_docs/kbn_reporting_export_types_csv.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-csv
 title: "@kbn/reporting-export-types-csv"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-csv plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-csv']
 ---
 import kbnReportingExportTypesCsvObj from './kbn_reporting_export_types_csv.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_csv_common.mdx b/api_docs/kbn_reporting_export_types_csv_common.mdx
index c104a3bbf50fe..adfe69a19d3bc 100644
--- a/api_docs/kbn_reporting_export_types_csv_common.mdx
+++ b/api_docs/kbn_reporting_export_types_csv_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-csv-common
 title: "@kbn/reporting-export-types-csv-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-csv-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-csv-common']
 ---
 import kbnReportingExportTypesCsvCommonObj from './kbn_reporting_export_types_csv_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_pdf.mdx b/api_docs/kbn_reporting_export_types_pdf.mdx
index f80dd0a9233f4..74f3fff1921a3 100644
--- a/api_docs/kbn_reporting_export_types_pdf.mdx
+++ b/api_docs/kbn_reporting_export_types_pdf.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-pdf
 title: "@kbn/reporting-export-types-pdf"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-pdf plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-pdf']
 ---
 import kbnReportingExportTypesPdfObj from './kbn_reporting_export_types_pdf.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_pdf_common.mdx b/api_docs/kbn_reporting_export_types_pdf_common.mdx
index df0ea10d9faf8..d837854fcf7c0 100644
--- a/api_docs/kbn_reporting_export_types_pdf_common.mdx
+++ b/api_docs/kbn_reporting_export_types_pdf_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-pdf-common
 title: "@kbn/reporting-export-types-pdf-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-pdf-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-pdf-common']
 ---
 import kbnReportingExportTypesPdfCommonObj from './kbn_reporting_export_types_pdf_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_png.mdx b/api_docs/kbn_reporting_export_types_png.mdx
index 70a98797808dc..dc8b35106422e 100644
--- a/api_docs/kbn_reporting_export_types_png.mdx
+++ b/api_docs/kbn_reporting_export_types_png.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-png
 title: "@kbn/reporting-export-types-png"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-png plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-png']
 ---
 import kbnReportingExportTypesPngObj from './kbn_reporting_export_types_png.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_png_common.mdx b/api_docs/kbn_reporting_export_types_png_common.mdx
index 997b525b416cc..e01374c5e89b1 100644
--- a/api_docs/kbn_reporting_export_types_png_common.mdx
+++ b/api_docs/kbn_reporting_export_types_png_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-png-common
 title: "@kbn/reporting-export-types-png-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-png-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-png-common']
 ---
 import kbnReportingExportTypesPngCommonObj from './kbn_reporting_export_types_png_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_mocks_server.mdx b/api_docs/kbn_reporting_mocks_server.mdx
index be36f128c4db7..96ed178bfc1bd 100644
--- a/api_docs/kbn_reporting_mocks_server.mdx
+++ b/api_docs/kbn_reporting_mocks_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-mocks-server
 title: "@kbn/reporting-mocks-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-mocks-server plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-mocks-server']
 ---
 import kbnReportingMocksServerObj from './kbn_reporting_mocks_server.devdocs.json';
diff --git a/api_docs/kbn_reporting_public.mdx b/api_docs/kbn_reporting_public.mdx
index 110925c133e7a..d75b8c2b68b7c 100644
--- a/api_docs/kbn_reporting_public.mdx
+++ b/api_docs/kbn_reporting_public.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-public
 title: "@kbn/reporting-public"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-public plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-public']
 ---
 import kbnReportingPublicObj from './kbn_reporting_public.devdocs.json';
diff --git a/api_docs/kbn_reporting_server.mdx b/api_docs/kbn_reporting_server.mdx
index ce284d7515560..dce9214ebfec3 100644
--- a/api_docs/kbn_reporting_server.mdx
+++ b/api_docs/kbn_reporting_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-server
 title: "@kbn/reporting-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-server plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-server']
 ---
 import kbnReportingServerObj from './kbn_reporting_server.devdocs.json';
diff --git a/api_docs/kbn_resizable_layout.mdx b/api_docs/kbn_resizable_layout.mdx
index 8a6a2fcc21766..a846c683113bb 100644
--- a/api_docs/kbn_resizable_layout.mdx
+++ b/api_docs/kbn_resizable_layout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-resizable-layout
 title: "@kbn/resizable-layout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/resizable-layout plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/resizable-layout']
 ---
 import kbnResizableLayoutObj from './kbn_resizable_layout.devdocs.json';
diff --git a/api_docs/kbn_rison.mdx b/api_docs/kbn_rison.mdx
index f8ab843a68f21..ffe74698962fd 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rison']
 ---
 import kbnRisonObj from './kbn_rison.devdocs.json';
diff --git a/api_docs/kbn_router_utils.devdocs.json b/api_docs/kbn_router_utils.devdocs.json
index a0649c6bc1ea3..da95c94131258 100644
--- a/api_docs/kbn_router_utils.devdocs.json
+++ b/api_docs/kbn_router_utils.devdocs.json
@@ -29,7 +29,8 @@
           "\n\ngetRouterLinkProps is an util that enable HTML elements, such buttons, to\nbehave as links."
         ],
         "signature": [
-          "({ href, onClick }: GetRouterLinkPropsDeps) => { href: string | undefined; onClick: (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => void; }"
+          "({ href, onClick }: GetRouterLinkPropsDeps) => ",
+          "RouterLinkProps"
         ],
         "path": "packages/kbn-router-utils/src/get_router_link_props/index.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_router_utils.mdx b/api_docs/kbn_router_utils.mdx
index 1de0be79028f9..372cf6654e955 100644
--- a/api_docs/kbn_router_utils.mdx
+++ b/api_docs/kbn_router_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-router-utils
 title: "@kbn/router-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/router-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/router-utils']
 ---
 import kbnRouterUtilsObj from './kbn_router_utils.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 2 | 0 | 1 | 0 |
+| 2 | 0 | 1 | 1 |
 
 ## Common
 
diff --git a/api_docs/kbn_rrule.devdocs.json b/api_docs/kbn_rrule.devdocs.json
index a2359c9a4e56a..849f4cc2f8ff7 100644
--- a/api_docs/kbn_rrule.devdocs.json
+++ b/api_docs/kbn_rrule.devdocs.json
@@ -245,7 +245,7 @@
         "label": "ConstructorOptions",
         "description": [],
         "signature": [
-          "Omit<Options, \"byweekday\" | \"wkst\"> & { byweekday?: (string | number)[] | null | undefined; wkst?: number | \"MO\" | \"TU\" | \"WE\" | \"TH\" | \"FR\" | \"SA\" | \"SU\" | null | undefined; }"
+          "Omit<Options, \"wkst\" | \"byweekday\"> & { byweekday?: (string | number)[] | null | undefined; wkst?: number | \"MO\" | \"TU\" | \"WE\" | \"TH\" | \"FR\" | \"SA\" | \"SU\" | null | undefined; }"
         ],
         "path": "packages/kbn-rrule/rrule.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_rrule.mdx b/api_docs/kbn_rrule.mdx
index 74cf987b2e0c3..6ffbabfe3a222 100644
--- a/api_docs/kbn_rrule.mdx
+++ b/api_docs/kbn_rrule.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rrule
 title: "@kbn/rrule"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rrule plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rrule']
 ---
 import kbnRruleObj from './kbn_rrule.devdocs.json';
diff --git a/api_docs/kbn_rule_data_utils.devdocs.json b/api_docs/kbn_rule_data_utils.devdocs.json
index 80797716b4af1..d1301871aaec5 100644
--- a/api_docs/kbn_rule_data_utils.devdocs.json
+++ b/api_docs/kbn_rule_data_utils.devdocs.json
@@ -1504,7 +1504,7 @@
         "label": "AlertStatus",
         "description": [],
         "signature": [
-          "\"recovered\" | \"active\" | \"untracked\""
+          "\"active\" | \"recovered\" | \"untracked\""
         ],
         "path": "packages/kbn-rule-data-utils/src/alerts_as_data_status.ts",
         "deprecated": false,
@@ -1699,7 +1699,7 @@
         "label": "RuleCreationValidConsumer",
         "description": [],
         "signature": [
-          "\"observability\" | \"stackAlerts\" | \"alerts\" | \"logs\" | \"infrastructure\""
+          "\"alerts\" | \"observability\" | \"stackAlerts\" | \"logs\" | \"infrastructure\""
         ],
         "path": "packages/kbn-rule-data-utils/src/rule_types/index.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_rule_data_utils.mdx b/api_docs/kbn_rule_data_utils.mdx
index 7927cd09a380f..0d15de2ee8bf4 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: 2024-04-02
+date: 2024-04-03
 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 37c8a4eaabea1..e40357e947404 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/saved-objects-settings']
 ---
 import kbnSavedObjectsSettingsObj from './kbn_saved_objects_settings.devdocs.json';
diff --git a/api_docs/kbn_search_api_panels.mdx b/api_docs/kbn_search_api_panels.mdx
index 3afc13a3036f1..76593324b16ed 100644
--- a/api_docs/kbn_search_api_panels.mdx
+++ b/api_docs/kbn_search_api_panels.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-api-panels
 title: "@kbn/search-api-panels"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-api-panels plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-api-panels']
 ---
 import kbnSearchApiPanelsObj from './kbn_search_api_panels.devdocs.json';
diff --git a/api_docs/kbn_search_connectors.mdx b/api_docs/kbn_search_connectors.mdx
index 0843af0b3c71a..8a777aa1fa0e5 100644
--- a/api_docs/kbn_search_connectors.mdx
+++ b/api_docs/kbn_search_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-connectors
 title: "@kbn/search-connectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-connectors plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-connectors']
 ---
 import kbnSearchConnectorsObj from './kbn_search_connectors.devdocs.json';
diff --git a/api_docs/kbn_search_errors.mdx b/api_docs/kbn_search_errors.mdx
index e5dbdf656a05a..e7528f2376423 100644
--- a/api_docs/kbn_search_errors.mdx
+++ b/api_docs/kbn_search_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-errors
 title: "@kbn/search-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-errors plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-errors']
 ---
 import kbnSearchErrorsObj from './kbn_search_errors.devdocs.json';
diff --git a/api_docs/kbn_search_index_documents.mdx b/api_docs/kbn_search_index_documents.mdx
index 4d9a6602950bb..7563b2ef24508 100644
--- a/api_docs/kbn_search_index_documents.mdx
+++ b/api_docs/kbn_search_index_documents.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-index-documents
 title: "@kbn/search-index-documents"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-index-documents plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-index-documents']
 ---
 import kbnSearchIndexDocumentsObj from './kbn_search_index_documents.devdocs.json';
diff --git a/api_docs/kbn_search_response_warnings.mdx b/api_docs/kbn_search_response_warnings.mdx
index e596aa3053f45..75ed7cd43ad79 100644
--- a/api_docs/kbn_search_response_warnings.mdx
+++ b/api_docs/kbn_search_response_warnings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-response-warnings
 title: "@kbn/search-response-warnings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-response-warnings plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-response-warnings']
 ---
 import kbnSearchResponseWarningsObj from './kbn_search_response_warnings.devdocs.json';
diff --git a/api_docs/kbn_security_hardening.mdx b/api_docs/kbn_security_hardening.mdx
index f50608af21b8e..3bbddef313b84 100644
--- a/api_docs/kbn_security_hardening.mdx
+++ b/api_docs/kbn_security_hardening.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-hardening
 title: "@kbn/security-hardening"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-hardening plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-hardening']
 ---
 import kbnSecurityHardeningObj from './kbn_security_hardening.devdocs.json';
diff --git a/api_docs/kbn_security_plugin_types_common.mdx b/api_docs/kbn_security_plugin_types_common.mdx
index b2e3d56688a48..9823b6909f77a 100644
--- a/api_docs/kbn_security_plugin_types_common.mdx
+++ b/api_docs/kbn_security_plugin_types_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-common
 title: "@kbn/security-plugin-types-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-common plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-common']
 ---
 import kbnSecurityPluginTypesCommonObj from './kbn_security_plugin_types_common.devdocs.json';
diff --git a/api_docs/kbn_security_plugin_types_public.devdocs.json b/api_docs/kbn_security_plugin_types_public.devdocs.json
index 19e33e7db0b0f..7b1340e3d43d9 100644
--- a/api_docs/kbn_security_plugin_types_public.devdocs.json
+++ b/api_docs/kbn_security_plugin_types_public.devdocs.json
@@ -566,6 +566,40 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-public",
+            "id": "def-public.UserProfileAPIClient.userProfileLoaded$",
+            "type": "Object",
+            "tags": [],
+            "label": "userProfileLoaded$",
+            "description": [
+              "\nIndicates if the user profile data has been loaded from the server.\nUseful to distinguish between the case when the user profile data is `null` because the HTTP\nrequest has not finished or because there is no user profile data for the current user."
+            ],
+            "signature": [
+              "Observable",
+              "<boolean>"
+            ],
+            "path": "x-pack/packages/security/plugin_types_public/src/user_profile/user_profile_api_client.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-public",
+            "id": "def-public.UserProfileAPIClient.enabled$",
+            "type": "Object",
+            "tags": [],
+            "label": "enabled$",
+            "description": [
+              "Flag to indicate if the current user has a user profile. Anonymous users don't have user profiles."
+            ],
+            "signature": [
+              "Observable",
+              "<boolean>"
+            ],
+            "path": "x-pack/packages/security/plugin_types_public/src/user_profile/user_profile_api_client.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "@kbn/security-plugin-types-public",
             "id": "def-public.UserProfileAPIClient.getCurrent",
@@ -825,6 +859,50 @@
               }
             ],
             "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-public",
+            "id": "def-public.UserProfileAPIClient.partialUpdate",
+            "type": "Function",
+            "tags": [],
+            "label": "partialUpdate",
+            "description": [
+              "\nPartially updates user profile data of the current user, merging the previous data with the provided data."
+            ],
+            "signature": [
+              "<D extends Partial<",
+              {
+                "pluginId": "@kbn/security-plugin-types-common",
+                "scope": "common",
+                "docId": "kibKbnSecurityPluginTypesCommonPluginApi",
+                "section": "def-common.UserProfileData",
+                "text": "UserProfileData"
+              },
+              ">>(data: D) => Promise<void>"
+            ],
+            "path": "x-pack/packages/security/plugin_types_public/src/user_profile/user_profile_api_client.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-public",
+                "id": "def-public.UserProfileAPIClient.partialUpdate.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "data",
+                "description": [
+                  "Application data to be merged with existing data."
+                ],
+                "signature": [
+                  "D"
+                ],
+                "path": "x-pack/packages/security/plugin_types_public/src/user_profile/user_profile_api_client.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/kbn_security_plugin_types_public.mdx b/api_docs/kbn_security_plugin_types_public.mdx
index ca0358a1a0c60..e02ed095402f6 100644
--- a/api_docs/kbn_security_plugin_types_public.mdx
+++ b/api_docs/kbn_security_plugin_types_public.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-public
 title: "@kbn/security-plugin-types-public"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-public plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-public']
 ---
 import kbnSecurityPluginTypesPublicObj from './kbn_security_plugin_types_public.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 49 | 0 | 15 | 0 |
+| 53 | 0 | 15 | 0 |
 
 ## Client
 
diff --git a/api_docs/kbn_security_plugin_types_server.mdx b/api_docs/kbn_security_plugin_types_server.mdx
index 01a6cf2bdcf60..092976064b04a 100644
--- a/api_docs/kbn_security_plugin_types_server.mdx
+++ b/api_docs/kbn_security_plugin_types_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-server
 title: "@kbn/security-plugin-types-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-server plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-server']
 ---
 import kbnSecurityPluginTypesServerObj from './kbn_security_plugin_types_server.devdocs.json';
diff --git a/api_docs/kbn_security_solution_features.mdx b/api_docs/kbn_security_solution_features.mdx
index 13edf258d5274..fb8d9e9eeefa3 100644
--- a/api_docs/kbn_security_solution_features.mdx
+++ b/api_docs/kbn_security_solution_features.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-features
 title: "@kbn/security-solution-features"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-features plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-features']
 ---
 import kbnSecuritySolutionFeaturesObj from './kbn_security_solution_features.devdocs.json';
diff --git a/api_docs/kbn_security_solution_navigation.mdx b/api_docs/kbn_security_solution_navigation.mdx
index 54994728f3fad..4a39104af875f 100644
--- a/api_docs/kbn_security_solution_navigation.mdx
+++ b/api_docs/kbn_security_solution_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-navigation
 title: "@kbn/security-solution-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-navigation plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-navigation']
 ---
 import kbnSecuritySolutionNavigationObj from './kbn_security_solution_navigation.devdocs.json';
diff --git a/api_docs/kbn_security_solution_side_nav.mdx b/api_docs/kbn_security_solution_side_nav.mdx
index c8448b166e65c..c022e2e8c67c3 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: 2024-04-02
+date: 2024-04-03
 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 543e9d4735c09..ccf37f34117cf 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: 2024-04-02
+date: 2024-04-03
 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 4ee8ec10ff6a6..9debccba0900b 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: 2024-04-02
+date: 2024-04-03
 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 d61774060998e..007e76dd28cd0 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: 2024-04-02
+date: 2024-04-03
 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 125b22ccc9e88..fb0dcdbf107a2 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: 2024-04-02
+date: 2024-04-03
 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 9af72bada8f52..97502430a3334 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: 2024-04-02
+date: 2024-04-03
 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.devdocs.json b/api_docs/kbn_securitysolution_exception_list_components.devdocs.json
index 2d9cb944dcb77..83db384190940 100644
--- a/api_docs/kbn_securitysolution_exception_list_components.devdocs.json
+++ b/api_docs/kbn_securitysolution_exception_list_components.devdocs.json
@@ -851,7 +851,7 @@
             "label": "formattedDateComponent",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"desc\" | \"filter\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"meta\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"canvas\" | \"svg\" | \"select\" | \"output\" | \"view\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\""
+              "\"symbol\" | \"object\" | \"source\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"desc\" | \"filter\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"meta\" | \"summary\" | \"data\" | \"pattern\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"canvas\" | \"svg\" | \"select\" | \"output\" | \"view\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/index.tsx",
             "deprecated": false,
@@ -865,7 +865,7 @@
             "label": "securityLinkAnchorComponent",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"desc\" | \"filter\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"meta\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"canvas\" | \"svg\" | \"select\" | \"output\" | \"view\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\""
+              "\"symbol\" | \"object\" | \"source\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"desc\" | \"filter\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"meta\" | \"summary\" | \"data\" | \"pattern\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"canvas\" | \"svg\" | \"select\" | \"output\" | \"view\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/index.tsx",
             "deprecated": false,
@@ -1004,7 +1004,7 @@
             "label": "securityLinkAnchorComponent",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"desc\" | \"filter\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"meta\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"canvas\" | \"svg\" | \"select\" | \"output\" | \"view\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\""
+              "\"symbol\" | \"object\" | \"source\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"desc\" | \"filter\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"meta\" | \"summary\" | \"data\" | \"pattern\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"canvas\" | \"svg\" | \"select\" | \"output\" | \"view\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx",
             "deprecated": false,
@@ -1018,7 +1018,7 @@
             "label": "formattedDateComponent",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"desc\" | \"filter\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"meta\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"canvas\" | \"svg\" | \"select\" | \"output\" | \"view\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\""
+              "\"symbol\" | \"object\" | \"source\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"desc\" | \"filter\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"meta\" | \"summary\" | \"data\" | \"pattern\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"canvas\" | \"svg\" | \"select\" | \"output\" | \"view\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx",
             "deprecated": false,
diff --git a/api_docs/kbn_securitysolution_exception_list_components.mdx b/api_docs/kbn_securitysolution_exception_list_components.mdx
index f848a2accd53b..cbd79c710703b 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: 2024-04-02
+date: 2024-04-03
 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 0553103f321e3..5acf371796207 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: 2024-04-02
+date: 2024-04-03
 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 db3f552244617..cd2b7ce47ab6c 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: 2024-04-02
+date: 2024-04-03
 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 114108e2323ce..4079e55bea3d5 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: 2024-04-02
+date: 2024-04-03
 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 516b9721493a5..c1a2d7a2b0162 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: 2024-04-02
+date: 2024-04-03
 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 8b3cea7f34fcb..ea12a9bae9444 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: 2024-04-02
+date: 2024-04-03
 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 84230567ddfaa..b08fb7be907e9 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: 2024-04-02
+date: 2024-04-03
 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 a663d8dbc96f0..e5be5bf315fc3 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: 2024-04-02
+date: 2024-04-03
 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 b95a38657119b..4af684c88ae4a 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: 2024-04-02
+date: 2024-04-03
 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 6ea474048ece1..eac630941696c 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: 2024-04-02
+date: 2024-04-03
 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 8e4e78ee49449..418d268c7fef2 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: 2024-04-02
+date: 2024-04-03
 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 d83903c99d5fd..d723674abe685 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: 2024-04-02
+date: 2024-04-03
 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 13ae7af46dc46..c28baa35cffba 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: 2024-04-02
+date: 2024-04-03
 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 079b40038a949..55957c13e87d5 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: 2024-04-02
+date: 2024-04-03
 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 5c65739857307..4709f481cf0fb 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: 2024-04-02
+date: 2024-04-03
 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 ad3805505e259..d2c0fd9f49156 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository']
 ---
 import kbnServerRouteRepositoryObj from './kbn_server_route_repository.devdocs.json';
diff --git a/api_docs/kbn_serverless_common_settings.mdx b/api_docs/kbn_serverless_common_settings.mdx
index 288d99c7dbe97..454d740b7c47f 100644
--- a/api_docs/kbn_serverless_common_settings.mdx
+++ b/api_docs/kbn_serverless_common_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-common-settings
 title: "@kbn/serverless-common-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-common-settings plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-common-settings']
 ---
 import kbnServerlessCommonSettingsObj from './kbn_serverless_common_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_observability_settings.mdx b/api_docs/kbn_serverless_observability_settings.mdx
index e641e18b44cc7..13edcdd227998 100644
--- a/api_docs/kbn_serverless_observability_settings.mdx
+++ b/api_docs/kbn_serverless_observability_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-observability-settings
 title: "@kbn/serverless-observability-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-observability-settings plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-observability-settings']
 ---
 import kbnServerlessObservabilitySettingsObj from './kbn_serverless_observability_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_project_switcher.mdx b/api_docs/kbn_serverless_project_switcher.mdx
index 968c3b188defc..b3a43648ca3f9 100644
--- a/api_docs/kbn_serverless_project_switcher.mdx
+++ b/api_docs/kbn_serverless_project_switcher.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-project-switcher
 title: "@kbn/serverless-project-switcher"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-project-switcher plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-project-switcher']
 ---
 import kbnServerlessProjectSwitcherObj from './kbn_serverless_project_switcher.devdocs.json';
diff --git a/api_docs/kbn_serverless_search_settings.mdx b/api_docs/kbn_serverless_search_settings.mdx
index 03f9b29dd06fe..80f8197b6bb3b 100644
--- a/api_docs/kbn_serverless_search_settings.mdx
+++ b/api_docs/kbn_serverless_search_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-search-settings
 title: "@kbn/serverless-search-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-search-settings plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-search-settings']
 ---
 import kbnServerlessSearchSettingsObj from './kbn_serverless_search_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_security_settings.mdx b/api_docs/kbn_serverless_security_settings.mdx
index 1a10d69a58b40..e578341f0935d 100644
--- a/api_docs/kbn_serverless_security_settings.mdx
+++ b/api_docs/kbn_serverless_security_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-security-settings
 title: "@kbn/serverless-security-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-security-settings plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-security-settings']
 ---
 import kbnServerlessSecuritySettingsObj from './kbn_serverless_security_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_storybook_config.mdx b/api_docs/kbn_serverless_storybook_config.mdx
index f13b13f950f56..aeb078aa1ec7d 100644
--- a/api_docs/kbn_serverless_storybook_config.mdx
+++ b/api_docs/kbn_serverless_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-storybook-config
 title: "@kbn/serverless-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-storybook-config plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-storybook-config']
 ---
 import kbnServerlessStorybookConfigObj from './kbn_serverless_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_shared_svg.mdx b/api_docs/kbn_shared_svg.mdx
index e996bd19a02c3..e1b478b7e62e7 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: 2024-04-02
+date: 2024-04-03
 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 0898e469705e5..47c645b37552b 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: 2024-04-02
+date: 2024-04-03
 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_button_exit_full_screen.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
index 63433ad9fb135..2ca5ad8ef8d69 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: 2024-04-02
+date: 2024-04-03
 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_toolbar.mdx b/api_docs/kbn_shared_ux_button_toolbar.mdx
index 7b9ef77a7d420..1013618a9cd4b 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: 2024-04-02
+date: 2024-04-03
 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 c49bbfdffeecc..85802ad7d0175 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: 2024-04-02
+date: 2024-04-03
 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 1fb664693ca42..f31d67f1d8355 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: 2024-04-02
+date: 2024-04-03
 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_chrome_navigation.mdx b/api_docs/kbn_shared_ux_chrome_navigation.mdx
index a76bb2809299d..ce555fd47de6a 100644
--- a/api_docs/kbn_shared_ux_chrome_navigation.mdx
+++ b/api_docs/kbn_shared_ux_chrome_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-chrome-navigation
 title: "@kbn/shared-ux-chrome-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-chrome-navigation plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-chrome-navigation']
 ---
 import kbnSharedUxChromeNavigationObj from './kbn_shared_ux_chrome_navigation.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_error_boundary.mdx b/api_docs/kbn_shared_ux_error_boundary.mdx
index 7af62e4966a69..ac96c2f646318 100644
--- a/api_docs/kbn_shared_ux_error_boundary.mdx
+++ b/api_docs/kbn_shared_ux_error_boundary.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-error-boundary
 title: "@kbn/shared-ux-error-boundary"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-error-boundary plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-error-boundary']
 ---
 import kbnSharedUxErrorBoundaryObj from './kbn_shared_ux_error_boundary.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_context.mdx b/api_docs/kbn_shared_ux_file_context.mdx
index c4cc138480627..a42feff719e71 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: 2024-04-02
+date: 2024-04-03
 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 bf6db16aed3f6..dba5102a87de9 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: 2024-04-02
+date: 2024-04-03
 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 96642c9c5cd70..0eae9b40b0223 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: 2024-04-02
+date: 2024-04-03
 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 93aa8353ab9db..b6761d1d4c1c3 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: 2024-04-02
+date: 2024-04-03
 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 62fb9e17ed72e..11035bc844ac8 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: 2024-04-02
+date: 2024-04-03
 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 6ead15a8dd872..d38cf76c0c567 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: 2024-04-02
+date: 2024-04-03
 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 e606abb757165..1e578f8cc4f20 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: 2024-04-02
+date: 2024-04-03
 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 4d7ebc7109d9c..bdc8ef963bcd2 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: 2024-04-02
+date: 2024-04-03
 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 c871d3df3e0c3..3df53f9aa1ae7 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: 2024-04-02
+date: 2024-04-03
 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 1d3bbac6939c1..5568c04d80b60 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: 2024-04-02
+date: 2024-04-03
 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 d6a65907773ed..9eba9835c9ced 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: 2024-04-02
+date: 2024-04-03
 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 5588cc51f7e50..43ae95ac4cea1 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: 2024-04-02
+date: 2024-04-03
 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 57ce5a4e2323a..1fa1702f7baed 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: 2024-04-02
+date: 2024-04-03
 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 2bd10f862ef2f..86220186e80f2 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: 2024-04-02
+date: 2024-04-03
 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 0c9844366fe6f..d1994d7f870dc 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: 2024-04-02
+date: 2024-04-03
 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 59b2583c69566..f0279eb18b6c1 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: 2024-04-02
+date: 2024-04-03
 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.devdocs.json b/api_docs/kbn_shared_ux_page_kibana_template.devdocs.json
index e5bf93d4d3631..820d84a381486 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template.devdocs.json
+++ b/api_docs/kbn_shared_ux_page_kibana_template.devdocs.json
@@ -181,7 +181,7 @@
           "CommonProps",
           " & React.HTMLAttributes<HTMLElement>) | undefined; component?: ",
           "ComponentTypes",
-          " | undefined; } & { isEmptyState?: boolean | undefined; solutionNav?: ",
+          " | undefined; } & { isEmptyState?: boolean | undefined; emptyPageBody?: React.ReactNode; solutionNav?: ",
           {
             "pluginId": "@kbn/shared-ux-page-solution-nav",
             "scope": "common",
diff --git a/api_docs/kbn_shared_ux_page_kibana_template.mdx b/api_docs/kbn_shared_ux_page_kibana_template.mdx
index 5eb9e64b760e1..950275224b27c 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: 2024-04-02
+date: 2024-04-03
 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 d440f62ddf3d7..52b140e76a3dc 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: 2024-04-02
+date: 2024-04-03
 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 3c20b5e057feb..cd076b098d752 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: 2024-04-02
+date: 2024-04-03
 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 7beb459daa2b2..3dd14effb4ad8 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: 2024-04-02
+date: 2024-04-03
 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 75714bcab715e..9f5365a26686f 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: 2024-04-02
+date: 2024-04-03
 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 a6b7973622eb8..e77e71ea99689 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: 2024-04-02
+date: 2024-04-03
 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 de3ecc53bc073..1ab8e57efb72d 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: 2024-04-02
+date: 2024-04-03
 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 f10462cb10dec..7a501955ebec8 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: 2024-04-02
+date: 2024-04-03
 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 f3fcd52a19927..f1b4ceaa463a7 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: 2024-04-02
+date: 2024-04-03
 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 f3e0ba1ecbc84..2dec0c51dcbd8 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: 2024-04-02
+date: 2024-04-03
 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 4699317cad4f4..b4426b7fad563 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: 2024-04-02
+date: 2024-04-03
 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 02701f3b79b18..4be815a89f87c 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: 2024-04-02
+date: 2024-04-03
 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 b05546c3b9d22..1cc6903ae7f51 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: 2024-04-02
+date: 2024-04-03
 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 0c7f2323639b5..acc6a5b6a9a3a 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: 2024-04-02
+date: 2024-04-03
 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 372a5823dff3c..e0d757af31ac8 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: 2024-04-02
+date: 2024-04-03
 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 6237a7baea8ea..0922b9a011a4a 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/slo-schema']
 ---
 import kbnSloSchemaObj from './kbn_slo_schema.devdocs.json';
diff --git a/api_docs/kbn_solution_nav_es.mdx b/api_docs/kbn_solution_nav_es.mdx
index 8a9e503c7da76..a21b9c6d990a2 100644
--- a/api_docs/kbn_solution_nav_es.mdx
+++ b/api_docs/kbn_solution_nav_es.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-solution-nav-es
 title: "@kbn/solution-nav-es"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/solution-nav-es plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/solution-nav-es']
 ---
 import kbnSolutionNavEsObj from './kbn_solution_nav_es.devdocs.json';
diff --git a/api_docs/kbn_solution_nav_oblt.mdx b/api_docs/kbn_solution_nav_oblt.mdx
index 76bec16d0178e..ceaaad44d8a91 100644
--- a/api_docs/kbn_solution_nav_oblt.mdx
+++ b/api_docs/kbn_solution_nav_oblt.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-solution-nav-oblt
 title: "@kbn/solution-nav-oblt"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/solution-nav-oblt plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/solution-nav-oblt']
 ---
 import kbnSolutionNavObltObj from './kbn_solution_nav_oblt.devdocs.json';
diff --git a/api_docs/kbn_some_dev_log.mdx b/api_docs/kbn_some_dev_log.mdx
index 381516ba9b141..bb0b9443f6d48 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/some-dev-log']
 ---
 import kbnSomeDevLogObj from './kbn_some_dev_log.devdocs.json';
diff --git a/api_docs/kbn_sort_predicates.mdx b/api_docs/kbn_sort_predicates.mdx
index 3cc21d68f6727..0f3f4ba349699 100644
--- a/api_docs/kbn_sort_predicates.mdx
+++ b/api_docs/kbn_sort_predicates.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-sort-predicates
 title: "@kbn/sort-predicates"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/sort-predicates plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/sort-predicates']
 ---
 import kbnSortPredicatesObj from './kbn_sort_predicates.devdocs.json';
diff --git a/api_docs/kbn_std.mdx b/api_docs/kbn_std.mdx
index 3c0513fb02a97..431d31913b598 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: 2024-04-02
+date: 2024-04-03
 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 7d73f384f8290..84fdf25464b21 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: 2024-04-02
+date: 2024-04-03
 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 78a182852b0d1..82621f82dcafe 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: 2024-04-02
+date: 2024-04-03
 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 1e1ca8754fe6a..18620fba6fbad 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/telemetry-tools']
 ---
 import kbnTelemetryToolsObj from './kbn_telemetry_tools.devdocs.json';
diff --git a/api_docs/kbn_test.devdocs.json b/api_docs/kbn_test.devdocs.json
index 7e272241534db..4d6eede1c4d9a 100644
--- a/api_docs/kbn_test.devdocs.json
+++ b/api_docs/kbn_test.devdocs.json
@@ -3303,7 +3303,7 @@
             "signature": [
               "Pick<",
               "ServerlessOptions",
-              ", \"host\" | \"tag\" | \"image\" | \"resources\" | \"kibanaUrl\" | \"projectType\"> | undefined"
+              ", \"host\" | \"tag\" | \"image\" | \"dataPath\" | \"resources\" | \"kibanaUrl\" | \"projectType\"> | undefined"
             ],
             "path": "packages/kbn-test/src/es/test_es_cluster.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_test.mdx b/api_docs/kbn_test.mdx
index 847f5198b4ebb..74408a0e1fc27 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test']
 ---
 import kbnTestObj from './kbn_test.devdocs.json';
diff --git a/api_docs/kbn_test_eui_helpers.mdx b/api_docs/kbn_test_eui_helpers.mdx
index d1e0edda9f334..1aecf2a18531c 100644
--- a/api_docs/kbn_test_eui_helpers.mdx
+++ b/api_docs/kbn_test_eui_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-eui-helpers
 title: "@kbn/test-eui-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-eui-helpers plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-eui-helpers']
 ---
 import kbnTestEuiHelpersObj from './kbn_test_eui_helpers.devdocs.json';
diff --git a/api_docs/kbn_test_jest_helpers.mdx b/api_docs/kbn_test_jest_helpers.mdx
index 92a2ef35baaf7..5a302d1b6bba8 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: 2024-04-02
+date: 2024-04-03
 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 801a226ac8eb8..98b7d9577d4fd 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-subj-selector']
 ---
 import kbnTestSubjSelectorObj from './kbn_test_subj_selector.devdocs.json';
diff --git a/api_docs/kbn_text_based_editor.mdx b/api_docs/kbn_text_based_editor.mdx
index 48126d4cb3a46..39ba0f0340423 100644
--- a/api_docs/kbn_text_based_editor.mdx
+++ b/api_docs/kbn_text_based_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-text-based-editor
 title: "@kbn/text-based-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/text-based-editor plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/text-based-editor']
 ---
 import kbnTextBasedEditorObj from './kbn_text_based_editor.devdocs.json';
diff --git a/api_docs/kbn_timerange.mdx b/api_docs/kbn_timerange.mdx
index 892d6ef93d294..4dc90803a9091 100644
--- a/api_docs/kbn_timerange.mdx
+++ b/api_docs/kbn_timerange.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-timerange
 title: "@kbn/timerange"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/timerange plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/timerange']
 ---
 import kbnTimerangeObj from './kbn_timerange.devdocs.json';
diff --git a/api_docs/kbn_tooling_log.mdx b/api_docs/kbn_tooling_log.mdx
index 994f1d60383da..e92d87509024a 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/tooling-log']
 ---
 import kbnToolingLogObj from './kbn_tooling_log.devdocs.json';
diff --git a/api_docs/kbn_triggers_actions_ui_types.mdx b/api_docs/kbn_triggers_actions_ui_types.mdx
index c0305e6fa6503..e57c08339caaf 100644
--- a/api_docs/kbn_triggers_actions_ui_types.mdx
+++ b/api_docs/kbn_triggers_actions_ui_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-triggers-actions-ui-types
 title: "@kbn/triggers-actions-ui-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/triggers-actions-ui-types plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/triggers-actions-ui-types']
 ---
 import kbnTriggersActionsUiTypesObj from './kbn_triggers_actions_ui_types.devdocs.json';
diff --git a/api_docs/kbn_ts_projects.mdx b/api_docs/kbn_ts_projects.mdx
index fa6080a60d37c..2e1464336dffb 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: 2024-04-02
+date: 2024-04-03
 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 50ff0ffeb735d..d57ba5766be00 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: 2024-04-02
+date: 2024-04-03
 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 d25376203d276..a166918f8696b 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: 2024-04-02
+date: 2024-04-03
 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.devdocs.json b/api_docs/kbn_ui_shared_deps_src.devdocs.json
index 28d0d05e41462..c7fe4c7b741d3 100644
--- a/api_docs/kbn_ui_shared_deps_src.devdocs.json
+++ b/api_docs/kbn_ui_shared_deps_src.devdocs.json
@@ -355,17 +355,6 @@
             "deprecated": false,
             "trackAdoption": false
           },
-          {
-            "parentPluginId": "@kbn/ui-shared-deps-src",
-            "id": "def-common.externals.rxjsoperators",
-            "type": "string",
-            "tags": [],
-            "label": "'rxjs/operators'",
-            "description": [],
-            "path": "packages/kbn-ui-shared-deps-src/src/definitions.js",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "@kbn/ui-shared-deps-src",
             "id": "def-common.externals.numeral",
diff --git a/api_docs/kbn_ui_shared_deps_src.mdx b/api_docs/kbn_ui_shared_deps_src.mdx
index a6bd3bcdbd6e4..ddb84ca0f1407 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-shared-deps-src']
 ---
 import kbnUiSharedDepsSrcObj from './kbn_ui_shared_deps_src.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kiban
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 55 | 0 | 46 | 0 |
+| 54 | 0 | 45 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_ui_theme.mdx b/api_docs/kbn_ui_theme.mdx
index 4b8abcb145176..acfec5ad73e89 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-theme']
 ---
 import kbnUiThemeObj from './kbn_ui_theme.devdocs.json';
diff --git a/api_docs/kbn_unified_data_table.devdocs.json b/api_docs/kbn_unified_data_table.devdocs.json
index a87e9745d8c07..29cec239e12b3 100644
--- a/api_docs/kbn_unified_data_table.devdocs.json
+++ b/api_docs/kbn_unified_data_table.devdocs.json
@@ -418,7 +418,7 @@
         "label": "UnifiedDataTable",
         "description": [],
         "signature": [
-          "({ ariaLabelledBy, columns, columnsMeta, showColumnTokens, configHeaderRowHeight, headerRowHeightState, onUpdateHeaderRowHeight, controlColumnIds, dataView, loadingState, onFilter, onResize, onSetColumns, onSort, rows, searchDescription, searchTitle, settings, showTimeCol, showFullScreenButton, sort, useNewFieldsApi, isSortEnabled, isPaginationEnabled, cellActionsTriggerId, className, rowHeightState, onUpdateRowHeight, maxAllowedSampleSize, sampleSizeState, onUpdateSampleSize, isPlainRecord, rowsPerPageState, onUpdateRowsPerPage, onFieldEdited, services, renderCustomGridBody, renderCustomToolbar, trailingControlColumns, totalHits, onFetchMoreRecords, renderDocumentView, setExpandedDoc, expandedDoc, configRowHeight, showMultiFields, maxDocFieldsDisplayed, externalControlColumns, externalAdditionalControls, rowsPerPageOptions, visibleCellActions, externalCustomRenderers, consumer, componentsTourSteps, gridStyleOverride, rowLineHeightOverride, customGridColumnsConfiguration, customControlColumnsConfiguration, }: ",
+          "({ ariaLabelledBy, columns, columnsMeta, showColumnTokens, configHeaderRowHeight, headerRowHeightState, onUpdateHeaderRowHeight, controlColumnIds, dataView, loadingState, onFilter, onResize, onSetColumns, onSort, rows, searchDescription, searchTitle, settings, showTimeCol, showFullScreenButton, sort, useNewFieldsApi, isSortEnabled, isPaginationEnabled, cellActionsTriggerId, className, rowHeightState, onUpdateRowHeight, maxAllowedSampleSize, sampleSizeState, onUpdateSampleSize, isPlainRecord, rowsPerPageState, onUpdateRowsPerPage, onFieldEdited, services, renderCustomGridBody, renderCustomToolbar, trailingControlColumns, totalHits, onFetchMoreRecords, renderDocumentView, setExpandedDoc, expandedDoc, configRowHeight, showMultiFields, maxDocFieldsDisplayed, externalControlColumns, externalAdditionalControls, rowsPerPageOptions, visibleCellActions, externalCustomRenderers, consumer, componentsTourSteps, gridStyleOverride, rowLineHeightOverride, cellActionsMetadata, customGridColumnsConfiguration, customControlColumnsConfiguration, }: ",
           {
             "pluginId": "@kbn/unified-data-table",
             "scope": "common",
@@ -437,7 +437,7 @@
             "id": "def-common.UnifiedDataTable.$1",
             "type": "Object",
             "tags": [],
-            "label": "{\n  ariaLabelledBy,\n  columns,\n  columnsMeta,\n  showColumnTokens,\n  configHeaderRowHeight,\n  headerRowHeightState,\n  onUpdateHeaderRowHeight,\n  controlColumnIds = CONTROL_COLUMN_IDS_DEFAULT,\n  dataView,\n  loadingState,\n  onFilter,\n  onResize,\n  onSetColumns,\n  onSort,\n  rows,\n  searchDescription,\n  searchTitle,\n  settings,\n  showTimeCol,\n  showFullScreenButton = true,\n  sort,\n  useNewFieldsApi,\n  isSortEnabled = true,\n  isPaginationEnabled = true,\n  cellActionsTriggerId,\n  className,\n  rowHeightState,\n  onUpdateRowHeight,\n  maxAllowedSampleSize,\n  sampleSizeState,\n  onUpdateSampleSize,\n  isPlainRecord = false,\n  rowsPerPageState,\n  onUpdateRowsPerPage,\n  onFieldEdited,\n  services,\n  renderCustomGridBody,\n  renderCustomToolbar,\n  trailingControlColumns,\n  totalHits,\n  onFetchMoreRecords,\n  renderDocumentView,\n  setExpandedDoc,\n  expandedDoc,\n  configRowHeight,\n  showMultiFields = true,\n  maxDocFieldsDisplayed = 50,\n  externalControlColumns,\n  externalAdditionalControls,\n  rowsPerPageOptions,\n  visibleCellActions,\n  externalCustomRenderers,\n  consumer = 'discover',\n  componentsTourSteps,\n  gridStyleOverride,\n  rowLineHeightOverride,\n  customGridColumnsConfiguration,\n  customControlColumnsConfiguration,\n}",
+            "label": "{\n  ariaLabelledBy,\n  columns,\n  columnsMeta,\n  showColumnTokens,\n  configHeaderRowHeight,\n  headerRowHeightState,\n  onUpdateHeaderRowHeight,\n  controlColumnIds = CONTROL_COLUMN_IDS_DEFAULT,\n  dataView,\n  loadingState,\n  onFilter,\n  onResize,\n  onSetColumns,\n  onSort,\n  rows,\n  searchDescription,\n  searchTitle,\n  settings,\n  showTimeCol,\n  showFullScreenButton = true,\n  sort,\n  useNewFieldsApi,\n  isSortEnabled = true,\n  isPaginationEnabled = true,\n  cellActionsTriggerId,\n  className,\n  rowHeightState,\n  onUpdateRowHeight,\n  maxAllowedSampleSize,\n  sampleSizeState,\n  onUpdateSampleSize,\n  isPlainRecord = false,\n  rowsPerPageState,\n  onUpdateRowsPerPage,\n  onFieldEdited,\n  services,\n  renderCustomGridBody,\n  renderCustomToolbar,\n  trailingControlColumns,\n  totalHits,\n  onFetchMoreRecords,\n  renderDocumentView,\n  setExpandedDoc,\n  expandedDoc,\n  configRowHeight,\n  showMultiFields = true,\n  maxDocFieldsDisplayed = 50,\n  externalControlColumns,\n  externalAdditionalControls,\n  rowsPerPageOptions,\n  visibleCellActions,\n  externalCustomRenderers,\n  consumer = 'discover',\n  componentsTourSteps,\n  gridStyleOverride,\n  rowLineHeightOverride,\n  cellActionsMetadata,\n  customGridColumnsConfiguration,\n  customControlColumnsConfiguration,\n}",
             "description": [],
             "signature": [
               {
@@ -2151,6 +2151,22 @@
             "path": "packages/kbn-unified-data-table/src/components/data_table.tsx",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/unified-data-table",
+            "id": "def-common.UnifiedDataTableProps.cellActionsMetadata",
+            "type": "Object",
+            "tags": [],
+            "label": "cellActionsMetadata",
+            "description": [
+              "\nCustom set of properties used by some actions.\nAn action might require a specific set of metadata properties to render.\nThis data is sent directly to actions."
+            ],
+            "signature": [
+              "Record<string, unknown> | undefined"
+            ],
+            "path": "packages/kbn-unified-data-table/src/components/data_table.tsx",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/kbn_unified_data_table.mdx b/api_docs/kbn_unified_data_table.mdx
index c8ce82116df68..8860c8b2baeba 100644
--- a/api_docs/kbn_unified_data_table.mdx
+++ b/api_docs/kbn_unified_data_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-data-table
 title: "@kbn/unified-data-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-data-table plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-data-table']
 ---
 import kbnUnifiedDataTableObj from './kbn_unified_data_table.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 143 | 0 | 78 | 1 |
+| 144 | 0 | 78 | 1 |
 
 ## Common
 
diff --git a/api_docs/kbn_unified_doc_viewer.mdx b/api_docs/kbn_unified_doc_viewer.mdx
index 9ba36a49b92c2..ca626a9e239f4 100644
--- a/api_docs/kbn_unified_doc_viewer.mdx
+++ b/api_docs/kbn_unified_doc_viewer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-doc-viewer
 title: "@kbn/unified-doc-viewer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-doc-viewer plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-doc-viewer']
 ---
 import kbnUnifiedDocViewerObj from './kbn_unified_doc_viewer.devdocs.json';
diff --git a/api_docs/kbn_unified_field_list.mdx b/api_docs/kbn_unified_field_list.mdx
index b54be9ca0cf8b..a3fa115c0f880 100644
--- a/api_docs/kbn_unified_field_list.mdx
+++ b/api_docs/kbn_unified_field_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-field-list
 title: "@kbn/unified-field-list"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-field-list plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-field-list']
 ---
 import kbnUnifiedFieldListObj from './kbn_unified_field_list.devdocs.json';
diff --git a/api_docs/kbn_unsaved_changes_badge.mdx b/api_docs/kbn_unsaved_changes_badge.mdx
index 879dc066d2104..c56275843a86c 100644
--- a/api_docs/kbn_unsaved_changes_badge.mdx
+++ b/api_docs/kbn_unsaved_changes_badge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unsaved-changes-badge
 title: "@kbn/unsaved-changes-badge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unsaved-changes-badge plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unsaved-changes-badge']
 ---
 import kbnUnsavedChangesBadgeObj from './kbn_unsaved_changes_badge.devdocs.json';
diff --git a/api_docs/kbn_use_tracked_promise.mdx b/api_docs/kbn_use_tracked_promise.mdx
index b0de235121704..23d6c8cf98dab 100644
--- a/api_docs/kbn_use_tracked_promise.mdx
+++ b/api_docs/kbn_use_tracked_promise.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-use-tracked-promise
 title: "@kbn/use-tracked-promise"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/use-tracked-promise plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/use-tracked-promise']
 ---
 import kbnUseTrackedPromiseObj from './kbn_use_tracked_promise.devdocs.json';
diff --git a/api_docs/kbn_user_profile_components.devdocs.json b/api_docs/kbn_user_profile_components.devdocs.json
index 4ba06b83b3258..9194672b1b884 100644
--- a/api_docs/kbn_user_profile_components.devdocs.json
+++ b/api_docs/kbn_user_profile_components.devdocs.json
@@ -437,7 +437,7 @@
         "label": "useUpdateUserProfile",
         "description": [],
         "signature": [
-          "({ notificationSuccess, pageReloadChecker, }?: Props) => { update: <D extends ",
+          "({ notificationSuccess, pageReloadChecker, }?: Props) => { update: <D extends Partial<",
           {
             "pluginId": "@kbn/user-profile-components",
             "scope": "common",
@@ -445,7 +445,7 @@
             "section": "def-common.UserProfileData",
             "text": "UserProfileData"
           },
-          ">(updatedData: D) => Promise<void>; showSuccessNotification: ({ isRefreshRequired }?: { isRefreshRequired?: boolean | undefined; }) => void; userProfileData: ",
+          ">>(updatedData: D) => Promise<void>; showSuccessNotification: ({ isRefreshRequired }?: { isRefreshRequired?: boolean | undefined; }) => void; userProfileData: ",
           {
             "pluginId": "@kbn/user-profile-components",
             "scope": "common",
@@ -453,7 +453,7 @@
             "section": "def-common.UserProfileData",
             "text": "UserProfileData"
           },
-          " | null | undefined; isLoading: boolean; }"
+          " | null | undefined; isLoading: boolean; userProfileEnabled: boolean | undefined; }"
         ],
         "path": "packages/kbn-user-profile-components/src/hooks/use_update_user_profile.tsx",
         "deprecated": false,
@@ -1471,6 +1471,20 @@
             "path": "packages/kbn-user-profile-components/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/user-profile-components",
+            "id": "def-common.UserSettingsData.solutionNavOptOut",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "solutionNavOptOut",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-user-profile-components/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -1574,7 +1588,7 @@
         "label": "UpdateUserProfileHook",
         "description": [],
         "signature": [
-          "({ notificationSuccess, pageReloadChecker, }?: Props) => { update: <D extends ",
+          "({ notificationSuccess, pageReloadChecker, }?: Props) => { update: <D extends Partial<",
           {
             "pluginId": "@kbn/user-profile-components",
             "scope": "common",
@@ -1582,7 +1596,7 @@
             "section": "def-common.UserProfileData",
             "text": "UserProfileData"
           },
-          ">(updatedData: D) => Promise<void>; showSuccessNotification: ({ isRefreshRequired }?: { isRefreshRequired?: boolean | undefined; }) => void; userProfileData: ",
+          ">>(updatedData: D) => Promise<void>; showSuccessNotification: ({ isRefreshRequired }?: { isRefreshRequired?: boolean | undefined; }) => void; userProfileData: ",
           {
             "pluginId": "@kbn/user-profile-components",
             "scope": "common",
@@ -1590,7 +1604,7 @@
             "section": "def-common.UserProfileData",
             "text": "UserProfileData"
           },
-          " | null | undefined; isLoading: boolean; }"
+          " | null | undefined; isLoading: boolean; userProfileEnabled: boolean | undefined; }"
         ],
         "path": "packages/kbn-user-profile-components/src/hooks/use_update_user_profile.tsx",
         "deprecated": false,
diff --git a/api_docs/kbn_user_profile_components.mdx b/api_docs/kbn_user_profile_components.mdx
index 655bf70bed690..6652f8fe653fa 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/user-profile-components']
 ---
 import kbnUserProfileComponentsObj from './kbn_user_profile_components.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 80 | 1 | 21 | 2 |
+| 81 | 1 | 22 | 2 |
 
 ## Common
 
diff --git a/api_docs/kbn_utility_types.mdx b/api_docs/kbn_utility_types.mdx
index f38b3c32d6be4..49d94149be952 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: 2024-04-02
+date: 2024-04-03
 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 f7e6680d815a4..e5267bb12fa55 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: 2024-04-02
+date: 2024-04-03
 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 38f95dea57162..14e9883c7a39a 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utils']
 ---
 import kbnUtilsObj from './kbn_utils.devdocs.json';
diff --git a/api_docs/kbn_visualization_ui_components.devdocs.json b/api_docs/kbn_visualization_ui_components.devdocs.json
index 329e0a16222f7..6b12deb322020 100644
--- a/api_docs/kbn_visualization_ui_components.devdocs.json
+++ b/api_docs/kbn_visualization_ui_components.devdocs.json
@@ -350,7 +350,7 @@
         "label": "DimensionTrigger",
         "description": [],
         "signature": [
-          "({ id, label, color, dataTestSubj, }: { label: React.ReactNode; id?: string | undefined; color?: \"default\" | \"warning\" | \"success\" | \"subdued\" | \"accent\" | \"danger\" | \"ghost\" | ",
+          "({ id, label, color, dataTestSubj, }: { label: React.ReactNode; id?: string | undefined; color?: \"warning\" | \"success\" | \"default\" | \"subdued\" | \"accent\" | \"danger\" | \"ghost\" | ",
           "Property",
           ".Color | undefined; dataTestSubj?: string | undefined; }) => JSX.Element"
         ],
@@ -405,7 +405,7 @@
                 "label": "color",
                 "description": [],
                 "signature": [
-                  "\"default\" | \"warning\" | \"success\" | \"subdued\" | \"accent\" | \"danger\" | \"ghost\" | ",
+                  "\"warning\" | \"success\" | \"default\" | \"subdued\" | \"accent\" | \"danger\" | \"ghost\" | ",
                   "Property",
                   ".Color | undefined"
                 ],
diff --git a/api_docs/kbn_visualization_ui_components.mdx b/api_docs/kbn_visualization_ui_components.mdx
index d3ed13f168995..519af37bc4da9 100644
--- a/api_docs/kbn_visualization_ui_components.mdx
+++ b/api_docs/kbn_visualization_ui_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-visualization-ui-components
 title: "@kbn/visualization-ui-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/visualization-ui-components plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/visualization-ui-components']
 ---
 import kbnVisualizationUiComponentsObj from './kbn_visualization_ui_components.devdocs.json';
diff --git a/api_docs/kbn_visualization_utils.mdx b/api_docs/kbn_visualization_utils.mdx
index b78061f7e126c..1eeaa193b0974 100644
--- a/api_docs/kbn_visualization_utils.mdx
+++ b/api_docs/kbn_visualization_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-visualization-utils
 title: "@kbn/visualization-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/visualization-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/visualization-utils']
 ---
 import kbnVisualizationUtilsObj from './kbn_visualization_utils.devdocs.json';
diff --git a/api_docs/kbn_xstate_utils.mdx b/api_docs/kbn_xstate_utils.mdx
index b193a7b175f2d..a73f5ec84549f 100644
--- a/api_docs/kbn_xstate_utils.mdx
+++ b/api_docs/kbn_xstate_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-xstate-utils
 title: "@kbn/xstate-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/xstate-utils plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/xstate-utils']
 ---
 import kbnXstateUtilsObj from './kbn_xstate_utils.devdocs.json';
diff --git a/api_docs/kbn_yarn_lock_validator.mdx b/api_docs/kbn_yarn_lock_validator.mdx
index c863952c82899..5dec6bfbc5689 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/yarn-lock-validator']
 ---
 import kbnYarnLockValidatorObj from './kbn_yarn_lock_validator.devdocs.json';
diff --git a/api_docs/kbn_zod_helpers.mdx b/api_docs/kbn_zod_helpers.mdx
index a40c4d5a41b5d..8e208f1023460 100644
--- a/api_docs/kbn_zod_helpers.mdx
+++ b/api_docs/kbn_zod_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-zod-helpers
 title: "@kbn/zod-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/zod-helpers plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/zod-helpers']
 ---
 import kbnZodHelpersObj from './kbn_zod_helpers.devdocs.json';
diff --git a/api_docs/kibana_overview.mdx b/api_docs/kibana_overview.mdx
index e307bf96a34c1..76fa22922da0c 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: 2024-04-02
+date: 2024-04-03
 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 03ecb9e5ac2c3..59d93cbac6d5c 100644
--- a/api_docs/kibana_react.devdocs.json
+++ b/api_docs/kibana_react.devdocs.json
@@ -663,6 +663,126 @@
             "plugin": "console",
             "path": "src/plugins/console/public/shared_imports.ts"
           },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/users/users_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/users/users_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/users/users_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/roles/roles_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/roles/roles_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/roles/roles_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/login/login_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/login/login_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/login/login_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx"
+          },
           {
             "plugin": "visualizations",
             "path": "src/plugins/visualizations/public/visualize_app/utils/use/use_visualize_app_state.tsx"
@@ -859,126 +979,6 @@
             "plugin": "lens",
             "path": "x-pack/plugins/lens/public/embeddable/embeddable.tsx"
           },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/api_keys/api_keys_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/users/users_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/users/users_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/users/users_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/roles/roles_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/roles/roles_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/roles/roles_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/management/role_mappings/role_mappings_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/logged_out/logged_out_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/login/login_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/login/login_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/login/login_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_page.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx"
-          },
           {
             "plugin": "alerting",
             "path": "x-pack/plugins/alerting/public/application/maintenance_windows.tsx"
@@ -2496,6 +2496,38 @@
             "plugin": "embeddable",
             "path": "src/plugins/embeddable/public/add_panel_flyout/open_add_panel_flyout.tsx"
           },
+          {
+            "plugin": "licensing",
+            "path": "x-pack/plugins/licensing/public/expired_banner.tsx"
+          },
+          {
+            "plugin": "licensing",
+            "path": "x-pack/plugins/licensing/public/expired_banner.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/session/session_expiration_toast.tsx"
+          },
+          {
+            "plugin": "security",
+            "path": "x-pack/plugins/security/public/session/session_expiration_toast.tsx"
+          },
+          {
+            "plugin": "navigation",
+            "path": "src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.tsx"
+          },
+          {
+            "plugin": "navigation",
+            "path": "src/plugins/navigation/public/solution_nav_userprofile_toggle/solution_nav_userprofile_toggle.tsx"
+          },
           {
             "plugin": "visualizations",
             "path": "src/plugins/visualizations/public/utils/saved_objects_utils/confirm_modal_promise.tsx"
@@ -2528,14 +2560,6 @@
             "plugin": "visualizations",
             "path": "src/plugins/visualizations/public/visualize_app/index.tsx"
           },
-          {
-            "plugin": "licensing",
-            "path": "x-pack/plugins/licensing/public/expired_banner.tsx"
-          },
-          {
-            "plugin": "licensing",
-            "path": "x-pack/plugins/licensing/public/expired_banner.tsx"
-          },
           {
             "plugin": "savedObjectsTagging",
             "path": "x-pack/plugins/saved_objects_tagging/public/components/edition_modal/open_modal.tsx"
@@ -2608,22 +2632,6 @@
             "plugin": "lens",
             "path": "x-pack/plugins/lens/public/trigger_actions/open_lens_config/in_app_embeddable_edit/in_app_embeddable_edit_action_helpers.tsx"
           },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/account_management/account_management_app.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/session/session_expiration_toast.tsx"
-          },
-          {
-            "plugin": "security",
-            "path": "x-pack/plugins/security/public/session/session_expiration_toast.tsx"
-          },
           {
             "plugin": "dashboard",
             "path": "src/plugins/dashboard/public/dashboard_container/embeddable/api/show_settings.tsx"
diff --git a/api_docs/kibana_react.mdx b/api_docs/kibana_react.mdx
index c1fbc1ab54492..02b5309d49a8d 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: 2024-04-02
+date: 2024-04-03
 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 3657531db5d20..56cb499071bfd 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: 2024-04-02
+date: 2024-04-03
 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 c238db055bc87..4cc1d8ac27e91 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: 2024-04-02
+date: 2024-04-03
 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 477ec9f3fc2ba..77c08bfaab453 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: 2024-04-02
+date: 2024-04-03
 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 94da93edd5fb3..05b545a67bc3e 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: 2024-04-02
+date: 2024-04-03
 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 c55c86345ddc7..a75059ad45bbe 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: 2024-04-02
+date: 2024-04-03
 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 f9e7e9fb31155..98ae46bc5ff68 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licensing']
 ---
 import licensingObj from './licensing.devdocs.json';
diff --git a/api_docs/links.mdx b/api_docs/links.mdx
index 8d7ca8da2e691..33b0649948563 100644
--- a/api_docs/links.mdx
+++ b/api_docs/links.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/links
 title: "links"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the links plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'links']
 ---
 import linksObj from './links.devdocs.json';
diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx
index 5d9a2aa51a415..29f7476c530d0 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lists']
 ---
 import listsObj from './lists.devdocs.json';
diff --git a/api_docs/logs_explorer.devdocs.json b/api_docs/logs_explorer.devdocs.json
index f6569623cc7a6..0b44e50f6b51c 100644
--- a/api_docs/logs_explorer.devdocs.json
+++ b/api_docs/logs_explorer.devdocs.json
@@ -312,7 +312,7 @@
             "signature": [
               "Pick<Required<Partial<",
               "DiscoverServices",
-              ">>, \"data\" | \"history\" | \"uiSettings\" | \"timefilter\" | \"filterManager\"> & { urlStateStorage: ",
+              ">>, \"history\" | \"data\" | \"uiSettings\" | \"timefilter\" | \"filterManager\"> & { urlStateStorage: ",
               {
                 "pluginId": "kibanaUtils",
                 "scope": "public",
diff --git a/api_docs/logs_explorer.mdx b/api_docs/logs_explorer.mdx
index cff63b095dfce..ecfd1b3d6c751 100644
--- a/api_docs/logs_explorer.mdx
+++ b/api_docs/logs_explorer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/logsExplorer
 title: "logsExplorer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the logsExplorer plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'logsExplorer']
 ---
 import logsExplorerObj from './logs_explorer.devdocs.json';
diff --git a/api_docs/logs_shared.mdx b/api_docs/logs_shared.mdx
index 125df55983aac..c356615057336 100644
--- a/api_docs/logs_shared.mdx
+++ b/api_docs/logs_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/logsShared
 title: "logsShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the logsShared plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'logsShared']
 ---
 import logsSharedObj from './logs_shared.devdocs.json';
diff --git a/api_docs/management.mdx b/api_docs/management.mdx
index 5435d6c1ccb47..3476e31de48c1 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: 2024-04-02
+date: 2024-04-03
 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 119cc08cbc22a..707bae4db6cce 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: 2024-04-02
+date: 2024-04-03
 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 4f153382eef80..a7024ff9988cf 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mapsEms']
 ---
 import mapsEmsObj from './maps_ems.devdocs.json';
diff --git a/api_docs/metrics_data_access.mdx b/api_docs/metrics_data_access.mdx
index 568f735838113..00480bdcb2483 100644
--- a/api_docs/metrics_data_access.mdx
+++ b/api_docs/metrics_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/metricsDataAccess
 title: "metricsDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the metricsDataAccess plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'metricsDataAccess']
 ---
 import metricsDataAccessObj from './metrics_data_access.devdocs.json';
diff --git a/api_docs/ml.mdx b/api_docs/ml.mdx
index 56eac3cd2ef35..2e4b9e5ca4113 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ml']
 ---
 import mlObj from './ml.devdocs.json';
diff --git a/api_docs/mock_idp_plugin.mdx b/api_docs/mock_idp_plugin.mdx
index 2662e0506bedf..d7943fd25c43d 100644
--- a/api_docs/mock_idp_plugin.mdx
+++ b/api_docs/mock_idp_plugin.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mockIdpPlugin
 title: "mockIdpPlugin"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the mockIdpPlugin plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mockIdpPlugin']
 ---
 import mockIdpPluginObj from './mock_idp_plugin.devdocs.json';
diff --git a/api_docs/monitoring.mdx b/api_docs/monitoring.mdx
index 8e806fbfd51c0..0149793e7be34 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: 2024-04-02
+date: 2024-04-03
 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 9513c33f3e127..1d6585aed095c 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoringCollection']
 ---
 import monitoringCollectionObj from './monitoring_collection.devdocs.json';
diff --git a/api_docs/navigation.devdocs.json b/api_docs/navigation.devdocs.json
index 4e3ed7bcd9564..415b04817bc72 100644
--- a/api_docs/navigation.devdocs.json
+++ b/api_docs/navigation.devdocs.json
@@ -1102,23 +1102,20 @@
         },
         {
           "parentPluginId": "navigation",
-          "id": "def-public.NavigationPublicStart.isSolutionNavigationEnabled",
-          "type": "Function",
+          "id": "def-public.NavigationPublicStart.isSolutionNavEnabled$",
+          "type": "Object",
           "tags": [],
-          "label": "isSolutionNavigationEnabled",
+          "label": "isSolutionNavEnabled$",
           "description": [
-            "\nUse this handler verify if the solution navigation is enabled."
+            "Flag to indicate if the solution navigation is enabled."
           ],
           "signature": [
-            "() => boolean"
+            "Observable",
+            "<boolean>"
           ],
           "path": "src/plugins/navigation/public/types.ts",
           "deprecated": false,
-          "trackAdoption": false,
-          "children": [],
-          "returnComment": [
-            "true if the solution navigation is enabled, false otherwise."
-          ]
+          "trackAdoption": false
         }
       ],
       "lifecycle": "start",
diff --git a/api_docs/navigation.mdx b/api_docs/navigation.mdx
index 91c779771b3b7..3d142993791f6 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: 2024-04-02
+date: 2024-04-03
 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 8ccded382f576..55305f2563787 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'newsfeed']
 ---
 import newsfeedObj from './newsfeed.devdocs.json';
diff --git a/api_docs/no_data_page.mdx b/api_docs/no_data_page.mdx
index db17be1fadf09..bb78182209da7 100644
--- a/api_docs/no_data_page.mdx
+++ b/api_docs/no_data_page.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/noDataPage
 title: "noDataPage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the noDataPage plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'noDataPage']
 ---
 import noDataPageObj from './no_data_page.devdocs.json';
diff --git a/api_docs/notifications.mdx b/api_docs/notifications.mdx
index f9b30df50b64e..f2f0076f1eb07 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: 2024-04-02
+date: 2024-04-03
 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 fa6b020de5d84..f8c598c730d15 100644
--- a/api_docs/observability.devdocs.json
+++ b/api_docs/observability.devdocs.json
@@ -8576,7 +8576,7 @@
             "label": "config",
             "description": [],
             "signature": [
-              "{ readonly enabled: boolean; readonly unsafe: Readonly<{} & { alertDetails: Readonly<{} & { uptime: Readonly<{} & { enabled: boolean; }>; observability: Readonly<{} & { enabled: boolean; }>; metrics: Readonly<{} & { enabled: boolean; }>; logs: Readonly<{} & { enabled: boolean; }>; }>; thresholdRule: Readonly<{} & { enabled: boolean; }>; ruleFormV2: Readonly<{} & { enabled: boolean; }>; }>; readonly annotations: Readonly<{} & { index: string; enabled: boolean; }>; readonly customThresholdRule: Readonly<{} & { groupByPageSize: number; }>; readonly createO11yGenericFeatureId: boolean; }"
+              "{ readonly enabled: boolean; readonly unsafe: Readonly<{} & { alertDetails: Readonly<{} & { uptime: Readonly<{} & { enabled: boolean; }>; metrics: Readonly<{} & { enabled: boolean; }>; observability: Readonly<{} & { enabled: boolean; }>; logs: Readonly<{} & { enabled: boolean; }>; }>; thresholdRule: Readonly<{} & { enabled: boolean; }>; ruleFormV2: Readonly<{} & { enabled: boolean; }>; }>; readonly annotations: Readonly<{} & { index: string; enabled: boolean; }>; readonly customThresholdRule: Readonly<{} & { groupByPageSize: number; }>; readonly createO11yGenericFeatureId: boolean; }"
             ],
             "path": "x-pack/plugins/observability_solution/observability/server/routes/types.ts",
             "deprecated": false,
@@ -8696,7 +8696,7 @@
         "label": "ObservabilityConfig",
         "description": [],
         "signature": [
-          "{ readonly enabled: boolean; readonly unsafe: Readonly<{} & { alertDetails: Readonly<{} & { uptime: Readonly<{} & { enabled: boolean; }>; observability: Readonly<{} & { enabled: boolean; }>; metrics: Readonly<{} & { enabled: boolean; }>; logs: Readonly<{} & { enabled: boolean; }>; }>; thresholdRule: Readonly<{} & { enabled: boolean; }>; ruleFormV2: Readonly<{} & { enabled: boolean; }>; }>; readonly annotations: Readonly<{} & { index: string; enabled: boolean; }>; readonly customThresholdRule: Readonly<{} & { groupByPageSize: number; }>; readonly createO11yGenericFeatureId: boolean; }"
+          "{ readonly enabled: boolean; readonly unsafe: Readonly<{} & { alertDetails: Readonly<{} & { uptime: Readonly<{} & { enabled: boolean; }>; metrics: Readonly<{} & { enabled: boolean; }>; observability: Readonly<{} & { enabled: boolean; }>; logs: Readonly<{} & { enabled: boolean; }>; }>; thresholdRule: Readonly<{} & { enabled: boolean; }>; ruleFormV2: Readonly<{} & { enabled: boolean; }>; }>; readonly annotations: Readonly<{} & { index: string; enabled: boolean; }>; readonly customThresholdRule: Readonly<{} & { groupByPageSize: number; }>; readonly createO11yGenericFeatureId: boolean; }"
         ],
         "path": "x-pack/plugins/observability_solution/observability/server/index.ts",
         "deprecated": false,
@@ -12232,7 +12232,7 @@
       "label": "ObservabilityPluginSetup",
       "description": [],
       "signature": [
-        "{ getAlertDetailsConfig(): Readonly<{} & { uptime: Readonly<{} & { enabled: boolean; }>; observability: Readonly<{} & { enabled: boolean; }>; metrics: Readonly<{} & { enabled: boolean; }>; logs: Readonly<{} & { enabled: boolean; }>; }>; getScopedAnnotationsClient: (requestContext: ",
+        "{ getAlertDetailsConfig(): Readonly<{} & { uptime: Readonly<{} & { enabled: boolean; }>; metrics: Readonly<{} & { enabled: boolean; }>; observability: Readonly<{} & { enabled: boolean; }>; logs: Readonly<{} & { enabled: boolean; }>; }>; getScopedAnnotationsClient: (requestContext: ",
         {
           "pluginId": "@kbn/core-http-request-handler-context-server",
           "scope": "common",
diff --git a/api_docs/observability.mdx b/api_docs/observability.mdx
index 3c953ba36d46a..af6ad843b8b1b 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observability']
 ---
 import observabilityObj from './observability.devdocs.json';
diff --git a/api_docs/observability_a_i_assistant.devdocs.json b/api_docs/observability_a_i_assistant.devdocs.json
index abc3d899af44a..c8bbfbd5080ef 100644
--- a/api_docs/observability_a_i_assistant.devdocs.json
+++ b/api_docs/observability_a_i_assistant.devdocs.json
@@ -3127,6 +3127,36 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "observabilityAIAssistant",
+        "id": "def-public.aiAssistantLogsIndexPattern",
+        "type": "string",
+        "tags": [],
+        "label": "aiAssistantLogsIndexPattern",
+        "description": [],
+        "signature": [
+          "\"observability:aiAssistantLogsIndexPattern\""
+        ],
+        "path": "x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/advanced_settings.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "observabilityAIAssistant",
+        "id": "def-public.aiAssistantResponseLanguage",
+        "type": "string",
+        "tags": [],
+        "label": "aiAssistantResponseLanguage",
+        "description": [],
+        "signature": [
+          "\"observability:aiAssistantResponseLanguage\""
+        ],
+        "path": "x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/advanced_settings.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "observabilityAIAssistant",
         "id": "def-public.APIReturnType",
@@ -3746,6 +3776,21 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "observabilityAIAssistant",
+        "id": "def-public.LANGUAGE_OPTIONS",
+        "type": "Array",
+        "tags": [],
+        "label": "LANGUAGE_OPTIONS",
+        "description": [],
+        "signature": [
+          "{ value: string; label: string; }[]"
+        ],
+        "path": "x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_user_preferred_language.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "observabilityAIAssistant",
         "id": "def-public.ObservabilityAIAssistantAPIClientRequestParamsOf",
@@ -4508,7 +4553,23 @@
         "initialIsOpen": false
       }
     ],
-    "objects": [],
+    "objects": [
+      {
+        "parentPluginId": "observabilityAIAssistant",
+        "id": "def-public.DEFAULT_LANGUAGE_OPTION",
+        "type": "Object",
+        "tags": [],
+        "label": "DEFAULT_LANGUAGE_OPTION",
+        "description": [],
+        "signature": [
+          "{ value: string; label: string; }"
+        ],
+        "path": "x-pack/plugins/observability_solution/observability_ai_assistant/public/hooks/use_user_preferred_language.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      }
+    ],
     "setup": {
       "parentPluginId": "observabilityAIAssistant",
       "id": "def-public.ObservabilityAIAssistantPublicSetup",
@@ -4744,7 +4805,7 @@
           "label": "useUserPreferredLanguage",
           "description": [],
           "signature": [
-            "() => { selectedLanguage: string | undefined; setSelectedLanguage: React.Dispatch<React.SetStateAction<string | undefined>>; LANGUAGE_OPTIONS: { label: string; }[]; getPreferredLanguage: () => string; }"
+            "() => { selectedLanguage: string; getPreferredLanguage: () => string; }"
           ],
           "path": "x-pack/plugins/observability_solution/observability_ai_assistant/public/types.ts",
           "deprecated": false,
@@ -4925,6 +4986,36 @@
     "interfaces": [],
     "enums": [],
     "misc": [
+      {
+        "parentPluginId": "observabilityAIAssistant",
+        "id": "def-server.aiAssistantLogsIndexPattern",
+        "type": "string",
+        "tags": [],
+        "label": "aiAssistantLogsIndexPattern",
+        "description": [],
+        "signature": [
+          "\"observability:aiAssistantLogsIndexPattern\""
+        ],
+        "path": "x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/advanced_settings.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "observabilityAIAssistant",
+        "id": "def-server.aiAssistantResponseLanguage",
+        "type": "string",
+        "tags": [],
+        "label": "aiAssistantResponseLanguage",
+        "description": [],
+        "signature": [
+          "\"observability:aiAssistantResponseLanguage\""
+        ],
+        "path": "x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/advanced_settings.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "observabilityAIAssistant",
         "id": "def-server.ObservabilityAIAssistantServerRouteRepository",
diff --git a/api_docs/observability_a_i_assistant.mdx b/api_docs/observability_a_i_assistant.mdx
index 6bd7979b14afe..b9900a8ea5d24 100644
--- a/api_docs/observability_a_i_assistant.mdx
+++ b/api_docs/observability_a_i_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAIAssistant
 title: "observabilityAIAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAIAssistant plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAIAssistant']
 ---
 import observabilityAIAssistantObj from './observability_a_i_assistant.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 227 | 1 | 225 | 25 |
+| 233 | 1 | 231 | 25 |
 
 ## Client
 
@@ -31,6 +31,9 @@ Contact [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-
 ### Start
 <DocDefinitionList data={[observabilityAIAssistantObj.client.start]}/>
 
+### Objects
+<DocDefinitionList data={observabilityAIAssistantObj.client.objects}/>
+
 ### Functions
 <DocDefinitionList data={observabilityAIAssistantObj.client.functions}/>
 
diff --git a/api_docs/observability_a_i_assistant_app.mdx b/api_docs/observability_a_i_assistant_app.mdx
index 20ba59101f826..385d7cb3df898 100644
--- a/api_docs/observability_a_i_assistant_app.mdx
+++ b/api_docs/observability_a_i_assistant_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAIAssistantApp
 title: "observabilityAIAssistantApp"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAIAssistantApp plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAIAssistantApp']
 ---
 import observabilityAIAssistantAppObj from './observability_a_i_assistant_app.devdocs.json';
diff --git a/api_docs/observability_ai_assistant_management.mdx b/api_docs/observability_ai_assistant_management.mdx
index 654a8b3790cf3..f24ded394f139 100644
--- a/api_docs/observability_ai_assistant_management.mdx
+++ b/api_docs/observability_ai_assistant_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAiAssistantManagement
 title: "observabilityAiAssistantManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAiAssistantManagement plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAiAssistantManagement']
 ---
 import observabilityAiAssistantManagementObj from './observability_ai_assistant_management.devdocs.json';
diff --git a/api_docs/observability_logs_explorer.mdx b/api_docs/observability_logs_explorer.mdx
index 4e8a48bef96ad..8d86c1e461d74 100644
--- a/api_docs/observability_logs_explorer.mdx
+++ b/api_docs/observability_logs_explorer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityLogsExplorer
 title: "observabilityLogsExplorer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityLogsExplorer plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityLogsExplorer']
 ---
 import observabilityLogsExplorerObj from './observability_logs_explorer.devdocs.json';
diff --git a/api_docs/observability_onboarding.mdx b/api_docs/observability_onboarding.mdx
index feff371f0b596..e766c28a3b03b 100644
--- a/api_docs/observability_onboarding.mdx
+++ b/api_docs/observability_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityOnboarding
 title: "observabilityOnboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityOnboarding plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityOnboarding']
 ---
 import observabilityOnboardingObj from './observability_onboarding.devdocs.json';
diff --git a/api_docs/observability_shared.devdocs.json b/api_docs/observability_shared.devdocs.json
index 5946e3a41bebd..f86368746ca16 100644
--- a/api_docs/observability_shared.devdocs.json
+++ b/api_docs/observability_shared.devdocs.json
@@ -1632,9 +1632,7 @@
         "label": "useEditableSettings",
         "description": [],
         "signature": [
-          "(app: ",
-          "ObservabilityApp",
-          ", settingsKeys: string[]) => { fields: Record<string, ",
+          "(settingsKeys: string[]) => { fields: Record<string, ",
           {
             "pluginId": "@kbn/management-settings-types",
             "scope": "common",
@@ -1691,21 +1689,6 @@
           {
             "parentPluginId": "observabilityShared",
             "id": "def-public.useEditableSettings.$1",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "app",
-            "description": [],
-            "signature": [
-              "ObservabilityApp"
-            ],
-            "path": "x-pack/plugins/observability_solution/observability_shared/public/hooks/use_editable_settings.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "observabilityShared",
-            "id": "def-public.useEditableSettings.$2",
             "type": "Array",
             "tags": [],
             "label": "settingsKeys",
diff --git a/api_docs/observability_shared.mdx b/api_docs/observability_shared.mdx
index 92b7f457d1a2d..c9519739a9ff3 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityShared']
 ---
 import observabilitySharedObj from './observability_shared.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/observability-ui](https://github.com/orgs/elastic/teams/observ
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 344 | 1 | 339 | 22 |
+| 343 | 1 | 338 | 22 |
 
 ## Client
 
diff --git a/api_docs/osquery.mdx b/api_docs/osquery.mdx
index 8e775c5a6b755..1709186090c16 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'osquery']
 ---
 import osqueryObj from './osquery.devdocs.json';
diff --git a/api_docs/painless_lab.mdx b/api_docs/painless_lab.mdx
index 87b45093501cf..97da743bcee08 100644
--- a/api_docs/painless_lab.mdx
+++ b/api_docs/painless_lab.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/painlessLab
 title: "painlessLab"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the painlessLab plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'painlessLab']
 ---
 import painlessLabObj from './painless_lab.devdocs.json';
diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx
index 16cee9ed0a5d9..0bf32b395ee87 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -21,17 +21,17 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | API Count | Any Count | Missing comments | Missing exports |
 |--------------|----------|-----------------|--------|
-| 46666 | 234 | 35405 | 1805 |
+| 46807 | 234 | 35519 | 1807 |
 
 ## Plugin Directory
 
 | Plugin name &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;  | Maintaining team | Description | API Cnt | Any Cnt | Missing<br />comments | Missing<br />exports |
 |--------------|----------------|-----------|--------------|----------|---------------|--------|
-| <DocLink id="kibActionsPluginApi" text="actions"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 289 | 0 | 283 | 32 |
+| <DocLink id="kibActionsPluginApi" text="actions"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 291 | 0 | 285 | 32 |
 | <DocLink id="kibAdvancedSettingsPluginApi" text="advancedSettings"/> | [@elastic/appex-sharedux @elastic/kibana-management](https://github.com/orgs/elastic/teams/appex-sharedux ) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibAiAssistantManagementSelectionPluginApi" text="aiAssistantManagementSelection"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibAiopsPluginApi" text="aiops"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | AIOps plugin maintained by ML team. | 67 | 0 | 4 | 1 |
-| <DocLink id="kibAlertingPluginApi" text="alerting"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 838 | 1 | 807 | 53 |
+| <DocLink id="kibAlertingPluginApi" text="alerting"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 854 | 1 | 822 | 54 |
 | <DocLink id="kibApmPluginApi" text="apm"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | The user interface for Elastic APM | 29 | 0 | 29 | 125 |
 | <DocLink id="kibApmDataAccessPluginApi" text="apmDataAccess"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 9 | 0 | 9 | 0 |
 | <DocLink id="kibAssetManagerPluginApi" text="assetManager"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | Asset manager plugin for entity assets (inventory, topology, etc) | 9 | 0 | 9 | 2 |
@@ -56,11 +56,11 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <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 | 108 | 0 | 105 | 12 |
 | <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. | 3261 | 31 | 2601 | 23 |
+| <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. | 3283 | 31 | 2619 | 23 |
 | <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 | 35 | 0 | 25 | 5 |
 | <DocLink id="kibDataViewFieldEditorPluginApi" text="dataViewFieldEditor"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Reusable data view field editor across Kibana | 72 | 0 | 33 | 0 |
 | <DocLink id="kibDataViewManagementPluginApi" text="dataViewManagement"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Data view management app | 2 | 0 | 2 | 0 |
-| <DocLink id="kibDataViewsPluginApi" text="dataViews"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | 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. | 976 | 0 | 294 | 4 |
+| <DocLink id="kibDataViewsPluginApi" text="dataViews"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | 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. | 1069 | 0 | 370 | 4 |
 | <DocLink id="kibDataVisualizerPluginApi" text="dataVisualizer"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | The Data Visualizer tools help you understand your data, by analyzing the metrics and fields in a log file or an existing Elasticsearch index. | 31 | 3 | 25 | 1 |
 | <DocLink id="kibDatasetQualityPluginApi" text="datasetQuality"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | This plugin introduces the concept of dataset quality, where users can easily get an overview on the datasets they have. | 10 | 0 | 10 | 5 |
 | <DocLink id="kibDevToolsPluginApi" text="devTools"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 15 | 0 | 9 | 2 |
@@ -140,12 +140,12 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibNoDataPagePluginApi" text="noDataPage"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 3 | 0 | 3 | 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/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | - | 670 | 2 | 661 | 14 |
-| <DocLink id="kibObservabilityAIAssistantPluginApi" text="observabilityAIAssistant"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 227 | 1 | 225 | 25 |
+| <DocLink id="kibObservabilityAIAssistantPluginApi" text="observabilityAIAssistant"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 233 | 1 | 231 | 25 |
 | <DocLink id="kibObservabilityAIAssistantAppPluginApi" text="observabilityAIAssistantApp"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibObservabilityAiAssistantManagementPluginApi" text="observabilityAiAssistantManagement"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibObservabilityLogsExplorerPluginApi" text="observabilityLogsExplorer"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | This plugin exposes and registers observability log consumption features. | 21 | 0 | 21 | 1 |
 | <DocLink id="kibObservabilityOnboardingPluginApi" text="observabilityOnboarding"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 14 | 0 | 14 | 0 |
-| <DocLink id="kibObservabilitySharedPluginApi" text="observabilityShared"/> | [@elastic/observability-ui](https://github.com/orgs/elastic/teams/observability-ui) | - | 344 | 1 | 339 | 22 |
+| <DocLink id="kibObservabilitySharedPluginApi" text="observabilityShared"/> | [@elastic/observability-ui](https://github.com/orgs/elastic/teams/observability-ui) | - | 343 | 1 | 338 | 22 |
 | <DocLink id="kibOsqueryPluginApi" text="osquery"/> | [@elastic/security-defend-workflows](https://github.com/orgs/elastic/teams/security-defend-workflows) | - | 23 | 0 | 23 | 7 |
 | <DocLink id="kibPainlessLabPluginApi" text="painlessLab"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibPresentationPanelPluginApi" text="presentationPanel"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds a standardized Presentation panel which allows any forward ref component to interface with various Kibana systems. | 11 | 0 | 11 | 4 |
@@ -169,10 +169,10 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibSearchPlaygroundPluginApi" text="searchPlayground"/> | [@elastic/enterprise-search-frontend](https://github.com/orgs/elastic/teams/enterprise-search-frontend) | - | 15 | 0 | 9 | 0 |
 | searchprofiler | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-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. | 409 | 0 | 199 | 2 |
-| <DocLink id="kibSecuritySolutionPluginApi" text="securitySolution"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 193 | 0 | 122 | 37 |
+| <DocLink id="kibSecuritySolutionPluginApi" text="securitySolution"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 195 | 0 | 124 | 37 |
 | <DocLink id="kibSecuritySolutionEssPluginApi" text="securitySolutionEss"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | ESS customizations for Security Solution. | 6 | 0 | 6 | 0 |
 | <DocLink id="kibSecuritySolutionServerlessPluginApi" text="securitySolutionServerless"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | Serverless customizations for security. | 7 | 0 | 7 | 0 |
-| <DocLink id="kibServerlessPluginApi" text="serverless"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | The core Serverless plugin, providing APIs to Serverless Project plugins. | 24 | 0 | 23 | 0 |
+| <DocLink id="kibServerlessPluginApi" text="serverless"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | The core Serverless plugin, providing APIs to Serverless Project plugins. | 25 | 0 | 24 | 0 |
 | <DocLink id="kibServerlessObservabilityPluginApi" text="serverlessObservability"/> | [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | Serverless customizations for observability. | 6 | 0 | 6 | 0 |
 | <DocLink id="kibServerlessSearchPluginApi" text="serverlessSearch"/> | [@elastic/enterprise-search-frontend](https://github.com/orgs/elastic/teams/enterprise-search-frontend) | Serverless customizations for search. | 6 | 0 | 6 | 0 |
 | <DocLink id="kibSessionViewPluginApi" text="sessionView"/> | [@elastic/kibana-cloud-security-posture](https://github.com/orgs/elastic/teams/kibana-cloud-security-posture) | - | 134 | 0 | 134 | 8 |
@@ -189,11 +189,11 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibTelemetryCollectionXpackPluginApi" text="telemetryCollectionXpack"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibTelemetryManagementSectionPluginApi" text="telemetryManagementSection"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 6 | 0 | 0 | 0 |
 | <DocLink id="kibTextBasedLanguagesPluginApi" text="textBasedLanguages"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 28 | 0 | 10 | 0 |
-| <DocLink id="kibThreatIntelligencePluginApi" text="threatIntelligence"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | Elastic threat intelligence helps you see if you are open to or have been subject to current or historical known threats | 30 | 0 | 14 | 5 |
+| <DocLink id="kibThreatIntelligencePluginApi" text="threatIntelligence"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | Elastic threat intelligence helps you see if you are open to or have been subject to current or historical known threats | 30 | 0 | 14 | 4 |
 | <DocLink id="kibTimelinesPluginApi" text="timelines"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | - | 240 | 1 | 196 | 17 |
 | <DocLink id="kibTransformPluginApi" text="transform"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | This plugin provides access to the transforms features provided by Elastic. Transforms enable you to convert existing Elasticsearch indices into summarized indices, which provide opportunities for new insights and analytics. | 4 | 0 | 4 | 1 |
 | translations | [@elastic/kibana-localization](https://github.com/orgs/elastic/teams/kibana-localization) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibTriggersActionsUiPluginApi" text="triggersActionsUi"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 598 | 1 | 572 | 58 |
+| <DocLink id="kibTriggersActionsUiPluginApi" text="triggersActionsUi"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 592 | 1 | 566 | 59 |
 | <DocLink id="kibUiActionsPluginApi" text="uiActions"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Adds UI Actions service to Kibana | 147 | 0 | 101 | 9 |
 | <DocLink id="kibUiActionsEnhancedPluginApi" text="uiActionsEnhanced"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Extends UI Actions plugin with more functionality | 212 | 0 | 145 | 11 |
 | <DocLink id="kibUnifiedDocViewerPluginApi" text="unifiedDocViewer"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin contains services reliant on the plugin lifecycle for the unified doc viewer component (see @kbn/unified-doc-viewer). | 10 | 0 | 7 | 2 |
@@ -448,7 +448,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnDataStreamAdapterPluginApi" text="@kbn/data-stream-adapter"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 80 | 0 | 80 | 1 |
 | <DocLink id="kibKbnDataViewUtilsPluginApi" text="@kbn/data-view-utils"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 1 | 0 | 0 | 0 |
 | <DocLink id="kibKbnDatemathPluginApi" text="@kbn/datemath"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 44 | 0 | 43 | 0 |
-| <DocLink id="kibKbnDeeplinksAnalyticsPluginApi" text="@kbn/deeplinks-analytics"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 6 | 0 | 6 | 0 |
+| <DocLink id="kibKbnDeeplinksAnalyticsPluginApi" text="@kbn/deeplinks-analytics"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 7 | 0 | 7 | 0 |
 | <DocLink id="kibKbnDeeplinksDevtoolsPluginApi" text="@kbn/deeplinks-devtools"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 5 | 0 | 5 | 0 |
 | <DocLink id="kibKbnDeeplinksFleetPluginApi" text="@kbn/deeplinks-fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 3 | 0 | 3 | 0 |
 | <DocLink id="kibKbnDeeplinksManagementPluginApi" text="@kbn/deeplinks-management"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 4 | 0 | 4 | 0 |
@@ -601,7 +601,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnReportingServerPluginApi" text="@kbn/reporting-server"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 88 | 0 | 87 | 0 |
 | <DocLink id="kibKbnResizableLayoutPluginApi" text="@kbn/resizable-layout"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | A component for creating resizable layouts containing a fixed width panel and a flexible panel, with support for horizontal and vertical layouts. | 18 | 0 | 5 | 0 |
 | <DocLink id="kibKbnRisonPluginApi" text="@kbn/rison"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 13 | 2 | 8 | 0 |
-| <DocLink id="kibKbnRouterUtilsPluginApi" text="@kbn/router-utils"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 2 | 0 | 1 | 0 |
+| <DocLink id="kibKbnRouterUtilsPluginApi" text="@kbn/router-utils"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 2 | 0 | 1 | 1 |
 | <DocLink id="kibKbnRrulePluginApi" text="@kbn/rrule"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 16 | 0 | 16 | 1 |
 | <DocLink id="kibKbnRuleDataUtilsPluginApi" text="@kbn/rule-data-utils"/> | [@elastic/security-detections-response](https://github.com/orgs/elastic/teams/security-detections-response) | - | 123 | 0 | 120 | 0 |
 | <DocLink id="kibKbnSavedObjectsSettingsPluginApi" text="@kbn/saved-objects-settings"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 2 | 0 | 2 | 0 |
@@ -612,7 +612,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnSearchResponseWarningsPluginApi" text="@kbn/search-response-warnings"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 20 | 0 | 18 | 1 |
 | <DocLink id="kibKbnSecurityHardeningPluginApi" text="@kbn/security-hardening"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 7 | 0 | 7 | 0 |
 | <DocLink id="kibKbnSecurityPluginTypesCommonPluginApi" text="@kbn/security-plugin-types-common"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 83 | 0 | 36 | 0 |
-| <DocLink id="kibKbnSecurityPluginTypesPublicPluginApi" text="@kbn/security-plugin-types-public"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 49 | 0 | 15 | 0 |
+| <DocLink id="kibKbnSecurityPluginTypesPublicPluginApi" text="@kbn/security-plugin-types-public"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 53 | 0 | 15 | 0 |
 | <DocLink id="kibKbnSecurityPluginTypesServerPluginApi" text="@kbn/security-plugin-types-server"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 213 | 0 | 114 | 0 |
 | <DocLink id="kibKbnSecuritySolutionFeaturesPluginApi" text="@kbn/security-solution-features"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 14 | 0 | 14 | 6 |
 | <DocLink id="kibKbnSecuritySolutionNavigationPluginApi" text="@kbn/security-solution-navigation"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 52 | 0 | 48 | 0 |
@@ -703,14 +703,14 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnTsProjectsPluginApi" text="@kbn/ts-projects"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 39 | 0 | 25 | 1 |
 | <DocLink id="kibKbnTypedReactRouterConfigPluginApi" text="@kbn/typed-react-router-config"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 86 | 0 | 86 | 1 |
 | <DocLink id="kibKbnUiActionsBrowserPluginApi" text="@kbn/ui-actions-browser"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 42 | 0 | 28 | 0 |
-| <DocLink id="kibKbnUiSharedDepsSrcPluginApi" text="@kbn/ui-shared-deps-src"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 55 | 0 | 46 | 0 |
+| <DocLink id="kibKbnUiSharedDepsSrcPluginApi" text="@kbn/ui-shared-deps-src"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 54 | 0 | 45 | 0 |
 | <DocLink id="kibKbnUiThemePluginApi" text="@kbn/ui-theme"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 9 | 0 | 8 | 0 |
-| <DocLink id="kibKbnUnifiedDataTablePluginApi" text="@kbn/unified-data-table"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the unified data table which can be integrated into apps | 143 | 0 | 78 | 1 |
+| <DocLink id="kibKbnUnifiedDataTablePluginApi" text="@kbn/unified-data-table"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the unified data table which can be integrated into apps | 144 | 0 | 78 | 1 |
 | <DocLink id="kibKbnUnifiedDocViewerPluginApi" text="@kbn/unified-doc-viewer"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 14 | 0 | 13 | 6 |
 | <DocLink id="kibKbnUnifiedFieldListPluginApi" text="@kbn/unified-field-list"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the field list and field stats which can be integrated into apps | 293 | 0 | 269 | 10 |
 | <DocLink id="kibKbnUnsavedChangesBadgePluginApi" text="@kbn/unsaved-changes-badge"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 13 | 0 | 9 | 0 |
 | <DocLink id="kibKbnUseTrackedPromisePluginApi" text="@kbn/use-tracked-promise"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 3 | 0 | 2 | 1 |
-| <DocLink id="kibKbnUserProfileComponentsPluginApi" text="@kbn/user-profile-components"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 80 | 1 | 21 | 2 |
+| <DocLink id="kibKbnUserProfileComponentsPluginApi" text="@kbn/user-profile-components"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 81 | 1 | 22 | 2 |
 | <DocLink id="kibKbnUtilityTypesPluginApi" text="@kbn/utility-types"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 37 | 0 | 16 | 1 |
 | <DocLink id="kibKbnUtilityTypesJestPluginApi" text="@kbn/utility-types-jest"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibKbnUtilsPluginApi" text="@kbn/utils"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 26 | 0 | 15 | 0 |
diff --git a/api_docs/presentation_panel.mdx b/api_docs/presentation_panel.mdx
index f8c688cd3ff6a..bd1323b77ef40 100644
--- a/api_docs/presentation_panel.mdx
+++ b/api_docs/presentation_panel.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationPanel
 title: "presentationPanel"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the presentationPanel plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationPanel']
 ---
 import presentationPanelObj from './presentation_panel.devdocs.json';
diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx
index e08af41e82e1d..52e1f96966e61 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: 2024-04-02
+date: 2024-04-03
 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 5df64c5ac2ec0..688a93a149d86 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profiling']
 ---
 import profilingObj from './profiling.devdocs.json';
diff --git a/api_docs/profiling_data_access.mdx b/api_docs/profiling_data_access.mdx
index 3f223b2f66d88..2e18195a12620 100644
--- a/api_docs/profiling_data_access.mdx
+++ b/api_docs/profiling_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profilingDataAccess
 title: "profilingDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the profilingDataAccess plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profilingDataAccess']
 ---
 import profilingDataAccessObj from './profiling_data_access.devdocs.json';
diff --git a/api_docs/remote_clusters.mdx b/api_docs/remote_clusters.mdx
index 1ba52c74a7290..d8b2f2befc529 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: 2024-04-02
+date: 2024-04-03
 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 5defdd714bbbe..008fdfdac92d6 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: 2024-04-02
+date: 2024-04-03
 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 6dbd6f57dbc28..78d2e4e788db0 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: 2024-04-02
+date: 2024-04-03
 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 68454853720b7..88ed5a87a9c52 100644
--- a/api_docs/rule_registry.devdocs.json
+++ b/api_docs/rule_registry.devdocs.json
@@ -2035,15 +2035,7 @@
           },
           "<TParams, TState, Record<string, any>, { [x: string]: unknown; }, \"default\", never>) => Promise<{ state: TState; }>; id: string; name: string; validate: { params: ",
           "RuleTypeParamsValidator",
-          "<TParams>; }; cancelAlertsOnRuleTimeout?: boolean | undefined; alerts?: ",
-          {
-            "pluginId": "alerting",
-            "scope": "server",
-            "docId": "kibAlertingPluginApi",
-            "section": "def-server.IRuleTypeAlerts",
-            "text": "IRuleTypeAlerts"
-          },
-          "<never> | undefined; recoveryActionGroup?: ",
+          "<TParams>; }; recoveryActionGroup?: ",
           {
             "pluginId": "@kbn/alerting-types",
             "scope": "common",
@@ -2107,7 +2099,15 @@
             "section": "def-common.SavedObjectReference",
             "text": "SavedObjectReference"
           },
-          "[]) => TParams; } | undefined; isExportable: boolean; defaultScheduleInterval?: string | undefined; ruleTaskTimeout?: string | undefined; doesSetRecoveryContext?: boolean | undefined; autoRecoverAlerts?: boolean | undefined; getViewInAppRelativeUrl?: ",
+          "[]) => TParams; } | undefined; isExportable: boolean; defaultScheduleInterval?: string | undefined; ruleTaskTimeout?: string | undefined; cancelAlertsOnRuleTimeout?: boolean | undefined; doesSetRecoveryContext?: boolean | undefined; alerts?: ",
+          {
+            "pluginId": "alerting",
+            "scope": "server",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-server.IRuleTypeAlerts",
+            "text": "IRuleTypeAlerts"
+          },
+          "<never> | undefined; autoRecoverAlerts?: boolean | undefined; getViewInAppRelativeUrl?: ",
           "GetViewInAppRelativeUrlFn",
           "<TParams> | undefined; fieldsForAAD?: string[] | undefined; }"
         ],
diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx
index 9f64fd578ec2b..ac85d8ddd0e79 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: 2024-04-02
+date: 2024-04-03
 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 c470f2dfc6c92..d8aa712eef657 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: 2024-04-02
+date: 2024-04-03
 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 69fdaf5ec462c..54873d52b4d46 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: 2024-04-02
+date: 2024-04-03
 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 b4b4cea15f613..8aa08fd968402 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: 2024-04-02
+date: 2024-04-03
 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 fd9f46123c6b7..8a31e80bf3758 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: 2024-04-02
+date: 2024-04-03
 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 cd2463deefe35..5ff2a8cbac7a3 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: 2024-04-02
+date: 2024-04-03
 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 bff365d7354b6..c00255bfb028a 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: 2024-04-02
+date: 2024-04-03
 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 930ce4e6378a0..daae9ae5829ab 100644
--- a/api_docs/saved_search.devdocs.json
+++ b/api_docs/saved_search.devdocs.json
@@ -1075,7 +1075,9 @@
                 "section": "def-common.SearchSource",
                 "text": "SearchSource"
               },
-              "; fetch: (options?: ",
+              "; history: ",
+              "SearchRequest",
+              "[]; fetch: (options?: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -1087,9 +1089,7 @@
               "SearchResponse",
               "<unknown, Record<string, ",
               "AggregationsAggregate",
-              ">>>; history: ",
-              "SearchRequest",
-              "[]; setField: <K extends keyof ",
+              ">>>; setField: <K extends keyof ",
               {
                 "pluginId": "data",
                 "scope": "common",
diff --git a/api_docs/saved_search.mdx b/api_docs/saved_search.mdx
index 0b08774235652..9b15d2c8906a7 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: 2024-04-02
+date: 2024-04-03
 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 81faf6f03d068..d436c911fe63b 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: 2024-04-02
+date: 2024-04-03
 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 32caa21f0c0d9..2eaf085c5d12d 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotting']
 ---
 import screenshottingObj from './screenshotting.devdocs.json';
diff --git a/api_docs/search_connectors.mdx b/api_docs/search_connectors.mdx
index e00f2149f433d..3973bef60ce04 100644
--- a/api_docs/search_connectors.mdx
+++ b/api_docs/search_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchConnectors
 title: "searchConnectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchConnectors plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchConnectors']
 ---
 import searchConnectorsObj from './search_connectors.devdocs.json';
diff --git a/api_docs/search_playground.mdx b/api_docs/search_playground.mdx
index 4b3538c984a6d..690cc3476bafe 100644
--- a/api_docs/search_playground.mdx
+++ b/api_docs/search_playground.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchPlayground
 title: "searchPlayground"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchPlayground plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchPlayground']
 ---
 import searchPlaygroundObj from './search_playground.devdocs.json';
diff --git a/api_docs/security.mdx b/api_docs/security.mdx
index e746f1014e34b..32fe2d4924412 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: 2024-04-02
+date: 2024-04-03
 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 d04dac1135e95..78f43a51abca2 100644
--- a/api_docs/security_solution.devdocs.json
+++ b/api_docs/security_solution.devdocs.json
@@ -114,7 +114,7 @@
             "label": "experimentalFeatures",
             "description": [],
             "signature": [
-              "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly assistantStreamingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutInCreateRuleEnabled: boolean; readonly expandableEventFlyoutEnabled: boolean; readonly expandableTimelineFlyoutEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly newUserDetailsFlyout: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly newHostDetailsFlyout: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jsonPrebuiltRulesDiffingEnabled: boolean; readonly perFieldPrebuiltRulesDiffingEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; }"
+              "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly assistantStreamingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutInCreateRuleEnabled: boolean; readonly expandableEventFlyoutEnabled: boolean; readonly expandableTimelineFlyoutEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly newUserDetailsFlyout: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly newHostDetailsFlyout: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jsonPrebuiltRulesDiffingEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly perFieldPrebuiltRulesDiffingEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; }"
             ],
             "path": "x-pack/plugins/security_solution/public/plugin.tsx",
             "deprecated": false,
@@ -568,7 +568,7 @@
               "\nExperimental flag needed to enable the link"
             ],
             "signature": [
-              "\"assistantModelEvaluation\" | \"assistantStreamingEnabled\" | \"tGridEnabled\" | \"tGridEventRenderedViewEnabled\" | \"excludePoliciesInFilterEnabled\" | \"kubernetesEnabled\" | \"chartEmbeddablesEnabled\" | \"donutChartEmbeddablesEnabled\" | \"previewTelemetryUrlEnabled\" | \"insightsRelatedAlertsByProcessAncestry\" | \"extendedRuleExecutionLoggingEnabled\" | \"socTrendsEnabled\" | \"responseActionsEnabled\" | \"endpointResponseActionsEnabled\" | \"responseActionUploadEnabled\" | \"automatedProcessActionsEnabled\" | \"responseActionsSentinelOneV1Enabled\" | \"responseActionsSentinelOneV2Enabled\" | \"alertsPageChartsEnabled\" | \"alertTypeEnabled\" | \"expandableFlyoutInCreateRuleEnabled\" | \"expandableEventFlyoutEnabled\" | \"expandableTimelineFlyoutEnabled\" | \"alertsPageFiltersEnabled\" | \"newUserDetailsFlyout\" | \"newUserDetailsFlyoutManagedUser\" | \"newHostDetailsFlyout\" | \"riskScoringPersistence\" | \"riskScoringRoutesEnabled\" | \"esqlRulesDisabled\" | \"protectionUpdatesEnabled\" | \"disableTimelineSaveTour\" | \"riskEnginePrivilegesRouteEnabled\" | \"sentinelOneDataInAnalyzerEnabled\" | \"sentinelOneManualHostActionsEnabled\" | \"crowdstrikeDataInAnalyzerEnabled\" | \"jsonPrebuiltRulesDiffingEnabled\" | \"perFieldPrebuiltRulesDiffingEnabled\" | \"timelineEsqlTabDisabled\" | \"analyzerDatePickersAndSourcererDisabled\" | undefined"
+              "\"assistantModelEvaluation\" | \"assistantStreamingEnabled\" | \"tGridEnabled\" | \"tGridEventRenderedViewEnabled\" | \"excludePoliciesInFilterEnabled\" | \"kubernetesEnabled\" | \"chartEmbeddablesEnabled\" | \"donutChartEmbeddablesEnabled\" | \"previewTelemetryUrlEnabled\" | \"insightsRelatedAlertsByProcessAncestry\" | \"extendedRuleExecutionLoggingEnabled\" | \"socTrendsEnabled\" | \"responseActionsEnabled\" | \"endpointResponseActionsEnabled\" | \"responseActionUploadEnabled\" | \"automatedProcessActionsEnabled\" | \"responseActionsSentinelOneV1Enabled\" | \"responseActionsSentinelOneV2Enabled\" | \"alertsPageChartsEnabled\" | \"alertTypeEnabled\" | \"expandableFlyoutInCreateRuleEnabled\" | \"expandableEventFlyoutEnabled\" | \"expandableTimelineFlyoutEnabled\" | \"alertsPageFiltersEnabled\" | \"newUserDetailsFlyout\" | \"newUserDetailsFlyoutManagedUser\" | \"newHostDetailsFlyout\" | \"riskScoringPersistence\" | \"riskScoringRoutesEnabled\" | \"esqlRulesDisabled\" | \"protectionUpdatesEnabled\" | \"disableTimelineSaveTour\" | \"riskEnginePrivilegesRouteEnabled\" | \"sentinelOneDataInAnalyzerEnabled\" | \"sentinelOneManualHostActionsEnabled\" | \"crowdstrikeDataInAnalyzerEnabled\" | \"jsonPrebuiltRulesDiffingEnabled\" | \"timelineEsqlTabDisabled\" | \"unifiedComponentsInTimelineEnabled\" | \"analyzerDatePickersAndSourcererDisabled\" | \"perFieldPrebuiltRulesDiffingEnabled\" | \"malwareOnWriteScanOptionAvailable\" | undefined"
             ],
             "path": "x-pack/plugins/security_solution/public/common/links/types.ts",
             "deprecated": false,
@@ -648,7 +648,7 @@
               "\nExperimental flag needed to disable the link. Opposite of experimentalKey"
             ],
             "signature": [
-              "\"assistantModelEvaluation\" | \"assistantStreamingEnabled\" | \"tGridEnabled\" | \"tGridEventRenderedViewEnabled\" | \"excludePoliciesInFilterEnabled\" | \"kubernetesEnabled\" | \"chartEmbeddablesEnabled\" | \"donutChartEmbeddablesEnabled\" | \"previewTelemetryUrlEnabled\" | \"insightsRelatedAlertsByProcessAncestry\" | \"extendedRuleExecutionLoggingEnabled\" | \"socTrendsEnabled\" | \"responseActionsEnabled\" | \"endpointResponseActionsEnabled\" | \"responseActionUploadEnabled\" | \"automatedProcessActionsEnabled\" | \"responseActionsSentinelOneV1Enabled\" | \"responseActionsSentinelOneV2Enabled\" | \"alertsPageChartsEnabled\" | \"alertTypeEnabled\" | \"expandableFlyoutInCreateRuleEnabled\" | \"expandableEventFlyoutEnabled\" | \"expandableTimelineFlyoutEnabled\" | \"alertsPageFiltersEnabled\" | \"newUserDetailsFlyout\" | \"newUserDetailsFlyoutManagedUser\" | \"newHostDetailsFlyout\" | \"riskScoringPersistence\" | \"riskScoringRoutesEnabled\" | \"esqlRulesDisabled\" | \"protectionUpdatesEnabled\" | \"disableTimelineSaveTour\" | \"riskEnginePrivilegesRouteEnabled\" | \"sentinelOneDataInAnalyzerEnabled\" | \"sentinelOneManualHostActionsEnabled\" | \"crowdstrikeDataInAnalyzerEnabled\" | \"jsonPrebuiltRulesDiffingEnabled\" | \"perFieldPrebuiltRulesDiffingEnabled\" | \"timelineEsqlTabDisabled\" | \"analyzerDatePickersAndSourcererDisabled\" | undefined"
+              "\"assistantModelEvaluation\" | \"assistantStreamingEnabled\" | \"tGridEnabled\" | \"tGridEventRenderedViewEnabled\" | \"excludePoliciesInFilterEnabled\" | \"kubernetesEnabled\" | \"chartEmbeddablesEnabled\" | \"donutChartEmbeddablesEnabled\" | \"previewTelemetryUrlEnabled\" | \"insightsRelatedAlertsByProcessAncestry\" | \"extendedRuleExecutionLoggingEnabled\" | \"socTrendsEnabled\" | \"responseActionsEnabled\" | \"endpointResponseActionsEnabled\" | \"responseActionUploadEnabled\" | \"automatedProcessActionsEnabled\" | \"responseActionsSentinelOneV1Enabled\" | \"responseActionsSentinelOneV2Enabled\" | \"alertsPageChartsEnabled\" | \"alertTypeEnabled\" | \"expandableFlyoutInCreateRuleEnabled\" | \"expandableEventFlyoutEnabled\" | \"expandableTimelineFlyoutEnabled\" | \"alertsPageFiltersEnabled\" | \"newUserDetailsFlyout\" | \"newUserDetailsFlyoutManagedUser\" | \"newHostDetailsFlyout\" | \"riskScoringPersistence\" | \"riskScoringRoutesEnabled\" | \"esqlRulesDisabled\" | \"protectionUpdatesEnabled\" | \"disableTimelineSaveTour\" | \"riskEnginePrivilegesRouteEnabled\" | \"sentinelOneDataInAnalyzerEnabled\" | \"sentinelOneManualHostActionsEnabled\" | \"crowdstrikeDataInAnalyzerEnabled\" | \"jsonPrebuiltRulesDiffingEnabled\" | \"timelineEsqlTabDisabled\" | \"unifiedComponentsInTimelineEnabled\" | \"analyzerDatePickersAndSourcererDisabled\" | \"perFieldPrebuiltRulesDiffingEnabled\" | \"malwareOnWriteScanOptionAvailable\" | undefined"
             ],
             "path": "x-pack/plugins/security_solution/public/common/links/types.ts",
             "deprecated": false,
@@ -1857,6 +1857,31 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "securitySolution",
+            "id": "def-public.TimelineModel.rowHeight",
+            "type": "number",
+            "tags": [],
+            "label": "rowHeight",
+            "description": [],
+            "signature": [
+              "number | undefined"
+            ],
+            "path": "x-pack/plugins/security_solution/public/timelines/store/model.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "securitySolution",
+            "id": "def-public.TimelineModel.sampleSize",
+            "type": "number",
+            "tags": [],
+            "label": "sampleSize",
+            "description": [],
+            "path": "x-pack/plugins/security_solution/public/timelines/store/model.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "securitySolution",
             "id": "def-public.TimelineModel.confirmingNoteId",
@@ -1990,7 +2015,7 @@
           "label": "experimentalFeatures",
           "description": [],
           "signature": [
-            "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly assistantStreamingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutInCreateRuleEnabled: boolean; readonly expandableEventFlyoutEnabled: boolean; readonly expandableTimelineFlyoutEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly newUserDetailsFlyout: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly newHostDetailsFlyout: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jsonPrebuiltRulesDiffingEnabled: boolean; readonly perFieldPrebuiltRulesDiffingEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; }"
+            "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly assistantStreamingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutInCreateRuleEnabled: boolean; readonly expandableEventFlyoutEnabled: boolean; readonly expandableTimelineFlyoutEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly newUserDetailsFlyout: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly newHostDetailsFlyout: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jsonPrebuiltRulesDiffingEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly perFieldPrebuiltRulesDiffingEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; }"
           ],
           "path": "x-pack/plugins/security_solution/public/types.ts",
           "deprecated": false,
@@ -3109,7 +3134,7 @@
             "\nThe security solution generic experimental features"
           ],
           "signature": [
-            "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly assistantStreamingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutInCreateRuleEnabled: boolean; readonly expandableEventFlyoutEnabled: boolean; readonly expandableTimelineFlyoutEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly newUserDetailsFlyout: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly newHostDetailsFlyout: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jsonPrebuiltRulesDiffingEnabled: boolean; readonly perFieldPrebuiltRulesDiffingEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; }"
+            "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly assistantStreamingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutInCreateRuleEnabled: boolean; readonly expandableEventFlyoutEnabled: boolean; readonly expandableTimelineFlyoutEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly newUserDetailsFlyout: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly newHostDetailsFlyout: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jsonPrebuiltRulesDiffingEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly perFieldPrebuiltRulesDiffingEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; }"
           ],
           "path": "x-pack/plugins/security_solution/server/plugin_contract.ts",
           "deprecated": false,
@@ -3285,7 +3310,7 @@
         "label": "ExperimentalFeatures",
         "description": [],
         "signature": [
-          "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly assistantStreamingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutInCreateRuleEnabled: boolean; readonly expandableEventFlyoutEnabled: boolean; readonly expandableTimelineFlyoutEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly newUserDetailsFlyout: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly newHostDetailsFlyout: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jsonPrebuiltRulesDiffingEnabled: boolean; readonly perFieldPrebuiltRulesDiffingEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; }"
+          "{ readonly tGridEnabled: boolean; readonly tGridEventRenderedViewEnabled: boolean; readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly chartEmbeddablesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly insightsRelatedAlertsByProcessAncestry: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly assistantStreamingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutInCreateRuleEnabled: boolean; readonly expandableEventFlyoutEnabled: boolean; readonly expandableTimelineFlyoutEnabled: boolean; readonly alertsPageFiltersEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly newUserDetailsFlyout: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly newHostDetailsFlyout: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jsonPrebuiltRulesDiffingEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly perFieldPrebuiltRulesDiffingEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; }"
         ],
         "path": "x-pack/plugins/security_solution/common/experimental_features.ts",
         "deprecated": false,
@@ -3334,7 +3359,7 @@
           "\nA list of allowed values that can be used in `xpack.securitySolution.enableExperimental`.\nThis object is then used to validate and parse the value entered."
         ],
         "signature": [
-          "{ readonly tGridEnabled: true; readonly tGridEventRenderedViewEnabled: true; readonly excludePoliciesInFilterEnabled: false; readonly kubernetesEnabled: true; readonly chartEmbeddablesEnabled: true; readonly donutChartEmbeddablesEnabled: false; readonly previewTelemetryUrlEnabled: false; readonly insightsRelatedAlertsByProcessAncestry: true; readonly extendedRuleExecutionLoggingEnabled: false; readonly assistantStreamingEnabled: false; readonly socTrendsEnabled: false; readonly responseActionsEnabled: true; readonly endpointResponseActionsEnabled: true; readonly responseActionUploadEnabled: true; readonly automatedProcessActionsEnabled: true; readonly responseActionsSentinelOneV1Enabled: true; readonly responseActionsSentinelOneV2Enabled: false; readonly alertsPageChartsEnabled: true; readonly alertTypeEnabled: false; readonly expandableFlyoutInCreateRuleEnabled: true; readonly expandableEventFlyoutEnabled: false; readonly expandableTimelineFlyoutEnabled: false; readonly alertsPageFiltersEnabled: true; readonly assistantModelEvaluation: false; readonly newUserDetailsFlyout: true; readonly newUserDetailsFlyoutManagedUser: false; readonly newHostDetailsFlyout: true; readonly riskScoringPersistence: true; readonly riskScoringRoutesEnabled: true; readonly esqlRulesDisabled: false; readonly protectionUpdatesEnabled: true; readonly disableTimelineSaveTour: false; readonly riskEnginePrivilegesRouteEnabled: true; readonly sentinelOneDataInAnalyzerEnabled: true; readonly sentinelOneManualHostActionsEnabled: true; readonly crowdstrikeDataInAnalyzerEnabled: false; readonly jsonPrebuiltRulesDiffingEnabled: true; readonly perFieldPrebuiltRulesDiffingEnabled: true; readonly timelineEsqlTabDisabled: false; readonly analyzerDatePickersAndSourcererDisabled: false; }"
+          "{ readonly tGridEnabled: true; readonly tGridEventRenderedViewEnabled: true; readonly excludePoliciesInFilterEnabled: false; readonly kubernetesEnabled: true; readonly chartEmbeddablesEnabled: true; readonly donutChartEmbeddablesEnabled: false; readonly previewTelemetryUrlEnabled: false; readonly insightsRelatedAlertsByProcessAncestry: true; readonly extendedRuleExecutionLoggingEnabled: false; readonly assistantStreamingEnabled: false; readonly socTrendsEnabled: false; readonly responseActionsEnabled: true; readonly endpointResponseActionsEnabled: true; readonly responseActionUploadEnabled: true; readonly automatedProcessActionsEnabled: true; readonly responseActionsSentinelOneV1Enabled: true; readonly responseActionsSentinelOneV2Enabled: false; readonly alertsPageChartsEnabled: true; readonly alertTypeEnabled: false; readonly expandableFlyoutInCreateRuleEnabled: true; readonly expandableEventFlyoutEnabled: false; readonly expandableTimelineFlyoutEnabled: false; readonly alertsPageFiltersEnabled: true; readonly assistantModelEvaluation: false; readonly newUserDetailsFlyout: true; readonly newUserDetailsFlyoutManagedUser: false; readonly newHostDetailsFlyout: true; readonly riskScoringPersistence: true; readonly riskScoringRoutesEnabled: true; readonly esqlRulesDisabled: false; readonly protectionUpdatesEnabled: true; readonly disableTimelineSaveTour: false; readonly riskEnginePrivilegesRouteEnabled: true; readonly sentinelOneDataInAnalyzerEnabled: true; readonly sentinelOneManualHostActionsEnabled: true; readonly crowdstrikeDataInAnalyzerEnabled: false; readonly jsonPrebuiltRulesDiffingEnabled: true; readonly timelineEsqlTabDisabled: false; readonly unifiedComponentsInTimelineEnabled: false; readonly analyzerDatePickersAndSourcererDisabled: false; readonly perFieldPrebuiltRulesDiffingEnabled: true; readonly malwareOnWriteScanOptionAvailable: false; }"
         ],
         "path": "x-pack/plugins/security_solution/common/experimental_features.ts",
         "deprecated": false,
diff --git a/api_docs/security_solution.mdx b/api_docs/security_solution.mdx
index e2dea3c81f6a9..2d2f0362a9ea1 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolution']
 ---
 import securitySolutionObj from './security_solution.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/security-solution](https://github.com/orgs/elastic/teams/secur
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 193 | 0 | 122 | 37 |
+| 195 | 0 | 124 | 37 |
 
 ## Client
 
diff --git a/api_docs/security_solution_ess.mdx b/api_docs/security_solution_ess.mdx
index a6e7a006837fd..44f6f0daf21c0 100644
--- a/api_docs/security_solution_ess.mdx
+++ b/api_docs/security_solution_ess.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolutionEss
 title: "securitySolutionEss"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolutionEss plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolutionEss']
 ---
 import securitySolutionEssObj from './security_solution_ess.devdocs.json';
diff --git a/api_docs/security_solution_serverless.mdx b/api_docs/security_solution_serverless.mdx
index 2339aa40092d5..be9a7c29c6137 100644
--- a/api_docs/security_solution_serverless.mdx
+++ b/api_docs/security_solution_serverless.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolutionServerless
 title: "securitySolutionServerless"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolutionServerless plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolutionServerless']
 ---
 import securitySolutionServerlessObj from './security_solution_serverless.devdocs.json';
diff --git a/api_docs/serverless.devdocs.json b/api_docs/serverless.devdocs.json
index a00f3481e2d9c..5fb8821aef905 100644
--- a/api_docs/serverless.devdocs.json
+++ b/api_docs/serverless.devdocs.json
@@ -166,7 +166,7 @@
           "label": "initNavigation",
           "description": [],
           "signature": [
-            "(navigationTree$: ",
+            "(id: string, navigationTree$: ",
             "Observable",
             "<",
             {
@@ -201,6 +201,21 @@
             {
               "parentPluginId": "serverless",
               "id": "def-public.ServerlessPluginStart.initNavigation.$1",
+              "type": "string",
+              "tags": [],
+              "label": "id",
+              "description": [],
+              "signature": [
+                "string"
+              ],
+              "path": "x-pack/plugins/serverless/public/types.ts",
+              "deprecated": false,
+              "trackAdoption": false,
+              "isRequired": true
+            },
+            {
+              "parentPluginId": "serverless",
+              "id": "def-public.ServerlessPluginStart.initNavigation.$2",
               "type": "Object",
               "tags": [],
               "label": "navigationTree$",
@@ -232,7 +247,7 @@
             },
             {
               "parentPluginId": "serverless",
-              "id": "def-public.ServerlessPluginStart.initNavigation.$2",
+              "id": "def-public.ServerlessPluginStart.initNavigation.$3",
               "type": "Object",
               "tags": [],
               "label": "config",
@@ -243,7 +258,7 @@
               "children": [
                 {
                   "parentPluginId": "serverless",
-                  "id": "def-public.ServerlessPluginStart.initNavigation.$2.dataTestSubj",
+                  "id": "def-public.ServerlessPluginStart.initNavigation.$3.dataTestSubj",
                   "type": "string",
                   "tags": [],
                   "label": "dataTestSubj",
@@ -257,7 +272,7 @@
                 },
                 {
                   "parentPluginId": "serverless",
-                  "id": "def-public.ServerlessPluginStart.initNavigation.$2.panelContentProvider",
+                  "id": "def-public.ServerlessPluginStart.initNavigation.$3.panelContentProvider",
                   "type": "Function",
                   "tags": [],
                   "label": "panelContentProvider",
diff --git a/api_docs/serverless.mdx b/api_docs/serverless.mdx
index 6713a5639bc72..8db1811e7501d 100644
--- a/api_docs/serverless.mdx
+++ b/api_docs/serverless.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverless
 title: "serverless"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverless plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverless']
 ---
 import serverlessObj from './serverless.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sh
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 24 | 0 | 23 | 0 |
+| 25 | 0 | 24 | 0 |
 
 ## Client
 
diff --git a/api_docs/serverless_observability.mdx b/api_docs/serverless_observability.mdx
index e25377570affe..a6948aacb04c7 100644
--- a/api_docs/serverless_observability.mdx
+++ b/api_docs/serverless_observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverlessObservability
 title: "serverlessObservability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverlessObservability plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessObservability']
 ---
 import serverlessObservabilityObj from './serverless_observability.devdocs.json';
diff --git a/api_docs/serverless_search.mdx b/api_docs/serverless_search.mdx
index b8847d38df1c8..de9841035fb65 100644
--- a/api_docs/serverless_search.mdx
+++ b/api_docs/serverless_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverlessSearch
 title: "serverlessSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverlessSearch plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessSearch']
 ---
 import serverlessSearchObj from './serverless_search.devdocs.json';
diff --git a/api_docs/session_view.mdx b/api_docs/session_view.mdx
index f707c1b505d82..0491e32a29aa2 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: 2024-04-02
+date: 2024-04-03
 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 4dee33b09de2e..5ed6f37040509 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'share']
 ---
 import shareObj from './share.devdocs.json';
diff --git a/api_docs/slo.mdx b/api_docs/slo.mdx
index 7c6758ae066ec..0b9d88658bf6e 100644
--- a/api_docs/slo.mdx
+++ b/api_docs/slo.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/slo
 title: "slo"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the slo plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'slo']
 ---
 import sloObj from './slo.devdocs.json';
diff --git a/api_docs/snapshot_restore.mdx b/api_docs/snapshot_restore.mdx
index d0ffe81f62e6b..8aac323d711f7 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: 2024-04-02
+date: 2024-04-03
 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 61c1d316c4e92..4a5bc0f99fbde 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: 2024-04-02
+date: 2024-04-03
 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 10150e168835e..0cf7dc69458d8 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: 2024-04-02
+date: 2024-04-03
 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 30c28e676e146..383864d61067a 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: 2024-04-02
+date: 2024-04-03
 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 03dd808fed98f..f54465bc049c9 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: 2024-04-02
+date: 2024-04-03
 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 885cdcd1e9482..84665fbcc55f2 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: 2024-04-02
+date: 2024-04-03
 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 84838b45657de..f5745899eb33b 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: 2024-04-02
+date: 2024-04-03
 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 e5f6d7943fa63..83ed7385c0d51 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: 2024-04-02
+date: 2024-04-03
 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 d13eafb1b365f..4aec847d49306 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryManagementSection']
 ---
 import telemetryManagementSectionObj from './telemetry_management_section.devdocs.json';
diff --git a/api_docs/text_based_languages.mdx b/api_docs/text_based_languages.mdx
index d04d44112a37b..96877efa43c03 100644
--- a/api_docs/text_based_languages.mdx
+++ b/api_docs/text_based_languages.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/textBasedLanguages
 title: "textBasedLanguages"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the textBasedLanguages plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'textBasedLanguages']
 ---
 import textBasedLanguagesObj from './text_based_languages.devdocs.json';
diff --git a/api_docs/threat_intelligence.devdocs.json b/api_docs/threat_intelligence.devdocs.json
index 9a90f0e74658f..6cb8ec5bda156 100644
--- a/api_docs/threat_intelligence.devdocs.json
+++ b/api_docs/threat_intelligence.devdocs.json
@@ -418,11 +418,7 @@
               "\nAdd to blocklist feature"
             ],
             "signature": [
-              "{ canWriteBlocklist: boolean; exceptionListApiClient: unknown; useSetUrlParams: () => (params: Record<string, string | number | null | undefined>, replace?: boolean | undefined) => void; getFlyoutComponent: () => React.NamedExoticComponent<",
-              "BlockListFlyoutProps",
-              ">; getFormComponent: () => React.NamedExoticComponent<",
-              "BlockListFormProps",
-              ">; }"
+              "Blocking"
             ],
             "path": "x-pack/plugins/threat_intelligence/public/types.ts",
             "deprecated": false,
diff --git a/api_docs/threat_intelligence.mdx b/api_docs/threat_intelligence.mdx
index 990974687d8a0..f6472a8fa5a03 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'threatIntelligence']
 ---
 import threatIntelligenceObj from './threat_intelligence.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/security-threat-hunting-investigations](https://github.com/org
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 30 | 0 | 14 | 5 |
+| 30 | 0 | 14 | 4 |
 
 ## Client
 
diff --git a/api_docs/timelines.devdocs.json b/api_docs/timelines.devdocs.json
index ed69cb01d25f9..10319c0121222 100644
--- a/api_docs/timelines.devdocs.json
+++ b/api_docs/timelines.devdocs.json
@@ -4353,6 +4353,14 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/flyout/document_details/right/context.tsx"
           },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/timelines/components/timeline/query_tab_content/index.tsx"
+          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
diff --git a/api_docs/timelines.mdx b/api_docs/timelines.mdx
index d4e11801e8a48..c9e3611417c56 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: 2024-04-02
+date: 2024-04-03
 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 29059348a0f63..ded0166be4319 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: 2024-04-02
+date: 2024-04-03
 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 acf4d43db70c5..40568e8323213 100644
--- a/api_docs/triggers_actions_ui.devdocs.json
+++ b/api_docs/triggers_actions_ui.devdocs.json
@@ -1092,7 +1092,7 @@
         "label": "loadActionTypes",
         "description": [],
         "signature": [
-          "({\n  http,\n  featureId,\n}: { http: ",
+          "({\n  http,\n  featureId,\n  includeSystemActions = false,\n}: { http: ",
           {
             "pluginId": "@kbn/core-http-browser",
             "scope": "common",
@@ -1100,7 +1100,7 @@
             "section": "def-common.HttpSetup",
             "text": "HttpSetup"
           },
-          "; featureId?: string | undefined; }) => Promise<",
+          "; featureId?: string | undefined; includeSystemActions?: boolean | undefined; }) => Promise<",
           {
             "pluginId": "actions",
             "scope": "common",
@@ -1119,7 +1119,7 @@
             "id": "def-public.loadActionTypes.$1",
             "type": "Object",
             "tags": [],
-            "label": "{\n  http,\n  featureId,\n}",
+            "label": "{\n  http,\n  featureId,\n  includeSystemActions = false,\n}",
             "description": [],
             "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts",
             "deprecated": false,
@@ -1158,6 +1158,20 @@
                 "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts",
                 "deprecated": false,
                 "trackAdoption": false
+              },
+              {
+                "parentPluginId": "triggersActionsUi",
+                "id": "def-public.loadActionTypes.$1.includeSystemActions",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "includeSystemActions",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/action_connector_api/connector_types.ts",
+                "deprecated": false,
+                "trackAdoption": false
               }
             ]
           }
@@ -2073,13 +2087,7 @@
         "description": [],
         "signature": [
           "(actionItem: ",
-          {
-            "pluginId": "alerting",
-            "scope": "common",
-            "docId": "kibAlertingPluginApi",
-            "section": "def-common.RuleAction",
-            "text": "RuleAction"
-          },
+          "RuleUiAction",
           ") => string | null"
         ],
         "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/value_validators.ts",
@@ -2089,18 +2097,12 @@
           {
             "parentPluginId": "triggersActionsUi",
             "id": "def-public.validateActionFilterQuery.$1",
-            "type": "Object",
+            "type": "CompoundType",
             "tags": [],
             "label": "actionItem",
             "description": [],
             "signature": [
-              {
-                "pluginId": "alerting",
-                "scope": "common",
-                "docId": "kibAlertingPluginApi",
-                "section": "def-common.RuleAction",
-                "text": "RuleAction"
-              }
+              "RuleUiAction"
             ],
             "path": "x-pack/plugins/triggers_actions_ui/public/application/lib/value_validators.ts",
             "deprecated": false,
@@ -3040,6 +3042,20 @@
             "path": "x-pack/plugins/triggers_actions_ui/public/types.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "triggersActionsUi",
+            "id": "def-public.ActionTypeModel.isSystemActionType",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "isSystemActionType",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "x-pack/plugins/triggers_actions_ui/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -4102,143 +4118,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "triggersActionsUi",
-        "id": "def-public.RuleAction",
-        "type": "Interface",
-        "tags": [],
-        "label": "RuleAction",
-        "description": [],
-        "path": "x-pack/plugins/alerting/common/rule.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "triggersActionsUi",
-            "id": "def-public.RuleAction.uuid",
-            "type": "string",
-            "tags": [],
-            "label": "uuid",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "path": "x-pack/plugins/alerting/common/rule.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "triggersActionsUi",
-            "id": "def-public.RuleAction.group",
-            "type": "string",
-            "tags": [],
-            "label": "group",
-            "description": [],
-            "path": "x-pack/plugins/alerting/common/rule.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "triggersActionsUi",
-            "id": "def-public.RuleAction.id",
-            "type": "string",
-            "tags": [],
-            "label": "id",
-            "description": [],
-            "path": "x-pack/plugins/alerting/common/rule.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "triggersActionsUi",
-            "id": "def-public.RuleAction.actionTypeId",
-            "type": "string",
-            "tags": [],
-            "label": "actionTypeId",
-            "description": [],
-            "path": "x-pack/plugins/alerting/common/rule.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "triggersActionsUi",
-            "id": "def-public.RuleAction.params",
-            "type": "Object",
-            "tags": [],
-            "label": "params",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "@kbn/core-saved-objects-common",
-                "scope": "common",
-                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                "section": "def-common.SavedObjectAttributes",
-                "text": "SavedObjectAttributes"
-              }
-            ],
-            "path": "x-pack/plugins/alerting/common/rule.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "triggersActionsUi",
-            "id": "def-public.RuleAction.frequency",
-            "type": "Object",
-            "tags": [],
-            "label": "frequency",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "alerting",
-                "scope": "common",
-                "docId": "kibAlertingPluginApi",
-                "section": "def-common.RuleActionFrequency",
-                "text": "RuleActionFrequency"
-              },
-              " | undefined"
-            ],
-            "path": "x-pack/plugins/alerting/common/rule.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "triggersActionsUi",
-            "id": "def-public.RuleAction.alertsFilter",
-            "type": "Object",
-            "tags": [],
-            "label": "alertsFilter",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "alerting",
-                "scope": "common",
-                "docId": "kibAlertingPluginApi",
-                "section": "def-common.AlertsFilter",
-                "text": "AlertsFilter"
-              },
-              " | undefined"
-            ],
-            "path": "x-pack/plugins/alerting/common/rule.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "triggersActionsUi",
-            "id": "def-public.RuleAction.useAlertDataForTemplate",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "useAlertDataForTemplate",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "path": "x-pack/plugins/alerting/common/rule.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "triggersActionsUi",
         "id": "def-public.RuleDefinitionProps",
@@ -4276,7 +4155,9 @@
                 "section": "def-common.SanitizedRule",
                 "text": "SanitizedRule"
               },
-              "<Params>, \"alertTypeId\"> & { ruleTypeId: string; }"
+              "<Params>, \"actions\" | \"alertTypeId\" | \"systemActions\"> & { ruleTypeId: string; actions: ",
+              "RuleUiAction",
+              "[]; }"
             ],
             "path": "x-pack/plugins/triggers_actions_ui/public/types.ts",
             "deprecated": false,
@@ -6548,7 +6429,9 @@
             "section": "def-common.SanitizedRule",
             "text": "SanitizedRule"
           },
-          "<Params>, \"alertTypeId\"> & { ruleTypeId: string; }"
+          "<Params>, \"actions\" | \"alertTypeId\" | \"systemActions\"> & { ruleTypeId: string; actions: ",
+          "RuleUiAction",
+          "[]; }"
         ],
         "path": "x-pack/plugins/triggers_actions_ui/public/types.ts",
         "deprecated": false,
@@ -6563,7 +6446,7 @@
         "label": "RuleCreationValidConsumer",
         "description": [],
         "signature": [
-          "\"observability\" | \"stackAlerts\" | \"alerts\" | \"logs\" | \"infrastructure\""
+          "\"alerts\" | \"observability\" | \"stackAlerts\" | \"logs\" | \"infrastructure\""
         ],
         "path": "packages/kbn-rule-data-utils/src/rule_types/index.ts",
         "deprecated": false,
@@ -6722,6 +6605,37 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "triggersActionsUi",
+        "id": "def-public.SanitizedRuleAction",
+        "type": "Type",
+        "tags": [],
+        "label": "SanitizedRuleAction",
+        "description": [],
+        "signature": [
+          "Omit<",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.RuleAction",
+            "text": "RuleAction"
+          },
+          ", \"alertsFilter\"> & { alertsFilter?: ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.SanitizedAlertsFilter",
+            "text": "SanitizedAlertsFilter"
+          },
+          " | undefined; }"
+        ],
+        "path": "x-pack/plugins/alerting/common/rule.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "triggersActionsUi",
         "id": "def-public.ValidNormalizedTypes",
@@ -7777,7 +7691,15 @@
           "signature": [
             "(props: Omit<",
             "ActionAccordionFormProps",
-            ", \"actionTypeRegistry\">) => React.ReactElement<",
+            ", \"actionTypeRegistry\" | \"setActions\"> & { setActions: (actions: ",
+            {
+              "pluginId": "alerting",
+              "scope": "common",
+              "docId": "kibAlertingPluginApi",
+              "section": "def-common.RuleAction",
+              "text": "RuleAction"
+            },
+            "[]) => void; }) => React.ReactElement<",
             "ActionAccordionFormProps",
             ", string | React.JSXElementConstructor<any>>"
           ],
@@ -7788,14 +7710,22 @@
             {
               "parentPluginId": "triggersActionsUi",
               "id": "def-public.TriggersAndActionsUIPublicPluginStart.getActionForm.$1",
-              "type": "Object",
+              "type": "CompoundType",
               "tags": [],
               "label": "props",
               "description": [],
               "signature": [
                 "Omit<",
                 "ActionAccordionFormProps",
-                ", \"actionTypeRegistry\">"
+                ", \"actionTypeRegistry\" | \"setActions\"> & { setActions: (actions: ",
+                {
+                  "pluginId": "alerting",
+                  "scope": "common",
+                  "docId": "kibAlertingPluginApi",
+                  "section": "def-common.RuleAction",
+                  "text": "RuleAction"
+                },
+                "[]) => void; }"
               ],
               "path": "x-pack/plugins/triggers_actions_ui/public/plugin.ts",
               "deprecated": false,
diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx
index 20ba448185ebf..a28a515149058 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'triggersActionsUi']
 ---
 import triggersActionsUiObj from './triggers_actions_ui.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 598 | 1 | 572 | 58 |
+| 592 | 1 | 566 | 59 |
 
 ## Client
 
diff --git a/api_docs/ui_actions.mdx b/api_docs/ui_actions.mdx
index e5027ca4df8f2..ac25162e63857 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: 2024-04-02
+date: 2024-04-03
 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 bfa2929a294af..c75b6b244b19b 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActionsEnhanced']
 ---
 import uiActionsEnhancedObj from './ui_actions_enhanced.devdocs.json';
diff --git a/api_docs/unified_doc_viewer.mdx b/api_docs/unified_doc_viewer.mdx
index 54d9c7e994303..d38559c4ccb96 100644
--- a/api_docs/unified_doc_viewer.mdx
+++ b/api_docs/unified_doc_viewer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedDocViewer
 title: "unifiedDocViewer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedDocViewer plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedDocViewer']
 ---
 import unifiedDocViewerObj from './unified_doc_viewer.devdocs.json';
diff --git a/api_docs/unified_histogram.mdx b/api_docs/unified_histogram.mdx
index c9c0d08a9e88a..e222f9350b43e 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: 2024-04-02
+date: 2024-04-03
 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 3f37f5681cd00..a596753a5e0e5 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: 2024-04-02
+date: 2024-04-03
 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 dea847eb9bd62..7c5468c9864f5 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch.autocomplete']
 ---
 import unifiedSearchAutocompleteObj from './unified_search_autocomplete.devdocs.json';
diff --git a/api_docs/uptime.mdx b/api_docs/uptime.mdx
index 2f7a17cbcf4f2..67db56c730436 100644
--- a/api_docs/uptime.mdx
+++ b/api_docs/uptime.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uptime
 title: "uptime"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uptime plugin
-date: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uptime']
 ---
 import uptimeObj from './uptime.devdocs.json';
diff --git a/api_docs/url_forwarding.mdx b/api_docs/url_forwarding.mdx
index 2ceeb00dcbf04..94c8f5b6ca085 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: 2024-04-02
+date: 2024-04-03
 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 f649a7886a556..d6f97a3f61348 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: 2024-04-02
+date: 2024-04-03
 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 8a66d48b2dc43..7c74474077c55 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: 2024-04-02
+date: 2024-04-03
 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 317ec35c86657..5cc14c329eed3 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: 2024-04-02
+date: 2024-04-03
 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 4e552264fc8fe..822701c7c18b0 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: 2024-04-02
+date: 2024-04-03
 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 6761588d5b7e8..497b55894d003 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: 2024-04-02
+date: 2024-04-03
 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 b5302b9064617..b9e06827b8b69 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: 2024-04-02
+date: 2024-04-03
 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 c977545cc5cf2..e9c82d17a7df1 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: 2024-04-02
+date: 2024-04-03
 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 15b6f49530bef..178789d705d3b 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: 2024-04-02
+date: 2024-04-03
 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 5e1a8b4101ebc..635d97c9f34b8 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: 2024-04-02
+date: 2024-04-03
 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 fc26696b0c411..01763c3f7716a 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: 2024-04-02
+date: 2024-04-03
 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 2c71119096a7d..6e2292e2ba2aa 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: 2024-04-02
+date: 2024-04-03
 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 e47c3fb59cfeb..b4f68b3a990b1 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: 2024-04-02
+date: 2024-04-03
 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 93bb6ef76ef0e..7d8eee18e12f6 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: 2024-04-02
+date: 2024-04-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizations']
 ---
 import visualizationsObj from './visualizations.devdocs.json';

From f7341700b9cbed2fd6c2fa623d189e214edf4aa4 Mon Sep 17 00:00:00 2001
From: Maxim Kholod <maxim.kholod@elastic.co>
Date: Wed, 3 Apr 2024 10:16:19 +0200
Subject: [PATCH 56/63] [Cloud Security] Move credentials type strings to
 constants for all cloud providers (#179031)

## Summary

Part of:
- https://github.com/elastic/security-team/issues/8040

Small refactoring which shouldn't affect functionality, a follow-up
after https://github.com/elastic/kibana/pull/178400 and
https://github.com/elastic/kibana/pull/177965. I didn't go as far as
moving all the var names to the contents, for now just moving all the
string values of credentials types we use to constants
---
 .../common/constants.ts                       |  7 +--
 .../aws_credentials_form.tsx                  | 25 ++++++++--
 .../get_aws_credentials_form_options.tsx      | 26 ++++++----
 .../aws_credentials_form/hooks.ts             | 24 ++++-----
 .../azure_credentials_form.tsx                | 44 +++++++++++------
 .../azure_credentials_form_agentless.tsx      |  3 +-
 .../get_azure_credentials_form_options.tsx    | 19 +++----
 .../azure_credentials_form/hooks.ts           | 24 +++++----
 .../gcp_credential_form.tsx                   | 49 +++++++++++--------
 .../fleet_extensions/policy_template_form.tsx |  6 +--
 .../components/fleet_extensions/utils.ts      | 20 ++++----
 11 files changed, 144 insertions(+), 103 deletions(-)

diff --git a/x-pack/plugins/cloud_security_posture/common/constants.ts b/x-pack/plugins/cloud_security_posture/common/constants.ts
index fd93ebb94fccf..ef7191c9efe11 100644
--- a/x-pack/plugins/cloud_security_posture/common/constants.ts
+++ b/x-pack/plugins/cloud_security_posture/common/constants.ts
@@ -6,10 +6,10 @@
  */
 
 import {
-  PostureTypes,
-  VulnSeverity,
   AwsCredentialsTypeFieldMap,
   GcpCredentialsTypeFieldMap,
+  PostureTypes,
+  VulnSeverity,
 } from './types_old';
 
 export const STATUS_ROUTE_PATH = '/internal/cloud_security_posture/status';
@@ -162,9 +162,6 @@ export const AWS_CREDENTIALS_TYPE_TO_FIELDS_MAP: AwsCredentialsTypeFieldMap = {
   cloud_formation: [],
 };
 
-export const SETUP_ACCESS_CLOUD_SHELL = 'google_cloud_shell';
-export const SETUP_ACCESS_MANUAL = 'manual';
-
 export const DETECTION_ENGINE_ALERTS_INDEX_DEFAULT = '.alerts-security.alerts-default';
 
 export const GCP_CREDENTIALS_TYPE_TO_FIELDS_MAP: GcpCredentialsTypeFieldMap = {
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
index 3f717a9f4cb22..18d387d3136f3 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_credentials_form.tsx
@@ -26,7 +26,7 @@ import {
 } from './get_aws_credentials_form_options';
 import { CspRadioOption, RadioGroup } from '../csp_boxed_radio_group';
 import { getPosturePolicy, NewPackagePolicyPostureInput } from '../utils';
-import { SetupFormat, useAwsCredentialsForm } from './hooks';
+import { useAwsCredentialsForm } from './hooks';
 import { AWS_ORGANIZATION_ACCOUNT } from '../policy_template_form';
 import { AwsCredentialsType } from '../../../../common/types_old';
 import { AwsInputVarFields } from './aws_input_var_fields';
@@ -38,6 +38,21 @@ import {
 interface AWSSetupInfoContentProps {
   info: ReactNode;
 }
+
+export type SetupFormat = typeof AWS_SETUP_FORMAT.CLOUD_FORMATION | typeof AWS_SETUP_FORMAT.MANUAL;
+
+export const AWS_SETUP_FORMAT = {
+  CLOUD_FORMATION: 'cloud_formation',
+  MANUAL: 'manual',
+};
+
+export const AWS_CREDENTIALS_TYPE = {
+  ASSUME_ROLE: 'assume_role',
+  DIRECT_ACCESS_KEYS: 'direct_access_keys',
+  TEMPORARY_KEYS: 'temporary_keys',
+  SHARED_CREDENTIALS: 'shared_credentials',
+  CLOUD_FORMATION: 'cloud_formation',
+} as const;
 export const AWSSetupInfoContent = ({ info }: AWSSetupInfoContentProps) => {
   return (
     <>
@@ -60,12 +75,12 @@ export const AWSSetupInfoContent = ({ info }: AWSSetupInfoContentProps) => {
 
 const getSetupFormatOptions = (): CspRadioOption[] => [
   {
-    id: 'cloud_formation',
+    id: AWS_SETUP_FORMAT.CLOUD_FORMATION,
     label: 'CloudFormation',
     testId: AWS_CREDENTIALS_TYPE_OPTIONS_TEST_SUBJ.CLOUDFORMATION,
   },
   {
-    id: 'manual',
+    id: AWS_SETUP_FORMAT.MANUAL,
     label: i18n.translate('xpack.csp.awsIntegration.setupFormatOptions.manual', {
       defaultMessage: 'Manual',
     }),
@@ -243,10 +258,10 @@ export const AwsCredentialsForm = ({
         }
       />
       <EuiSpacer size="l" />
-      {setupFormat === 'cloud_formation' && (
+      {setupFormat === AWS_SETUP_FORMAT.CLOUD_FORMATION && (
         <CloudFormationSetup hasCloudFormationTemplate={hasCloudFormationTemplate} input={input} />
       )}
-      {setupFormat === 'manual' && (
+      {setupFormat === AWS_SETUP_FORMAT.MANUAL && (
         <>
           <AwsCredentialTypeSelector
             label={i18n.translate('xpack.csp.awsIntegration.awsCredentialTypeSelectorLabel', {
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/get_aws_credentials_form_options.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/get_aws_credentials_form_options.tsx
index f9d6fe06e5a8b..90175947ca172 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/get_aws_credentials_form_options.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/get_aws_credentials_form_options.tsx
@@ -11,6 +11,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { NewPackagePolicyInput } from '@kbn/fleet-plugin/common';
 import { AwsCredentialsType } from '../../../../common/types_old';
+import { AWS_CREDENTIALS_TYPE } from './aws_credentials_form';
 
 const AssumeRoleDescription = (
   <div>
@@ -109,19 +110,24 @@ const getAwsCredentialsTypeSelectorOptions = (
 };
 
 export const getAwsCredentialsFormManualOptions = (): AwsCredentialsTypeOptions =>
-  getAwsCredentialsTypeSelectorOptions(({ value }) => value !== 'cloud_formation');
+  getAwsCredentialsTypeSelectorOptions(
+    ({ value }) => value !== AWS_CREDENTIALS_TYPE.CLOUD_FORMATION
+  );
 
 export const getAwsCredentialsFormAgentlessOptions = (): AwsCredentialsTypeOptions =>
   getAwsCredentialsTypeSelectorOptions(
-    ({ value }) => value === 'direct_access_keys' || value === 'temporary_keys'
+    ({ value }) =>
+      value === AWS_CREDENTIALS_TYPE.DIRECT_ACCESS_KEYS ||
+      value === AWS_CREDENTIALS_TYPE.TEMPORARY_KEYS
   );
 
-export const DEFAULT_AWS_CREDENTIALS_TYPE = 'cloud_formation';
-export const DEFAULT_MANUAL_AWS_CREDENTIALS_TYPE = 'assume_role';
-export const DEFAULT_AGENTLESS_AWS_CREDENTIALS_TYPE = 'direct_access_keys';
+export const DEFAULT_AWS_CREDENTIALS_TYPE = AWS_CREDENTIALS_TYPE.CLOUD_FORMATION;
+export const DEFAULT_MANUAL_AWS_CREDENTIALS_TYPE: typeof AWS_CREDENTIALS_TYPE.ASSUME_ROLE =
+  AWS_CREDENTIALS_TYPE.ASSUME_ROLE;
+export const DEFAULT_AGENTLESS_AWS_CREDENTIALS_TYPE = AWS_CREDENTIALS_TYPE.DIRECT_ACCESS_KEYS;
 
 export const getAwsCredentialsFormOptions = (): AwsOptions => ({
-  assume_role: {
+  [AWS_CREDENTIALS_TYPE.ASSUME_ROLE]: {
     label: i18n.translate('xpack.csp.awsIntegration.assumeRoleLabel', {
       defaultMessage: 'Assume role',
     }),
@@ -134,7 +140,7 @@ export const getAwsCredentialsFormOptions = (): AwsOptions => ({
       },
     },
   },
-  direct_access_keys: {
+  [AWS_CREDENTIALS_TYPE.DIRECT_ACCESS_KEYS]: {
     label: i18n.translate('xpack.csp.awsIntegration.directAccessKeyLabel', {
       defaultMessage: 'Direct access keys',
     }),
@@ -144,7 +150,7 @@ export const getAwsCredentialsFormOptions = (): AwsOptions => ({
       secret_access_key: { label: AWS_FIELD_LABEL.secret_access_key, type: 'password' },
     },
   },
-  temporary_keys: {
+  [AWS_CREDENTIALS_TYPE.TEMPORARY_KEYS]: {
     info: TemporaryKeysDescription,
     label: i18n.translate('xpack.csp.awsIntegration.temporaryKeysLabel', {
       defaultMessage: 'Temporary keys',
@@ -159,7 +165,7 @@ export const getAwsCredentialsFormOptions = (): AwsOptions => ({
       },
     },
   },
-  shared_credentials: {
+  [AWS_CREDENTIALS_TYPE.SHARED_CREDENTIALS]: {
     label: i18n.translate('xpack.csp.awsIntegration.sharedCredentialLabel', {
       defaultMessage: 'Shared credentials',
     }),
@@ -177,7 +183,7 @@ export const getAwsCredentialsFormOptions = (): AwsOptions => ({
       },
     },
   },
-  cloud_formation: {
+  [AWS_CREDENTIALS_TYPE.CLOUD_FORMATION]: {
     label: 'CloudFormation',
     info: [],
     fields: {},
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/hooks.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/hooks.ts
index 3735a585268e1..5c9603ee17cc5 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/hooks.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/hooks.ts
@@ -9,10 +9,10 @@ import { useEffect, useRef } from 'react';
 import { NewPackagePolicy, PackageInfo } from '@kbn/fleet-plugin/common';
 import { cspIntegrationDocsNavigation } from '../../../common/navigation/constants';
 import {
+  getAwsCredentialsType,
   getCspmCloudFormationDefaultValue,
   getPosturePolicy,
   NewPackagePolicyPostureInput,
-  getAwsCredentialsType,
 } from '../utils';
 import {
   DEFAULT_MANUAL_AWS_CREDENTIALS_TYPE,
@@ -21,13 +21,12 @@ import {
 } from './get_aws_credentials_form_options';
 import { CLOUDBEAT_AWS } from '../../../../common/constants';
 import { AwsCredentialsType } from '../../../../common/types_old';
+import { AWS_CREDENTIALS_TYPE, AWS_SETUP_FORMAT, SetupFormat } from './aws_credentials_form';
 /**
  * Update CloudFormation template and stack name in the Agent Policy
  * based on the selected policy template
  */
 
-export type SetupFormat = 'cloud_formation' | 'manual';
-
 const getSetupFormatFromInput = (
   input: Extract<NewPackagePolicyPostureInput, { type: 'cloudbeat/cis_aws' }>,
   hasCloudFormationTemplate: boolean
@@ -35,13 +34,13 @@ const getSetupFormatFromInput = (
   const credentialsType = getAwsCredentialsType(input);
   // CloudFormation is the default setup format if the integration has a CloudFormation template
   if (!credentialsType && hasCloudFormationTemplate) {
-    return 'cloud_formation';
+    return AWS_SETUP_FORMAT.CLOUD_FORMATION;
   }
-  if (credentialsType !== 'cloud_formation') {
-    return 'manual';
+  if (credentialsType !== AWS_CREDENTIALS_TYPE.CLOUD_FORMATION) {
+    return AWS_SETUP_FORMAT.MANUAL;
   }
 
-  return 'cloud_formation';
+  return AWS_SETUP_FORMAT.CLOUD_FORMATION;
 };
 
 export const useAwsCredentialsForm = ({
@@ -60,7 +59,7 @@ export const useAwsCredentialsForm = ({
   updatePolicy: (updatedPolicy: NewPackagePolicy) => void;
 }) => {
   // We only have a value for 'aws.credentials.type' once the form has mounted.
-  // On initial render we don't have that value so we fallback to the default option.
+  // On initial render we don't have that value, so we fall back to the default option.
   const awsCredentialsType: AwsCredentialsType =
     getAwsCredentialsType(input) || DEFAULT_MANUAL_AWS_CREDENTIALS_TYPE;
 
@@ -76,7 +75,8 @@ export const useAwsCredentialsForm = ({
   const lastManualCredentialsType = useRef<string | undefined>(undefined);
 
   useEffect(() => {
-    const isInvalid = setupFormat === 'cloud_formation' && !hasCloudFormationTemplate;
+    const isInvalid =
+      setupFormat === AWS_SETUP_FORMAT.CLOUD_FORMATION && !hasCloudFormationTemplate;
 
     setIsValid(!isInvalid);
 
@@ -97,7 +97,7 @@ export const useAwsCredentialsForm = ({
   });
 
   const onSetupFormatChange = (newSetupFormat: SetupFormat) => {
-    if (newSetupFormat === 'cloud_formation') {
+    if (newSetupFormat === AWS_SETUP_FORMAT.CLOUD_FORMATION) {
       // We need to store the current manual fields to restore them later
       fieldsSnapshot.current = Object.fromEntries(
         fields.map((field) => [field.id, { value: field.value }])
@@ -108,7 +108,7 @@ export const useAwsCredentialsForm = ({
       updatePolicy(
         getPosturePolicy(newPolicy, input.type, {
           'aws.credentials.type': {
-            value: 'cloud_formation',
+            value: AWS_CREDENTIALS_TYPE.CLOUD_FORMATION,
             type: 'text',
           },
           // Clearing fields from previous setup format to prevent exposing credentials
@@ -182,7 +182,7 @@ const useCloudFormationTemplate = ({
   useEffect(() => {
     const policyInputCloudFormationTemplate = getAwsCloudFormationTemplate(newPolicy);
 
-    if (setupFormat === 'manual') {
+    if (setupFormat === AWS_SETUP_FORMAT.MANUAL) {
       if (!!policyInputCloudFormationTemplate) {
         updateCloudFormationPolicyTemplate(newPolicy, updatePolicy, undefined);
       }
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
index 3604bb6693def..e1ae2ce16e242 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
@@ -6,16 +6,16 @@
  */
 import React, { useEffect } from 'react';
 import {
+  EuiCallOut,
+  EuiFieldPassword,
+  EuiFieldText,
+  EuiFormRow,
+  EuiHorizontalRule,
   EuiLink,
+  EuiSelect,
   EuiSpacer,
   EuiText,
   EuiTitle,
-  EuiCallOut,
-  EuiHorizontalRule,
-  EuiFormRow,
-  EuiSelect,
-  EuiFieldPassword,
-  EuiFieldText,
 } from '@elastic/eui';
 import type { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { NewPackagePolicyInput, PackageInfo } from '@kbn/fleet-plugin/common';
@@ -30,7 +30,7 @@ import {
   getAzureCredentialsFormManualOptions,
 } from './get_azure_credentials_form_options';
 import { AzureCredentialsType } from '../../../../common/types_old';
-import { SetupFormat, useAzureCredentialsForm } from './hooks';
+import { useAzureCredentialsForm } from './hooks';
 import { getPosturePolicy, NewPackagePolicyPostureInput } from '../utils';
 import { CspRadioOption, RadioGroup } from '../csp_boxed_radio_group';
 import { CIS_AZURE_SETUP_FORMAT_TEST_SUBJECTS } from '../../test_subjects';
@@ -39,8 +39,22 @@ interface AzureSetupInfoContentProps {
   integrationLink: string;
 }
 
-export const AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE = 'arm_template';
-export const AZURE_MANUAL_CREDENTIAL_TYPE = 'manual';
+export type SetupFormat = typeof AZURE_SETUP_FORMAT.ARM_TEMPLATE | typeof AZURE_SETUP_FORMAT.MANUAL;
+
+export const AZURE_SETUP_FORMAT = {
+  ARM_TEMPLATE: 'arm_template',
+  MANUAL: 'manual',
+};
+
+export const AZURE_CREDENTIALS_TYPE = {
+  ARM_TEMPLATE: 'arm_template',
+  MANUAL: 'manual',
+  SERVICE_PRINCIPAL_WITH_CLIENT_SECRET: 'service_principal_with_client_secret',
+  SERVICE_PRINCIPAL_WITH_CLIENT_CERTIFICATE: 'service_principal_with_client_certificate',
+  SERVICE_PRINCIPAL_WITH_CLIENT_USERNAME_AND_PASSWORD:
+    'service_principal_with_client_username_and_password',
+  MANAGED_IDENTITY: 'managed_identity',
+} as const;
 
 export const AzureSetupInfoContent = ({ integrationLink }: AzureSetupInfoContentProps) => {
   return (
@@ -77,12 +91,12 @@ export const AzureSetupInfoContent = ({ integrationLink }: AzureSetupInfoContent
 
 const getSetupFormatOptions = (): CspRadioOption[] => [
   {
-    id: AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE,
+    id: AZURE_SETUP_FORMAT.ARM_TEMPLATE,
     label: 'ARM Template',
     testId: CIS_AZURE_SETUP_FORMAT_TEST_SUBJECTS.ARM_TEMPLATE,
   },
   {
-    id: AZURE_MANUAL_CREDENTIAL_TYPE,
+    id: AZURE_SETUP_FORMAT.MANUAL,
     label: i18n.translate('xpack.csp.azureIntegration.setupFormatOptions.manual', {
       defaultMessage: 'Manual',
     }),
@@ -315,7 +329,7 @@ export const AzureCredentialsForm = ({
 
   useEffect(() => {
     if (!setupFormat) {
-      onSetupFormatChange(AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE);
+      onSetupFormatChange(AZURE_SETUP_FORMAT.ARM_TEMPLATE);
     }
   }, [setupFormat, onSetupFormatChange]);
 
@@ -368,13 +382,13 @@ export const AzureCredentialsForm = ({
         }
       />
       <EuiSpacer size="l" />
-      {setupFormat === AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE && (
+      {setupFormat === AZURE_SETUP_FORMAT.ARM_TEMPLATE && (
         <ArmTemplateSetup hasArmTemplateUrl={hasArmTemplateUrl} input={input} />
       )}
-      {setupFormat === AZURE_MANUAL_CREDENTIAL_TYPE && !isPackageVersionValidForManualFields && (
+      {setupFormat === AZURE_SETUP_FORMAT.MANUAL && !isPackageVersionValidForManualFields && (
         <TemporaryManualSetup integrationLink={integrationLink} />
       )}
-      {setupFormat === AZURE_MANUAL_CREDENTIAL_TYPE && isPackageVersionValidForManualFields && (
+      {setupFormat === AZURE_SETUP_FORMAT.MANUAL && isPackageVersionValidForManualFields && (
         <>
           <AzureCredentialTypeSelector
             type={azureCredentialsType}
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form_agentless.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form_agentless.tsx
index 1d763fe8cfa57..914a0ad99df35 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form_agentless.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form_agentless.tsx
@@ -17,6 +17,7 @@ import {
   AzureSetupInfoContent,
   AzureInputVarFields,
   ARM_TEMPLATE_EXTERNAL_DOC_URL,
+  AZURE_CREDENTIALS_TYPE,
 } from './azure_credentials_form';
 import { getPosturePolicy } from '../utils';
 import {
@@ -31,7 +32,7 @@ export const AzureCredentialsFormAgentless = ({
 }: AzureCredentialsFormProps) => {
   const integrationLink = cspIntegrationDocsNavigation.cspm.getStartedPath;
   const options = getAzureCredentialsFormOptions();
-  const group = options.service_principal_with_client_secret;
+  const group = options[AZURE_CREDENTIALS_TYPE.SERVICE_PRINCIPAL_WITH_CLIENT_SECRET];
   const fields = getInputVarsFields(input, group.fields);
 
   return (
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/get_azure_credentials_form_options.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/get_azure_credentials_form_options.tsx
index d9ec4c4c0b20b..97ef3ae78b974 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/get_azure_credentials_form_options.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/get_azure_credentials_form_options.tsx
@@ -12,6 +12,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiText } from '@elastic/eui';
 import { AzureCredentialsType } from '../../../../common/types_old';
 import { CIS_AZURE_INPUT_FIELDS_TEST_SUBJECTS } from '../../test_subjects';
+import { AZURE_CREDENTIALS_TYPE } from './azure_credentials_form';
 
 export type AzureCredentialsFields = Record<
   string,
@@ -37,9 +38,9 @@ export const getAzureCredentialsFormManualOptions = (): Array<{
     }))
     .filter(
       ({ value }) =>
-        value !== 'arm_template' && // we remove this in order to hide it from the selectable options in the manual drop down
-        value !== 'manual' && // TODO: remove 'manual' for stack version 8.13
-        value !== 'service_principal_with_client_username_and_password' // this option is temporarily hidden
+        value !== AZURE_CREDENTIALS_TYPE.ARM_TEMPLATE && // we remove this in order to hide it from the selectable options in the manual drop down
+        value !== AZURE_CREDENTIALS_TYPE.MANUAL && // TODO: remove 'manual' for stack version 8.13
+        value !== AZURE_CREDENTIALS_TYPE.SERVICE_PRINCIPAL_WITH_CLIENT_USERNAME_AND_PASSWORD // this option is temporarily hidden
     );
 };
 
@@ -66,7 +67,7 @@ const I18N_CLIENT_ID = i18n.translate('xpack.csp.azureIntegration.clientIdLabel'
 });
 
 export const getAzureCredentialsFormOptions = (): AzureOptions => ({
-  managed_identity: {
+  [AZURE_CREDENTIALS_TYPE.MANAGED_IDENTITY]: {
     label: i18n.translate('xpack.csp.azureIntegration.credentialType.managedIdentityLabel', {
       defaultMessage: 'Managed Identity',
     }),
@@ -80,18 +81,18 @@ export const getAzureCredentialsFormOptions = (): AzureOptions => ({
     ),
     fields: {},
   },
-  arm_template: {
+  [AZURE_CREDENTIALS_TYPE.ARM_TEMPLATE]: {
     label: 'ARM Template',
     info: [],
     fields: {},
   },
   // TODO: remove for stack version 8.13
-  manual: {
+  [AZURE_CREDENTIALS_TYPE.MANUAL]: {
     label: 'Manual',
     info: [],
     fields: {},
   },
-  service_principal_with_client_secret: {
+  [AZURE_CREDENTIALS_TYPE.SERVICE_PRINCIPAL_WITH_CLIENT_SECRET]: {
     label: i18n.translate('xpack.csp.azureIntegration.servicePrincipalWithClientSecretLabel', {
       defaultMessage: 'Service principal with Client Secret',
     }),
@@ -113,7 +114,7 @@ export const getAzureCredentialsFormOptions = (): AzureOptions => ({
       },
     },
   },
-  service_principal_with_client_certificate: {
+  [AZURE_CREDENTIALS_TYPE.SERVICE_PRINCIPAL_WITH_CLIENT_CERTIFICATE]: {
     label: i18n.translate('xpack.csp.azureIntegration.servicePrincipalWithClientCertificateLabel', {
       defaultMessage: 'Service principal with Client Certificate',
     }),
@@ -141,7 +142,7 @@ export const getAzureCredentialsFormOptions = (): AzureOptions => ({
       },
     },
   },
-  service_principal_with_client_username_and_password: {
+  [AZURE_CREDENTIALS_TYPE.SERVICE_PRINCIPAL_WITH_CLIENT_USERNAME_AND_PASSWORD]: {
     label: i18n.translate(
       'xpack.csp.azureIntegration.servicePrincipalWithClientUsernameAndPasswordLabel',
       { defaultMessage: 'Service principal with Client Username and Password' }
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/hooks.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/hooks.ts
index 2eb56fc6ace83..9957779fbca51 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/hooks.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/hooks.ts
@@ -7,7 +7,7 @@
 
 import { useEffect, useRef } from 'react';
 import { NewPackagePolicy, PackageInfo } from '@kbn/fleet-plugin/common';
-import { AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE } from './azure_credentials_form';
+import { AZURE_CREDENTIALS_TYPE, AZURE_SETUP_FORMAT, SetupFormat } from './azure_credentials_form';
 import { cspIntegrationDocsNavigation } from '../../../common/navigation/constants';
 import {
   getArmTemplateUrlFromCspmPackage,
@@ -21,21 +21,19 @@ import {
 import { CLOUDBEAT_AZURE } from '../../../../common/constants';
 import { AzureCredentialsType } from '../../../../common/types_old';
 
-export type SetupFormat = 'arm_template' | 'manual';
-
 const getSetupFormatFromInput = (
   input: Extract<NewPackagePolicyPostureInput, { type: 'cloudbeat/cis_azure' }>,
   hasArmTemplateUrl: boolean
 ): SetupFormat => {
   const credentialsType = getAzureCredentialsType(input);
   if (!credentialsType && hasArmTemplateUrl) {
-    return 'arm_template';
+    return AZURE_SETUP_FORMAT.ARM_TEMPLATE;
   }
-  if (credentialsType !== 'arm_template') {
-    return 'manual';
+  if (credentialsType !== AZURE_CREDENTIALS_TYPE.ARM_TEMPLATE) {
+    return AZURE_SETUP_FORMAT.MANUAL;
   }
 
-  return 'arm_template';
+  return AZURE_SETUP_FORMAT.ARM_TEMPLATE;
 };
 
 const getAzureCredentialsType = (
@@ -82,7 +80,7 @@ const useUpdateAzureArmTemplate = ({
   useEffect(() => {
     const azureArmTemplateUrl = getAzureArmTemplateUrl(newPolicy);
 
-    if (setupFormat === 'manual') {
+    if (setupFormat === AZURE_SETUP_FORMAT.MANUAL) {
       if (!!azureArmTemplateUrl) {
         updateAzureArmTemplateUrlInPolicy(newPolicy, updatePolicy, undefined);
       }
@@ -115,7 +113,7 @@ export const useAzureCredentialsForm = ({
   updatePolicy: (updatedPolicy: NewPackagePolicy) => void;
 }) => {
   const azureCredentialsType: AzureCredentialsType =
-    getAzureCredentialsType(input) || AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE;
+    getAzureCredentialsType(input) || AZURE_CREDENTIALS_TYPE.ARM_TEMPLATE;
 
   const options = getAzureCredentialsFormOptions();
 
@@ -129,7 +127,7 @@ export const useAzureCredentialsForm = ({
   const lastManualCredentialsType = useRef<string | undefined>(undefined);
 
   useEffect(() => {
-    const isInvalid = setupFormat === AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE && !hasArmTemplateUrl;
+    const isInvalid = setupFormat === AZURE_SETUP_FORMAT.ARM_TEMPLATE && !hasArmTemplateUrl;
     setIsValid(!isInvalid);
 
     onChange({
@@ -148,10 +146,10 @@ export const useAzureCredentialsForm = ({
     setupFormat,
   });
 
-  const defaultAzureManualCredentialType = 'managed_identity';
+  const defaultAzureManualCredentialType = AZURE_CREDENTIALS_TYPE.MANAGED_IDENTITY;
 
   const onSetupFormatChange = (newSetupFormat: SetupFormat) => {
-    if (newSetupFormat === AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE) {
+    if (newSetupFormat === AZURE_SETUP_FORMAT.ARM_TEMPLATE) {
       fieldsSnapshot.current = Object.fromEntries(
         fields?.map((field) => [field.id, { value: field.value }])
       );
@@ -161,7 +159,7 @@ export const useAzureCredentialsForm = ({
       updatePolicy(
         getPosturePolicy(newPolicy, input.type, {
           'azure.credentials.type': {
-            value: AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE,
+            value: AZURE_CREDENTIALS_TYPE.ARM_TEMPLATE,
             type: 'text',
           },
           ...Object.fromEntries(fields?.map((field) => [field.id, { value: undefined }])),
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credential_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credential_form.tsx
index 4a0953f55e5a5..8e78a606aa71c 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credential_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credential_form.tsx
@@ -27,11 +27,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
 import { GcpCredentialsType } from '../../../../common/types_old';
-import {
-  CLOUDBEAT_GCP,
-  SETUP_ACCESS_CLOUD_SHELL,
-  SETUP_ACCESS_MANUAL,
-} from '../../../../common/constants';
+import { CLOUDBEAT_GCP } from '../../../../common/constants';
 import { CspRadioOption, RadioGroup } from '../csp_boxed_radio_group';
 import {
   getCspmCloudShellDefaultValue,
@@ -47,7 +43,18 @@ import {
   GCP_CREDENTIALS_TYPE_OPTIONS_TEST_SUBJ,
 } from '../../test_subjects';
 
-type SetupFormatGCP = 'google_cloud_shell' | 'manual';
+export const GCP_SETUP_ACCESS = {
+  CLOUD_SHELL: 'google_cloud_shell',
+  MANUAL: 'manual',
+};
+
+export const GCP_CREDENTIALS_TYPE = {
+  CREDENTIALS_FILE: 'credentials-file',
+  CREDENTIALS_JSON: 'credentials-json',
+  CREDENTIALS_NONE: 'credentials-none',
+};
+
+type SetupFormatGCP = typeof GCP_SETUP_ACCESS.CLOUD_SHELL | typeof GCP_SETUP_ACCESS.MANUAL;
 export const GCPSetupInfoContent = () => (
   <>
     <EuiHorizontalRule margin="xl" />
@@ -173,14 +180,14 @@ const credentialOptionsList = [
     text: i18n.translate('xpack.csp.gcpIntegration.credentialsFileOption', {
       defaultMessage: 'Credentials File',
     }),
-    value: 'credentials-file',
+    value: GCP_CREDENTIALS_TYPE.CREDENTIALS_FILE,
     'data-test-subj': 'credentials_file_option_test_id',
   },
   {
     text: i18n.translate('xpack.csp.gcpIntegration.credentialsJsonOption', {
       defaultMessage: 'Credentials JSON',
     }),
-    value: 'credentials-json',
+    value: GCP_CREDENTIALS_TYPE.CREDENTIALS_JSON,
     'data-test-subj': 'credentials_json_option_test_id',
   },
 ];
@@ -230,7 +237,7 @@ export const gcpField: GcpInputFields = {
 
 const getSetupFormatOptions = (): CspRadioOption[] => [
   {
-    id: SETUP_ACCESS_CLOUD_SHELL,
+    id: GCP_SETUP_ACCESS.CLOUD_SHELL,
     label: i18n.translate('xpack.csp.gcpIntegration.setupFormatOptions.googleCloudShell', {
       defaultMessage: 'Google Cloud Shell',
     }),
@@ -238,7 +245,7 @@ const getSetupFormatOptions = (): CspRadioOption[] => [
     testId: GCP_CREDENTIALS_TYPE_OPTIONS_TEST_SUBJ.CLOUD_SHELL,
   },
   {
-    id: SETUP_ACCESS_MANUAL,
+    id: GCP_SETUP_ACCESS.MANUAL,
     label: i18n.translate('xpack.csp.gcpIntegration.setupFormatOptions.manual', {
       defaultMessage: 'Manual',
     }),
@@ -279,13 +286,13 @@ const getSetupFormatFromInput = (
   const credentialsType = input.streams[0].vars?.setup_access?.value;
   // Google Cloud shell is the default value
   if (!credentialsType) {
-    return SETUP_ACCESS_CLOUD_SHELL;
+    return GCP_SETUP_ACCESS.CLOUD_SHELL;
   }
-  if (credentialsType !== SETUP_ACCESS_CLOUD_SHELL) {
-    return SETUP_ACCESS_MANUAL;
+  if (credentialsType !== GCP_SETUP_ACCESS.CLOUD_SHELL) {
+    return GCP_SETUP_ACCESS.MANUAL;
   }
 
-  return SETUP_ACCESS_CLOUD_SHELL;
+  return GCP_SETUP_ACCESS.CLOUD_SHELL;
 };
 
 const getGoogleCloudShellUrl = (newPolicy: NewPackagePolicy) => {
@@ -328,7 +335,7 @@ const useCloudShellUrl = ({
   useEffect(() => {
     const policyInputCloudShellUrl = getGoogleCloudShellUrl(newPolicy);
 
-    if (setupFormat === SETUP_ACCESS_MANUAL) {
+    if (setupFormat === GCP_SETUP_ACCESS.MANUAL) {
       if (!!policyInputCloudShellUrl) {
         updateCloudShellUrl(newPolicy, updatePolicy, undefined);
       }
@@ -395,7 +402,7 @@ export const GcpCredentialsForm = ({
     setupFormat,
   });
   const onSetupFormatChange = (newSetupFormat: SetupFormatGCP) => {
-    if (newSetupFormat === 'google_cloud_shell') {
+    if (newSetupFormat === GCP_SETUP_ACCESS.CLOUD_SHELL) {
       // We need to store the current manual fields to restore them later
       fieldsSnapshot.current = Object.fromEntries(
         fieldsToHide.map((field) => [field.id, { value: field.value }])
@@ -406,11 +413,11 @@ export const GcpCredentialsForm = ({
       updatePolicy(
         getPosturePolicy(newPolicy, input.type, {
           setup_access: {
-            value: SETUP_ACCESS_CLOUD_SHELL,
+            value: GCP_SETUP_ACCESS.CLOUD_SHELL,
             type: 'text',
           },
           'gcp.credentials.type': {
-            value: 'credentials-none',
+            value: GCP_CREDENTIALS_TYPE.CREDENTIALS_NONE,
             type: 'text',
           },
           // Clearing fields from previous setup format to prevent exposing credentials
@@ -422,12 +429,12 @@ export const GcpCredentialsForm = ({
       updatePolicy(
         getPosturePolicy(newPolicy, input.type, {
           setup_access: {
-            value: SETUP_ACCESS_MANUAL,
+            value: GCP_SETUP_ACCESS.MANUAL,
             type: 'text',
           },
           'gcp.credentials.type': {
             // Restoring last manual credentials type
-            value: lastCredentialsType.current || 'credentials-file',
+            value: lastCredentialsType.current || GCP_CREDENTIALS_TYPE.CREDENTIALS_FILE,
             type: 'text',
           },
           // Restoring fields from manual setup format if any
@@ -464,7 +471,7 @@ export const GcpCredentialsForm = ({
         }
       />
       <EuiSpacer size="l" />
-      {setupFormat === SETUP_ACCESS_CLOUD_SHELL ? (
+      {setupFormat === GCP_SETUP_ACCESS.CLOUD_SHELL ? (
         <GoogleCloudShellSetup
           disabled={disabled}
           fields={fields}
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
index fef3fd2c59a5c..9ef413d1e3e46 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
@@ -30,7 +30,6 @@ import type {
 import { PackageInfo, PackagePolicy } from '@kbn/fleet-plugin/common';
 import { useParams } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE } from './azure_credentials_form/azure_credentials_form';
 import { CspRadioGroupProps, RadioGroup } from './csp_boxed_radio_group';
 import { assert } from '../../../common/utils/helpers';
 import type { CloudSecurityPolicyTemplate, PostureInput } from '../../../common/types_old';
@@ -61,6 +60,7 @@ import { usePackagePolicyList } from '../../common/api/use_package_policy_list';
 import { gcpField, getInputVarsFields } from './gcp_credentials_form/gcp_credential_form';
 import { SetupTechnologySelector } from './setup_technology_selector/setup_technology_selector';
 import { useSetupTechnology } from './setup_technology_selector/use_setup_technology';
+import { AZURE_CREDENTIALS_TYPE } from './azure_credentials_form/azure_credentials_form';
 
 const DEFAULT_INPUT_TYPE = {
   kspm: CLOUDBEAT_VANILLA,
@@ -451,8 +451,8 @@ const AzureAccountTypeSelect = ({
           },
           'azure.credentials.type': {
             value: isAgentless
-              ? 'service_principal_with_client_secret'
-              : AZURE_ARM_TEMPLATE_CREDENTIAL_TYPE,
+              ? AZURE_CREDENTIALS_TYPE.SERVICE_PRINCIPAL_WITH_CLIENT_SECRET
+              : AZURE_CREDENTIALS_TYPE.ARM_TEMPLATE,
             type: 'text',
           },
         })
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts
index 308414cdd58c8..1a42e5dd5c54f 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/utils.ts
@@ -42,6 +42,8 @@ import {
   DEFAULT_AWS_CREDENTIALS_TYPE,
   DEFAULT_MANUAL_AWS_CREDENTIALS_TYPE,
 } from './aws_credentials_form/get_aws_credentials_form_options';
+import { GCP_CREDENTIALS_TYPE, GCP_SETUP_ACCESS } from './gcp_credentials_form/gcp_credential_form';
+import { AZURE_CREDENTIALS_TYPE } from './azure_credentials_form/azure_credentials_form';
 
 // Posture policies only support the default namespace
 export const POSTURE_NAMESPACE = 'default';
@@ -233,15 +235,15 @@ export const getDefaultAzureCredentialsType = (
   setupTechnology?: SetupTechnology
 ): string => {
   if (setupTechnology && setupTechnology === SetupTechnology.AGENTLESS) {
-    return 'service_principal_with_client_secret';
+    return AZURE_CREDENTIALS_TYPE.SERVICE_PRINCIPAL_WITH_CLIENT_SECRET;
   }
 
   const hasArmTemplateUrl = !!getArmTemplateUrlFromCspmPackage(packageInfo);
   if (hasArmTemplateUrl) {
-    return 'arm_template';
+    return AZURE_CREDENTIALS_TYPE.ARM_TEMPLATE;
   }
 
-  return 'managed_identity';
+  return AZURE_CREDENTIALS_TYPE.MANAGED_IDENTITY;
 };
 
 export const getDefaultGcpHiddenVars = (
@@ -251,11 +253,11 @@ export const getDefaultGcpHiddenVars = (
   if (setupTechnology && setupTechnology === SetupTechnology.AGENTLESS) {
     return {
       'gcp.credentials.type': {
-        value: 'credentials-json',
+        value: GCP_CREDENTIALS_TYPE.CREDENTIALS_JSON,
         type: 'text',
       },
       setup_access: {
-        value: 'manual',
+        value: GCP_SETUP_ACCESS.MANUAL,
         type: 'text',
       },
     };
@@ -265,11 +267,11 @@ export const getDefaultGcpHiddenVars = (
   if (hasCloudShellUrl) {
     return {
       'gcp.credentials.type': {
-        value: 'credentials-none',
+        value: GCP_CREDENTIALS_TYPE.CREDENTIALS_NONE,
         type: 'text',
       },
       setup_access: {
-        value: 'google_cloud_shell',
+        value: GCP_SETUP_ACCESS.CLOUD_SHELL,
         type: 'text',
       },
     };
@@ -277,11 +279,11 @@ export const getDefaultGcpHiddenVars = (
 
   return {
     'gcp.credentials.type': {
-      value: 'credentials-file',
+      value: GCP_CREDENTIALS_TYPE.CREDENTIALS_FILE,
       type: 'text',
     },
     setup_access: {
-      value: 'manual',
+      value: GCP_SETUP_ACCESS.MANUAL,
       type: 'text',
     },
   };

From a5b13f325d9b5547d09f07d3165e3120b6223b88 Mon Sep 17 00:00:00 2001
From: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
Date: Wed, 3 Apr 2024 10:54:32 +0200
Subject: [PATCH 57/63] [Fleet] added CPU metrics to request diagnostics
 (#179819)

## Summary

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

Added option to request agent diagnostics with CPU metrics. This is a
new checkbox in Request diagnostics modal. When clicked, the action will
contain a `additional_metrics: ["CPU"]`.
Also replaced the click handler of `Request diagnotics .zip` button in
Agent Details / Diagnostics tab, to open the same modal instead of
immediately triggering the action.

To verify:
- Enroll 2 agents with version `8.14-SNAPSHOT`
- Click on Agent diagnostics action in Agent list / Agent details
- Verify that the CPU checkbox appears in the modal window
- Verify that the diagnotics zip contains `cpu.pprof` file
- Verify the same in bulk request diagnostics action when selecting 2
agents

<img width="1412" alt="image"
src="https://github.com/elastic/kibana/assets/90178898/4b8ee884-42e7-4da1-91cb-903fa05a2abf">

Action created in `.fleet-actions`:
```
      {
        "_index": ".fleet-actions-7",
        "_id": "224e484f-fc49-4fba-989e-8ac30db29eff",
        "_score": 1,
        "_source": {
          "@timestamp": "2024-04-02T12:24:49.062Z",
          "expiration": "2024-04-02T12:27:49.062Z",
          "agents": [
            "b4a5d936-265c-40b1-be6a-d13ca91bed36"
          ],
          "action_id": "1fc01f99-c511-49bf-9350-96ddf537b562",
          "data": {
            "additional_metrics": [
              "CPU"
            ]
          },
          "type": "REQUEST_DIAGNOSTICS",
          "traceparent": "00-a5e3c645397964952efbeceed896e9db-03730cd3f6d60955-01"
        }
      },
```

### 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)
- [ ] [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
---
 .../plugins/fleet/common/openapi/bundled.json |  43 +++++-
 .../plugins/fleet/common/openapi/bundled.yaml |  25 +++-
 .../fleet/common/openapi/entrypoint.yaml      |   3 +-
 .../agents@bulk_request_diagnostics.yaml      |   7 +
 ...agents@{agent_id}@request_diagnostics.yaml |  13 ++
 ...lates@{pkg_name}@{pkg_version}@inputs.yaml |   2 +
 .../fleet/common/types/rest_spec/agent.ts     |  11 ++
 .../components/agent_diagnostics/index.tsx    | 139 ++++++++----------
 .../index.test.tsx                            | 104 +++++++++++++
 .../agent_request_diagnostics_modal/index.tsx |  19 ++-
 .../fleet/public/hooks/use_request/agents.ts  |   8 +-
 .../agent/request_diagnostics_handler.test.ts |  14 +-
 .../agent/request_diagnostics_handler.ts      |   9 +-
 .../services/agents/request_diagnostics.ts    |  17 ++-
 .../request_diagnostics_action_runner.ts      |   6 +
 .../fleet/server/types/rest_spec/agent.ts     |  12 ++
 .../apis/agents/request_diagnostics.ts        |  39 +++++
 17 files changed, 376 insertions(+), 95 deletions(-)
 create mode 100644 x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.test.tsx

diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
index f7c192db0fe5e..a526294d963fa 100644
--- a/x-pack/plugins/fleet/common/openapi/bundled.json
+++ b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -15,8 +15,7 @@
   },
   "servers": [
     {
-      "url": "http://localhost:5601/api/fleet",
-      "description": "local"
+      "url": "http://KIBANA_HOST:5601/api/fleet"
     }
   ],
   "paths": {
@@ -1530,6 +1529,9 @@
           "Elastic Package Manager (EPM)"
         ],
         "responses": {
+          "200": {
+            "description": "OK"
+          },
           "400": {
             "$ref": "#/components/responses/error"
           }
@@ -3076,6 +3078,30 @@
         "tags": [
           "Agents"
         ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "additional_metrics": {
+                    "type": "array",
+                    "items": {
+                      "oneOf": [
+                        {
+                          "type": "string",
+                          "enum": [
+                            "CPU"
+                          ]
+                        }
+                      ]
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -3159,6 +3185,19 @@
                         "description": "list of agent IDs"
                       }
                     ]
+                  },
+                  "additional_metrics": {
+                    "type": "array",
+                    "items": {
+                      "oneOf": [
+                        {
+                          "type": "string",
+                          "enum": [
+                            "CPU"
+                          ]
+                        }
+                      ]
+                    }
                   }
                 },
                 "required": [
diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
index 406a2550d770d..f76e50c095aed 100644
--- a/x-pack/plugins/fleet/common/openapi/bundled.yaml
+++ b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -10,8 +10,7 @@ info:
     name: Elastic License 2.0
     url: https://www.elastic.co/licensing/elastic-license
 servers:
-  - url: http://localhost:5601/api/fleet
-    description: local
+  - url: http://KIBANA_HOST:5601/api/fleet
 paths:
   /health_check:
     post:
@@ -966,6 +965,8 @@ paths:
       tags:
         - Elastic Package Manager (EPM)
       responses:
+        '200':
+          description: OK
         '400':
           $ref: '#/components/responses/error'
       operationId: get-inputs-template
@@ -1928,6 +1929,19 @@ paths:
       summary: Request agent diagnostics
       tags:
         - Agents
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                additional_metrics:
+                  type: array
+                  items:
+                    oneOf:
+                      - type: string
+                        enum:
+                          - CPU
       responses:
         '200':
           description: OK
@@ -1979,6 +1993,13 @@ paths:
                       items:
                         type: string
                       description: list of agent IDs
+                additional_metrics:
+                  type: array
+                  items:
+                    oneOf:
+                      - type: string
+                        enum:
+                          - CPU
               required:
                 - agents
             example:
diff --git a/x-pack/plugins/fleet/common/openapi/entrypoint.yaml b/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
index beb18d507079e..a4b3f2cbaaa18 100644
--- a/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
+++ b/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
@@ -10,8 +10,7 @@ info:
     name: Elastic License 2.0
     url: https://www.elastic.co/licensing/elastic-license
 servers:
-  - url: 'http://localhost:5601/api/fleet'
-    description: local
+  - url: 'http://KIBANA_HOST:5601/api/fleet'
 paths:
   # Fleet internals
   /health_check:
diff --git a/x-pack/plugins/fleet/common/openapi/paths/agents@bulk_request_diagnostics.yaml b/x-pack/plugins/fleet/common/openapi/paths/agents@bulk_request_diagnostics.yaml
index 3f0733ed8f258..2ef2d1c1ff5d5 100644
--- a/x-pack/plugins/fleet/common/openapi/paths/agents@bulk_request_diagnostics.yaml
+++ b/x-pack/plugins/fleet/common/openapi/paths/agents@bulk_request_diagnostics.yaml
@@ -33,6 +33,13 @@ post:
                   items:
                     type: string
                   description: list of agent IDs
+            additional_metrics:
+              type: array
+              items:
+                oneOf:
+                  - type: string
+                    enum:
+                      - "CPU"
           required:
             - agents
         example:
diff --git a/x-pack/plugins/fleet/common/openapi/paths/agents@{agent_id}@request_diagnostics.yaml b/x-pack/plugins/fleet/common/openapi/paths/agents@{agent_id}@request_diagnostics.yaml
index 37aed12d5f4f1..eba9a695d1cbc 100644
--- a/x-pack/plugins/fleet/common/openapi/paths/agents@{agent_id}@request_diagnostics.yaml
+++ b/x-pack/plugins/fleet/common/openapi/paths/agents@{agent_id}@request_diagnostics.yaml
@@ -8,6 +8,19 @@ post:
   summary: Request agent diagnostics
   tags:
     - Agents
+  requestBody:
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            additional_metrics:
+              type: array
+              items:
+                oneOf:
+                  - type: string
+                    enum:
+                      - "CPU"
   responses:
     '200':
       description: OK
diff --git a/x-pack/plugins/fleet/common/openapi/paths/epm@templates@{pkg_name}@{pkg_version}@inputs.yaml b/x-pack/plugins/fleet/common/openapi/paths/epm@templates@{pkg_name}@{pkg_version}@inputs.yaml
index 5f7b3f28c8c7d..3a5c89f7c34e3 100644
--- a/x-pack/plugins/fleet/common/openapi/paths/epm@templates@{pkg_name}@{pkg_version}@inputs.yaml
+++ b/x-pack/plugins/fleet/common/openapi/paths/epm@templates@{pkg_name}@{pkg_version}@inputs.yaml
@@ -5,6 +5,8 @@ get:
   responses:
     '400':
       $ref: ../components/responses/error.yaml
+    '200':
+      description: OK
   operationId: get-inputs-template
   security:
     - basicAuth: []
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/agent.ts b/x-pack/plugins/fleet/common/types/rest_spec/agent.ts
index 07553dbc21acf..3e5244bf67353 100644
--- a/x-pack/plugins/fleet/common/types/rest_spec/agent.ts
+++ b/x-pack/plugins/fleet/common/types/rest_spec/agent.ts
@@ -152,6 +152,16 @@ export interface PostBulkAgentReassignRequest {
   };
 }
 
+export enum RequestDiagnosticsAdditionalMetrics {
+  'CPU' = 'CPU',
+}
+
+export interface PostRequestDiagnosticsRequest {
+  body: {
+    additional_metrics: RequestDiagnosticsAdditionalMetrics[];
+  };
+}
+
 export type PostRequestDiagnosticsResponse = BulkAgentAction;
 export type PostBulkRequestDiagnosticsResponse = BulkAgentAction;
 
@@ -159,6 +169,7 @@ export interface PostRequestBulkDiagnosticsRequest {
   body: {
     agents: string[] | string;
     batchSize?: number;
+    additional_metrics: RequestDiagnosticsAdditionalMetrics[];
   };
 }
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx
index c16066b0e771b..1eaea92be9639 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx
@@ -6,6 +6,7 @@
  */
 
 import type { EuiTableFieldDataColumnType } from '@elastic/eui';
+import { EuiPortal } from '@elastic/eui';
 import { EuiToolTip } from '@elastic/eui';
 import {
   EuiBasicTable,
@@ -30,14 +31,9 @@ import {
   MINIMUM_DIAGNOSTICS_AGENT_VERSION,
 } from '../../../../../../../../common/services';
 
-import {
-  sendGetAgentUploads,
-  sendPostRequestDiagnostics,
-  useAuthz,
-  useLink,
-  useStartServices,
-} from '../../../../../hooks';
+import { sendGetAgentUploads, useAuthz, useLink, useStartServices } from '../../../../../hooks';
 import type { AgentDiagnostics, Agent } from '../../../../../../../../common/types/models';
+import { AgentRequestDiagnosticsModal } from '../../../components/agent_request_diagnostics_modal';
 
 const FlexStartEuiFlexItem = styled(EuiFlexItem)`
   align-self: flex-start;
@@ -55,11 +51,11 @@ export const AgentDiagnosticsTab: React.FunctionComponent<AgentDiagnosticsProps>
   const authz = useAuthz();
   const { notifications } = useStartServices();
   const { getAbsolutePath } = useLink();
-  const [isSubmitting, setIsSubmitting] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
   const [diagnosticsEntries, setDiagnosticEntries] = useState<AgentDiagnostics[]>([]);
   const [prevDiagnosticsEntries, setPrevDiagnosticEntries] = useState<AgentDiagnostics[]>([]);
   const [loadInterval, setLoadInterval] = useState(10000);
+  const [isRequestDiagnosticsModalOpen, setIsRequestDiagnosticsModalOpen] = useState(false);
 
   const loadData = useCallback(async () => {
     try {
@@ -194,93 +190,78 @@ export const AgentDiagnosticsTab: React.FunctionComponent<AgentDiagnosticsProps>
     },
   ];
 
-  async function onSubmit() {
-    try {
-      setIsSubmitting(true);
-      const { error } = await sendPostRequestDiagnostics(agent.id);
-      if (error) {
-        throw error;
-      }
-      setIsSubmitting(false);
-      const successMessage = i18n.translate(
-        'xpack.fleet.requestDiagnostics.successSingleNotificationTitle',
-        {
-          defaultMessage: 'Request diagnostics submitted',
-        }
-      );
-      notifications.toasts.addSuccess(successMessage);
-      loadData();
-    } catch (error) {
-      setIsSubmitting(false);
-      notifications.toasts.addError(error, {
-        title: i18n.translate('xpack.fleet.requestDiagnostics.fatalErrorNotificationTitle', {
-          defaultMessage:
-            'Error requesting diagnostics {count, plural, one {agent} other {agents}}',
-          values: { count: 1 },
-        }),
-      });
-    }
-  }
-
   const requestDiagnosticsButton = (
     <EuiButton
       fill
       size="m"
-      onClick={onSubmit}
-      disabled={
-        isSubmitting || !isAgentRequestDiagnosticsSupported(agent) || !authz.fleet.readAgents
-      }
+      onClick={() => {
+        setIsRequestDiagnosticsModalOpen(true);
+      }}
+      disabled={!isAgentRequestDiagnosticsSupported(agent) || !authz.fleet.readAgents}
     >
       <FormattedMessage
-        id="xpack.fleet.agentList.diagnosticsOneButton"
+        id="xpack.fleet.requestDiagnostics.diagnosticsOneButton"
         defaultMessage="Request diagnostics .zip"
       />
     </EuiButton>
   );
 
   return (
-    <EuiFlexGroup direction="column" gutterSize="l">
-      <EuiFlexItem>
-        <EuiCallOut
-          iconType="warning"
-          color="warning"
-          title={
-            <FormattedMessage
-              id="xpack.fleet.fleetServerSetup.calloutTitle"
-              defaultMessage="Agent diagnostics"
-            />
-          }
-        >
-          <FormattedMessage
-            id="xpack.fleet.requestDiagnostics.calloutText"
-            defaultMessage="Diagnostics files are stored in Elasticsearch, and as such can incur storage costs."
+    <>
+      {isRequestDiagnosticsModalOpen && (
+        <EuiPortal>
+          <AgentRequestDiagnosticsModal
+            agents={[agent]}
+            agentCount={1}
+            onClose={() => {
+              setIsRequestDiagnosticsModalOpen(false);
+            }}
           />
-        </EuiCallOut>
-      </EuiFlexItem>
-      <FlexStartEuiFlexItem>
-        {isAgentRequestDiagnosticsSupported(agent) ? (
-          requestDiagnosticsButton
-        ) : (
-          <EuiToolTip
-            content={
+        </EuiPortal>
+      )}
+      <EuiFlexGroup direction="column" gutterSize="l">
+        <EuiFlexItem>
+          <EuiCallOut
+            iconType="warning"
+            color="warning"
+            title={
               <FormattedMessage
-                id="xpack.fleet.requestDiagnostics.notSupportedTooltip"
-                defaultMessage="Requesting agent diagnostics is not supported for agents before version {version}."
-                values={{ version: MINIMUM_DIAGNOSTICS_AGENT_VERSION }}
+                id="xpack.fleet.fleetServerSetup.calloutTitle"
+                defaultMessage="Agent diagnostics"
               />
             }
           >
-            {requestDiagnosticsButton}
-          </EuiToolTip>
-        )}
-      </FlexStartEuiFlexItem>
-      <EuiFlexItem>
-        {isLoading ? (
-          <EuiSkeletonText lines={3} />
-        ) : (
-          <EuiBasicTable<AgentDiagnostics> items={diagnosticsEntries} columns={columns} />
-        )}
-      </EuiFlexItem>
-    </EuiFlexGroup>
+            <FormattedMessage
+              id="xpack.fleet.requestDiagnostics.calloutText"
+              defaultMessage="Diagnostics files are stored in Elasticsearch, and as such can incur storage costs."
+            />
+          </EuiCallOut>
+        </EuiFlexItem>
+        <FlexStartEuiFlexItem>
+          {isAgentRequestDiagnosticsSupported(agent) ? (
+            requestDiagnosticsButton
+          ) : (
+            <EuiToolTip
+              content={
+                <FormattedMessage
+                  id="xpack.fleet.requestDiagnostics.notSupportedTooltip"
+                  defaultMessage="Requesting agent diagnostics is not supported for agents before version {version}."
+                  values={{ version: MINIMUM_DIAGNOSTICS_AGENT_VERSION }}
+                />
+              }
+            >
+              {requestDiagnosticsButton}
+            </EuiToolTip>
+          )}
+        </FlexStartEuiFlexItem>
+        <EuiFlexItem>
+          {isLoading ? (
+            <EuiSkeletonText lines={3} />
+          ) : (
+            <EuiBasicTable<AgentDiagnostics> items={diagnosticsEntries} columns={columns} />
+          )}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
   );
 };
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.test.tsx
new file mode 100644
index 0000000000000..b86e3cc29a67a
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.test.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 React from 'react';
+
+import { act, fireEvent } from '@testing-library/react';
+
+import { createFleetTestRendererMock } from '../../../../../../mock';
+
+import { sendPostRequestDiagnostics, sendPostBulkRequestDiagnostics } from '../../../../hooks';
+
+import { AgentRequestDiagnosticsModal } from '.';
+
+jest.mock('../../../../hooks', () => {
+  return {
+    ...jest.requireActual('../../../../hooks'),
+    sendPostRequestDiagnostics: jest.fn().mockResolvedValue({}),
+    sendPostBulkRequestDiagnostics: jest.fn().mockResolvedValue({}),
+  };
+});
+
+const mockSendPostRequestDiagnostics = sendPostRequestDiagnostics as jest.Mock;
+const mockSendPostBulkRequestDiagnostics = sendPostBulkRequestDiagnostics as jest.Mock;
+
+describe('AgentRequestDiagnosticsModal', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  function render(props: any = {}) {
+    const renderer = createFleetTestRendererMock();
+
+    const utils = renderer.render(
+      <AgentRequestDiagnosticsModal
+        onClose={jest.fn()}
+        agents={[{ id: 'agent1' } as any]}
+        agentCount={1}
+        {...props}
+      />
+    );
+
+    return { utils };
+  }
+
+  it('should include CPU option when checkbox is checked', async () => {
+    const { utils } = render();
+
+    act(() => {
+      fireEvent.click(utils.getByTestId('cpuMetricsCheckbox'));
+    });
+    act(() => {
+      fireEvent.click(utils.getByTestId('confirmModalConfirmButton'));
+    });
+
+    expect(mockSendPostRequestDiagnostics).toHaveBeenCalledWith('agent1', {
+      additional_metrics: ['CPU'],
+    });
+  });
+
+  it('should not include CPU option when checkbox is not checked', async () => {
+    const { utils } = render();
+
+    act(() => {
+      fireEvent.click(utils.getByTestId('confirmModalConfirmButton'));
+    });
+
+    expect(mockSendPostRequestDiagnostics).toHaveBeenCalledWith('agent1', {
+      additional_metrics: [],
+    });
+  });
+
+  it('should include CPU option when checkbox is checked when bulk action', async () => {
+    const { utils } = render({ agents: [{ id: 'agent1' }, { id: 'agent2' }], agentCount: 2 });
+
+    act(() => {
+      fireEvent.click(utils.getByTestId('cpuMetricsCheckbox'));
+    });
+    act(() => {
+      fireEvent.click(utils.getByTestId('confirmModalConfirmButton'));
+    });
+
+    expect(mockSendPostBulkRequestDiagnostics).toHaveBeenCalledWith({
+      additional_metrics: ['CPU'],
+      agents: ['agent1', 'agent2'],
+    });
+  });
+
+  it('should not include CPU option when checkbox is checked when bulk action', async () => {
+    const { utils } = render({ agents: [{ id: 'agent1' }, { id: 'agent2' }], agentCount: 2 });
+
+    act(() => {
+      fireEvent.click(utils.getByTestId('confirmModalConfirmButton'));
+    });
+
+    expect(mockSendPostBulkRequestDiagnostics).toHaveBeenCalledWith({
+      additional_metrics: [],
+      agents: ['agent1', 'agent2'],
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx
index 0d3ccbd804e52..82bf1f1b31874 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx
@@ -8,9 +8,10 @@
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
-import { EuiConfirmModal } from '@elastic/eui';
+import { EuiCheckbox, EuiConfirmModal } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { RequestDiagnosticsAdditionalMetrics } from '../../../../../../../common/types';
 import type { Agent } from '../../../../types';
 import {
   sendPostRequestDiagnostics,
@@ -35,15 +36,20 @@ export const AgentRequestDiagnosticsModal: React.FunctionComponent<Props> = ({
   const isSingleAgent = Array.isArray(agents) && agents.length === 1;
   const { getPath } = useLink();
   const history = useHistory();
+  const [cpuMetricsEnabled, setCPUMetricsEnabled] = useState(false);
 
   async function onSubmit() {
     try {
       setIsSubmitting(true);
+      const additionalMetrics = cpuMetricsEnabled ? [RequestDiagnosticsAdditionalMetrics.CPU] : [];
 
       const { error } = isSingleAgent
-        ? await sendPostRequestDiagnostics((agents[0] as Agent).id)
+        ? await sendPostRequestDiagnostics((agents[0] as Agent).id, {
+            additional_metrics: additionalMetrics,
+          })
         : await sendPostBulkRequestDiagnostics({
             agents: typeof agents === 'string' ? agents : agents.map((agent) => agent.id),
+            additional_metrics: additionalMetrics,
           });
       if (error) {
         throw error;
@@ -122,6 +128,15 @@ export const AgentRequestDiagnosticsModal: React.FunctionComponent<Props> = ({
           defaultMessage="Diagnostics files are stored in Elasticsearch, and as such can incur storage costs."
         />
       </p>
+      <p>
+        <EuiCheckbox
+          id="cpuMetricsCheckbox"
+          data-test-subj="cpuMetricsCheckbox"
+          label="Collect additional CPU metrics"
+          checked={cpuMetricsEnabled}
+          onChange={() => setCPUMetricsEnabled(!cpuMetricsEnabled)}
+        />
+      </p>
     </EuiConfirmModal>
   );
 };
diff --git a/x-pack/plugins/fleet/public/hooks/use_request/agents.ts b/x-pack/plugins/fleet/public/hooks/use_request/agents.ts
index 70576d65ef575..e83243b9efa4d 100644
--- a/x-pack/plugins/fleet/public/hooks/use_request/agents.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/agents.ts
@@ -14,6 +14,7 @@ import type {
   PostBulkRequestDiagnosticsResponse,
   PostBulkUpdateAgentTagsRequest,
   PostRequestBulkDiagnosticsRequest,
+  PostRequestDiagnosticsRequest,
   PostRequestDiagnosticsResponse,
   UpdateAgentRequest,
 } from '../../../common/types';
@@ -206,10 +207,15 @@ export function sendPostAgentUpgrade(
   });
 }
 
-export function sendPostRequestDiagnostics(agentId: string, options?: RequestOptions) {
+export function sendPostRequestDiagnostics(
+  agentId: string,
+  body: PostRequestDiagnosticsRequest['body'],
+  options?: RequestOptions
+) {
   return sendRequest<PostRequestDiagnosticsResponse>({
     path: agentRouteService.getRequestDiagnosticsPath(agentId),
     method: 'post',
+    body,
     version: API_VERSIONS.public.v1,
     ...options,
   });
diff --git a/x-pack/plugins/fleet/server/routes/agent/request_diagnostics_handler.test.ts b/x-pack/plugins/fleet/server/routes/agent/request_diagnostics_handler.test.ts
index 4442d7694d4bb..b0502c6a23cd5 100644
--- a/x-pack/plugins/fleet/server/routes/agent/request_diagnostics_handler.test.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/request_diagnostics_handler.test.ts
@@ -17,6 +17,8 @@ import {
   httpServerMock,
 } from '@kbn/core/server/mocks';
 
+import type { RequestDiagnosticsAdditionalMetrics } from '../../../common/types';
+
 import { getAgentById } from '../../services/agents';
 import * as AgentService from '../../services/agents';
 
@@ -31,7 +33,12 @@ describe('request diagnostics handler', () => {
   let mockSavedObjectsClient: jest.Mocked<SavedObjectsClientContract>;
   let mockElasticsearchClient: jest.Mocked<ElasticsearchClient>;
   let mockContext: RequestHandlerContext;
-  let mockRequest: KibanaRequest<{ agentId: string }, undefined, undefined, any>;
+  let mockRequest: KibanaRequest<
+    { agentId: string },
+    undefined,
+    { additional_metrics: RequestDiagnosticsAdditionalMetrics[] },
+    any
+  >;
 
   beforeEach(() => {
     mockSavedObjectsClient = savedObjectsClientMock.create();
@@ -50,7 +57,10 @@ describe('request diagnostics handler', () => {
         },
       },
     } as unknown as RequestHandlerContext;
-    mockRequest = httpServerMock.createKibanaRequest({ params: { agentId: 'agent1' } });
+    mockRequest = httpServerMock.createKibanaRequest({
+      params: { agentId: 'agent1' },
+      body: { additional_metrics: ['CPU'] },
+    });
   });
 
   it('should return ok if agent supports request diagnostics', async () => {
diff --git a/x-pack/plugins/fleet/server/routes/agent/request_diagnostics_handler.ts b/x-pack/plugins/fleet/server/routes/agent/request_diagnostics_handler.ts
index d4598101580ef..a87b21ab89352 100644
--- a/x-pack/plugins/fleet/server/routes/agent/request_diagnostics_handler.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/request_diagnostics_handler.ts
@@ -21,7 +21,7 @@ import { getAgentById } from '../../services/agents';
 export const requestDiagnosticsHandler: RequestHandler<
   TypeOf<typeof PostRequestDiagnosticsActionRequestSchema.params>,
   undefined,
-  undefined
+  TypeOf<typeof PostRequestDiagnosticsActionRequestSchema.body>
 > = async (context, request, response) => {
   const coreContext = await context.core;
   const esClient = coreContext.elasticsearch.client.asInternalUser;
@@ -38,7 +38,11 @@ export const requestDiagnosticsHandler: RequestHandler<
       });
     }
 
-    const result = await AgentService.requestDiagnostics(esClient, request.params.agentId);
+    const result = await AgentService.requestDiagnostics(
+      esClient,
+      request.params.agentId,
+      request.body?.additional_metrics
+    );
 
     return response.ok({ body: { actionId: result.actionId } });
   } catch (error) {
@@ -61,6 +65,7 @@ export const bulkRequestDiagnosticsHandler: RequestHandler<
     const result = await AgentService.bulkRequestDiagnostics(esClient, soClient, {
       ...agentOptions,
       batchSize: request.body.batchSize,
+      additionalMetrics: request.body.additional_metrics,
     });
 
     return response.ok({ body: { actionId: result.actionId } });
diff --git a/x-pack/plugins/fleet/server/services/agents/request_diagnostics.ts b/x-pack/plugins/fleet/server/services/agents/request_diagnostics.ts
index 51b56d0e0007e..e2ed7e7ae8f1f 100644
--- a/x-pack/plugins/fleet/server/services/agents/request_diagnostics.ts
+++ b/x-pack/plugins/fleet/server/services/agents/request_diagnostics.ts
@@ -7,6 +7,8 @@
 
 import type { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 
+import type { RequestDiagnosticsAdditionalMetrics } from '../../../common/types';
+
 import { SO_SEARCH_LIMIT } from '../../constants';
 
 import type { GetAgentsOptions } from '.';
@@ -22,13 +24,17 @@ const REQUEST_DIAGNOSTICS_TIMEOUT_MS = 3 * 60 * 1000; // 3 hours;
 
 export async function requestDiagnostics(
   esClient: ElasticsearchClient,
-  agentId: string
+  agentId: string,
+  additionalMetrics?: RequestDiagnosticsAdditionalMetrics[]
 ): Promise<{ actionId: string }> {
   const response = await createAgentAction(esClient, {
     agents: [agentId],
     created_at: new Date().toISOString(),
     type: 'REQUEST_DIAGNOSTICS',
     expiration: new Date(Date.now() + REQUEST_DIAGNOSTICS_TIMEOUT_MS).toISOString(),
+    data: {
+      additional_metrics: additionalMetrics,
+    },
   });
   return { actionId: response.id };
 }
@@ -38,11 +44,14 @@ export async function bulkRequestDiagnostics(
   soClient: SavedObjectsClientContract,
   options: GetAgentsOptions & {
     batchSize?: number;
+    additionalMetrics?: RequestDiagnosticsAdditionalMetrics[];
   }
 ): Promise<{ actionId: string }> {
   if ('agentIds' in options) {
     const givenAgents = await getAgents(esClient, soClient, options);
-    return await requestDiagnosticsBatch(esClient, givenAgents, {});
+    return await requestDiagnosticsBatch(esClient, givenAgents, {
+      additionalMetrics: options.additionalMetrics,
+    });
   }
 
   const batchSize = options.batchSize ?? SO_SEARCH_LIMIT;
@@ -54,7 +63,9 @@ export async function bulkRequestDiagnostics(
   });
   if (res.total <= batchSize) {
     const givenAgents = await getAgents(esClient, soClient, options);
-    return await requestDiagnosticsBatch(esClient, givenAgents, {});
+    return await requestDiagnosticsBatch(esClient, givenAgents, {
+      additionalMetrics: options.additionalMetrics,
+    });
   } else {
     return await new RequestDiagnosticsActionRunner(
       esClient,
diff --git a/x-pack/plugins/fleet/server/services/agents/request_diagnostics_action_runner.ts b/x-pack/plugins/fleet/server/services/agents/request_diagnostics_action_runner.ts
index 88cb2d5770688..a2d2d753eaa71 100644
--- a/x-pack/plugins/fleet/server/services/agents/request_diagnostics_action_runner.ts
+++ b/x-pack/plugins/fleet/server/services/agents/request_diagnostics_action_runner.ts
@@ -8,6 +8,8 @@
 import { v4 as uuidv4 } from 'uuid';
 import type { ElasticsearchClient } from '@kbn/core/server';
 
+import type { RequestDiagnosticsAdditionalMetrics } from '../../../common/types';
+
 import { isAgentRequestDiagnosticsSupported } from '../../../common/services';
 
 import type { Agent } from '../../types';
@@ -38,6 +40,7 @@ export async function requestDiagnosticsBatch(
   options: {
     actionId?: string;
     total?: number;
+    additionalMetrics?: RequestDiagnosticsAdditionalMetrics[];
   }
 ): Promise<{ actionId: string }> {
   const errors: Record<Agent['id'], Error> = {};
@@ -62,6 +65,9 @@ export async function requestDiagnosticsBatch(
     created_at: now,
     type: 'REQUEST_DIAGNOSTICS',
     total,
+    data: {
+      additional_metrics: options.additionalMetrics,
+    },
   });
 
   await createErrorActionResults(
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/agent.ts b/x-pack/plugins/fleet/server/types/rest_spec/agent.ts
index 456463561f0b2..ad3e96d10d555 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/agent.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/agent.ts
@@ -9,6 +9,8 @@ import { schema } from '@kbn/config-schema';
 import moment from 'moment';
 import semverIsValid from 'semver/functions/valid';
 
+import { RequestDiagnosticsAdditionalMetrics } from '../../../common/types';
+
 import { SO_SEARCH_LIMIT, AGENTS_PREFIX, AGENT_MAPPINGS } from '../../constants';
 
 import { NewAgentActionSchema } from '../models';
@@ -163,12 +165,22 @@ export const PostRequestDiagnosticsActionRequestSchema = {
   params: schema.object({
     agentId: schema.string(),
   }),
+  body: schema.nullable(
+    schema.object({
+      additional_metrics: schema.maybe(
+        schema.arrayOf(schema.oneOf([schema.literal(RequestDiagnosticsAdditionalMetrics.CPU)]))
+      ),
+    })
+  ),
 };
 
 export const PostBulkRequestDiagnosticsActionRequestSchema = {
   body: schema.object({
     agents: schema.oneOf([schema.arrayOf(schema.string()), schema.string()]),
     batchSize: schema.maybe(schema.number()),
+    additional_metrics: schema.maybe(
+      schema.arrayOf(schema.oneOf([schema.literal(RequestDiagnosticsAdditionalMetrics.CPU)]))
+    ),
   }),
 };
 
diff --git a/x-pack/test/fleet_api_integration/apis/agents/request_diagnostics.ts b/x-pack/test/fleet_api_integration/apis/agents/request_diagnostics.ts
index 8bf70174780a7..70b1b2c20b1d1 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/request_diagnostics.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/request_diagnostics.ts
@@ -17,6 +17,7 @@ export default function (providerContext: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
 
   describe('fleet_request_diagnostics', () => {
     skipIfNoDockerRegistry(providerContext);
@@ -118,5 +119,43 @@ export default function (providerContext: FtrProviderContext) {
         throw e;
       });
     });
+
+    it('should create action with additional_metrics when api contains CPU option', async () => {
+      await supertest
+        .post(`/api/fleet/agents/agent1/request_diagnostics`)
+        .set('kbn-xsrf', 'xxx')
+        .send({
+          additional_metrics: ['CPU'],
+        })
+        .expect(200);
+      const actionsRes = await es.search({
+        index: '.fleet-actions',
+        body: {
+          sort: [{ '@timestamp': { order: 'desc' } }],
+        },
+      });
+      const action: any = actionsRes.hits.hits[0]._source;
+      expect(action.data.additional_metrics).contain('CPU');
+    });
+
+    it('/agents/bulk_request_diagnostics should add CPU option to action doc', async () => {
+      await supertestWithoutAuth
+        .post(`/api/fleet/agents/bulk_request_diagnostics`)
+        .set('kbn-xsrf', 'xxx')
+        .auth(testUsers.fleet_agents_read_only.username, testUsers.fleet_agents_read_only.password)
+        .send({
+          agents: ['agent2', 'agent3'],
+          additional_metrics: ['CPU'],
+        });
+
+      const actionsRes = await es.search({
+        index: '.fleet-actions',
+        body: {
+          sort: [{ '@timestamp': { order: 'desc' } }],
+        },
+      });
+      const action: any = actionsRes.hits.hits[0]._source;
+      expect(action.data.additional_metrics).contain('CPU');
+    });
   });
 }

From 02cf6e6752c5b82e4647ff7f14b4ed40258e808c Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Wed, 3 Apr 2024 12:08:08 +0300
Subject: [PATCH 58/63] fix: [Dashboard > Create new rule][SCREEN READER]:
 Headings must be properly nested for usability (#179684)

Closes: https://github.com/elastic/security-team/issues/8651

## Description

The Create new rule form has a number of headings that are improperly
nested (wrong level) and one form label that's incorrectly been tagged
as a heading. This makes for a more difficult screen reader experience;
a large number of screen reader users [primarily navigate by
headings](https://webaim.org/projects/screenreadersurvey9/#finding).

### Steps to recreate

1. Open [Create new
rule](https://kibana.siem.estc.dev/app/security/rules/create)
2. Open [HeadingsMap
extension](https://chromewebstore.google.com/detail/headingsmap/flbjommegcjonpdmenkdiocclhjacmbi?pli=1)
or your preferred screen reader
3. If using a screen reader, traverse the page by headings only to hear
the perceived importance of information

#### What was done?:

1. The layout has been updated to utilize `EuiFormRow`.
2. Fixed issues with resizing the container.

Before:


https://github.com/elastic/kibana/assets/20072247/3a9cec61-e353-4fb9-acd0-fe7a05f9d23b



After:


https://github.com/elastic/kibana/assets/20072247/2ccdd8ab-f287-43e3-919a-a42fc6d30272
---
 .../components/rule_preview/index.tsx         | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/rule_preview/index.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/rule_preview/index.tsx
index a74281262760b..8deb2ebd41863 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/rule_preview/index.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/rule_preview/index.tsx
@@ -17,6 +17,7 @@ import {
   EuiSuperUpdateButton,
   EuiText,
   EuiTitle,
+  EuiFormRow,
 } from '@elastic/eui';
 import moment from 'moment';
 import type { List } from '@kbn/securitysolution-io-ts-list-types';
@@ -210,7 +211,7 @@ const RulePreviewComponent: React.FC<RulePreviewProps> = ({
   );
 
   return (
-    <>
+    <div data-test-subj="rule-preview">
       <EuiTitle size="m">
         <h2>{i18n.RULE_PREVIEW_TITLE}</h2>
       </EuiTitle>
@@ -231,32 +232,35 @@ const RulePreviewComponent: React.FC<RulePreviewProps> = ({
           <EuiSpacer />
         </>
       )}
-      <EuiText size="xs" data-test-subj="rule-preview">
-        <h4>{i18n.QUERY_PREVIEW_LABEL}</h4>
-      </EuiText>
       <EuiSpacer size="xs" />
-      <EuiFlexGroup alignItems="center" responsive={false} gutterSize="s">
-        <EuiSuperDatePicker
-          start={startDate}
-          end={endDate}
-          isDisabled={isDisabled}
-          onTimeChange={onTimeChange}
-          showUpdateButton={false}
-          commonlyUsedRanges={timeRanges}
-          onRefresh={onTimeframeRefresh}
-          data-test-subj="preview-time-frame"
-        />
-        <EuiFlexItem grow={false}>
-          <EuiSuperUpdateButton
-            isDisabled={isDateRangeInvalid || isDisabled}
-            iconType={isDirty ? 'kqlFunction' : 'refresh'}
-            onClick={onTimeframeRefresh}
-            color={isDirty ? 'success' : 'primary'}
-            fill={true}
-            data-test-subj="previewSubmitButton"
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
+      <EuiFormRow label={i18n.QUERY_PREVIEW_LABEL}>
+        <EuiFlexGroup alignItems="center" gutterSize="s" responsive>
+          <EuiFlexItem grow>
+            <EuiSuperDatePicker
+              start={startDate}
+              end={endDate}
+              isDisabled={isDisabled}
+              onTimeChange={onTimeChange}
+              showUpdateButton={false}
+              commonlyUsedRanges={timeRanges}
+              onRefresh={onTimeframeRefresh}
+              data-test-subj="preview-time-frame"
+              width="full"
+            />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiSuperUpdateButton
+              isDisabled={isDateRangeInvalid || isDisabled}
+              iconType={isDirty ? 'kqlFunction' : 'refresh'}
+              onClick={onTimeframeRefresh}
+              color={isDirty ? 'success' : 'primary'}
+              fill={true}
+              data-test-subj="previewSubmitButton"
+              fullWidth={true}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFormRow>
       <EuiSpacer size="l" />
       {isPreviewRequestInProgress && <LoadingHistogram />}
       {!isPreviewRequestInProgress && previewId && spaceId && (
@@ -270,7 +274,7 @@ const RulePreviewComponent: React.FC<RulePreviewProps> = ({
         />
       )}
       <PreviewLogs logs={logs} hasNoiseWarning={hasNoiseWarning} isAborted={isAborted} />
-    </>
+    </div>
   );
 };
 

From bb628f6dbec44df8e89cd3d6a711ede9021068f6 Mon Sep 17 00:00:00 2001
From: Marco Liberati <dej611@users.noreply.github.com>
Date: Wed, 3 Apr 2024 11:38:50 +0200
Subject: [PATCH 59/63] [ES|QL] Change team ownership (#179791)

## Summary

Update PR tag for the CI job.
---
 .buildkite/scripts/steps/esql_grammar_sync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.buildkite/scripts/steps/esql_grammar_sync.sh b/.buildkite/scripts/steps/esql_grammar_sync.sh
index 88c6871794b3b..9d97a9ac6c87a 100755
--- a/.buildkite/scripts/steps/esql_grammar_sync.sh
+++ b/.buildkite/scripts/steps/esql_grammar_sync.sh
@@ -122,7 +122,7 @@ main () {
   git push kibanamachine "$BRANCH_NAME"
 
   # Create a PR
-  gh pr create --draft --title "$PR_TITLE" --body "$PR_BODY" --base main --head "kibanamachine:${BRANCH_NAME}" --label 'release_note:skip' --label 'Team:Visualizations' 
+  gh pr create --draft --title "$PR_TITLE" --body "$PR_BODY" --base main --head "kibanamachine:${BRANCH_NAME}" --label 'release_note:skip' --label 'Team:ESQL' 
 }
 
 main

From 7d080e9e98949819054932de470ef32a62bf1e56 Mon Sep 17 00:00:00 2001
From: Elena Stoeva <59341489+ElenaStoeva@users.noreply.github.com>
Date: Wed, 3 Apr 2024 10:49:54 +0100
Subject: [PATCH 60/63] [Console] Fix hook for setting initial value in Monaco
 editor (#179865)

## Summary

This is a follow-up to https://github.com/elastic/kibana/pull/178899
where we added a hook for setting the initial value in the Monaco editor
in Console. However, the hook introduced a bug - it wasn't possible to
type anything in the editor as every re-render called the function in
the hook, which set the value in the editor to be the initial value.
This PR fixes this.
---
 .../editor/monaco/monaco_editor.tsx           |  6 +++---
 .../editor/monaco/use_set_initial_value.ts    | 20 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
index 292cf6a422172..0a76a938ad903 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/monaco/monaco_editor.tsx
@@ -27,11 +27,11 @@ export const MonacoEditor = ({ initialTextValue }: EditorProps) => {
 
   const [value, setValue] = useState(initialTextValue);
 
-  const setInitialValue = useSetInitialValue({ initialTextValue, setValue, toasts });
+  const setInitialValue = useSetInitialValue;
 
   useEffect(() => {
-    setInitialValue();
-  }, [setInitialValue]);
+    setInitialValue({ initialTextValue, setValue, toasts });
+  }, [initialTextValue, setInitialValue, toasts]);
 
   return (
     <div
diff --git a/src/plugins/console/public/application/containers/editor/monaco/use_set_initial_value.ts b/src/plugins/console/public/application/containers/editor/monaco/use_set_initial_value.ts
index c086905b44e53..0107a95ccbfc0 100644
--- a/src/plugins/console/public/application/containers/editor/monaco/use_set_initial_value.ts
+++ b/src/plugins/console/public/application/containers/editor/monaco/use_set_initial_value.ts
@@ -75,19 +75,17 @@ export const useSetInitialValue = (params: SetInitialValueParams) => {
     loadBufferFromRemote(url);
   }, 200);
 
-  return () => {
-    window.addEventListener('hashchange', onHashChange);
+  window.addEventListener('hashchange', onHashChange);
 
-    const loadFromParam = readLoadFromParam();
+  const loadFromParam = readLoadFromParam();
 
-    if (loadFromParam) {
-      loadBufferFromRemote(loadFromParam);
-    } else {
-      setValue(initialTextValue || DEFAULT_INPUT_VALUE);
-    }
+  if (loadFromParam) {
+    loadBufferFromRemote(loadFromParam);
+  } else {
+    setValue(initialTextValue || DEFAULT_INPUT_VALUE);
+  }
 
-    return () => {
-      window.removeEventListener('hashchange', onHashChange);
-    };
+  return () => {
+    window.removeEventListener('hashchange', onHashChange);
   };
 };

From b10fc631ab37580f59d79618d922e524bfcc3381 Mon Sep 17 00:00:00 2001
From: "Eyo O. Eyo" <7893459+eokoneyo@users.noreply.github.com>
Date: Wed, 3 Apr 2024 12:07:14 +0200
Subject: [PATCH 61/63] fix issue with font size in markdown component
 (#179867)

## Summary

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

## Visual confirmation
![ScreenRecording2024-04-02at20 09 45-ezgif
com-video-to-gif-converter](https://github.com/elastic/kibana/assets/7893459/12ea4c85-9057-405c-9306-45c26ab27118)



<!-- ### 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
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] 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)
-->
---
 packages/shared-ux/markdown/impl/markdown.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/shared-ux/markdown/impl/markdown.tsx b/packages/shared-ux/markdown/impl/markdown.tsx
index 09189a226821f..6a35ada5bc72a 100644
--- a/packages/shared-ux/markdown/impl/markdown.tsx
+++ b/packages/shared-ux/markdown/impl/markdown.tsx
@@ -87,6 +87,7 @@ export const Markdown = ({
     }
     return (
       <EuiMarkdownFormat
+        textSize={'relative'}
         className={className}
         aria-label={ariaLabelContent ?? 'markdown component'}
         parsingPluginList={_parsingPlugins}

From 2e6d8d245e79817bf68db1e3db6a4de9d9af5aec Mon Sep 17 00:00:00 2001
From: "Eyo O. Eyo" <7893459+eokoneyo@users.noreply.github.com>
Date: Wed, 3 Apr 2024 12:12:51 +0200
Subject: [PATCH 62/63] remove unused legacy markdown component (#179272)

## Summary

Removes previous markdown, since all its usage has been migrated to new
markdown component.

<!-- ### 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
- [ ] [Flaky Test
Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was
used on any tests changed
- [ ] 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: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 src/plugins/kibana_react/public/index.ts      |   3 -
 .../__snapshots__/markdown.test.tsx.snap      |  60 ----
 .../public/markdown/_markdown.scss            | 328 ------------------
 .../kibana_react/public/markdown/index.scss   |   1 -
 .../kibana_react/public/markdown/index.tsx    |  34 --
 .../public/markdown/markdown.test.tsx         |  83 -----
 .../kibana_react/public/markdown/markdown.tsx | 109 ------
 .../public/markdown/markdown_simple.tsx       |  23 --
 8 files changed, 641 deletions(-)
 delete mode 100644 src/plugins/kibana_react/public/markdown/__snapshots__/markdown.test.tsx.snap
 delete mode 100644 src/plugins/kibana_react/public/markdown/_markdown.scss
 delete mode 100644 src/plugins/kibana_react/public/markdown/index.scss
 delete mode 100644 src/plugins/kibana_react/public/markdown/index.tsx
 delete mode 100644 src/plugins/kibana_react/public/markdown/markdown.test.tsx
 delete mode 100644 src/plugins/kibana_react/public/markdown/markdown.tsx
 delete mode 100644 src/plugins/kibana_react/public/markdown/markdown_simple.tsx

diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
index 93480cd3cf945..510d57fc6c09a 100644
--- a/src/plugins/kibana_react/public/index.ts
+++ b/src/plugins/kibana_react/public/index.ts
@@ -56,9 +56,6 @@ export { ValidatedDualRange } from './validated_range';
 export type { ToastInput, KibanaReactNotifications } from './notifications';
 export { createNotifications } from './notifications';
 
-/** @deprecated use `Markdown` from `@kbn/shared-ux-markdown` */
-export { Markdown, MarkdownSimple } from './markdown';
-
 export { toMountPoint } from './util';
 export type { ToMountPointOptions } from './util';
 
diff --git a/src/plugins/kibana_react/public/markdown/__snapshots__/markdown.test.tsx.snap b/src/plugins/kibana_react/public/markdown/__snapshots__/markdown.test.tsx.snap
deleted file mode 100644
index 4299acdd32c9e..0000000000000
--- a/src/plugins/kibana_react/public/markdown/__snapshots__/markdown.test.tsx.snap
+++ /dev/null
@@ -1,60 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`props markdown 1`] = `
-<div
-  className="kbnMarkdown__body"
-  dangerouslySetInnerHTML={
-    Object {
-      "__html": "<p>I am <em>some</em> <a href=\\"https://en.wikipedia.org/wiki/Content\\">content</a> with <code>markdown</code></p>
-",
-    }
-  }
-/>
-`;
-
-exports[`props openLinksInNewTab 1`] = `
-<div
-  className="kbnMarkdown__body"
-  dangerouslySetInnerHTML={
-    Object {
-      "__html": "<p>I am <em>some</em> <a href=\\"https://en.wikipedia.org/wiki/Content\\" target=\\"_blank\\" rel=\\"noopener noreferrer\\">content</a> with <code>markdown</code></p>
-",
-    }
-  }
-/>
-`;
-
-exports[`props whiteListedRules 1`] = `
-<div
-  className="kbnMarkdown__body"
-  dangerouslySetInnerHTML={
-    Object {
-      "__html": "<p>I am <em>some</em> [content](https://en.wikipedia.org/wiki/Content) with <code>markdown</code></p>
-",
-    }
-  }
-/>
-`;
-
-exports[`render 1`] = `
-<div
-  className="kbnMarkdown__body"
-  dangerouslySetInnerHTML={
-    Object {
-      "__html": "",
-    }
-  }
-/>
-`;
-
-exports[`should never render html tags 1`] = `
-<div
-  className="kbnMarkdown__body"
-  dangerouslySetInnerHTML={
-    Object {
-      "__html": "<p>&lt;div&gt;I may be dangerous if rendered as html&lt;/div&gt;</p>
-",
-    }
-  }
-/>
-`;
diff --git a/src/plugins/kibana_react/public/markdown/_markdown.scss b/src/plugins/kibana_react/public/markdown/_markdown.scss
deleted file mode 100644
index a3bba38509bcd..0000000000000
--- a/src/plugins/kibana_react/public/markdown/_markdown.scss
+++ /dev/null
@@ -1,328 +0,0 @@
-// Default styles for Markdown element
-//
-// 1. Links
-// 2. Headings
-// 3. Images
-// 4. Blockquotes
-// 5. Horizontal rules
-// 6. Lists
-// 7. Tables
-// 8. Code blocks
-
-// Functions
-// Note: The inlined base font size is set in common/functions/font.js. It should match $kbnMdFontSize.
-$kbnDefaultFontSize: 14px;
-
-@function canvasToEm($size) {
-  @return #{calc($size / $kbnDefaultFontSize)}em;
-}
-
-.kbnMarkdown__body {
-  // Font size variables
-  $kbnMarkdownFontSizeS: canvasToEm(12px);
-  $kbnMarkdownFontSize: canvasToEm(14px);
-  $kbnMarkdownFontSizeL: canvasToEm(20px);
-  $kbnMarkdownFontSizeXL: canvasToEm(28px);
-  $kbnMarkdownFontSizeXXL: canvasToEm(36px);
-
-  // Spacing variables
-  $kbnMarkdownSizeL: canvasToEm(24px);
-  $kbnMarkdownSize: canvasToEm(16px);
-  $kbnMarkdownSizeS: canvasToEm(12px);
-  $kbnMarkdownSizeXS: canvasToEm(8px);
-  $kbnMarkdownSizeXXS: canvasToEm(4px);
-
-  // Grayscale variables
-  $kbnMarkdownAlphaLightestShade: rgba($euiColorFullShade, .05);
-  $kbnMarkdownAlphaLightShade: rgba($euiColorFullShade, .15);
-  $kbnMarkdownAlphaDarkShade: rgba($euiColorFullShade, .65);
-
-  // Reverse grayscale for opposite of theme
-  $kbnMarkdownAlphaLightestShadeReversed: rgba($euiColorEmptyShade, .05);
-  $kbnMarkdownAlphaLightShadeReversed: rgba($euiColorEmptyShade, .15);
-  $kbnMarkdownAlphaDarkShadeReversed: rgba($euiColorEmptyShade, .65);
-
-  &--reversed {
-    color: $euiColorLightestShade;
-  }
-
-  > *:first-child {
-    margin-top: 0 !important;
-  }
-
-  > *:last-child {
-    margin-bottom: 0 !important;
-  }
-
-  p,
-  blockquote,
-  ul,
-  ol,
-  dl,
-  table,
-  pre {
-    margin-top: 0;
-    margin-bottom: $kbnMarkdownSize;
-    line-height: 1.5em;
-  }
-
-  strong {
-    font-weight: 600;
-  }
-
-  // 1. Links
-  a {
-    color: inherit;
-    text-decoration: underline;
-  }
-
-  a:hover {
-    text-decoration: underline dotted;
-  }
-
-  a:active,
-  a:hover {
-    outline-width: 0;
-  }
-
-  a:not([href]) {
-    color: inherit;
-    text-decoration: none;
-  }
-
-  // 2. Headings
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6 {
-    margin-top: 0;
-    margin-bottom: $kbnMarkdownSizeXS;
-  }
-
-  h1 {
-    font-size: $kbnMarkdownFontSizeXXL;
-    line-height: 1.333333em;
-    font-weight: 300;
-  }
-
-  h2 {
-    font-size: $kbnMarkdownFontSizeXL;
-    line-height: 1.428571em;
-    font-weight: 300;
-  }
-
-  h3 {
-    font-size: $kbnMarkdownFontSizeL;
-    line-height: 1.6em;
-    font-weight: 600;
-  }
-
-  h4 {
-    font-size: $kbnMarkdownSize;
-    line-height: 1.5em;
-    font-weight: 600;
-  }
-
-  h5 {
-    font-size: $kbnMarkdownFontSize;
-    line-height: 1.142857em;
-    font-weight: 700;
-  }
-
-  h6 {
-    font-size: $kbnMarkdownFontSizeS;
-    line-height: 1.333333em;
-    font-weight: 700;
-    text-transform: uppercase;
-  }
-
-  // 3. Images
-  img {
-    max-width: 100%;
-    box-sizing: content-box;
-    border-style: none;
-    pointer-events: auto;
-  }
-
-  // 4. Blockquotes
-  blockquote {
-    padding: 0 1em;
-    border-left: $kbnMarkdownSizeXXS solid $kbnMarkdownAlphaLightShade;
-  }
-  &--reversed blockquote {
-    border-left-color: $kbnMarkdownAlphaLightShadeReversed;
-  }
-
-  // 5. Horizontal rules
-  hr {
-    overflow: hidden;
-    background: transparent;
-    height: 2px;
-    padding: 0;
-    margin: $kbnMarkdownSizeL 0;
-    background-color: $kbnMarkdownAlphaLightShade;
-    border: 0;
-  }
-  &--reversed hr {
-    background-color: $kbnMarkdownAlphaLightShadeReversed;
-  }
-
-  hr::before {
-    display: table;
-    content: '';
-  }
-
-  hr::after {
-    display: table;
-    clear: both;
-    content: '';
-  }
-
-  // 6. Lists
-  ul,
-  ol {
-    padding-left: $kbnMarkdownSizeL;
-    margin-top: 0;
-    margin-bottom: $kbnMarkdownSize;
-  }
-
-  ul {
-    list-style-type: disc;
-  }
-  ol {
-    list-style-type: decimal;
-  }
-
-  ul ul {
-    list-style-type: circle;
-  }
-
-  ol ol,
-  ul ol {
-    list-style-type: lower-roman;
-  }
-
-  ul ul ol,
-  ul ol ol,
-  ol ul ol,
-  ol ol ol {
-    list-style-type: lower-alpha;
-  }
-
-  dd {
-    margin-left: 0;
-  }
-
-  ul ul,
-  ul ol,
-  ol ol,
-  ol ul {
-    margin-top: 0;
-    margin-bottom: 0;
-  }
-
-  li > p {
-    margin-bottom: $kbnMarkdownSizeXS;
-  }
-
-  li + li {
-    margin-top: $kbnMarkdownSizeXXS;
-  }
-
-  // 7. Tables
-  table {
-    display: block;
-    width: 100%;
-    overflow: auto;
-    border-left: 1px solid $kbnMarkdownAlphaLightShade;
-    border-spacing: 0;
-    border-collapse: collapse;
-  }
-  &--reversed table {
-    border-left-color: $kbnMarkdownAlphaLightShadeReversed;
-  }
-
-  td,
-  th {
-    padding: 0;
-  }
-
-  table th,
-  table td {
-    padding: $kbnMarkdownSizeXXS $kbnMarkdownSizeS;
-    border-top: 1px solid $kbnMarkdownAlphaLightShade;
-    border-bottom: 1px solid $kbnMarkdownAlphaLightShade;
-
-    &:last-child {
-      border-right: 1px solid $kbnMarkdownAlphaLightShade;
-    }
-  }
-  &--reversed table th,
-  &--reversed table td {
-    border-color: $kbnMarkdownAlphaLightShadeReversed;
-  }
-
-  table tr {
-    background-color: transparent;
-    border-top: 1px solid $kbnMarkdownAlphaLightShade;
-  }
-  &--reversed table tr {
-    border-top-color: $kbnMarkdownAlphaLightShadeReversed;
-  }
-
-  // 8. Code blocks
-  code,
-  pre {
-    margin-bottom: $kbnMarkdownSizeXS;
-    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
-    font-size: $kbnMarkdownFontSizeS;
-  }
-
-  code {
-    padding: $kbnMarkdownSizeXXS 0;
-    margin: 0;
-    background-color: $kbnMarkdownAlphaLightestShade;
-    border-radius: $kbnMarkdownSizeXXS;
-  }
-  &--reversed code {
-    background-color: $kbnMarkdownAlphaLightestShadeReversed;
-  }
-
-  code::before,
-  code::after {
-    letter-spacing: -.2em;
-    content: '\00a0';
-  }
-
-  pre {
-    padding: $kbnMarkdownSize;
-    overflow: auto;
-    font-size: $kbnMarkdownFontSizeS;
-    line-height: 1.333333em;
-    background-color: $kbnMarkdownAlphaLightestShade;
-    border-radius: $kbnMarkdownSizeXXS;
-    word-wrap: normal;
-  }
-  &--reversed pre {
-    background-color: $kbnMarkdownAlphaLightestShadeReversed;
-  }
-
-  pre code {
-    display: inline;
-    max-width: auto;
-    padding: 0;
-    overflow: visible;
-    line-height: inherit;
-    word-wrap: normal;
-    white-space: pre;
-    background-color: transparent;
-    border: 0;
-  }
-
-  pre code::before,
-  pre code::after {
-    content: normal;
-  }
-}
diff --git a/src/plugins/kibana_react/public/markdown/index.scss b/src/plugins/kibana_react/public/markdown/index.scss
deleted file mode 100644
index f997ea5384eac..0000000000000
--- a/src/plugins/kibana_react/public/markdown/index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './markdown';
diff --git a/src/plugins/kibana_react/public/markdown/index.tsx b/src/plugins/kibana_react/public/markdown/index.tsx
deleted file mode 100644
index c15d4269cf3c0..0000000000000
--- a/src/plugins/kibana_react/public/markdown/index.tsx
+++ /dev/null
@@ -1,34 +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 React from 'react';
-import { EuiSkeletonText, EuiDelayRender } from '@elastic/eui';
-import type { MarkdownSimpleProps } from './markdown_simple';
-import type { MarkdownProps } from './markdown';
-
-const Fallback = () => (
-  <EuiDelayRender>
-    <EuiSkeletonText lines={3} />
-  </EuiDelayRender>
-);
-
-/** @deprecated use `Markdown` from `@kbn/shared-ux-markdown` */
-const LazyMarkdownSimple = React.lazy(() => import('./markdown_simple'));
-export const MarkdownSimple = (props: MarkdownSimpleProps) => (
-  <React.Suspense fallback={<Fallback />}>
-    <LazyMarkdownSimple {...props} />
-  </React.Suspense>
-);
-
-/** @deprecated use `Markdown` from `@kbn/shared-ux-markdown` */
-const LazyMarkdown = React.lazy(() => import('./markdown'));
-export const Markdown = (props: MarkdownProps) => (
-  <React.Suspense fallback={<Fallback />}>
-    <LazyMarkdown {...props} />
-  </React.Suspense>
-);
diff --git a/src/plugins/kibana_react/public/markdown/markdown.test.tsx b/src/plugins/kibana_react/public/markdown/markdown.test.tsx
deleted file mode 100644
index 1dda072be9e5f..0000000000000
--- a/src/plugins/kibana_react/public/markdown/markdown.test.tsx
+++ /dev/null
@@ -1,83 +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 React from 'react';
-import { shallow } from 'enzyme';
-
-import { Markdown } from './markdown';
-
-test('render', () => {
-  const component = shallow(<Markdown />);
-  expect(component).toMatchSnapshot();
-});
-
-test('should never render html tags', () => {
-  const component = shallow(
-    <Markdown markdown="<div>I may be dangerous if rendered as html</div>" />
-  );
-  expect(component).toMatchSnapshot();
-});
-
-test('should render links with parentheses correctly', () => {
-  const component = shallow(
-    <Markdown markdown="[link](https://example.com/foo/bar?group=(()filters:!t))" />
-  );
-  expect(component.render().find('a').prop('href')).toBe(
-    'https://example.com/foo/bar?group=(()filters:!t)'
-  );
-});
-
-test('should add `noreferrer` and `nooopener` to all links in new tabs', () => {
-  const component = shallow(
-    <Markdown
-      openLinksInNewTab={true}
-      markdown="[link](https://example.com/foo/bar?group=(()filters:!t))"
-    />
-  );
-  expect(component.render().find('a').prop('rel')).toBe('noopener noreferrer');
-});
-
-describe('props', () => {
-  const markdown = 'I am *some* [content](https://en.wikipedia.org/wiki/Content) with `markdown`';
-
-  test('markdown', () => {
-    const component = shallow(<Markdown markdown={markdown} />);
-    expect(component).toMatchSnapshot();
-  });
-
-  test('openLinksInNewTab', () => {
-    const component = shallow(<Markdown openLinksInNewTab={true} markdown={markdown} />);
-    expect(component).toMatchSnapshot();
-  });
-
-  test('whiteListedRules', () => {
-    const component = shallow(
-      <Markdown whiteListedRules={['backticks', 'emphasis']} markdown={markdown} />
-    );
-    expect(component).toMatchSnapshot();
-  });
-
-  test('should update markdown when openLinksInNewTab prop change', () => {
-    const component = shallow(<Markdown openLinksInNewTab={false} markdown={markdown} />);
-    expect(component.render().find('a').prop('target')).not.toBe('_blank');
-    component.setProps({ openLinksInNewTab: true });
-    expect(component.render().find('a').prop('target')).toBe('_blank');
-  });
-
-  test('should update markdown when whiteListedRules prop change', () => {
-    const md = '*emphasis* `backticks`';
-    const component = shallow(
-      <Markdown whiteListedRules={['emphasis', 'backticks']} markdown={md} />
-    );
-    expect(component.render().find('em')).toHaveLength(1);
-    expect(component.render().find('code')).toHaveLength(1);
-    component.setProps({ whiteListedRules: ['backticks'] });
-    expect(component.render().find('code')).toHaveLength(1);
-    expect(component.render().find('em')).toHaveLength(0);
-  });
-});
diff --git a/src/plugins/kibana_react/public/markdown/markdown.tsx b/src/plugins/kibana_react/public/markdown/markdown.tsx
deleted file mode 100644
index 62f2564daf1f5..0000000000000
--- a/src/plugins/kibana_react/public/markdown/markdown.tsx
+++ /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 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 classNames from 'classnames';
-import React, { useEffect } from 'react';
-import MarkdownIt from 'markdown-it';
-import { memoize } from 'lodash';
-import { getSecureRelForTarget } from '@elastic/eui';
-
-import './index.scss';
-/**
- * Return a memoized markdown rendering function that use the specified
- * whiteListedRules and openLinksInNewTab configurations.
- * @param {Array of Strings} whiteListedRules - white list of markdown rules
- * list of rules can be found at https://github.com/markdown-it/markdown-it/issues/361
- * @param {Boolean} openLinksInNewTab
- * @return {Function} Returns an Object to use with dangerouslySetInnerHTML
- * with the rendered markdown HTML
- */
-export const markdownFactory = memoize(
-  (whiteListedRules: string[] = [], openLinksInNewTab: boolean = false) => {
-    let markdownIt: MarkdownIt;
-
-    // It is imperative that the html config property be set to false, to mitigate XSS: the output of markdown-it is
-    // fed directly to the DOM via React's dangerouslySetInnerHTML below.
-
-    if (whiteListedRules && whiteListedRules.length > 0) {
-      markdownIt = new MarkdownIt('zero', { html: false, linkify: true });
-      markdownIt.enable(whiteListedRules);
-    } else {
-      markdownIt = new MarkdownIt({ html: false, linkify: true });
-    }
-
-    if (openLinksInNewTab) {
-      // All links should open in new browser tab.
-      // Define custom renderer to add 'target' attribute
-      // https://github.com/markdown-it/markdown-it/blob/master/docs/architecture.md#renderer
-      const originalLinkRender =
-        markdownIt.renderer.rules.link_open ||
-        function (tokens, idx, options, env, self) {
-          return self.renderToken(tokens, idx, options);
-        };
-      markdownIt.renderer.rules.link_open = function (tokens, idx, options, env, self) {
-        const href = tokens[idx].attrGet('href');
-        const target = '_blank';
-        const rel = getSecureRelForTarget({ href: href === null ? undefined : href, target });
-
-        // https://www.jitbit.com/alexblog/256-targetblank---the-most-underestimated-vulnerability-ever/
-        tokens[idx].attrPush(['target', target]);
-        if (rel) {
-          tokens[idx].attrPush(['rel', rel]);
-        }
-        return originalLinkRender(tokens, idx, options, env, self);
-      };
-    }
-    /**
-     * This method is used to render markdown from the passed parameter
-     * into HTML. It will just return an empty string when the markdown is empty.
-     * @param {String} markdown - The markdown String
-     * @return {String} - Returns the rendered HTML as string.
-     */
-    return (markdown: string) => {
-      return markdown ? markdownIt.render(markdown) : '';
-    };
-  },
-  (whiteListedRules: string[] = [], openLinksInNewTab: boolean = false) => {
-    return `${whiteListedRules.join('_')}${openLinksInNewTab}`;
-  }
-);
-
-export interface MarkdownProps extends React.HTMLAttributes<HTMLDivElement> {
-  className?: string;
-  markdown?: string;
-  openLinksInNewTab?: boolean;
-  whiteListedRules?: string[];
-  onRender?: () => void;
-}
-
-export const Markdown = (props: MarkdownProps) => {
-  useEffect(() => {
-    props.onRender?.();
-  }, [props]);
-
-  const { className, markdown = '', openLinksInNewTab, whiteListedRules, ...rest } = props;
-  const classes = classNames('kbnMarkdown__body', className);
-  const markdownRenderer = markdownFactory(whiteListedRules, openLinksInNewTab);
-  const renderedMarkdown = markdownRenderer(markdown);
-  return (
-    <div
-      {...rest}
-      className={classes}
-      /*
-       * Justification for dangerouslySetInnerHTML:
-       * The Markdown Visualization is, believe it or not, responsible for rendering Markdown.
-       * This relies on `markdown-it` to produce safe and correct HTML.
-       */
-      dangerouslySetInnerHTML={{ __html: renderedMarkdown }} // eslint-disable-line react/no-danger
-    />
-  );
-};
-
-// Needed for React.lazy
-// eslint-disable-next-line import/no-default-export
-export default Markdown;
diff --git a/src/plugins/kibana_react/public/markdown/markdown_simple.tsx b/src/plugins/kibana_react/public/markdown/markdown_simple.tsx
deleted file mode 100644
index 24b9eee7b1ca5..0000000000000
--- a/src/plugins/kibana_react/public/markdown/markdown_simple.tsx
+++ /dev/null
@@ -1,23 +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 React from 'react';
-import ReactMarkdown from 'react-markdown';
-
-export interface MarkdownSimpleProps {
-  children: string;
-}
-
-// Render markdown string into JSX inside of a Fragment.
-export const MarkdownSimple = ({ children }: MarkdownSimpleProps) => (
-  <ReactMarkdown>{children}</ReactMarkdown>
-);
-
-// Needed for React.lazy
-// eslint-disable-next-line import/no-default-export
-export default MarkdownSimple;

From 0a3a8bb9713e9f43383a5b14109352feabb85e5c Mon Sep 17 00:00:00 2001
From: Maryam Saeidi <maryam.saeidi@elastic.co>
Date: Wed, 3 Apr 2024 12:15:22 +0200
Subject: [PATCH 63/63] Fix buttons must have discernible text issue by adding
 aria-label (#179892)

Fixes #179490

## Summary

This PR fixes buttons must have discernible text issues by adding
aria-label to the `EuiButtonEmpty` components.
---
 .../pages/alerts/components/rule_stats.tsx    | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/observability_solution/observability/public/pages/alerts/components/rule_stats.tsx b/x-pack/plugins/observability_solution/observability/public/pages/alerts/components/rule_stats.tsx
index 005ba7ccaec82..81743ca011938 100644
--- a/x-pack/plugins/observability_solution/observability/public/pages/alerts/components/rule_stats.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/pages/alerts/components/rule_stats.tsx
@@ -48,6 +48,16 @@ const getStatCount = (stats: RuleStatsState, status: Status) => {
   return stats[status];
 };
 
+const disabledLabel = i18n.translate('xpack.observability.alerts.ruleStats.disabled', {
+  defaultMessage: 'Disabled',
+});
+const snoozedLabel = i18n.translate('xpack.observability.alerts.ruleStats.muted', {
+  defaultMessage: 'Snoozed',
+});
+const errorsLabel = i18n.translate('xpack.observability.alerts.ruleStats.errors', {
+  defaultMessage: 'Errors',
+});
+
 export const renderRuleStats = (
   ruleStats: RuleStatsState,
   manageRulesHref: string,
@@ -76,6 +86,7 @@ export const renderRuleStats = (
       condition={ruleStats.disabled > 0}
       wrap={(wrappedChildren) => (
         <EuiButtonEmpty
+          aria-label={disabledLabel}
           data-test-subj="o11yDisabledStatsComponentButton"
           onClick={() => handleNavigateToRules(ruleStats, 'disabled')}
         >
@@ -85,9 +96,7 @@ export const renderRuleStats = (
     >
       <StyledStat
         title={ruleStats.disabled}
-        description={i18n.translate('xpack.observability.alerts.ruleStats.disabled', {
-          defaultMessage: 'Disabled',
-        })}
+        description={disabledLabel}
         color="primary"
         titleColor={ruleStats.disabled > 0 ? 'primary' : ''}
         titleSize="xs"
@@ -102,6 +111,7 @@ export const renderRuleStats = (
       condition={ruleStats.muted + ruleStats.snoozed > 0}
       wrap={(wrappedChildren) => (
         <EuiButtonEmpty
+          aria-label={snoozedLabel}
           data-test-subj="o11ySnoozedStatsComponentButton"
           onClick={() => handleNavigateToRules(ruleStats, 'snoozed')}
         >
@@ -111,9 +121,7 @@ export const renderRuleStats = (
     >
       <StyledStat
         title={ruleStats.muted + ruleStats.snoozed}
-        description={i18n.translate('xpack.observability.alerts.ruleStats.muted', {
-          defaultMessage: 'Snoozed',
-        })}
+        description={snoozedLabel}
         color="primary"
         titleColor={ruleStats.muted + ruleStats.snoozed > 0 ? 'primary' : ''}
         titleSize="xs"
@@ -128,6 +136,7 @@ export const renderRuleStats = (
       condition={ruleStats.error > 0}
       wrap={(wrappedChildren) => (
         <EuiButtonEmpty
+          aria-label={errorsLabel}
           data-test-subj="o11yErrorStatsComponentButton"
           onClick={() => handleNavigateToRules(ruleStats, 'error')}
         >
@@ -137,9 +146,7 @@ export const renderRuleStats = (
     >
       <StyledStat
         title={ruleStats.error}
-        description={i18n.translate('xpack.observability.alerts.ruleStats.errors', {
-          defaultMessage: 'Errors',
-        })}
+        description={errorsLabel}
         color="primary"
         titleColor={ruleStats.error > 0 ? 'primary' : ''}
         titleSize="xs"