diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
index 1c466c001cb97e..db022ae7f0f58e 100644
--- a/.buildkite/ftr_configs.yml
+++ b/.buildkite/ftr_configs.yml
@@ -252,6 +252,9 @@ enabled:
   - x-pack/test/functional/apps/lens/group1/config.ts
   - x-pack/test/functional/apps/lens/group2/config.ts
   - x-pack/test/functional/apps/lens/group3/config.ts
+  - x-pack/test/functional/apps/lens/group4/config.ts
+  - x-pack/test/functional/apps/lens/group5/config.ts
+  - x-pack/test/functional/apps/lens/group6/config.ts
   - x-pack/test/functional/apps/lens/open_in_lens/tsvb/config.ts
   - x-pack/test/functional/apps/lens/open_in_lens/agg_based/config.ts
   - x-pack/test/functional/apps/lens/open_in_lens/dashboard/config.ts
@@ -350,7 +353,9 @@ enabled:
   - x-pack/test/security_solution_endpoint/config.ts
   - x-pack/test/session_view/basic/config.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
+  - x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
+  - x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
   - x-pack/test/spaces_api_integration/spaces_only/config.ts
   - x-pack/test/timeline/security_and_spaces/config_trial.ts
   - x-pack/test/ui_capabilities/security_and_spaces/config.ts
diff --git a/.buildkite/scripts/steps/checks.sh b/.buildkite/scripts/steps/checks.sh
index 3272a5184e60b0..bf30578bfebc57 100755
--- a/.buildkite/scripts/steps/checks.sh
+++ b/.buildkite/scripts/steps/checks.sh
@@ -22,3 +22,4 @@ export DISABLE_BOOTSTRAP_VALIDATION=false
 .buildkite/scripts/steps/checks/test_projects.sh
 .buildkite/scripts/steps/checks/test_hardening.sh
 .buildkite/scripts/steps/checks/ftr_configs.sh
+.buildkite/scripts/steps/checks/saved_objects_compat_changes.sh
\ No newline at end of file
diff --git a/.buildkite/scripts/steps/checks/saved_objects_compat_changes.sh b/.buildkite/scripts/steps/checks/saved_objects_compat_changes.sh
new file mode 100755
index 00000000000000..e6123b5b752b8c
--- /dev/null
+++ b/.buildkite/scripts/steps/checks/saved_objects_compat_changes.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common/util.sh
+
+echo --- Check Mappings Update
+cmd="node scripts/check_mappings_update"
+if is_pr && ! is_auto_commit_disabled; then
+  cmd="$cmd --fix"
+fi
+
+eval "$cmd"
+check_for_changed_files "$cmd" true
diff --git a/.buildkite/scripts/steps/storybooks/build_and_upload.ts b/.buildkite/scripts/steps/storybooks/build_and_upload.ts
index 3796076d0a3cdd..75be5696dbca64 100644
--- a/.buildkite/scripts/steps/storybooks/build_and_upload.ts
+++ b/.buildkite/scripts/steps/storybooks/build_and_upload.ts
@@ -49,6 +49,7 @@ const STORYBOOKS = [
   'ui_actions_enhanced',
   'language_documentation_popover',
   'unified_search',
+  'random_sampling',
 ];
 
 const GITHUB_CONTEXT = 'Build and Publish Storybooks';
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d76ed31b2b2b16..cb9607ecbb51a7 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -61,6 +61,7 @@ packages/kbn-cell-actions @elastic/security-threat-hunting-explore
 src/plugins/chart_expressions/common @elastic/kibana-visualizations
 packages/kbn-chart-icons @elastic/kibana-visualizations
 src/plugins/charts @elastic/kibana-visualizations
+packages/kbn-check-mappings-update-cli @elastic/kibana-core
 packages/kbn-ci-stats-core @elastic/kibana-operations
 packages/kbn-ci-stats-performance-metrics @elastic/kibana-operations
 packages/kbn-ci-stats-reporter @elastic/kibana-operations
@@ -458,6 +459,7 @@ x-pack/examples/third_party_maps_source_example @elastic/kibana-gis
 src/plugins/maps_ems @elastic/kibana-gis
 x-pack/plugins/maps @elastic/kibana-gis
 x-pack/packages/ml/agg_utils @elastic/ml-ui
+x-pack/packages/ml/anomaly_utils @elastic/ml-ui
 x-pack/packages/ml/date_picker @elastic/ml-ui
 x-pack/packages/ml/error_utils @elastic/ml-ui
 x-pack/packages/ml/is_defined @elastic/ml-ui
@@ -503,6 +505,7 @@ examples/portable_dashboards_example @elastic/kibana-presentation
 examples/preboot_example @elastic/kibana-security @elastic/kibana-core
 src/plugins/presentation_util @elastic/kibana-presentation
 x-pack/plugins/profiling @elastic/profiling-ui
+x-pack/packages/kbn-random-sampling @elastic/kibana-visualizations
 packages/kbn-react-field @elastic/kibana-data-discovery
 x-pack/plugins/remote_clusters @elastic/platform-deployment-management
 test/plugin_functional/plugins/rendering_plugin @elastic/kibana-core
@@ -573,7 +576,10 @@ packages/kbn-securitysolution-utils @elastic/security-solution-platform
 packages/kbn-server-http-tools @elastic/kibana-core
 packages/kbn-server-route-repository @elastic/apm-ui
 x-pack/plugins/serverless @elastic/appex-sharedux
+x-pack/plugins/serverless_observability @elastic/appex-sharedux
 packages/serverless/project_switcher @elastic/appex-sharedux
+x-pack/plugins/serverless_search @elastic/appex-sharedux
+x-pack/plugins/serverless_security @elastic/appex-sharedux
 packages/serverless/storybook/config @elastic/appex-sharedux
 packages/serverless/types @elastic/appex-sharedux
 test/plugin_functional/plugins/session_notifications @elastic/kibana-core
@@ -591,6 +597,7 @@ packages/shared-ux/button_toolbar @elastic/appex-sharedux
 packages/shared-ux/card/no_data/impl @elastic/appex-sharedux
 packages/shared-ux/card/no_data/mocks @elastic/appex-sharedux
 packages/shared-ux/card/no_data/types @elastic/appex-sharedux
+packages/shared-ux/chrome/navigation @elastic/appex-sharedux
 packages/shared-ux/file/context @elastic/appex-sharedux
 packages/shared-ux/file/image/impl @elastic/appex-sharedux
 packages/shared-ux/file/image/mocks @elastic/appex-sharedux
@@ -717,6 +724,7 @@ src/plugins/vis_types/timeseries @elastic/kibana-visualizations
 src/plugins/vis_types/vega @elastic/kibana-visualizations
 src/plugins/vis_types/vislib @elastic/kibana-visualizations
 src/plugins/vis_types/xy @elastic/kibana-visualizations
+src/plugins/visualization_ui_components @elastic/kibana-visualizations
 src/plugins/visualizations @elastic/kibana-visualizations
 x-pack/plugins/watcher @elastic/platform-deployment-management
 packages/kbn-web-worker-stub @elastic/kibana-operations
diff --git a/.i18nrc.json b/.i18nrc.json
index c2bf494c68c064..d3afda75dce511 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -75,6 +75,7 @@
     "navigation": "src/plugins/navigation",
     "newsfeed": "src/plugins/newsfeed",
     "presentationUtil": "src/plugins/presentation_util",
+    "randomSampling": "x-pack/packages/kbn-random-sampling",
     "reporting": "packages/kbn-reporting/common",
     "savedObjects": "src/plugins/saved_objects",
     "savedObjectsFinder": "src/plugins/saved_objects_finder",
@@ -108,6 +109,7 @@
     "visTypeVislib": "src/plugins/vis_types/vislib",
     "visTypeXy": "src/plugins/vis_types/xy",
     "visualizations": "src/plugins/visualizations",
+    "visualizationUiComponents": "src/plugins/visualization_ui_components",
     "unifiedSearch": "src/plugins/unified_search",
     "unifiedFieldList": "src/plugins/unified_field_list",
     "unifiedHistogram": "src/plugins/unified_histogram"
diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx
index dbcd1f9a10016e..62f018e08063b8 100644
--- a/api_docs/actions.mdx
+++ b/api_docs/actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
 title: "actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the actions plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';
diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
index 4dd43a658e2884..7ddec2f57e2dda 100644
--- a/api_docs/advanced_settings.mdx
+++ b/api_docs/advanced_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
 title: "advancedSettings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the advancedSettings plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';
diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx
index e27256d455ef0a..1492459ea7ccbc 100644
--- a/api_docs/aiops.mdx
+++ b/api_docs/aiops.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
 title: "aiops"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiops plugin
-date: 2023-04-27
+date: 2023-05-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 81ad124973bc68..95608c57e68805 100644
--- a/api_docs/alerting.devdocs.json
+++ b/api_docs/alerting.devdocs.json
@@ -9264,7 +9264,7 @@
         "label": "ENABLE_MAINTENANCE_WINDOWS",
         "description": [],
         "signature": [
-          "false"
+          "true"
         ],
         "path": "x-pack/plugins/alerting/common/index.ts",
         "deprecated": false,
diff --git a/api_docs/alerting.mdx b/api_docs/alerting.mdx
index 69d65bbb762868..a20d8bd4fd6db4 100644
--- a/api_docs/alerting.mdx
+++ b/api_docs/alerting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the alerting plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 ---
 import alertingObj from './alerting.devdocs.json';
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
index c6b91320b229a1..a47cc0a320a96d 100644
--- a/api_docs/apm.mdx
+++ b/api_docs/apm.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
 title: "apm"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apm plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
 ---
 import apmObj from './apm.devdocs.json';
diff --git a/api_docs/asset_manager.mdx b/api_docs/asset_manager.mdx
index b2887f30009773..d2f41ffaa2eb63 100644
--- a/api_docs/asset_manager.mdx
+++ b/api_docs/asset_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/assetManager
 title: "assetManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the assetManager plugin
-date: 2023-04-27
+date: 2023-05-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 b59502d972345b..8eccc9190f351f 100644
--- a/api_docs/banners.mdx
+++ b/api_docs/banners.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
 title: "banners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the banners plugin
-date: 2023-04-27
+date: 2023-05-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 89adeb6b44e60c..739cd25f31dff6 100644
--- a/api_docs/bfetch.mdx
+++ b/api_docs/bfetch.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch
 title: "bfetch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the bfetch plugin
-date: 2023-04-27
+date: 2023-05-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 a19734b3c2ccb6..6101a484636286 100644
--- a/api_docs/canvas.mdx
+++ b/api_docs/canvas.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas
 title: "canvas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the canvas plugin
-date: 2023-04-27
+date: 2023-05-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 ce453c5849ecff..54ab796b77a859 100644
--- a/api_docs/cases.devdocs.json
+++ b/api_docs/cases.devdocs.json
@@ -582,8 +582,8 @@
             "pluginId": "cases",
             "scope": "common",
             "docId": "kibCasesPluginApi",
-            "section": "def-common.Case",
-            "text": "Case"
+            "section": "def-common.CaseUI",
+            "text": "CaseUI"
           },
           " | undefined) => void) | undefined; onClose?: (() => void) | undefined; }"
         ],
@@ -660,8 +660,8 @@
             "pluginId": "cases",
             "scope": "common",
             "docId": "kibCasesPluginApi",
-            "section": "def-common.Case",
-            "text": "Case"
+            "section": "def-common.CaseUI",
+            "text": "CaseUI"
           },
           ", createAttachments: (args: ",
           "PostComment",
@@ -670,8 +670,8 @@
             "pluginId": "cases",
             "scope": "common",
             "docId": "kibCasesPluginApi",
-            "section": "def-common.Case",
-            "text": "Case"
+            "section": "def-common.CaseUI",
+            "text": "CaseUI"
           },
           ") => void) | undefined; attachments?: ",
           {
@@ -897,7 +897,13 @@
             " | undefined; severity?: ",
             "CaseSeverity",
             " | undefined; assignees?: string | string[] | undefined; reporters?: string | string[] | undefined; defaultSearchOperator?: \"AND\" | \"OR\" | undefined; fields?: string | string[] | undefined; from?: string | undefined; page?: number | undefined; perPage?: number | undefined; search?: string | undefined; searchFields?: string | string[] | undefined; rootSearchFields?: string[] | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; to?: string | undefined; owner?: string | string[] | undefined; }, signal?: AbortSignal | undefined) => Promise<",
-            "Cases",
+            {
+              "pluginId": "cases",
+              "scope": "common",
+              "docId": "kibCasesPluginApi",
+              "section": "def-common.CasesUI",
+              "text": "CasesUI"
+            },
             ">; getCasesStatus: (query: { from?: string | undefined; to?: string | undefined; owner?: string | string[] | undefined; }, signal?: AbortSignal | undefined) => Promise<{ countOpenCases: number; countInProgressCases: number; countClosedCases: number; }>; getCasesMetrics: (query: { features: string[]; } & { from?: string | undefined; to?: string | undefined; owner?: string | string[] | undefined; }, signal?: AbortSignal | undefined) => Promise<{ mttr?: number | null | undefined; }>; bulkGet: <Field extends \"id\" | \"connector\" | \"tags\" | \"description\" | \"title\" | \"version\" | \"duration\" | \"status\" | \"settings\" | \"owner\" | \"severity\" | \"assignees\" | \"closed_at\" | \"closed_by\" | \"created_at\" | \"created_by\" | \"external_service\" | \"updated_at\" | \"updated_by\" | \"totalComment\" | \"totalAlerts\" | \"comments\" = \"id\" | \"connector\" | \"tags\" | \"description\" | \"title\" | \"version\" | \"duration\" | \"status\" | \"settings\" | \"owner\" | \"severity\" | \"assignees\" | \"closed_at\" | \"closed_by\" | \"created_at\" | \"created_by\" | \"external_service\" | \"updated_at\" | \"updated_by\" | \"totalComment\" | \"totalAlerts\" | \"comments\">(params: ",
             {
               "pluginId": "cases",
@@ -1023,8 +1029,8 @@
               "pluginId": "cases",
               "scope": "common",
               "docId": "kibCasesPluginApi",
-              "section": "def-common.Case",
-              "text": "Case"
+              "section": "def-common.CaseUI",
+              "text": "CaseUI"
             },
             " | undefined; }) => ",
             {
@@ -1738,7 +1744,7 @@
         "label": "Case",
         "description": [],
         "signature": [
-          "Omit<{ description: string; status: ",
+          "{ description: string; status: ",
           {
             "pluginId": "@kbn/cases-components",
             "scope": "common",
@@ -1746,23 +1752,23 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          "; tags: string[]; title: string; connector: { id: string; type: ",
+          "; tags: string[]; title: string; connector: { id: string; } & (({ type: ",
           "ConnectorTypes",
-          ".casesWebhook; fields: null; name: string; } | { id: string; type: ",
+          ".casesWebhook; fields: null; } & { name: string; }) | ({ type: ",
           "ConnectorTypes",
-          ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; name: string; } | { id: string; type: ",
+          ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; } & { name: string; }) | ({ type: ",
           "ConnectorTypes",
-          ".none; fields: null; name: string; } | { id: string; type: ",
+          ".none; fields: null; } & { name: string; }) | ({ type: ",
           "ConnectorTypes",
-          ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; name: string; } | { id: string; type: ",
+          ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; } & { name: string; }) | ({ type: ",
           "ConnectorTypes",
-          ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; name: string; } | { id: string; type: ",
+          ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; } & { name: string; }) | ({ type: ",
           "ConnectorTypes",
-          ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; name: string; } | { id: string; type: ",
+          ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; } & { name: string; }) | ({ type: ",
           "ConnectorTypes",
-          ".swimlane; fields: { caseId: string | null; } | null; name: string; }; settings: { syncAlerts: boolean; }; owner: string; severity: ",
+          ".swimlane; fields: { caseId: string | null; } | null; } & { name: string; })); settings: { syncAlerts: boolean; }; owner: string; severity: ",
           "CaseSeverity",
-          "; assignees: { uid: string; }[]; duration: number | null; closedAt: string | null; closedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; externalService: { connectorId: string; connectorName: string; externalId: string; externalTitle: string; externalUrl: string; pushedAt: string; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; totalComment: number; totalAlerts: number; version: string; comments?: ({ comment: string; type: ",
+          "; assignees: { uid: string; }[]; } & { duration: number | null; closed_at: string | null; closed_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; external_service: ({ connector_id: string; } & { connector_name: string; external_id: string; external_title: string; external_url: string; pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; }) | null; updated_at: string | null; updated_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: ((({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -1770,7 +1776,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          ".user; owner: string; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; owner: string; pushed_at: string | null; pushed_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; updated_at: string | null; updated_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -1778,7 +1784,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".alert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          ".alert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; owner: string; pushed_at: string | null; pushed_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; updated_at: string | null; updated_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -1786,7 +1792,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".actions; comment: string; actions: { targets: { hostname: string; endpointId: string; }[]; type: string; }; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { externalReferenceId: string; externalReferenceStorage: { type: ",
+          ".actions; comment: string; actions: { targets: { hostname: string; endpointId: string; }[]; type: string; }; owner: string; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; owner: string; pushed_at: string | null; pushed_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; updated_at: string | null; updated_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; }) | (({ externalReferenceId: string; externalReferenceStorage: { type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -1794,7 +1800,15 @@
             "section": "def-common.ExternalReferenceStorageType",
             "text": "ExternalReferenceStorageType"
           },
-          ".elasticSearchDoc; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | null; type: ",
+          ".elasticSearchDoc; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: ",
+          {
+            "pluginId": "@kbn/utility-types",
+            "scope": "common",
+            "docId": "kibKbnUtilityTypesPluginApi",
+            "section": "def-common.JsonValue",
+            "text": "JsonValue"
+          },
+          "; } | null; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -1802,7 +1816,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".externalReference; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { externalReferenceId: string; externalReferenceStorage: { type: ",
+          ".externalReference; owner: string; } | { externalReferenceId: string; externalReferenceStorage: { type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -1810,7 +1824,15 @@
             "section": "def-common.ExternalReferenceStorageType",
             "text": "ExternalReferenceStorageType"
           },
-          ".savedObject; soType: string; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | null; type: ",
+          ".savedObject; soType: string; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: ",
+          {
+            "pluginId": "@kbn/utility-types",
+            "scope": "common",
+            "docId": "kibKbnUtilityTypesPluginApi",
+            "section": "def-common.JsonValue",
+            "text": "JsonValue"
+          },
+          "; } | null; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -1818,7 +1840,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".externalReference; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          ".externalReference; owner: string; }) & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; owner: string; pushed_at: string | null; pushed_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; updated_at: string | null; updated_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -1826,24 +1848,30 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".persistableState; owner: string; persistableStateAttachmentTypeId: string; persistableStateAttachmentState: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; }; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; })[] | undefined; }, \"comments\"> & { comments: ",
-          "Comment",
-          "[]; }"
+          ".persistableState; owner: string; persistableStateAttachmentTypeId: string; persistableStateAttachmentState: { [x: string]: ",
+          {
+            "pluginId": "@kbn/utility-types",
+            "scope": "common",
+            "docId": "kibKbnUtilityTypesPluginApi",
+            "section": "def-common.JsonValue",
+            "text": "JsonValue"
+          },
+          "; }; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; owner: string; pushed_at: string | null; pushed_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; updated_at: string | null; updated_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; })) & { id: string; version: string; })[] | undefined; }"
         ],
-        "path": "x-pack/plugins/cases/common/ui/types.ts",
+        "path": "x-pack/plugins/cases/common/api/cases/case.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.CaseResponse",
+        "id": "def-common.Cases",
         "type": "Type",
         "tags": [],
-        "label": "CaseResponse",
+        "label": "Cases",
         "description": [],
         "signature": [
-          "{ description: string; status: ",
+          "({ description: string; status: ",
           {
             "pluginId": "@kbn/cases-components",
             "scope": "common",
@@ -1955,7 +1983,7 @@
             "section": "def-common.JsonValue",
             "text": "JsonValue"
           },
-          "; }; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; owner: string; pushed_at: string | null; pushed_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; updated_at: string | null; updated_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; })) & { id: string; version: string; })[] | undefined; }"
+          "; }; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }; owner: string; pushed_at: string | null; pushed_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; updated_at: string | null; updated_by: ({ email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } & { profile_uid?: string | undefined; }) | null; })) & { id: string; version: string; })[] | undefined; })[]"
         ],
         "path": "x-pack/plugins/cases/common/api/cases/case.ts",
         "deprecated": false,
@@ -2250,6 +2278,222 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CasesUI",
+        "type": "Type",
+        "tags": [],
+        "label": "CasesUI",
+        "description": [],
+        "signature": [
+          "Omit<{ cases: { description: string; status: ",
+          {
+            "pluginId": "@kbn/cases-components",
+            "scope": "common",
+            "docId": "kibKbnCasesComponentsPluginApi",
+            "section": "def-common.CaseStatuses",
+            "text": "CaseStatuses"
+          },
+          "; tags: string[]; title: string; connector: { id: string; type: ",
+          "ConnectorTypes",
+          ".casesWebhook; fields: null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".none; fields: null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".swimlane; fields: { caseId: string | null; } | null; name: string; }; settings: { syncAlerts: boolean; }; owner: string; severity: ",
+          "CaseSeverity",
+          "; assignees: { uid: string; }[]; duration: number | null; closedAt: string | null; closedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; externalService: { connectorId: string; connectorName: string; externalId: string; externalTitle: string; externalUrl: string; pushedAt: string; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; totalComment: number; totalAlerts: number; version: string; comments?: ({ comment: string; type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".user; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".alert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".actions; comment: string; actions: { targets: { hostname: string; endpointId: string; }[]; type: string; }; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { externalReferenceId: string; externalReferenceStorage: { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ExternalReferenceStorageType",
+            "text": "ExternalReferenceStorageType"
+          },
+          ".elasticSearchDoc; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | null; type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".externalReference; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { externalReferenceId: string; externalReferenceStorage: { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ExternalReferenceStorageType",
+            "text": "ExternalReferenceStorageType"
+          },
+          ".savedObject; soType: string; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | null; type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".externalReference; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".persistableState; owner: string; persistableStateAttachmentTypeId: string; persistableStateAttachmentState: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; }; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; })[] | undefined; }[]; page: number; perPage: number; total: number; countOpenCases: number; countInProgressCases: number; countClosedCases: number; }, \"cases\"> & { cases: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CaseUI",
+            "text": "CaseUI"
+          },
+          "[]; }"
+        ],
+        "path": "x-pack/plugins/cases/common/ui/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CaseUI",
+        "type": "Type",
+        "tags": [],
+        "label": "CaseUI",
+        "description": [],
+        "signature": [
+          "Omit<{ description: string; status: ",
+          {
+            "pluginId": "@kbn/cases-components",
+            "scope": "common",
+            "docId": "kibKbnCasesComponentsPluginApi",
+            "section": "def-common.CaseStatuses",
+            "text": "CaseStatuses"
+          },
+          "; tags: string[]; title: string; connector: { id: string; type: ",
+          "ConnectorTypes",
+          ".casesWebhook; fields: null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".none; fields: null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; name: string; } | { id: string; type: ",
+          "ConnectorTypes",
+          ".swimlane; fields: { caseId: string | null; } | null; name: string; }; settings: { syncAlerts: boolean; }; owner: string; severity: ",
+          "CaseSeverity",
+          "; assignees: { uid: string; }[]; duration: number | null; closedAt: string | null; closedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; externalService: { connectorId: string; connectorName: string; externalId: string; externalTitle: string; externalUrl: string; pushedAt: string; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; totalComment: number; totalAlerts: number; version: string; comments?: ({ comment: string; type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".user; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".alert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".actions; comment: string; actions: { targets: { hostname: string; endpointId: string; }[]; type: string; }; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { externalReferenceId: string; externalReferenceStorage: { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ExternalReferenceStorageType",
+            "text": "ExternalReferenceStorageType"
+          },
+          ".elasticSearchDoc; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | null; type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".externalReference; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { externalReferenceId: string; externalReferenceStorage: { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ExternalReferenceStorageType",
+            "text": "ExternalReferenceStorageType"
+          },
+          ".savedObject; soType: string; }; externalReferenceAttachmentTypeId: string; externalReferenceMetadata: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | null; type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".externalReference; owner: string; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; } | { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".persistableState; owner: string; persistableStateAttachmentTypeId: string; persistableStateAttachmentState: { [x: string]: string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | (string | number | boolean | any | any | null)[] | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | (string | number | boolean | any | any | null)[] | null; } | (string | number | boolean | { [x: string]: string | number | boolean | any | any | null; } | any | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null)[] | null; }; createdAt: string; createdBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; }; pushedAt: string | null; pushedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; updatedAt: string | null; updatedBy: { email: string | null | undefined; fullName: string | null | undefined; username: string | null | undefined; profileUid?: string | undefined; } | null; id: string; version: string; })[] | undefined; }, \"comments\"> & { comments: ",
+          "Comment",
+          "[]; }"
+        ],
+        "path": "x-pack/plugins/cases/common/ui/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "cases",
         "id": "def-common.CaseViewRefreshPropInterface",
diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx
index f409545f7a3d33..1277a68e5d9dd7 100644
--- a/api_docs/cases.mdx
+++ b/api_docs/cases.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases
 title: "cases"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cases plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases']
 ---
 import casesObj from './cases.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 96 | 0 | 79 | 32 |
+| 98 | 0 | 81 | 31 |
 
 ## Client
 
diff --git a/api_docs/charts.mdx b/api_docs/charts.mdx
index cef44631e30bc7..83084ea8685fa1 100644
--- a/api_docs/charts.mdx
+++ b/api_docs/charts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts
 title: "charts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the charts plugin
-date: 2023-04-27
+date: 2023-05-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 f05ac0528e0fbb..e2765dff788db1 100644
--- a/api_docs/cloud.mdx
+++ b/api_docs/cloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud
 title: "cloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloud plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud']
 ---
 import cloudObj from './cloud.devdocs.json';
diff --git a/api_docs/cloud_chat.mdx b/api_docs/cloud_chat.mdx
index e22689eab2661d..0a96e740a19d53 100644
--- a/api_docs/cloud_chat.mdx
+++ b/api_docs/cloud_chat.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudChat
 title: "cloudChat"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudChat plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudChat']
 ---
 import cloudChatObj from './cloud_chat.devdocs.json';
diff --git a/api_docs/cloud_data_migration.mdx b/api_docs/cloud_data_migration.mdx
index 72b66e52694c04..24e5ad230baab7 100644
--- a/api_docs/cloud_data_migration.mdx
+++ b/api_docs/cloud_data_migration.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDataMigration
 title: "cloudDataMigration"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDataMigration plugin
-date: 2023-04-27
+date: 2023-05-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 2711b22ac63c3f..fc15a161f5734c 100644
--- a/api_docs/cloud_defend.mdx
+++ b/api_docs/cloud_defend.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDefend
 title: "cloudDefend"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDefend plugin
-date: 2023-04-27
+date: 2023-05-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 c6b55847fba89d..1fb43a7863d7ae 100644
--- a/api_docs/cloud_experiments.mdx
+++ b/api_docs/cloud_experiments.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudExperiments
 title: "cloudExperiments"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudExperiments plugin
-date: 2023-04-27
+date: 2023-05-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 eea136ac0be266..5d5d163d6a868c 100644
--- a/api_docs/cloud_security_posture.mdx
+++ b/api_docs/cloud_security_posture.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudSecurityPosture
 title: "cloudSecurityPosture"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudSecurityPosture plugin
-date: 2023-04-27
+date: 2023-05-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 2f1713473db5ec..3e08be7d258c1a 100644
--- a/api_docs/console.mdx
+++ b/api_docs/console.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/console
 title: "console"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the console plugin
-date: 2023-04-27
+date: 2023-05-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 e2d954e78933d4..aea72d4e1e9732 100644
--- a/api_docs/content_management.mdx
+++ b/api_docs/content_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/contentManagement
 title: "contentManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the contentManagement plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'contentManagement']
 ---
 import contentManagementObj from './content_management.devdocs.json';
diff --git a/api_docs/controls.mdx b/api_docs/controls.mdx
index a6259f7af00aa1..567c3ee173b3d1 100644
--- a/api_docs/controls.mdx
+++ b/api_docs/controls.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/controls
 title: "controls"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the controls plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'controls']
 ---
 import controlsObj from './controls.devdocs.json';
diff --git a/api_docs/custom_integrations.devdocs.json b/api_docs/custom_integrations.devdocs.json
index 4a147dae086939..893c689e75f980 100644
--- a/api_docs/custom_integrations.devdocs.json
+++ b/api_docs/custom_integrations.devdocs.json
@@ -1026,6 +1026,41 @@
         "deprecated": false,
         "trackAdoption": false,
         "children": [
+          {
+            "parentPluginId": "customIntegrations",
+            "id": "def-common.INTEGRATION_CATEGORY_DISPLAY.advanced_analytics_ueba",
+            "type": "Object",
+            "tags": [],
+            "label": "advanced_analytics_ueba",
+            "description": [],
+            "path": "src/plugins/custom_integrations/common/index.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "customIntegrations",
+                "id": "def-common.INTEGRATION_CATEGORY_DISPLAY.advanced_analytics_ueba.title",
+                "type": "string",
+                "tags": [],
+                "label": "title",
+                "description": [],
+                "path": "src/plugins/custom_integrations/common/index.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "customIntegrations",
+                "id": "def-common.INTEGRATION_CATEGORY_DISPLAY.advanced_analytics_ueba.parent_id",
+                "type": "string",
+                "tags": [],
+                "label": "parent_id",
+                "description": [],
+                "path": "src/plugins/custom_integrations/common/index.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
           {
             "parentPluginId": "customIntegrations",
             "id": "def-common.INTEGRATION_CATEGORY_DISPLAY.analytics_engine",
diff --git a/api_docs/custom_integrations.mdx b/api_docs/custom_integrations.mdx
index 2f69930fc6cf91..bf927215821470 100644
--- a/api_docs/custom_integrations.mdx
+++ b/api_docs/custom_integrations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/customIntegrations
 title: "customIntegrations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the customIntegrations plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'customIntegrations']
 ---
 import customIntegrationsObj from './custom_integrations.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) for questi
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 271 | 0 | 252 | 1 |
+| 274 | 0 | 255 | 1 |
 
 ## Client
 
diff --git a/api_docs/dashboard.mdx b/api_docs/dashboard.mdx
index a57919677671b2..3d9820e27e4835 100644
--- a/api_docs/dashboard.mdx
+++ b/api_docs/dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboard
 title: "dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboard plugin
-date: 2023-04-27
+date: 2023-05-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 d68d5d997a885d..37465df69ae81c 100644
--- a/api_docs/dashboard_enhanced.mdx
+++ b/api_docs/dashboard_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboardEnhanced
 title: "dashboardEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboardEnhanced plugin
-date: 2023-04-27
+date: 2023-05-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 b4085d0c76a684..071b77bfe57ed5 100644
--- a/api_docs/data.devdocs.json
+++ b/api_docs/data.devdocs.json
@@ -10965,22 +10965,6 @@
             "plugin": "savedObjectsTagging",
             "path": "x-pack/plugins/saved_objects_tagging/public/utils.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
           {
             "plugin": "lists",
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts"
@@ -11089,18 +11073,6 @@
             "plugin": "savedObjectsManagement",
             "path": "src/plugins/saved_objects_management/server/lib/find_relationships.test.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
           {
             "plugin": "synthetics",
             "path": "x-pack/plugins/synthetics/public/apps/synthetics/state/monitor_list/api.ts"
@@ -13525,6 +13497,10 @@
                 "plugin": "@kbn/es-query",
                 "path": "packages/kbn-es-query/src/es_query/types.ts"
               },
+              {
+                "plugin": "visualizationUiComponents",
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx"
+              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
@@ -13753,10 +13729,6 @@
                 "plugin": "controls",
                 "path": "src/plugins/controls/public/services/options_list/options_list_service.ts"
               },
-              {
-                "plugin": "lens",
-                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
-              },
               {
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/services/field_stats/load_field_stats.ts"
@@ -13773,6 +13745,10 @@
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/hooks/use_existing_fields.ts"
               },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
+              },
               {
                 "plugin": "lens",
                 "path": "x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx"
@@ -18231,27 +18207,7 @@
                   "TransportRequestOptions",
                   " | undefined): Promise<",
                   "CountResponse",
-                  ">; }; exists: { (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithOutMeta",
-                  " | undefined): Promise<boolean>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithMeta",
-                  " | undefined): Promise<",
-                  "TransportResult",
-                  "<boolean, unknown>>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+                  ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
                   "default",
                   "; child: (opts: ",
                   "ClientOptions",
@@ -18429,7 +18385,27 @@
                   "default",
                   "; eql: ",
                   "default",
-                  "; existsSource: { (this: That, params: ",
+                  "; exists: { (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithOutMeta",
+                  " | undefined): Promise<boolean>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithMeta",
+                  " | undefined): Promise<",
+                  "TransportResult",
+                  "<boolean, unknown>>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
                   "ExistsSourceRequest",
                   " | ",
                   "ExistsSourceRequest",
@@ -21123,6 +21099,10 @@
                 "plugin": "@kbn/es-query",
                 "path": "packages/kbn-es-query/src/es_query/types.ts"
               },
+              {
+                "plugin": "visualizationUiComponents",
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx"
+              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
@@ -21351,10 +21331,6 @@
                 "plugin": "controls",
                 "path": "src/plugins/controls/public/services/options_list/options_list_service.ts"
               },
-              {
-                "plugin": "lens",
-                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
-              },
               {
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/services/field_stats/load_field_stats.ts"
@@ -21371,6 +21347,10 @@
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/hooks/use_existing_fields.ts"
               },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
+              },
               {
                 "plugin": "lens",
                 "path": "x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx"
@@ -26144,7 +26124,7 @@
           "\nCreate a function that will escape CSV values like \"=\", \"@\" and \"+\" with a\n\"'\". This will also place CSV values in \"\" if contain non-alphanumeric chars.\n\nFor example:\n\nGiven: =1+1\nReturns: \"'=1+1\"\n\nSee OWASP: https://www.owasp.org/index.php/CSV_Injection."
         ],
         "signature": [
-          "(quoteValues: boolean, escapeFormulas: boolean) => (val: RawValue) => string"
+          "({\n  separator,\n  quoteValues,\n  escapeFormulaValues,\n}: { separator: string; quoteValues: boolean; escapeFormulaValues: boolean; }) => (val: RawValue) => string"
         ],
         "path": "src/plugins/data/common/exports/escape_value.ts",
         "deprecated": false,
@@ -26153,32 +26133,48 @@
           {
             "parentPluginId": "data",
             "id": "def-common.createEscapeValue.$1",
-            "type": "boolean",
-            "tags": [],
-            "label": "quoteValues",
-            "description": [],
-            "signature": [
-              "boolean"
-            ],
-            "path": "src/plugins/data/common/exports/escape_value.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "data",
-            "id": "def-common.createEscapeValue.$2",
-            "type": "boolean",
+            "type": "Object",
             "tags": [],
-            "label": "escapeFormulas",
+            "label": "{\n  separator,\n  quoteValues,\n  escapeFormulaValues,\n}",
             "description": [],
-            "signature": [
-              "boolean"
-            ],
             "path": "src/plugins/data/common/exports/escape_value.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "isRequired": true
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.createEscapeValue.$1.separator",
+                "type": "string",
+                "tags": [],
+                "label": "separator",
+                "description": [],
+                "path": "src/plugins/data/common/exports/escape_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-common.createEscapeValue.$1.quoteValues",
+                "type": "boolean",
+                "tags": [],
+                "label": "quoteValues",
+                "description": [],
+                "path": "src/plugins/data/common/exports/escape_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-common.createEscapeValue.$1.escapeFormulaValues",
+                "type": "boolean",
+                "tags": [],
+                "label": "escapeFormulaValues",
+                "description": [],
+                "path": "src/plugins/data/common/exports/escape_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
           }
         ],
         "returnComment": [],
@@ -28726,22 +28722,6 @@
             "plugin": "savedObjectsTagging",
             "path": "x-pack/plugins/saved_objects_tagging/public/utils.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
           {
             "plugin": "lists",
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts"
@@ -28850,18 +28830,6 @@
             "plugin": "savedObjectsManagement",
             "path": "src/plugins/saved_objects_management/server/lib/find_relationships.test.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
           {
             "plugin": "synthetics",
             "path": "x-pack/plugins/synthetics/public/apps/synthetics/state/monitor_list/api.ts"
diff --git a/api_docs/data.mdx b/api_docs/data.mdx
index 33fab650e970ab..f97231a98b47c1 100644
--- a/api_docs/data.mdx
+++ b/api_docs/data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data
 title: "data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data plugin
-date: 2023-04-27
+date: 2023-05-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 |
 |-------------------|-----------|------------------------|-----------------|
-| 3271 | 119 | 2577 | 27 |
+| 3273 | 119 | 2579 | 27 |
 
 ## Client
 
diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx
index c808d9b040e574..66614407e92f1f 100644
--- a/api_docs/data_query.mdx
+++ b/api_docs/data_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-query
 title: "data.query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.query plugin
-date: 2023-04-27
+date: 2023-05-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 |
 |-------------------|-----------|------------------------|-----------------|
-| 3271 | 119 | 2577 | 27 |
+| 3273 | 119 | 2579 | 27 |
 
 ## Client
 
diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx
index c1a4858ac82e9f..7ca65f211105c2 100644
--- a/api_docs/data_search.mdx
+++ b/api_docs/data_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-search
 title: "data.search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.search plugin
-date: 2023-04-27
+date: 2023-05-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 |
 |-------------------|-----------|------------------------|-----------------|
-| 3271 | 119 | 2577 | 27 |
+| 3273 | 119 | 2579 | 27 |
 
 ## Client
 
diff --git a/api_docs/data_view_editor.mdx b/api_docs/data_view_editor.mdx
index 8d7c5bf1e056a9..44492a6054937c 100644
--- a/api_docs/data_view_editor.mdx
+++ b/api_docs/data_view_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewEditor
 title: "dataViewEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewEditor plugin
-date: 2023-04-27
+date: 2023-05-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 7982005da1d131..cdda39c638b751 100644
--- a/api_docs/data_view_field_editor.mdx
+++ b/api_docs/data_view_field_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewFieldEditor
 title: "dataViewFieldEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewFieldEditor plugin
-date: 2023-04-27
+date: 2023-05-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 6719f70a9ee16f..3db079a469c70d 100644
--- a/api_docs/data_view_management.mdx
+++ b/api_docs/data_view_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewManagement
 title: "dataViewManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewManagement plugin
-date: 2023-04-27
+date: 2023-05-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 3d6c008d357ae5..aead3861dd5cfa 100644
--- a/api_docs/data_views.devdocs.json
+++ b/api_docs/data_views.devdocs.json
@@ -67,6 +67,10 @@
                 "plugin": "@kbn/es-query",
                 "path": "packages/kbn-es-query/src/es_query/types.ts"
               },
+              {
+                "plugin": "visualizationUiComponents",
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx"
+              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
@@ -311,10 +315,6 @@
                 "plugin": "controls",
                 "path": "src/plugins/controls/public/services/options_list/options_list_service.ts"
               },
-              {
-                "plugin": "lens",
-                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
-              },
               {
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/services/field_stats/load_field_stats.ts"
@@ -331,6 +331,10 @@
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/hooks/use_existing_fields.ts"
               },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
+              },
               {
                 "plugin": "lens",
                 "path": "x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx"
@@ -8292,6 +8296,10 @@
                 "plugin": "@kbn/es-query",
                 "path": "packages/kbn-es-query/src/es_query/types.ts"
               },
+              {
+                "plugin": "visualizationUiComponents",
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx"
+              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
@@ -8536,10 +8544,6 @@
                 "plugin": "controls",
                 "path": "src/plugins/controls/public/services/options_list/options_list_service.ts"
               },
-              {
-                "plugin": "lens",
-                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
-              },
               {
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/services/field_stats/load_field_stats.ts"
@@ -8556,6 +8560,10 @@
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/hooks/use_existing_fields.ts"
               },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
+              },
               {
                 "plugin": "lens",
                 "path": "x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx"
@@ -14425,27 +14433,7 @@
                 "TransportRequestOptions",
                 " | undefined): Promise<",
                 "CountResponse",
-                ">; }; exists: { (this: That, params: ",
-                "ExistsRequest",
-                " | ",
-                "ExistsRequest",
-                ", options?: ",
-                "TransportRequestOptionsWithOutMeta",
-                " | undefined): Promise<boolean>; (this: That, params: ",
-                "ExistsRequest",
-                " | ",
-                "ExistsRequest",
-                ", options?: ",
-                "TransportRequestOptionsWithMeta",
-                " | undefined): Promise<",
-                "TransportResult",
-                "<boolean, unknown>>; (this: That, params: ",
-                "ExistsRequest",
-                " | ",
-                "ExistsRequest",
-                ", options?: ",
-                "TransportRequestOptions",
-                " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+                ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
                 "default",
                 "; child: (opts: ",
                 "ClientOptions",
@@ -14623,7 +14611,27 @@
                 "default",
                 "; eql: ",
                 "default",
-                "; existsSource: { (this: That, params: ",
+                "; exists: { (this: That, params: ",
+                "ExistsRequest",
+                " | ",
+                "ExistsRequest",
+                ", options?: ",
+                "TransportRequestOptionsWithOutMeta",
+                " | undefined): Promise<boolean>; (this: That, params: ",
+                "ExistsRequest",
+                " | ",
+                "ExistsRequest",
+                ", options?: ",
+                "TransportRequestOptionsWithMeta",
+                " | undefined): Promise<",
+                "TransportResult",
+                "<boolean, unknown>>; (this: That, params: ",
+                "ExistsRequest",
+                " | ",
+                "ExistsRequest",
+                ", options?: ",
+                "TransportRequestOptions",
+                " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
                 "ExistsSourceRequest",
                 " | ",
                 "ExistsSourceRequest",
@@ -15574,6 +15582,10 @@
                 "plugin": "@kbn/es-query",
                 "path": "packages/kbn-es-query/src/es_query/types.ts"
               },
+              {
+                "plugin": "visualizationUiComponents",
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx"
+              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
@@ -15818,10 +15830,6 @@
                 "plugin": "controls",
                 "path": "src/plugins/controls/public/services/options_list/options_list_service.ts"
               },
-              {
-                "plugin": "lens",
-                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
-              },
               {
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/services/field_stats/load_field_stats.ts"
@@ -15838,6 +15846,10 @@
                 "plugin": "unifiedFieldList",
                 "path": "src/plugins/unified_field_list/public/hooks/use_existing_fields.ts"
               },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/data_views_service/loader.ts"
+              },
               {
                 "plugin": "lens",
                 "path": "x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx"
@@ -26237,22 +26249,6 @@
             "plugin": "savedObjectsTagging",
             "path": "x-pack/plugins/saved_objects_tagging/public/utils.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
           {
             "plugin": "lists",
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts"
@@ -26389,18 +26385,6 @@
             "plugin": "data",
             "path": "src/plugins/data/server/search/saved_objects/search_session_migration.test.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
           {
             "plugin": "synthetics",
             "path": "x-pack/plugins/synthetics/public/apps/synthetics/state/monitor_list/api.ts"
diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx
index 278417afb1594e..30e066763a5280 100644
--- a/api_docs/data_views.mdx
+++ b/api_docs/data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViews
 title: "dataViews"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViews plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViews']
 ---
 import dataViewsObj from './data_views.devdocs.json';
diff --git a/api_docs/data_visualizer.mdx b/api_docs/data_visualizer.mdx
index c5b357e1df77aa..160671b16fa1da 100644
--- a/api_docs/data_visualizer.mdx
+++ b/api_docs/data_visualizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataVisualizer
 title: "dataVisualizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataVisualizer plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataVisualizer']
 ---
 import dataVisualizerObj from './data_visualizer.devdocs.json';
diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx
index 10a69469470fd3..e0b32a130df631 100644
--- a/api_docs/deprecations_by_api.mdx
+++ b/api_docs/deprecations_by_api.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByApi
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-api
 title: Deprecated API usage by API
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -17,9 +17,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | Deprecated API | Referencing plugin(s) | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibAlertingPluginApi" section="def-public.PluginSetupContract.registerNavigation" text="registerNavigation"/> | ml, stackAlerts | - |
-| <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, lens, unifiedFieldList, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
-| <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, lens, unifiedFieldList, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
-| <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | @kbn/es-query, securitySolution, timelines, lists, threatIntelligence, data, savedObjectsManagement, unifiedSearch, controls, lens, unifiedFieldList, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover | - |
+| <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | @kbn/es-query, visualizationUiComponents, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
+| <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | @kbn/es-query, visualizationUiComponents, securitySolution, timelines, lists, threatIntelligence, dataViews, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover, data | - |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | @kbn/es-query, visualizationUiComponents, securitySolution, timelines, lists, threatIntelligence, data, savedObjectsManagement, unifiedSearch, controls, unifiedFieldList, lens, triggersActionsUi, aiops, ml, infra, visTypeTimeseries, apm, exploratoryView, dataVisualizer, fleet, canvas, enterpriseSearch, graph, stackAlerts, synthetics, transform, upgradeAssistant, ux, maps, dataViewManagement, inputControlVis, visDefaultEditor, presentationUtil, visTypeTimelion, visTypeVega, discover | - |
 | <DocLink id="kibKibanaReactPluginApi" section="def-public.RedirectAppLinks" text="RedirectAppLinks"/> | home, data, esUiShared, spaces, savedObjectsManagement, exploratoryView, fleet, observability, ml, apm, indexLifecycleManagement, observabilityOnboarding, synthetics, upgradeAssistant, ux, kibanaOverview | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | encryptedSavedObjects, actions, data, ml, logstash, securitySolution, cloudChat | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authz" text="authz"/> | actions, ml, savedObjectsTagging, enterpriseSearch | - |
@@ -42,8 +42,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDataPluginApi" section="def-common.EsQuerySearchAfter" text="EsQuerySearchAfter"/> | discover | - |
 | <DocLink id="kibUiActionsPluginApi" section="def-public.UiActionsService.executeTriggerActions" text="executeTriggerActions"/> | data, discover, imageEmbeddable, embeddable | - |
 | <DocLink id="kibKbnCoreUiSettingsCommonPluginApi" section="def-common.UiSettingsParams.metric" text="metric"/> | advancedSettings, discover | - |
-| <DocLink id="kibDataPluginApi" section="def-public.SavedObject" text="SavedObject"/> | @kbn/core-saved-objects-common, @kbn/core-saved-objects-api-browser, @kbn/core-saved-objects-browser-internal, @kbn/core-saved-objects-api-server, @kbn/core, home, dataViews, savedObjectsTagging, fleet, canvas, osquery, synthetics, savedObjects, @kbn/core-saved-objects-browser-mocks, @kbn/core-saved-objects-import-export-server-internal, savedObjectsTaggingOss, cases, lists, securitySolution, upgradeAssistant, savedObjectsManagement, @kbn/core-ui-settings-server-internal, dashboard | - |
-| <DocLink id="kibDataPluginApi" section="def-common.SavedObject" text="SavedObject"/> | @kbn/core-saved-objects-common, @kbn/core-saved-objects-api-browser, @kbn/core-saved-objects-browser-internal, @kbn/core-saved-objects-api-server, @kbn/core, home, dataViews, savedObjectsTagging, fleet, canvas, osquery, synthetics, savedObjects, @kbn/core-saved-objects-browser-mocks, @kbn/core-saved-objects-import-export-server-internal, savedObjectsTaggingOss, cases, lists, securitySolution, upgradeAssistant, savedObjectsManagement, @kbn/core-ui-settings-server-internal, data | - |
+| <DocLink id="kibDataPluginApi" section="def-public.SavedObject" text="SavedObject"/> | @kbn/core-saved-objects-common, @kbn/core-saved-objects-api-browser, @kbn/core-saved-objects-browser-internal, @kbn/core-saved-objects-api-server, @kbn/core, home, dataViews, savedObjectsTagging, fleet, canvas, osquery, synthetics, savedObjects, @kbn/core-saved-objects-browser-mocks, @kbn/core-saved-objects-import-export-server-internal, savedObjectsTaggingOss, lists, securitySolution, upgradeAssistant, savedObjectsManagement, cases, @kbn/core-ui-settings-server-internal, dashboard | - |
+| <DocLink id="kibDataPluginApi" section="def-common.SavedObject" text="SavedObject"/> | @kbn/core-saved-objects-common, @kbn/core-saved-objects-api-browser, @kbn/core-saved-objects-browser-internal, @kbn/core-saved-objects-api-server, @kbn/core, home, dataViews, savedObjectsTagging, fleet, canvas, osquery, synthetics, savedObjects, @kbn/core-saved-objects-browser-mocks, @kbn/core-saved-objects-import-export-server-internal, savedObjectsTaggingOss, lists, securitySolution, upgradeAssistant, savedObjectsManagement, cases, @kbn/core-ui-settings-server-internal, data | - |
 | <DocLink id="kibDataPluginApi" section="def-common.EqlSearchStrategyRequest.options" text="options"/> | securitySolution | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.BeatFields" text="BeatFields"/> | securitySolution | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.BrowserField" text="BrowserField"/> | @kbn/securitysolution-data-table, securitySolution | - |
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index f3767ec8e73b02..fb68f0aaa374cc 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByPlugin
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-plugin
 title: Deprecated API usage by plugin
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -418,10 +418,10 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObject), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObject), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObject), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObject), [find.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/operations/find.ts#:~:text=SavedObject), [find.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/operations/find.ts#:~:text=SavedObject), [find.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/operations/find.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject)+ 8 more | - |
-| <DocLink id="kibDataPluginApi" section="def-common.SavedObject" text="SavedObject"/> | [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObject), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObject), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObject), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObject), [find.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/operations/find.ts#:~:text=SavedObject), [find.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/operations/find.ts#:~:text=SavedObject), [find.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/operations/find.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject)+ 44 more | - |
+| <DocLink id="kibDataPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject)+ 1 more | - |
+| <DocLink id="kibDataPluginApi" section="def-common.SavedObject" text="SavedObject"/> | [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObject)+ 23 more | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.ResolvedSimpleSavedObject" text="ResolvedSimpleSavedObject"/> | [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/common/ui/types.ts#:~:text=ResolvedSimpleSavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/common/ui/types.ts#:~:text=ResolvedSimpleSavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/common/ui/types.ts#:~:text=ResolvedSimpleSavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/common/ui/types.ts#:~:text=ResolvedSimpleSavedObject) | - |
-| <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectReference" text="SavedObjectReference"/> | [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/attachment_framework/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/attachment_framework/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/attachment_framework/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/attachment_framework/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/so_references.ts#:~:text=SavedObjectReference), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObjectReference), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObjectReference) | - |
+| <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectReference" text="SavedObjectReference"/> | [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/attachment_framework/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/attachment_framework/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/attachment_framework/so_references.ts#:~:text=SavedObjectReference), [so_references.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/attachment_framework/so_references.ts#:~:text=SavedObjectReference), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObjectReference), [test_utils.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/services/user_actions/test_utils.ts#:~:text=SavedObjectReference) | - |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | [cases.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/saved_object_types/cases.ts#:~:text=convertToMultiNamespaceTypeVersion), [configure.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/saved_object_types/configure.ts#:~:text=convertToMultiNamespaceTypeVersion), [comments.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/saved_object_types/comments.ts#:~:text=convertToMultiNamespaceTypeVersion), [user_actions.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/saved_object_types/user_actions.ts#:~:text=convertToMultiNamespaceTypeVersion), [connector_mappings.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cases/server/saved_object_types/connector_mappings.ts#:~:text=convertToMultiNamespaceTypeVersion) | - |
 
 
@@ -861,7 +861,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | [loader.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/data_views_service/loader.ts#:~:text=title), [lens_top_nav.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx#:~:text=title), [loader.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/data_views_service/loader.ts#:~:text=title), [lens_top_nav.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx#:~:text=title) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | [loader.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/data_views_service/loader.ts#:~:text=title), [lens_top_nav.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx#:~:text=title), [loader.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/data_views_service/loader.ts#:~:text=title), [lens_top_nav.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx#:~:text=title) | - |
 | <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | [loader.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/data_views_service/loader.ts#:~:text=title), [lens_top_nav.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/app_plugin/lens_top_nav.tsx#:~:text=title) | - |
-| <DocLink id="kibKbnCoreLifecycleBrowserPluginApi" section="def-common.CoreStart.savedObjects" text="savedObjects"/> | [lens_attribute_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/lens_attribute_service.ts#:~:text=savedObjects), [lens_attribute_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/lens_attribute_service.ts#:~:text=savedObjects), [form_based.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx#:~:text=savedObjects), [form_based.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx#:~:text=savedObjects), [form_based.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx#:~:text=savedObjects), [visualization.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx#:~:text=savedObjects), [visualization.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx#:~:text=savedObjects), [mounter.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/app_plugin/mounter.tsx#:~:text=savedObjects) | - |
+| <DocLink id="kibKbnCoreLifecycleBrowserPluginApi" section="def-common.CoreStart.savedObjects" text="savedObjects"/> | [lens_attribute_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/lens_attribute_service.ts#:~:text=savedObjects), [lens_attribute_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/lens_attribute_service.ts#:~:text=savedObjects), [form_based.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx#:~:text=savedObjects), [form_based.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx#:~:text=savedObjects), [form_based.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx#:~:text=savedObjects), [visualization.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx#:~:text=savedObjects), [visualization.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx#:~:text=savedObjects), [visualization.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx#:~:text=savedObjects), [mounter.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/app_plugin/mounter.tsx#:~:text=savedObjects) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsClientContract" text="SavedObjectsClientContract"/> | [find_object_by_title.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts#:~:text=SavedObjectsClientContract), [find_object_by_title.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts#:~:text=SavedObjectsClientContract), [check_for_duplicate_title.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts#:~:text=SavedObjectsClientContract), [check_for_duplicate_title.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/persistence/saved_objects_utils/check_for_duplicate_title.ts#:~:text=SavedObjectsClientContract), [reference_editor.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.tsx#:~:text=SavedObjectsClientContract), [reference_editor.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.tsx#:~:text=SavedObjectsClientContract), [dimension_panel.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_panel.tsx#:~:text=SavedObjectsClientContract), [dimension_panel.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_panel.tsx#:~:text=SavedObjectsClientContract), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/index.ts#:~:text=SavedObjectsClientContract), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/index.ts#:~:text=SavedObjectsClientContract)+ 8 more | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsClientContract.create" text="create"/> | [saved_object_store.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/persistence/saved_object_store.ts#:~:text=create) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsClientContract.find" text="find"/> | [find_object_by_title.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.ts#:~:text=find), [find_object_by_title.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts#:~:text=find), [find_object_by_title.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/persistence/saved_objects_utils/find_object_by_title.test.ts#:~:text=find) | - |
@@ -1185,11 +1185,11 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | [request_context_factory.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/request_context_factory.ts#:~:text=authc), [route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts#:~:text=authc), [create_signals_migration_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts#:~:text=authc), [delete_signals_migration_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts#:~:text=authc), [finalize_signals_migration_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts#:~:text=authc), [open_close_signals_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts#:~:text=authc), [common.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts#:~:text=authc) | - |
 | <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), [use_data_view.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx#:~:text=BrowserField)+ 34 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/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/common/types/header_actions/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/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)+ 96 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/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/common/types/header_actions/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/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)+ 97 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="kibKbnCoreLifecycleBrowserPluginApi" section="def-common.CoreStart.savedObjects" text="savedObjects"/> | [use_dashboard_button_href.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts#:~:text=savedObjects), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=savedObjects) | - |
-| <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsClientContract.find" text="find"/> | [use_dashboard_button_href.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts#:~:text=find), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=find), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=find) | - |
+| <DocLink id="kibKbnCoreLifecycleBrowserPluginApi" section="def-common.CoreStart.savedObjects" text="savedObjects"/> | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=savedObjects) | - |
+| <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsClientContract.find" text="find"/> | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=find), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx#:~:text=find) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SimpleSavedObject" text="SimpleSavedObject"/> | [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/hooks/types.ts#:~:text=SimpleSavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/hooks/types.ts#:~:text=SimpleSavedObject) | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObject.migrationVersion" text="migrationVersion"/> | [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion), [host_risk_score_dashboards.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/saved_object/host_risk_score_dashboards.ts#:~:text=migrationVersion)+ 34 more | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" section="def-common.SavedObjectAttributes" text="SavedObjectAttributes"/> | [legacy_types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_types.ts#:~:text=SavedObjectAttributes), [legacy_types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_types.ts#:~:text=SavedObjectAttributes), [legacy_migrations.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_migrations.ts#:~:text=SavedObjectAttributes), [legacy_migrations.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_migrations.ts#:~:text=SavedObjectAttributes), [legacy_types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_types.ts#:~:text=SavedObjectAttributes), [legacy_types.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_types.ts#:~:text=SavedObjectAttributes), [legacy_migrations.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_migrations.ts#:~:text=SavedObjectAttributes), [legacy_migrations.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/rule_actions/legacy_migrations.ts#:~:text=SavedObjectAttributes) | - |
@@ -1432,6 +1432,16 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 
 
 
+## visualizationUiComponents
+
+| Deprecated API | Reference location(s) | Remove By |
+| ---------------|-----------|-----------|
+| <DocLink id="kibDataPluginApi" section="def-common.DataView.title" text="title"/> | [filter_query_input.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx#:~:text=title), [filter_query_input.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx#:~:text=title) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.DataView.title" text="title"/> | [filter_query_input.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx#:~:text=title), [filter_query_input.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx#:~:text=title) | - |
+| <DocLink id="kibDataViewsPluginApi" section="def-public.DataView.title" text="title"/> | [filter_query_input.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx#:~:text=title) | - |
+
+
+
 ## visualizations
 
 | Deprecated API | Reference location(s) | Remove By |
diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx
index 681aab6749780d..bc6e3ad8d12918 100644
--- a/api_docs/deprecations_by_team.mdx
+++ b/api_docs/deprecations_by_team.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsDueByTeam
 slug: /kibana-dev-docs/api-meta/deprecations-due-by-team
 title: Deprecated APIs due to be removed, by team
 description: Lists the teams that are referencing deprecated APIs with a remove by date.
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
diff --git a/api_docs/dev_tools.mdx b/api_docs/dev_tools.mdx
index 977adf7bd33efb..73759c4b9e15c4 100644
--- a/api_docs/dev_tools.mdx
+++ b/api_docs/dev_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/devTools
 title: "devTools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the devTools plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'devTools']
 ---
 import devToolsObj from './dev_tools.devdocs.json';
diff --git a/api_docs/discover.devdocs.json b/api_docs/discover.devdocs.json
index c1d7997a50235a..696fa2dfe83c54 100644
--- a/api_docs/discover.devdocs.json
+++ b/api_docs/discover.devdocs.json
@@ -1846,21 +1846,6 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "discover",
-        "id": "def-common.SHOW_LEGACY_FIELD_TOP_VALUES",
-        "type": "string",
-        "tags": [],
-        "label": "SHOW_LEGACY_FIELD_TOP_VALUES",
-        "description": [],
-        "signature": [
-          "\"discover:showLegacyFieldTopValues\""
-        ],
-        "path": "src/plugins/discover/common/index.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "discover",
         "id": "def-common.SHOW_MULTIFIELDS",
diff --git a/api_docs/discover.mdx b/api_docs/discover.mdx
index 8719508bd1d2a7..eb130a50d7992e 100644
--- a/api_docs/discover.mdx
+++ b/api_docs/discover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discover
 title: "discover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discover plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discover']
 ---
 import discoverObj from './discover.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 97 | 0 | 78 | 7 |
+| 96 | 0 | 77 | 7 |
 
 ## Client
 
diff --git a/api_docs/discover_enhanced.mdx b/api_docs/discover_enhanced.mdx
index 81c24601eaac23..4c3153f5590b63 100644
--- a/api_docs/discover_enhanced.mdx
+++ b/api_docs/discover_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverEnhanced
 title: "discoverEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discoverEnhanced plugin
-date: 2023-04-27
+date: 2023-05-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 dbc881a9bba3f9..27e713e7a085fa 100644
--- a/api_docs/ecs_data_quality_dashboard.mdx
+++ b/api_docs/ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ecsDataQualityDashboard
 title: "ecsDataQualityDashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ecsDataQualityDashboard plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ecsDataQualityDashboard']
 ---
 import ecsDataQualityDashboardObj from './ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/embeddable.mdx b/api_docs/embeddable.mdx
index 732ce00d8af529..27510d5fa8bc94 100644
--- a/api_docs/embeddable.mdx
+++ b/api_docs/embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddable
 title: "embeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddable plugin
-date: 2023-04-27
+date: 2023-05-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 7c74e202508f2d..382b09177ef5a4 100644
--- a/api_docs/embeddable_enhanced.mdx
+++ b/api_docs/embeddable_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddableEnhanced
 title: "embeddableEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddableEnhanced plugin
-date: 2023-04-27
+date: 2023-05-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 43949f5330e83e..6741f03c9a5274 100644
--- a/api_docs/encrypted_saved_objects.mdx
+++ b/api_docs/encrypted_saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/encryptedSavedObjects
 title: "encryptedSavedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the encryptedSavedObjects plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'encryptedSavedObjects']
 ---
 import encryptedSavedObjectsObj from './encrypted_saved_objects.devdocs.json';
diff --git a/api_docs/enterprise_search.devdocs.json b/api_docs/enterprise_search.devdocs.json
index d4385c5fee8e3b..f32dcd8b9b0464 100644
--- a/api_docs/enterprise_search.devdocs.json
+++ b/api_docs/enterprise_search.devdocs.json
@@ -6,7 +6,23 @@
     "interfaces": [],
     "enums": [],
     "misc": [],
-    "objects": []
+    "objects": [],
+    "start": {
+      "parentPluginId": "enterpriseSearch",
+      "id": "def-public.EnterpriseSearchPublicStart",
+      "type": "Type",
+      "tags": [],
+      "label": "EnterpriseSearchPublicStart",
+      "description": [],
+      "signature": [
+        "void"
+      ],
+      "path": "x-pack/plugins/enterprise_search/public/plugin.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
   },
   "server": {
     "classes": [],
diff --git a/api_docs/enterprise_search.mdx b/api_docs/enterprise_search.mdx
index f268bd6da5485e..bc1a7ad6319c3e 100644
--- a/api_docs/enterprise_search.mdx
+++ b/api_docs/enterprise_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/enterpriseSearch
 title: "enterpriseSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the enterpriseSearch plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'enterpriseSearch']
 ---
 import enterpriseSearchObj from './enterprise_search.devdocs.json';
@@ -21,7 +21,12 @@ Contact [@elastic/enterprise-search-frontend](https://github.com/orgs/elastic/te
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 7 | 0 | 7 | 0 |
+| 9 | 0 | 9 | 0 |
+
+## Client
+
+### Start
+<DocDefinitionList data={[enterpriseSearchObj.client.start]}/>
 
 ## Server
 
diff --git a/api_docs/es_ui_shared.mdx b/api_docs/es_ui_shared.mdx
index fa279e5ea2ad48..1c7cb0a4a737c6 100644
--- a/api_docs/es_ui_shared.mdx
+++ b/api_docs/es_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esUiShared
 title: "esUiShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the esUiShared plugin
-date: 2023-04-27
+date: 2023-05-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 e97b5c52fed5a2..b9995e81f73968 100644
--- a/api_docs/event_annotation.mdx
+++ b/api_docs/event_annotation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotation
 title: "eventAnnotation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventAnnotation plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotation']
 ---
 import eventAnnotationObj from './event_annotation.devdocs.json';
diff --git a/api_docs/event_log.mdx b/api_docs/event_log.mdx
index c48951ff20684d..06ab3d2458859d 100644
--- a/api_docs/event_log.mdx
+++ b/api_docs/event_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventLog
 title: "eventLog"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventLog plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventLog']
 ---
 import eventLogObj from './event_log.devdocs.json';
diff --git a/api_docs/exploratory_view.devdocs.json b/api_docs/exploratory_view.devdocs.json
index 955001e7681091..4ae79916759f7e 100644
--- a/api_docs/exploratory_view.devdocs.json
+++ b/api_docs/exploratory_view.devdocs.json
@@ -2218,7 +2218,7 @@
                 "section": "def-common.AppUpdater",
                 "text": "AppUpdater"
               },
-              ">; }) => void; }"
+              ">; }) => void; setIsSidebarEnabled: (isEnabled: boolean) => void; }"
             ],
             "path": "x-pack/plugins/exploratory_view/public/plugin.ts",
             "deprecated": false,
diff --git a/api_docs/exploratory_view.mdx b/api_docs/exploratory_view.mdx
index 31fa07d7f2d66d..8c10bbc4b32369 100644
--- a/api_docs/exploratory_view.mdx
+++ b/api_docs/exploratory_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/exploratoryView
 title: "exploratoryView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the exploratoryView plugin
-date: 2023-04-27
+date: 2023-05-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 16a576517daf61..d8c21a9d85a7d6 100644
--- a/api_docs/expression_error.mdx
+++ b/api_docs/expression_error.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionError
 title: "expressionError"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionError plugin
-date: 2023-04-27
+date: 2023-05-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 380aa33b810ba5..d8e0f495629b05 100644
--- a/api_docs/expression_gauge.mdx
+++ b/api_docs/expression_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionGauge
 title: "expressionGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionGauge plugin
-date: 2023-04-27
+date: 2023-05-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 5bb979dbeef1e6..7df7fe980d53ca 100644
--- a/api_docs/expression_heatmap.mdx
+++ b/api_docs/expression_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionHeatmap
 title: "expressionHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionHeatmap plugin
-date: 2023-04-27
+date: 2023-05-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 518ec7d4291bc5..204a2bf9584ed7 100644
--- a/api_docs/expression_image.mdx
+++ b/api_docs/expression_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionImage
 title: "expressionImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionImage plugin
-date: 2023-04-27
+date: 2023-05-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 5cd83632a8aac4..69eec7ebd4773c 100644
--- a/api_docs/expression_legacy_metric_vis.mdx
+++ b/api_docs/expression_legacy_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionLegacyMetricVis
 title: "expressionLegacyMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionLegacyMetricVis plugin
-date: 2023-04-27
+date: 2023-05-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 c29d56325df94b..18a2d8df875c83 100644
--- a/api_docs/expression_metric.mdx
+++ b/api_docs/expression_metric.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetric
 title: "expressionMetric"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetric plugin
-date: 2023-04-27
+date: 2023-05-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 64bbb1a7c614e9..6d9e9cbfdf8f22 100644
--- a/api_docs/expression_metric_vis.mdx
+++ b/api_docs/expression_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetricVis
 title: "expressionMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetricVis plugin
-date: 2023-04-27
+date: 2023-05-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 aa801b9269c5e3..ff152c343b46ab 100644
--- a/api_docs/expression_partition_vis.mdx
+++ b/api_docs/expression_partition_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionPartitionVis
 title: "expressionPartitionVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionPartitionVis plugin
-date: 2023-04-27
+date: 2023-05-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 abbb118a71203a..05e53c7f584901 100644
--- a/api_docs/expression_repeat_image.mdx
+++ b/api_docs/expression_repeat_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRepeatImage
 title: "expressionRepeatImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRepeatImage plugin
-date: 2023-04-27
+date: 2023-05-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 901ca1522582ea..cecf10c743a4d0 100644
--- a/api_docs/expression_reveal_image.mdx
+++ b/api_docs/expression_reveal_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRevealImage
 title: "expressionRevealImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRevealImage plugin
-date: 2023-04-27
+date: 2023-05-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 9d2da8e5dcd27f..30cf33e6066d18 100644
--- a/api_docs/expression_shape.mdx
+++ b/api_docs/expression_shape.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionShape
 title: "expressionShape"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionShape plugin
-date: 2023-04-27
+date: 2023-05-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 205a7cd0946138..c059bca82026b6 100644
--- a/api_docs/expression_tagcloud.mdx
+++ b/api_docs/expression_tagcloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionTagcloud
 title: "expressionTagcloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionTagcloud plugin
-date: 2023-04-27
+date: 2023-05-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 12def441a89ad2..111520c8d3e96e 100644
--- a/api_docs/expression_x_y.mdx
+++ b/api_docs/expression_x_y.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionXY
 title: "expressionXY"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionXY plugin
-date: 2023-04-27
+date: 2023-05-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 b8baf0b54b6ca9..3c0f481f712737 100644
--- a/api_docs/expressions.mdx
+++ b/api_docs/expressions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressions
 title: "expressions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressions plugin
-date: 2023-04-27
+date: 2023-05-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 dbb5b25ebc5dea..7fd52fdb1e62b1 100644
--- a/api_docs/features.mdx
+++ b/api_docs/features.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/features
 title: "features"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the features plugin
-date: 2023-04-27
+date: 2023-05-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 b4df16c1dd524b..4472b1454f1854 100644
--- a/api_docs/field_formats.mdx
+++ b/api_docs/field_formats.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldFormats
 title: "fieldFormats"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fieldFormats plugin
-date: 2023-04-27
+date: 2023-05-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 00ec5a1274c4ea..494b140b5a9d51 100644
--- a/api_docs/file_upload.mdx
+++ b/api_docs/file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fileUpload
 title: "fileUpload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fileUpload plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fileUpload']
 ---
 import fileUploadObj from './file_upload.devdocs.json';
diff --git a/api_docs/files.devdocs.json b/api_docs/files.devdocs.json
index cf918647a230ab..ba16dce92b951c 100644
--- a/api_docs/files.devdocs.json
+++ b/api_docs/files.devdocs.json
@@ -744,6 +744,41 @@
         ],
         "returnComment": [],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "files",
+        "id": "def-server.createFileHashTransform",
+        "type": "Function",
+        "tags": [],
+        "label": "createFileHashTransform",
+        "description": [
+          "\nCreates a `Transform` that will calculate a Hash based on the data provided by a Readable"
+        ],
+        "signature": [
+          "(algorithm?: \"sha256\" | \"md5\" | \"sha1\" | \"sha512\") => FileHashTransform"
+        ],
+        "path": "src/plugins/files/server/file_client/stream_transforms/file_hash_transform/file_hash_transform.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "files",
+            "id": "def-server.createFileHashTransform.$1",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "algorithm",
+            "description": [],
+            "signature": [
+              "\"sha256\" | \"md5\" | \"sha1\" | \"sha512\""
+            ],
+            "path": "src/plugins/files/server/file_client/stream_transforms/file_hash_transform/file_hash_transform.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
       }
     ],
     "interfaces": [
@@ -964,27 +999,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -1162,7 +1177,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -2977,6 +3012,135 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "files",
+            "id": "def-server.FileMetadataClient.bulkGet",
+            "type": "Function",
+            "tags": [],
+            "label": "bulkGet",
+            "description": [
+              "\nBulk get file metadata\n"
+            ],
+            "signature": [
+              "{ (arg: { ids: string[]; throwIfNotFound?: true | undefined; }): Promise<",
+              {
+                "pluginId": "files",
+                "scope": "server",
+                "docId": "kibFilesPluginApi",
+                "section": "def-server.FileDescriptor",
+                "text": "FileDescriptor"
+              },
+              "<unknown>[]>; (arg: ",
+              "BulkGetArg",
+              " | { ids: string[]; throwIfNotFound: false; }): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "server",
+                "docId": "kibFilesPluginApi",
+                "section": "def-server.FileDescriptor",
+                "text": "FileDescriptor"
+              },
+              "<unknown> | null)[]>; }"
+            ],
+            "path": "src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "files",
+                "id": "def-server.FileMetadataClient.bulkGet.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "arg",
+                "description": [],
+                "path": "src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "files",
+                    "id": "def-server.FileMetadataClient.bulkGet.$1.ids",
+                    "type": "Array",
+                    "tags": [],
+                    "label": "ids",
+                    "description": [],
+                    "signature": [
+                      "string[]"
+                    ],
+                    "path": "src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "files",
+                    "id": "def-server.FileMetadataClient.bulkGet.$1.throwIfNotFound",
+                    "type": "boolean",
+                    "tags": [],
+                    "label": "throwIfNotFound",
+                    "description": [],
+                    "signature": [
+                      "true | undefined"
+                    ],
+                    "path": "src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "files",
+            "id": "def-server.FileMetadataClient.bulkGet",
+            "type": "Function",
+            "tags": [],
+            "label": "bulkGet",
+            "description": [],
+            "signature": [
+              "{ (arg: { ids: string[]; throwIfNotFound?: true | undefined; }): Promise<",
+              {
+                "pluginId": "files",
+                "scope": "server",
+                "docId": "kibFilesPluginApi",
+                "section": "def-server.FileDescriptor",
+                "text": "FileDescriptor"
+              },
+              "<unknown>[]>; (arg: ",
+              "BulkGetArg",
+              " | { ids: string[]; throwIfNotFound: false; }): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "server",
+                "docId": "kibFilesPluginApi",
+                "section": "def-server.FileDescriptor",
+                "text": "FileDescriptor"
+              },
+              "<unknown> | null)[]>; }"
+            ],
+            "path": "src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "files",
+                "id": "def-server.FileMetadataClient.bulkGet.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "arg",
+                "description": [],
+                "signature": [
+                  "BulkGetArg",
+                  " | { ids: string[]; throwIfNotFound: false; }"
+                ],
+                "path": "src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "files",
             "id": "def-server.FileMetadataClient.update",
@@ -3577,31 +3741,73 @@
           },
           {
             "parentPluginId": "files",
-            "id": "def-server.FileServiceStart.find",
+            "id": "def-server.FileServiceStart.bulkGetById",
             "type": "Function",
             "tags": [],
-            "label": "find",
+            "label": "bulkGetById",
             "description": [
-              "\nFind files given a set of parameters.\n"
+              "\nBulk get files by IDs. Will throw if any of the files fail to load (set `throwIfNotFound` to `false` to not throw and return `null` instead)\n"
             ],
             "signature": [
-              "<M>(args: ",
+              "{ <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; }): Promise<",
               {
                 "pluginId": "files",
-                "scope": "server",
+                "scope": "common",
                 "docId": "kibFilesPluginApi",
-                "section": "def-server.FindFileArgs",
-                "text": "FindFileArgs"
+                "section": "def-common.File",
+                "text": "File"
               },
-              ") => Promise<{ files: ",
+              "<unknown>[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; format: \"map\"; }): Promise<{ [id: string]: ",
               {
-                "pluginId": "@kbn/shared-ux-file-types",
+                "pluginId": "files",
                 "scope": "common",
-                "docId": "kibKbnSharedUxFileTypesPluginApi",
-                "section": "def-common.FileJSON",
-                "text": "FileJSON"
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
               },
-              "<M>[]; total: number; }>"
+              "<unknown>; }>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; }): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null)[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; format: \"map\"; }): Promise<{ [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; }>; <M>(args: ",
+              "BulkGetByIdArgs",
+              "): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<M> | { [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; })[]>; }"
             ],
             "path": "src/plugins/files/server/file_service/file_service.ts",
             "deprecated": false,
@@ -3609,21 +3815,17 @@
             "children": [
               {
                 "parentPluginId": "files",
-                "id": "def-server.FileServiceStart.find.$1",
-                "type": "Object",
+                "id": "def-server.FileServiceStart.bulkGetById.$1",
+                "type": "CompoundType",
                 "tags": [],
                 "label": "args",
                 "description": [
-                  "- find files args"
+                  "- bulk get files by IDs args"
                 ],
                 "signature": [
-                  {
-                    "pluginId": "files",
-                    "scope": "server",
-                    "docId": "kibFilesPluginApi",
-                    "section": "def-server.FindFileArgs",
-                    "text": "FindFileArgs"
-                  }
+                  "Pick<",
+                  "BulkGetByIdArgs",
+                  ", \"ids\"> & { throwIfNotFound?: true | undefined; }"
                 ],
                 "path": "src/plugins/files/server/file_service/file_service.ts",
                 "deprecated": false,
@@ -3635,46 +3837,470 @@
           },
           {
             "parentPluginId": "files",
-            "id": "def-server.FileServiceStart.getShareObject",
+            "id": "def-server.FileServiceStart.bulkGetById",
             "type": "Function",
             "tags": [],
-            "label": "getShareObject",
-            "description": [
-              "\nGet an instance of a share object\n"
-            ],
+            "label": "bulkGetById",
+            "description": [],
             "signature": [
-              "(arg: IdArg) => Promise<",
+              "{ <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; }): Promise<",
               {
-                "pluginId": "@kbn/shared-ux-file-types",
+                "pluginId": "files",
                 "scope": "common",
-                "docId": "kibKbnSharedUxFileTypesPluginApi",
-                "section": "def-common.FileShareJSON",
-                "text": "FileShareJSON"
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
               },
-              ">"
-            ],
-            "path": "src/plugins/files/server/file_service/file_service.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": [
+              "<unknown>[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; format: \"map\"; }): Promise<{ [id: string]: ",
               {
-                "parentPluginId": "files",
-                "id": "def-server.FileServiceStart.getShareObject.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "arg",
-                "description": [
-                  "- get share args"
-                ],
-                "signature": [
-                  "IdArg"
-                ],
-                "path": "src/plugins/files/server/file_share_service/types.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown>; }>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; }): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null)[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; format: \"map\"; }): Promise<{ [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; }>; <M>(args: ",
+              "BulkGetByIdArgs",
+              "): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<M> | { [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; })[]>; }"
+            ],
+            "path": "src/plugins/files/server/file_service/file_service.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "files",
+                "id": "def-server.FileServiceStart.bulkGetById.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "args",
+                "description": [],
+                "signature": [
+                  "Pick<",
+                  "BulkGetByIdArgs",
+                  ", \"ids\"> & { throwIfNotFound?: true | undefined; format: \"map\"; }"
+                ],
+                "path": "src/plugins/files/server/file_service/file_service.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "files",
+            "id": "def-server.FileServiceStart.bulkGetById",
+            "type": "Function",
+            "tags": [],
+            "label": "bulkGetById",
+            "description": [],
+            "signature": [
+              "{ <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; }): Promise<",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown>[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; format: \"map\"; }): Promise<{ [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown>; }>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; }): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null)[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; format: \"map\"; }): Promise<{ [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; }>; <M>(args: ",
+              "BulkGetByIdArgs",
+              "): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<M> | { [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; })[]>; }"
+            ],
+            "path": "src/plugins/files/server/file_service/file_service.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "files",
+                "id": "def-server.FileServiceStart.bulkGetById.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "args",
+                "description": [],
+                "signature": [
+                  "Pick<",
+                  "BulkGetByIdArgs",
+                  ", \"ids\"> & { throwIfNotFound: false; }"
+                ],
+                "path": "src/plugins/files/server/file_service/file_service.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "files",
+            "id": "def-server.FileServiceStart.bulkGetById",
+            "type": "Function",
+            "tags": [],
+            "label": "bulkGetById",
+            "description": [],
+            "signature": [
+              "{ <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; }): Promise<",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown>[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; format: \"map\"; }): Promise<{ [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown>; }>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; }): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null)[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; format: \"map\"; }): Promise<{ [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; }>; <M>(args: ",
+              "BulkGetByIdArgs",
+              "): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<M> | { [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; })[]>; }"
+            ],
+            "path": "src/plugins/files/server/file_service/file_service.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "files",
+                "id": "def-server.FileServiceStart.bulkGetById.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "args",
+                "description": [],
+                "signature": [
+                  "Pick<",
+                  "BulkGetByIdArgs",
+                  ", \"ids\"> & { throwIfNotFound: false; format: \"map\"; }"
+                ],
+                "path": "src/plugins/files/server/file_service/file_service.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "files",
+            "id": "def-server.FileServiceStart.bulkGetById",
+            "type": "Function",
+            "tags": [],
+            "label": "bulkGetById",
+            "description": [],
+            "signature": [
+              "{ <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; }): Promise<",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown>[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound?: true | undefined; format: \"map\"; }): Promise<{ [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown>; }>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; }): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null)[]>; <M>(args: Pick<",
+              "BulkGetByIdArgs",
+              ", \"ids\"> & { throwIfNotFound: false; format: \"map\"; }): Promise<{ [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; }>; <M>(args: ",
+              "BulkGetByIdArgs",
+              "): Promise<(",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<M> | { [id: string]: ",
+              {
+                "pluginId": "files",
+                "scope": "common",
+                "docId": "kibFilesPluginApi",
+                "section": "def-common.File",
+                "text": "File"
+              },
+              "<unknown> | null; })[]>; }"
+            ],
+            "path": "src/plugins/files/server/file_service/file_service.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "files",
+                "id": "def-server.FileServiceStart.bulkGetById.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "args",
+                "description": [],
+                "signature": [
+                  "BulkGetByIdArgs"
+                ],
+                "path": "src/plugins/files/server/file_service/file_service.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "files",
+            "id": "def-server.FileServiceStart.find",
+            "type": "Function",
+            "tags": [],
+            "label": "find",
+            "description": [
+              "\nFind files given a set of parameters.\n"
+            ],
+            "signature": [
+              "<M>(args: ",
+              {
+                "pluginId": "files",
+                "scope": "server",
+                "docId": "kibFilesPluginApi",
+                "section": "def-server.FindFileArgs",
+                "text": "FindFileArgs"
+              },
+              ") => Promise<{ files: ",
+              {
+                "pluginId": "@kbn/shared-ux-file-types",
+                "scope": "common",
+                "docId": "kibKbnSharedUxFileTypesPluginApi",
+                "section": "def-common.FileJSON",
+                "text": "FileJSON"
+              },
+              "<M>[]; total: number; }>"
+            ],
+            "path": "src/plugins/files/server/file_service/file_service.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "files",
+                "id": "def-server.FileServiceStart.find.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "args",
+                "description": [
+                  "- find files args"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "files",
+                    "scope": "server",
+                    "docId": "kibFilesPluginApi",
+                    "section": "def-server.FindFileArgs",
+                    "text": "FindFileArgs"
+                  }
+                ],
+                "path": "src/plugins/files/server/file_service/file_service.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "files",
+            "id": "def-server.FileServiceStart.getShareObject",
+            "type": "Function",
+            "tags": [],
+            "label": "getShareObject",
+            "description": [
+              "\nGet an instance of a share object\n"
+            ],
+            "signature": [
+              "(arg: IdArg) => Promise<",
+              {
+                "pluginId": "@kbn/shared-ux-file-types",
+                "scope": "common",
+                "docId": "kibKbnSharedUxFileTypesPluginApi",
+                "section": "def-common.FileShareJSON",
+                "text": "FileShareJSON"
+              },
+              ">"
+            ],
+            "path": "src/plugins/files/server/file_service/file_service.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "files",
+                "id": "def-server.FileServiceStart.getShareObject.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "arg",
+                "description": [
+                  "- get share args"
+                ],
+                "signature": [
+                  "IdArg"
+                ],
+                "path": "src/plugins/files/server/file_share_service/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
           },
           {
             "parentPluginId": "files",
@@ -4912,7 +5538,7 @@
             "tags": [],
             "label": "update",
             "description": [
-              "\nUpdate a file object's metadatathat can be updated.\n"
+              "\nUpdate a file object's metadata that can be updated.\n"
             ],
             "signature": [
               "(attr: Partial<",
@@ -4979,7 +5605,9 @@
               "Readable",
               ", abort$?: ",
               "Observable",
-              "<unknown> | undefined) => Promise<",
+              "<unknown> | undefined, options?: Partial<Pick<",
+              "UploadOptions",
+              ", \"transforms\">> | undefined) => Promise<",
               {
                 "pluginId": "files",
                 "scope": "common",
@@ -5027,6 +5655,25 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": false
+              },
+              {
+                "parentPluginId": "files",
+                "id": "def-common.File.uploadContent.$3",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [
+                  "- additional options."
+                ],
+                "signature": [
+                  "Partial<Pick<",
+                  "UploadOptions",
+                  ", \"transforms\">> | undefined"
+                ],
+                "path": "src/plugins/files/common/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
               }
             ],
             "returnComment": []
@@ -5442,6 +6089,22 @@
             "path": "packages/shared-ux/file/types/index.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "files",
+            "id": "def-common.FileJSON.hash",
+            "type": "Object",
+            "tags": [],
+            "label": "hash",
+            "description": [
+              "\nFile hash information"
+            ],
+            "signature": [
+              "{ [hashName: string]: string | undefined; md5?: string | undefined; sha1?: string | undefined; sha256?: string | undefined; sha384?: string | undefined; sha512?: string | undefined; ssdeep?: string | undefined; tlsh?: string | undefined; } | undefined"
+            ],
+            "path": "packages/shared-ux/file/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/files.mdx b/api_docs/files.mdx
index d291c4e115cb0a..a997c1b76a1654 100644
--- a/api_docs/files.mdx
+++ b/api_docs/files.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/files
 title: "files"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the files plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'files']
 ---
 import filesObj from './files.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 219 | 0 | 10 | 6 |
+| 239 | 0 | 24 | 9 |
 
 ## Client
 
diff --git a/api_docs/files_management.mdx b/api_docs/files_management.mdx
index dfaa7570dd97ec..0fdb228526124d 100644
--- a/api_docs/files_management.mdx
+++ b/api_docs/files_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/filesManagement
 title: "filesManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the filesManagement plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'filesManagement']
 ---
 import filesManagementObj from './files_management.devdocs.json';
diff --git a/api_docs/fleet.devdocs.json b/api_docs/fleet.devdocs.json
index 9d82cf6eeff9c5..b72af9a88e6d44 100644
--- a/api_docs/fleet.devdocs.json
+++ b/api_docs/fleet.devdocs.json
@@ -5766,7 +5766,7 @@
             "label": "rotateKeyPair",
             "description": [],
             "signature": [
-              "() => Promise<boolean>"
+              "() => Promise<void>"
             ],
             "path": "x-pack/plugins/fleet/server/services/security/message_signing_service.ts",
             "deprecated": false,
@@ -9445,27 +9445,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -9643,7 +9623,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -10780,27 +10780,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -10978,7 +10958,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -12128,27 +12128,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -12326,7 +12306,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -13473,27 +13473,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -13671,7 +13651,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -14821,27 +14821,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -15019,7 +14999,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -17930,7 +17930,8 @@
               "\nComponents array"
             ],
             "signature": [
-              "FleetServerAgentComponent[] | undefined"
+              "FleetServerAgentComponent",
+              "[] | undefined"
             ],
             "path": "x-pack/plugins/fleet/common/types/models/agent.ts",
             "deprecated": false,
@@ -23707,7 +23708,7 @@
         "label": "PackageSpecCategory",
         "description": [],
         "signature": [
-          "\"connector\" | \"security\" | \"monitoring\" | \"observability\" | \"infrastructure\" | \"cloud\" | \"custom\" | \"enterprise_search\" | \"analytics_engine\" | \"application_observability\" | \"app_search\" | \"auditd\" | \"authentication\" | \"aws\" | \"azure\" | \"big_data\" | \"cdn_security\" | \"config_management\" | \"connector_client\" | \"connector_package\" | \"containers\" | \"content_source\" | \"crawler\" | \"credential_management\" | \"crm\" | \"custom_logs\" | \"database_security\" | \"datastore\" | \"dns_security\" | \"edr_xdr\" | \"elasticsearch_sdk\" | \"elastic_stack\" | \"email_security\" | \"firewall_security\" | \"google_cloud\" | \"iam\" | \"ids_ips\" | \"java_observability\" | \"kubernetes\" | \"language_client\" | \"languages\" | \"load_balancer\" | \"message_queue\" | \"native_search\" | \"network\" | \"network_security\" | \"notification\" | \"os_system\" | \"process_manager\" | \"productivity\" | \"productivity_security\" | \"proxy_security\" | \"sdk_search\" | \"stream_processing\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"virtualization\" | \"vpn_security\" | \"vulnerability_management\" | \"web\" | \"web_application_firewall\" | \"websphere\" | \"workplace_search\""
+          "\"connector\" | \"security\" | \"monitoring\" | \"observability\" | \"infrastructure\" | \"cloud\" | \"custom\" | \"enterprise_search\" | \"advanced_analytics_ueba\" | \"analytics_engine\" | \"application_observability\" | \"app_search\" | \"auditd\" | \"authentication\" | \"aws\" | \"azure\" | \"big_data\" | \"cdn_security\" | \"config_management\" | \"connector_client\" | \"connector_package\" | \"containers\" | \"content_source\" | \"crawler\" | \"credential_management\" | \"crm\" | \"custom_logs\" | \"database_security\" | \"datastore\" | \"dns_security\" | \"edr_xdr\" | \"elasticsearch_sdk\" | \"elastic_stack\" | \"email_security\" | \"firewall_security\" | \"google_cloud\" | \"iam\" | \"ids_ips\" | \"java_observability\" | \"kubernetes\" | \"language_client\" | \"languages\" | \"load_balancer\" | \"message_queue\" | \"native_search\" | \"network\" | \"network_security\" | \"notification\" | \"os_system\" | \"process_manager\" | \"productivity\" | \"productivity_security\" | \"proxy_security\" | \"sdk_search\" | \"stream_processing\" | \"support\" | \"threat_intel\" | \"ticketing\" | \"version_control\" | \"virtualization\" | \"vpn_security\" | \"vulnerability_management\" | \"web\" | \"web_application_firewall\" | \"websphere\" | \"workplace_search\""
         ],
         "path": "x-pack/plugins/fleet/common/types/models/package_spec.ts",
         "deprecated": false,
diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx
index c5591932075947..27b55593e87d5a 100644
--- a/api_docs/fleet.mdx
+++ b/api_docs/fleet.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fleet
 title: "fleet"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fleet plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fleet']
 ---
 import fleetObj from './fleet.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) for questi
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 1110 | 3 | 1005 | 28 |
+| 1110 | 3 | 1005 | 29 |
 
 ## Client
 
diff --git a/api_docs/global_search.mdx b/api_docs/global_search.mdx
index 1cf05676b21838..7af6df1ca5a768 100644
--- a/api_docs/global_search.mdx
+++ b/api_docs/global_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/globalSearch
 title: "globalSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the globalSearch plugin
-date: 2023-04-27
+date: 2023-05-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 3d290e02c4d733..f529fbd88f483e 100644
--- a/api_docs/guided_onboarding.mdx
+++ b/api_docs/guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/guidedOnboarding
 title: "guidedOnboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the guidedOnboarding plugin
-date: 2023-04-27
+date: 2023-05-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 3be6fa2b089ccf..da5579adeba5f9 100644
--- a/api_docs/home.mdx
+++ b/api_docs/home.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/home
 title: "home"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the home plugin
-date: 2023-04-27
+date: 2023-05-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 2be31eca02858e..155c935921f632 100644
--- a/api_docs/image_embeddable.mdx
+++ b/api_docs/image_embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/imageEmbeddable
 title: "imageEmbeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the imageEmbeddable plugin
-date: 2023-04-27
+date: 2023-05-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 8ec055093d677a..435e12ba7ff8e0 100644
--- a/api_docs/index_lifecycle_management.mdx
+++ b/api_docs/index_lifecycle_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexLifecycleManagement
 title: "indexLifecycleManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexLifecycleManagement plugin
-date: 2023-04-27
+date: 2023-05-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 517615e32f821d..fbae5bdf243033 100644
--- a/api_docs/index_management.mdx
+++ b/api_docs/index_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexManagement
 title: "indexManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexManagement plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexManagement']
 ---
 import indexManagementObj from './index_management.devdocs.json';
diff --git a/api_docs/infra.devdocs.json b/api_docs/infra.devdocs.json
index 679788fc86bddc..767658d05117ba 100644
--- a/api_docs/infra.devdocs.json
+++ b/api_docs/infra.devdocs.json
@@ -351,6 +351,20 @@
           "deprecated": false,
           "trackAdoption": false
         },
+        {
+          "parentPluginId": "infra",
+          "id": "def-public.InfraClientStartExports.metricsExplorerViews",
+          "type": "Object",
+          "tags": [],
+          "label": "metricsExplorerViews",
+          "description": [],
+          "signature": [
+            "MetricsExplorerViewsServiceStart"
+          ],
+          "path": "x-pack/plugins/infra/public/types.ts",
+          "deprecated": false,
+          "trackAdoption": false
+        },
         {
           "parentPluginId": "infra",
           "id": "def-public.InfraClientStartExports.telemetry",
diff --git a/api_docs/infra.mdx b/api_docs/infra.mdx
index c83a3ed4466a89..02f681bcc38fec 100644
--- a/api_docs/infra.mdx
+++ b/api_docs/infra.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/infra
 title: "infra"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the infra plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'infra']
 ---
 import infraObj from './infra.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/infra-monitoring-ui](https://github.com/orgs/elastic/teams/inf
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 47 | 0 | 44 | 12 |
+| 48 | 0 | 45 | 13 |
 
 ## Client
 
diff --git a/api_docs/inspector.mdx b/api_docs/inspector.mdx
index 9e8dcefa943af6..70e89d7195207f 100644
--- a/api_docs/inspector.mdx
+++ b/api_docs/inspector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inspector
 title: "inspector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the inspector plugin
-date: 2023-04-27
+date: 2023-05-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 ec876749f96f77..fdc96e1662cd57 100644
--- a/api_docs/interactive_setup.mdx
+++ b/api_docs/interactive_setup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/interactiveSetup
 title: "interactiveSetup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the interactiveSetup plugin
-date: 2023-04-27
+date: 2023-05-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 45851df2e5d7e2..a2f55ed9cb1ed4 100644
--- a/api_docs/kbn_ace.mdx
+++ b/api_docs/kbn_ace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ace
 title: "@kbn/ace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ace plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ace']
 ---
 import kbnAceObj from './kbn_ace.devdocs.json';
diff --git a/api_docs/kbn_aiops_components.mdx b/api_docs/kbn_aiops_components.mdx
index 9f9d6f20e18f97..3e1e49197df4cc 100644
--- a/api_docs/kbn_aiops_components.mdx
+++ b/api_docs/kbn_aiops_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-components
 title: "@kbn/aiops-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-components plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-components']
 ---
 import kbnAiopsComponentsObj from './kbn_aiops_components.devdocs.json';
diff --git a/api_docs/kbn_aiops_utils.mdx b/api_docs/kbn_aiops_utils.mdx
index 76069a8096fbdd..d2db6678d020f7 100644
--- a/api_docs/kbn_aiops_utils.mdx
+++ b/api_docs/kbn_aiops_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-utils
 title: "@kbn/aiops-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-utils plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-utils']
 ---
 import kbnAiopsUtilsObj from './kbn_aiops_utils.devdocs.json';
diff --git a/api_docs/kbn_alerting_state_types.mdx b/api_docs/kbn_alerting_state_types.mdx
index a4602f67ef9f17..284c355efc52f3 100644
--- a/api_docs/kbn_alerting_state_types.mdx
+++ b/api_docs/kbn_alerting_state_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-state-types
 title: "@kbn/alerting-state-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-state-types plugin
-date: 2023-04-27
+date: 2023-05-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_alerts.mdx b/api_docs/kbn_alerts.mdx
index 0e432269925e32..2aa59a79b9b98f 100644
--- a/api_docs/kbn_alerts.mdx
+++ b/api_docs/kbn_alerts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts
 title: "@kbn/alerts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts']
 ---
 import kbnAlertsObj from './kbn_alerts.devdocs.json';
diff --git a/api_docs/kbn_alerts_as_data_utils.mdx b/api_docs/kbn_alerts_as_data_utils.mdx
index e9952c200af596..f9589235de1435 100644
--- a/api_docs/kbn_alerts_as_data_utils.mdx
+++ b/api_docs/kbn_alerts_as_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-as-data-utils
 title: "@kbn/alerts-as-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-as-data-utils plugin
-date: 2023-04-27
+date: 2023-05-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.mdx b/api_docs/kbn_alerts_ui_shared.mdx
index 8d75bdef868436..76be38521aa714 100644
--- a/api_docs/kbn_alerts_ui_shared.mdx
+++ b/api_docs/kbn_alerts_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-ui-shared
 title: "@kbn/alerts-ui-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-ui-shared plugin
-date: 2023-04-27
+date: 2023-05-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 5b34db622f9379..9709e92533a5ad 100644
--- a/api_docs/kbn_analytics.mdx
+++ b/api_docs/kbn_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics
 title: "@kbn/analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics plugin
-date: 2023-04-27
+date: 2023-05-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 125c8ed10ff976..67573ee099194e 100644
--- a/api_docs/kbn_analytics_client.mdx
+++ b/api_docs/kbn_analytics_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-client
 title: "@kbn/analytics-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-client plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-client']
 ---
 import kbnAnalyticsClientObj from './kbn_analytics_client.devdocs.json';
diff --git a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
index b3636b5c004fee..293e11920a5c09 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-browser
 title: "@kbn/analytics-shippers-elastic-v3-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-browser plugin
-date: 2023-04-27
+date: 2023-05-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 d28a95a58747ce..b2f9aaf2524447 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-common
 title: "@kbn/analytics-shippers-elastic-v3-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-common plugin
-date: 2023-04-27
+date: 2023-05-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 ceb1cd98404273..6988aa2180e905 100644
--- a/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx
+++ b/api_docs/kbn_analytics_shippers_elastic_v3_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-elastic-v3-server
 title: "@kbn/analytics-shippers-elastic-v3-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-elastic-v3-server plugin
-date: 2023-04-27
+date: 2023-05-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 6945006d36a336..e73c765187aa1a 100644
--- a/api_docs/kbn_analytics_shippers_fullstory.mdx
+++ b/api_docs/kbn_analytics_shippers_fullstory.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-fullstory
 title: "@kbn/analytics-shippers-fullstory"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-fullstory plugin
-date: 2023-04-27
+date: 2023-05-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_analytics_shippers_gainsight.mdx b/api_docs/kbn_analytics_shippers_gainsight.mdx
index 486ecc9763ff02..25cff66a64cd31 100644
--- a/api_docs/kbn_analytics_shippers_gainsight.mdx
+++ b/api_docs/kbn_analytics_shippers_gainsight.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-shippers-gainsight
 title: "@kbn/analytics-shippers-gainsight"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-shippers-gainsight plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-shippers-gainsight']
 ---
 import kbnAnalyticsShippersGainsightObj from './kbn_analytics_shippers_gainsight.devdocs.json';
diff --git a/api_docs/kbn_apm_config_loader.mdx b/api_docs/kbn_apm_config_loader.mdx
index 74e31145a438e1..cf987591c11a26 100644
--- a/api_docs/kbn_apm_config_loader.mdx
+++ b/api_docs/kbn_apm_config_loader.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-config-loader
 title: "@kbn/apm-config-loader"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-config-loader plugin
-date: 2023-04-27
+date: 2023-05-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_synthtrace.mdx b/api_docs/kbn_apm_synthtrace.mdx
index c607330ae9f1f8..90a781efc9f945 100644
--- a/api_docs/kbn_apm_synthtrace.mdx
+++ b/api_docs/kbn_apm_synthtrace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace
 title: "@kbn/apm-synthtrace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_apm_synthtrace_client.devdocs.json
index 3b600525e33253..47d4c1f343f46e 100644
--- a/api_docs/kbn_apm_synthtrace_client.devdocs.json
+++ b/api_docs/kbn_apm_synthtrace_client.devdocs.json
@@ -851,7 +851,7 @@
             "label": "appMetrics",
             "description": [],
             "signature": [
-              "(metrics: Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }>) => ",
+              "(metrics: Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.process.cgroup.memory.mem.limit.bytes': number; 'system.process.cgroup.memory.mem.usage.bytes': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }>) => ",
               "Metricset",
               "<",
               {
@@ -875,7 +875,7 @@
                 "label": "metrics",
                 "description": [],
                 "signature": [
-                  "Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }>"
+                  "Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.process.cgroup.memory.mem.limit.bytes': number; 'system.process.cgroup.memory.mem.usage.bytes': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }>"
                 ],
                 "path": "packages/kbn-apm-synthtrace-client/src/lib/apm/instance.ts",
                 "deprecated": false,
@@ -1292,7 +1292,7 @@
             "label": "appMetrics",
             "description": [],
             "signature": [
-              "(metrics: Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }>) => ",
+              "(metrics: Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.process.cgroup.memory.mem.limit.bytes': number; 'system.process.cgroup.memory.mem.usage.bytes': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }>) => ",
               "Metricset",
               "<",
               {
@@ -1316,7 +1316,7 @@
                 "label": "metrics",
                 "description": [],
                 "signature": [
-                  "Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }>"
+                  "Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.process.cgroup.memory.mem.limit.bytes': number; 'system.process.cgroup.memory.mem.usage.bytes': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }>"
                 ],
                 "path": "packages/kbn-apm-synthtrace-client/src/lib/apm/mobile_device.ts",
                 "deprecated": false,
@@ -2439,7 +2439,7 @@
           "GeoLocation",
           "; 'client.geo.region_iso_code': string; 'client.geo.region_name': string; 'client.ip': string; 'cloud.account.id': string; 'cloud.account.name': string; 'cloud.availability_zone': string; 'cloud.machine.type': string; 'cloud.project.id': string; 'cloud.project.name': string; 'cloud.provider': string; 'cloud.region': string; 'cloud.service.name': string; 'container.id': string; 'destination.address': string; 'destination.port': number; 'device.id': string; 'device.manufacturer': string; 'device.model.identifier': string; 'device.model.name': string; 'ecs.version': string; 'error.exception': ",
           "ApmException",
-          "[]; 'error.grouping_key': string; 'error.grouping_name': string; 'error.id': string; 'error.type': string; 'event.ingested': number; 'event.name': string; 'event.outcome': string; 'event.outcome_numeric': number | { sum: number; value_count: number; }; 'faas.coldstart': boolean; 'faas.execution': string; 'faas.id': string; 'faas.name': string; 'faas.trigger.type': string; 'faas.version': string; 'host.architecture': string; 'host.hostname': string; 'host.name': string; 'host.os.full': string; 'host.os.name': string; 'host.os.platform': string; 'host.os.type': string; 'host.os.version': string; 'http.request.method': string; 'http.response.status_code': number; 'kubernetes.pod.name': string; 'kubernetes.pod.uid': string; 'labels.name': string; 'labels.telemetry_auto_version': string; 'metricset.name': string; 'network.carrier.icc': string; 'network.carrier.mcc': string; 'network.carrier.mnc': string; 'network.carrier.name': string; 'network.connection.subtype': string; 'network.connection.type': string; 'observer.type': string; 'observer.version_major': number; 'observer.version': string; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'session.id': string; 'trace.id': string; 'transaction.aggregation.overflow_count': number; 'transaction.duration.us': number; 'transaction.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.result': string; 'transaction.sampled': boolean; 'service.environment': string; 'service.framework.name': string; 'service.framework.version': string; 'service.language.name': string; 'service.language.version': string; 'service.name': string; 'service.node.name': string; 'service.runtime.name': string; 'service.runtime.version': string; 'service.target.name': string; 'service.target.type': string; 'service.version': string; 'span.action': string; 'span.destination.service.resource': string; 'span.destination.service.response_time.count': number; 'span.destination.service.response_time.sum.us': number; 'span.duration.us': number; 'span.id': string; 'span.name': string; 'span.self_time.count': number; 'span.self_time.sum.us': number; 'span.subtype': string; 'span.type': string; 'span.links': { trace: { id: string; }; span: { id: string; }; }[]; 'url.original': string; }> & Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }> & Partial<{ 'metricset.interval': string; 'transaction.duration.summary': string; }>"
+          "[]; 'error.grouping_key': string; 'error.grouping_name': string; 'error.id': string; 'error.type': string; 'event.ingested': number; 'event.name': string; 'event.outcome': string; 'event.outcome_numeric': number | { sum: number; value_count: number; }; 'faas.coldstart': boolean; 'faas.execution': string; 'faas.id': string; 'faas.name': string; 'faas.trigger.type': string; 'faas.version': string; 'host.architecture': string; 'host.hostname': string; 'host.name': string; 'host.os.full': string; 'host.os.name': string; 'host.os.platform': string; 'host.os.type': string; 'host.os.version': string; 'http.request.method': string; 'http.response.status_code': number; 'kubernetes.pod.name': string; 'kubernetes.pod.uid': string; 'labels.name': string; 'labels.telemetry_auto_version': string; 'metricset.name': string; 'network.carrier.icc': string; 'network.carrier.mcc': string; 'network.carrier.mnc': string; 'network.carrier.name': string; 'network.connection.subtype': string; 'network.connection.type': string; 'observer.type': string; 'observer.version_major': number; 'observer.version': string; 'parent.id': string; 'processor.event': string; 'processor.name': string; 'session.id': string; 'trace.id': string; 'transaction.aggregation.overflow_count': number; 'transaction.duration.us': number; 'transaction.id': string; 'transaction.name': string; 'transaction.type': string; 'transaction.duration.histogram': { values: number[]; counts: number[]; }; 'transaction.result': string; 'transaction.sampled': boolean; 'service.environment': string; 'service.framework.name': string; 'service.framework.version': string; 'service.language.name': string; 'service.language.version': string; 'service.name': string; 'service.node.name': string; 'service.runtime.name': string; 'service.runtime.version': string; 'service.target.name': string; 'service.target.type': string; 'service.version': string; 'span.action': string; 'span.destination.service.resource': string; 'span.destination.service.response_time.count': number; 'span.destination.service.response_time.sum.us': number; 'span.duration.us': number; 'span.id': string; 'span.name': string; 'span.self_time.count': number; 'span.self_time.sum.us': number; 'span.subtype': string; 'span.type': string; 'span.links': { trace: { id: string; }; span: { id: string; }; }[]; 'url.original': string; }> & Partial<{ 'system.process.memory.size': number; 'system.memory.actual.free': number; 'system.memory.total': number; 'system.process.cgroup.memory.mem.limit.bytes': number; 'system.process.cgroup.memory.mem.usage.bytes': number; 'system.cpu.total.norm.pct': number; 'system.process.memory.rss.bytes': number; 'system.process.cpu.total.norm.pct': number; 'jvm.memory.heap.used': number; 'jvm.memory.non_heap.used': number; 'jvm.thread.count': number; 'faas.billed_duration': number; 'faas.timeout': number; 'faas.coldstart_duration': number; 'faas.duration': number; 'application.launch.time': number; }> & Partial<{ 'metricset.interval': string; 'transaction.duration.summary': string; }>"
         ],
         "path": "packages/kbn-apm-synthtrace-client/src/lib/apm/apm_fields.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_apm_synthtrace_client.mdx b/api_docs/kbn_apm_synthtrace_client.mdx
index 50a3c23d8cd683..e8a935690c881b 100644
--- a/api_docs/kbn_apm_synthtrace_client.mdx
+++ b/api_docs/kbn_apm_synthtrace_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace-client
 title: "@kbn/apm-synthtrace-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace-client plugin
-date: 2023-04-27
+date: 2023-05-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 2e0932a72224f2..71b7bce36495dc 100644
--- a/api_docs/kbn_apm_utils.mdx
+++ b/api_docs/kbn_apm_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-utils
 title: "@kbn/apm-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-utils plugin
-date: 2023-04-27
+date: 2023-05-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 ffdf3e2b4cef60..13db9eef60d329 100644
--- a/api_docs/kbn_axe_config.mdx
+++ b/api_docs/kbn_axe_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-axe-config
 title: "@kbn/axe-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/axe-config plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/axe-config']
 ---
 import kbnAxeConfigObj from './kbn_axe_config.devdocs.json';
diff --git a/api_docs/kbn_cases_components.mdx b/api_docs/kbn_cases_components.mdx
index 924488c4b926dd..15cb368c1d12e5 100644
--- a/api_docs/kbn_cases_components.mdx
+++ b/api_docs/kbn_cases_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cases-components
 title: "@kbn/cases-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cases-components plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_cell_actions.devdocs.json
index e24dccb321638b..2cafafac5fa416 100644
--- a/api_docs/kbn_cell_actions.devdocs.json
+++ b/api_docs/kbn_cell_actions.devdocs.json
@@ -1106,7 +1106,7 @@
             "label": "fields",
             "description": [],
             "signature": [
-              "BulkField[]"
+              "BulkField[] | undefined"
             ],
             "path": "packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx",
             "deprecated": false,
diff --git a/api_docs/kbn_cell_actions.mdx b/api_docs/kbn_cell_actions.mdx
index 43db77f47675c6..f5c40cfbace49b 100644
--- a/api_docs/kbn_cell_actions.mdx
+++ b/api_docs/kbn_cell_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cell-actions
 title: "@kbn/cell-actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cell-actions plugin
-date: 2023-04-27
+date: 2023-05-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 9825b6f79ddb73..a64c7b862b2c6e 100644
--- a/api_docs/kbn_chart_expressions_common.mdx
+++ b/api_docs/kbn_chart_expressions_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-expressions-common
 title: "@kbn/chart-expressions-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-expressions-common plugin
-date: 2023-04-27
+date: 2023-05-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 72b7dc5f3b47ff..e6e9aae56e4e25 100644
--- a/api_docs/kbn_chart_icons.mdx
+++ b/api_docs/kbn_chart_icons.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-icons
 title: "@kbn/chart-icons"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-icons plugin
-date: 2023-04-27
+date: 2023-05-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 a49b85c43e5b2a..2f1bef7620c944 100644
--- a/api_docs/kbn_ci_stats_core.mdx
+++ b/api_docs/kbn_ci_stats_core.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-core
 title: "@kbn/ci-stats-core"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-core plugin
-date: 2023-04-27
+date: 2023-05-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 4d43d0e7bc512e..3390eed9c66b86 100644
--- a/api_docs/kbn_ci_stats_performance_metrics.mdx
+++ b/api_docs/kbn_ci_stats_performance_metrics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-performance-metrics
 title: "@kbn/ci-stats-performance-metrics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-performance-metrics plugin
-date: 2023-04-27
+date: 2023-05-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 3ddecb33fdd261..28958beca139b3 100644
--- a/api_docs/kbn_ci_stats_reporter.mdx
+++ b/api_docs/kbn_ci_stats_reporter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-reporter
 title: "@kbn/ci-stats-reporter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-reporter plugin
-date: 2023-04-27
+date: 2023-05-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 4d5d71c9332abb..2326d37c3e97b7 100644
--- a/api_docs/kbn_cli_dev_mode.mdx
+++ b/api_docs/kbn_cli_dev_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cli-dev-mode
 title: "@kbn/cli-dev-mode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cli-dev-mode plugin
-date: 2023-04-27
+date: 2023-05-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 e53e9b11b60daa..3509b913518f0f 100644
--- a/api_docs/kbn_code_editor.mdx
+++ b/api_docs/kbn_code_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor
 title: "@kbn/code-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor plugin
-date: 2023-04-27
+date: 2023-05-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_mocks.mdx b/api_docs/kbn_code_editor_mocks.mdx
index 83b05652600727..20fcb0fa56b349 100644
--- a/api_docs/kbn_code_editor_mocks.mdx
+++ b/api_docs/kbn_code_editor_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor-mocks
 title: "@kbn/code-editor-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor-mocks plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor-mocks']
 ---
 import kbnCodeEditorMocksObj from './kbn_code_editor_mocks.devdocs.json';
diff --git a/api_docs/kbn_coloring.mdx b/api_docs/kbn_coloring.mdx
index c80ad83d1c4e24..a7f5279a6fb8de 100644
--- a/api_docs/kbn_coloring.mdx
+++ b/api_docs/kbn_coloring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-coloring
 title: "@kbn/coloring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/coloring plugin
-date: 2023-04-27
+date: 2023-05-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 bba27794268b6d..99efea0df4dcf3 100644
--- a/api_docs/kbn_config.mdx
+++ b/api_docs/kbn_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config
 title: "@kbn/config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config plugin
-date: 2023-04-27
+date: 2023-05-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 afa3194e9ca4bd..c053e552cff526 100644
--- a/api_docs/kbn_config_mocks.mdx
+++ b/api_docs/kbn_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-mocks
 title: "@kbn/config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 47cefe839a26f1..5a5acf77cf50b6 100644
--- a/api_docs/kbn_config_schema.mdx
+++ b/api_docs/kbn_config_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-schema
 title: "@kbn/config-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-schema plugin
-date: 2023-04-27
+date: 2023-05-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 4f449fb0d84cd1..2027a1d10520a6 100644
--- a/api_docs/kbn_content_management_content_editor.mdx
+++ b/api_docs/kbn_content_management_content_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-content-editor
 title: "@kbn/content-management-content-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-content-editor plugin
-date: 2023-04-27
+date: 2023-05-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_table_list.mdx b/api_docs/kbn_content_management_table_list.mdx
index 9fc12cbcf16707..f19b201be52f60 100644
--- a/api_docs/kbn_content_management_table_list.mdx
+++ b/api_docs/kbn_content_management_table_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list
 title: "@kbn/content-management-table-list"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list']
 ---
 import kbnContentManagementTableListObj from './kbn_content_management_table_list.devdocs.json';
diff --git a/api_docs/kbn_content_management_utils.devdocs.json b/api_docs/kbn_content_management_utils.devdocs.json
index 9f1ddd3e9ad60c..6c6c13efb2b098 100644
--- a/api_docs/kbn_content_management_utils.devdocs.json
+++ b/api_docs/kbn_content_management_utils.devdocs.json
@@ -18,7 +18,304 @@
   },
   "common": {
     "classes": [],
-    "functions": [],
+    "functions": [
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.createResultSchema",
+        "type": "Function",
+        "tags": [],
+        "label": "createResultSchema",
+        "description": [],
+        "signature": [
+          "(soSchema: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<any>) => ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<{ item: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<any>; }>"
+        ],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.createResultSchema.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "soSchema",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.ObjectType",
+                "text": "ObjectType"
+              },
+              "<any>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.objectTypeToGetResultSchema",
+        "type": "Function",
+        "tags": [],
+        "label": "objectTypeToGetResultSchema",
+        "description": [],
+        "signature": [
+          "(soSchema: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<any>) => ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<{ item: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<any>; meta: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<{ outcome: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<\"conflict\" | \"exactMatch\" | \"aliasMatch\">; aliasTargetId: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string | undefined>; aliasPurpose: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<\"savedObjectConversion\" | \"savedObjectImport\" | undefined>; }>; }>"
+        ],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.objectTypeToGetResultSchema.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "soSchema",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.ObjectType",
+                "text": "ObjectType"
+              },
+              "<any>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.savedObjectSchema",
+        "type": "Function",
+        "tags": [],
+        "label": "savedObjectSchema",
+        "description": [],
+        "signature": [
+          "(attributesSchema: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<any>) => ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<{ id: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string>; type: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string>; version: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string | undefined>; createdAt: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string | undefined>; updatedAt: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string | undefined>; error: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<Readonly<{} & { error: string; message: string; metadata: Readonly<{} & {}>; statusCode: number; }> | undefined>; attributes: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<any>; references: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<Readonly<{ name?: string | undefined; } & { type: string; id: string; }>[]>; namespaces: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string[] | undefined>; originId: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string | undefined>; }>"
+        ],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.savedObjectSchema.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "attributesSchema",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.ObjectType",
+                "text": "ObjectType"
+              },
+              "<any>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
     "interfaces": [
       {
         "parentPluginId": "@kbn/content-management-utils",
@@ -42,7 +339,7 @@
           },
           "<ContentType, Attributes, CreateOptions, UpdateOptions, SearchOptions>"
         ],
-        "path": "packages/kbn-content-management-utils/types.ts",
+        "path": "packages/kbn-content-management-utils/src/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -65,7 +362,7 @@
               },
               "<Attributes>"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -97,7 +394,7 @@
               },
               "[] | undefined; }"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -113,7 +410,7 @@
             "signature": [
               "CreateOptions"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -129,7 +426,7 @@
             "signature": [
               "UpdateOptions"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -145,7 +442,7 @@
             "signature": [
               "SearchOptions"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -168,7 +465,7 @@
               },
               "<ContentType, object>"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -192,7 +489,7 @@
               },
               "<Attributes>; meta: { outcome: \"conflict\" | \"exactMatch\" | \"aliasMatch\"; aliasTargetId?: string | undefined; aliasPurpose?: \"savedObjectConversion\" | \"savedObjectImport\" | undefined; }; }"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -215,7 +512,7 @@
               },
               "<ContentType, Attributes, CreateOptions>"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -239,7 +536,7 @@
               },
               "<Attributes>; }"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -262,7 +559,7 @@
               },
               "<ContentType, SearchOptions>"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -286,7 +583,7 @@
               },
               "<Attributes>[]; pagination: { total: number; cursor?: string | undefined; }; }"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -309,7 +606,7 @@
               },
               "<ContentType, Attributes, UpdateOptions>"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -325,7 +622,7 @@
             "signature": [
               "{ item: PartialItem<Attributes>; }"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -348,7 +645,7 @@
               },
               "<ContentType, object>"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -370,7 +667,7 @@
                 "text": "DeleteResult"
               }
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -384,7 +681,7 @@
         "tags": [],
         "label": "Reference",
         "description": [],
-        "path": "packages/kbn-content-management-utils/types.ts",
+        "path": "packages/kbn-content-management-utils/src/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -395,7 +692,7 @@
             "tags": [],
             "label": "type",
             "description": [],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -406,7 +703,7 @@
             "tags": [],
             "label": "id",
             "description": [],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -417,7 +714,7 @@
             "tags": [],
             "label": "name",
             "description": [],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -433,7 +730,7 @@
         "description": [
           "Saved Object create options - Pick and Omit to customize"
         ],
-        "path": "packages/kbn-content-management-utils/types.ts",
+        "path": "packages/kbn-content-management-utils/src/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -449,7 +746,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -465,7 +762,7 @@
             "signature": [
               "boolean | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -481,7 +778,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -504,7 +801,7 @@
               },
               "[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -520,7 +817,7 @@
             "signature": [
               "boolean | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -536,7 +833,7 @@
             "signature": [
               "string[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -552,7 +849,7 @@
         "description": [
           "Saved Object search options - Pick and Omit to customize"
         ],
-        "path": "packages/kbn-content-management-utils/types.ts",
+        "path": "packages/kbn-content-management-utils/src/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -568,7 +865,7 @@
             "signature": [
               "number | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -584,7 +881,7 @@
             "signature": [
               "number | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -600,7 +897,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -617,7 +914,7 @@
               "SortOrder",
               " | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -633,7 +930,7 @@
             "signature": [
               "string[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -649,7 +946,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -665,7 +962,7 @@
             "signature": [
               "string[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -682,7 +979,7 @@
               "SortResults",
               " | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -698,7 +995,7 @@
             "signature": [
               "string[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -729,7 +1026,7 @@
               },
               "[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -745,7 +1042,7 @@
             "signature": [
               "\"AND\" | \"OR\" | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -776,7 +1073,7 @@
               },
               "[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -792,7 +1089,7 @@
             "signature": [
               "\"AND\" | \"OR\" | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -808,7 +1105,7 @@
             "signature": [
               "\"AND\" | \"OR\" | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -824,7 +1121,7 @@
             "signature": [
               "any"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -844,7 +1141,7 @@
               "AggregationsAggregationContainer",
               "> | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -860,7 +1157,7 @@
             "signature": [
               "string[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -883,7 +1180,7 @@
               },
               " | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -909,7 +1206,7 @@
           },
           "<Attributes>"
         ],
-        "path": "packages/kbn-content-management-utils/types.ts",
+        "path": "packages/kbn-content-management-utils/src/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -932,7 +1229,7 @@
               },
               "[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -946,7 +1243,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -969,7 +1266,7 @@
               },
               " | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -985,7 +1282,7 @@
             "signature": [
               "Attributes | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1001,7 +1298,7 @@
             "signature": [
               "number | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -1027,7 +1324,7 @@
           },
           "<Attributes>"
         ],
-        "path": "packages/kbn-content-management-utils/types.ts",
+        "path": "packages/kbn-content-management-utils/src/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -1038,7 +1335,7 @@
             "tags": [],
             "label": "id",
             "description": [],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1049,7 +1346,7 @@
             "tags": [],
             "label": "type",
             "description": [],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1063,7 +1360,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1077,7 +1374,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1091,7 +1388,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1105,7 +1402,7 @@
             "signature": [
               "{ error: string; message: string; statusCode: number; metadata?: Record<string, unknown> | undefined; } | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1119,7 +1416,7 @@
             "signature": [
               "Attributes"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1140,7 +1437,7 @@
               },
               "[]"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1154,7 +1451,7 @@
             "signature": [
               "string[] | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -1168,7 +1465,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-content-management-utils/types.ts",
+            "path": "packages/kbn-content-management-utils/src/types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -1190,12 +1487,821 @@
         "signature": [
           "{ item: T; meta: { outcome: \"conflict\" | \"exactMatch\" | \"aliasMatch\"; aliasTargetId?: string | undefined; aliasPurpose?: \"savedObjectConversion\" | \"savedObjectImport\" | undefined; }; }"
         ],
-        "path": "packages/kbn-content-management-utils/types.ts",
+        "path": "packages/kbn-content-management-utils/src/types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
       }
     ],
-    "objects": []
+    "objects": [
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.apiError",
+        "type": "Object",
+        "tags": [],
+        "label": "apiError",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<{ error: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string>; message: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string>; statusCode: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<number>; metadata: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<{}>; }>"
+        ],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.createOptionsSchemas",
+        "type": "Object",
+        "tags": [],
+        "label": "createOptionsSchemas",
+        "description": [],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.createOptionsSchemas.id",
+            "type": "Object",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.createOptionsSchemas.references",
+            "type": "Object",
+            "tags": [],
+            "label": "references",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<Readonly<{ name?: string | undefined; } & { type: string; id: string; }>[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.createOptionsSchemas.overwrite",
+            "type": "Object",
+            "tags": [],
+            "label": "overwrite",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<boolean | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.createOptionsSchemas.version",
+            "type": "Object",
+            "tags": [],
+            "label": "version",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.createOptionsSchemas.refresh",
+            "type": "Object",
+            "tags": [],
+            "label": "refresh",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<boolean | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.createOptionsSchemas.initialNamespaces",
+            "type": "Object",
+            "tags": [],
+            "label": "initialNamespaces",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.referenceSchema",
+        "type": "Object",
+        "tags": [],
+        "label": "referenceSchema",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
+          },
+          "<{ name: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string | undefined>; type: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string>; id: ",
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<string>; }>"
+        ],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.referencesSchema",
+        "type": "Object",
+        "tags": [],
+        "label": "referencesSchema",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<Readonly<{ name?: string | undefined; } & { type: string; id: string; }>[]>"
+        ],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.schemaAndOr",
+        "type": "Object",
+        "tags": [],
+        "label": "schemaAndOr",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/config-schema",
+            "scope": "common",
+            "docId": "kibKbnConfigSchemaPluginApi",
+            "section": "def-common.Type",
+            "text": "Type"
+          },
+          "<\"AND\" | \"OR\">"
+        ],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.searchOptionsSchemas",
+        "type": "Object",
+        "tags": [],
+        "label": "searchOptionsSchemas",
+        "description": [],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.page",
+            "type": "Object",
+            "tags": [],
+            "label": "page",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<number | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.perPage",
+            "type": "Object",
+            "tags": [],
+            "label": "perPage",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<number | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.sortField",
+            "type": "Object",
+            "tags": [],
+            "label": "sortField",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.sortOrder",
+            "type": "Object",
+            "tags": [],
+            "label": "sortOrder",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<\"asc\" | \"desc\" | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.fields",
+            "type": "Object",
+            "tags": [],
+            "label": "fields",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.search",
+            "type": "Object",
+            "tags": [],
+            "label": "search",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.searchFields",
+            "type": "Object",
+            "tags": [],
+            "label": "searchFields",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string | string[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.rootSearchFields",
+            "type": "Object",
+            "tags": [],
+            "label": "rootSearchFields",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.hasReference",
+            "type": "Object",
+            "tags": [],
+            "label": "hasReference",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<Readonly<{ name?: string | undefined; } & { type: string; id: string; }> | Readonly<{ name?: string | undefined; } & { type: string; id: string; }>[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.hasReferenceOperator",
+            "type": "Object",
+            "tags": [],
+            "label": "hasReferenceOperator",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<\"AND\" | \"OR\" | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.hasNoReference",
+            "type": "Object",
+            "tags": [],
+            "label": "hasNoReference",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<Readonly<{ name?: string | undefined; } & { type: string; id: string; }> | Readonly<{ name?: string | undefined; } & { type: string; id: string; }>[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.hasNoReferenceOperator",
+            "type": "Object",
+            "tags": [],
+            "label": "hasNoReferenceOperator",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<\"AND\" | \"OR\" | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.defaultSearchOperator",
+            "type": "Object",
+            "tags": [],
+            "label": "defaultSearchOperator",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<\"AND\" | \"OR\" | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.namespaces",
+            "type": "Object",
+            "tags": [],
+            "label": "namespaces",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.type",
+            "type": "Object",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.filter",
+            "type": "Object",
+            "tags": [],
+            "label": "filter",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.searchOptionsSchemas.pit",
+            "type": "Object",
+            "tags": [],
+            "label": "pit",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<Readonly<{ keepAlive?: string | undefined; } & { id: string; }> | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/content-management-utils",
+        "id": "def-common.updateOptionsSchema",
+        "type": "Object",
+        "tags": [],
+        "label": "updateOptionsSchema",
+        "description": [],
+        "path": "packages/kbn-content-management-utils/src/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.updateOptionsSchema.references",
+            "type": "Object",
+            "tags": [],
+            "label": "references",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<Readonly<{ name?: string | undefined; } & { type: string; id: string; }>[] | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.updateOptionsSchema.version",
+            "type": "Object",
+            "tags": [],
+            "label": "version",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.updateOptionsSchema.refresh",
+            "type": "Object",
+            "tags": [],
+            "label": "refresh",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<boolean | \"wait_for\" | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.updateOptionsSchema.upsert",
+            "type": "Function",
+            "tags": [],
+            "label": "upsert",
+            "description": [],
+            "signature": [
+              "(attributesSchema: ",
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.ObjectType",
+                "text": "ObjectType"
+              },
+              "<any>) => ",
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<Readonly<{ error?: Readonly<{} & { error: string; message: string; metadata: Readonly<{} & {}>; statusCode: number; }> | undefined; namespaces?: string[] | undefined; createdAt?: string | undefined; updatedAt?: string | undefined; version?: string | undefined; originId?: string | undefined; } & { type: string; id: string; references: Readonly<{ name?: string | undefined; } & { type: string; id: string; }>[]; attributes: Readonly<{ [x: string]: any; } & {}>; }> | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/content-management-utils",
+                "id": "def-common.updateOptionsSchema.upsert.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "attributesSchema",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/config-schema",
+                    "scope": "common",
+                    "docId": "kibKbnConfigSchemaPluginApi",
+                    "section": "def-common.ObjectType",
+                    "text": "ObjectType"
+                  },
+                  "<any>"
+                ],
+                "path": "packages/kbn-content-management-utils/src/schema.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/content-management-utils",
+            "id": "def-common.updateOptionsSchema.retryOnConflict",
+            "type": "Object",
+            "tags": [],
+            "label": "retryOnConflict",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<number | undefined>"
+            ],
+            "path": "packages/kbn-content-management-utils/src/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ]
   }
 }
\ No newline at end of file
diff --git a/api_docs/kbn_content_management_utils.mdx b/api_docs/kbn_content_management_utils.mdx
index 56f852c540d834..9c467807494b2d 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: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-utils']
 ---
 import kbnContentManagementUtilsObj from './kbn_content_management_utils.devdocs.json';
@@ -21,10 +21,16 @@ Contact [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 64 | 1 | 15 | 0 |
+| 106 | 1 | 57 | 0 |
 
 ## Common
 
+### Objects
+<DocDefinitionList data={kbnContentManagementUtilsObj.common.objects}/>
+
+### Functions
+<DocDefinitionList data={kbnContentManagementUtilsObj.common.functions}/>
+
 ### Interfaces
 <DocDefinitionList data={kbnContentManagementUtilsObj.common.interfaces}/>
 
diff --git a/api_docs/kbn_core_analytics_browser.mdx b/api_docs/kbn_core_analytics_browser.mdx
index 90c0a3da1063ca..a5ca58476ecfa6 100644
--- a/api_docs/kbn_core_analytics_browser.mdx
+++ b/api_docs/kbn_core_analytics_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser
 title: "@kbn/core-analytics-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser plugin
-date: 2023-04-27
+date: 2023-05-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 d8b4ef78021c86..8ea576d59580a5 100644
--- a/api_docs/kbn_core_analytics_browser_internal.mdx
+++ b/api_docs/kbn_core_analytics_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-internal
 title: "@kbn/core-analytics-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 f97182bfe10322..49ca962e54de71 100644
--- a/api_docs/kbn_core_analytics_browser_mocks.mdx
+++ b/api_docs/kbn_core_analytics_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-mocks
 title: "@kbn/core-analytics-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 d1fb67e67aa3c2..47be55e7e2ee59 100644
--- a/api_docs/kbn_core_analytics_server.mdx
+++ b/api_docs/kbn_core_analytics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server
 title: "@kbn/core-analytics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server plugin
-date: 2023-04-27
+date: 2023-05-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 e476550f67f9ca..4feb74f2fecba3 100644
--- a/api_docs/kbn_core_analytics_server_internal.mdx
+++ b/api_docs/kbn_core_analytics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-internal
 title: "@kbn/core-analytics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 15a5b71ad48bed..34446c493a62f4 100644
--- a/api_docs/kbn_core_analytics_server_mocks.mdx
+++ b/api_docs/kbn_core_analytics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-mocks
 title: "@kbn/core-analytics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 fdbf515d52f2e5..a719378fe89635 100644
--- a/api_docs/kbn_core_application_browser.mdx
+++ b/api_docs/kbn_core_application_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser
 title: "@kbn/core-application-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser plugin
-date: 2023-04-27
+date: 2023-05-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 8136d6f0eef712..9de2ca42446518 100644
--- a/api_docs/kbn_core_application_browser_internal.mdx
+++ b/api_docs/kbn_core_application_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-internal
 title: "@kbn/core-application-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 f150ce894cae03..adb64f33051ab7 100644
--- a/api_docs/kbn_core_application_browser_mocks.mdx
+++ b/api_docs/kbn_core_application_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-mocks
 title: "@kbn/core-application-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 4fc6e59b49ae47..396bcd07b4b765 100644
--- a/api_docs/kbn_core_application_common.mdx
+++ b/api_docs/kbn_core_application_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-common
 title: "@kbn/core-application-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-common plugin
-date: 2023-04-27
+date: 2023-05-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 9620c7088c902d..e494bc3a4f3648 100644
--- a/api_docs/kbn_core_apps_browser_internal.mdx
+++ b/api_docs/kbn_core_apps_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-internal
 title: "@kbn/core-apps-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 36ccacc4ea3e08..b239ba917856d6 100644
--- a/api_docs/kbn_core_apps_browser_mocks.mdx
+++ b/api_docs/kbn_core_apps_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-mocks
 title: "@kbn/core-apps-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 5bd0eb09d4f9bc..49f6c7f64b1c96 100644
--- a/api_docs/kbn_core_apps_server_internal.mdx
+++ b/api_docs/kbn_core_apps_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-server-internal
 title: "@kbn/core-apps-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 9820634802dbec..018fc70629081c 100644
--- a/api_docs/kbn_core_base_browser_mocks.mdx
+++ b/api_docs/kbn_core_base_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-browser-mocks
 title: "@kbn/core-base-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 69f28f56306c62..a304d0701b1f6e 100644
--- a/api_docs/kbn_core_base_common.mdx
+++ b/api_docs/kbn_core_base_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-common
 title: "@kbn/core-base-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-common plugin
-date: 2023-04-27
+date: 2023-05-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 53250812bd806d..3f8f4ee6a2fabf 100644
--- a/api_docs/kbn_core_base_server_internal.mdx
+++ b/api_docs/kbn_core_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-internal
 title: "@kbn/core-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 908b45a3f49587..5ddf1b15e56822 100644
--- a/api_docs/kbn_core_base_server_mocks.mdx
+++ b/api_docs/kbn_core_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-mocks
 title: "@kbn/core-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 52242df008c520..c40a5e28bc21de 100644
--- a/api_docs/kbn_core_capabilities_browser_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-browser-mocks
 title: "@kbn/core-capabilities-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 ef72625e6a1a65..8ce40f8e032702 100644
--- a/api_docs/kbn_core_capabilities_common.mdx
+++ b/api_docs/kbn_core_capabilities_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-common
 title: "@kbn/core-capabilities-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-common plugin
-date: 2023-04-27
+date: 2023-05-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 033096ac78e760..ce94816fb17fe2 100644
--- a/api_docs/kbn_core_capabilities_server.mdx
+++ b/api_docs/kbn_core_capabilities_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server
 title: "@kbn/core-capabilities-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server plugin
-date: 2023-04-27
+date: 2023-05-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 cddf2e19cfb75a..9675f9a6239ecb 100644
--- a/api_docs/kbn_core_capabilities_server_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server-mocks
 title: "@kbn/core-capabilities-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_core_chrome_browser.devdocs.json
index 04cae5a9ab4958..b6a2c3c3a1a83a 100644
--- a/api_docs/kbn_core_chrome_browser.devdocs.json
+++ b/api_docs/kbn_core_chrome_browser.devdocs.json
@@ -1327,6 +1327,132 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/core-chrome-browser",
+        "id": "def-common.ChromeProjectNavigation",
+        "type": "Interface",
+        "tags": [],
+        "label": "ChromeProjectNavigation",
+        "description": [],
+        "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-chrome-browser",
+            "id": "def-common.ChromeProjectNavigation.navigationTree",
+            "type": "Array",
+            "tags": [],
+            "label": "navigationTree",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-chrome-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreChromeBrowserPluginApi",
+                "section": "def-common.ChromeProjectNavigationNode",
+                "text": "ChromeProjectNavigationNode"
+              },
+              "[]"
+            ],
+            "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-chrome-browser",
+        "id": "def-common.ChromeProjectNavigationNode",
+        "type": "Interface",
+        "tags": [],
+        "label": "ChromeProjectNavigationNode",
+        "description": [],
+        "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-chrome-browser",
+            "id": "def-common.ChromeProjectNavigationNode.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-chrome-browser",
+            "id": "def-common.ChromeProjectNavigationNode.link",
+            "type": "string",
+            "tags": [],
+            "label": "link",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-chrome-browser",
+            "id": "def-common.ChromeProjectNavigationNode.children",
+            "type": "Array",
+            "tags": [],
+            "label": "children",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-chrome-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreChromeBrowserPluginApi",
+                "section": "def-common.ChromeProjectNavigationNode",
+                "text": "ChromeProjectNavigationNode"
+              },
+              "[] | undefined"
+            ],
+            "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-chrome-browser",
+            "id": "def-common.ChromeProjectNavigationNode.title",
+            "type": "string",
+            "tags": [],
+            "label": "title",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-chrome-browser",
+            "id": "def-common.ChromeProjectNavigationNode.icon",
+            "type": "string",
+            "tags": [],
+            "label": "icon",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/core-chrome-browser",
         "id": "def-common.ChromeRecentlyAccessed",
@@ -2315,6 +2441,38 @@
             "trackAdoption": false,
             "children": [],
             "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-chrome-browser",
+            "id": "def-common.ChromeStart.project",
+            "type": "Object",
+            "tags": [],
+            "label": "project",
+            "description": [
+              "\nConfiguration for serverless projects"
+            ],
+            "signature": [
+              "{ setNavigation(projectNavigation: ",
+              {
+                "pluginId": "@kbn/core-chrome-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreChromeBrowserPluginApi",
+                "section": "def-common.ChromeProjectNavigation",
+                "text": "ChromeProjectNavigation"
+              },
+              "): void; setSideNavComponent(component: ",
+              {
+                "pluginId": "@kbn/core-chrome-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreChromeBrowserPluginApi",
+                "section": "def-common.SideNavComponent",
+                "text": "SideNavComponent"
+              },
+              " | null): void; }"
+            ],
+            "path": "packages/core/chrome/core-chrome-browser/src/contracts.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -2370,6 +2528,19 @@
           }
         ],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-chrome-browser",
+        "id": "def-common.SideNavCompProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "SideNavCompProps",
+        "description": [],
+        "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [],
+        "initialIsOpen": false
       }
     ],
     "enums": [],
@@ -2453,6 +2624,21 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/core-chrome-browser",
+        "id": "def-common.ChromeProjectNavigationLink",
+        "type": "Type",
+        "tags": [],
+        "label": "ChromeProjectNavigationLink",
+        "description": [],
+        "signature": [
+          "string"
+        ],
+        "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/core-chrome-browser",
         "id": "def-common.ChromeStyle",
@@ -2467,6 +2653,37 @@
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-chrome-browser",
+        "id": "def-common.SideNavComponent",
+        "type": "Type",
+        "tags": [],
+        "label": "SideNavComponent",
+        "description": [],
+        "signature": [
+          "React.ComponentClass<",
+          {
+            "pluginId": "@kbn/core-chrome-browser",
+            "scope": "common",
+            "docId": "kibKbnCoreChromeBrowserPluginApi",
+            "section": "def-common.SideNavCompProps",
+            "text": "SideNavCompProps"
+          },
+          ", any> | React.FunctionComponent<",
+          {
+            "pluginId": "@kbn/core-chrome-browser",
+            "scope": "common",
+            "docId": "kibKbnCoreChromeBrowserPluginApi",
+            "section": "def-common.SideNavCompProps",
+            "text": "SideNavCompProps"
+          },
+          ">"
+        ],
+        "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
       }
     ],
     "objects": []
diff --git a/api_docs/kbn_core_chrome_browser.mdx b/api_docs/kbn_core_chrome_browser.mdx
index 2218e9d4002958..809a5f6924f33b 100644
--- a/api_docs/kbn_core_chrome_browser.mdx
+++ b/api_docs/kbn_core_chrome_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser
 title: "@kbn/core-chrome-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser']
 ---
 import kbnCoreChromeBrowserObj from './kbn_core_chrome_browser.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 124 | 0 | 47 | 0 |
+| 136 | 0 | 58 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_core_chrome_browser_mocks.mdx b/api_docs/kbn_core_chrome_browser_mocks.mdx
index d079e5ac82db96..86df711b545882 100644
--- a/api_docs/kbn_core_chrome_browser_mocks.mdx
+++ b/api_docs/kbn_core_chrome_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser-mocks
 title: "@kbn/core-chrome-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 45ead2eb3ab9cb..608335f0f5e571 100644
--- a/api_docs/kbn_core_config_server_internal.mdx
+++ b/api_docs/kbn_core_config_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-config-server-internal
 title: "@kbn/core-config-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-config-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 1e1173d6d61164..39d0a76858821d 100644
--- a/api_docs/kbn_core_custom_branding_browser.mdx
+++ b/api_docs/kbn_core_custom_branding_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser
 title: "@kbn/core-custom-branding-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser plugin
-date: 2023-04-27
+date: 2023-05-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 2fc88fe446b7b2..ffd4572a497951 100644
--- a/api_docs/kbn_core_custom_branding_browser_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-internal
 title: "@kbn/core-custom-branding-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 dbb95b2a738449..3584109a108650 100644
--- a/api_docs/kbn_core_custom_branding_browser_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-mocks
 title: "@kbn/core-custom-branding-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 0756554c9a2cde..cebb4343c3dc05 100644
--- a/api_docs/kbn_core_custom_branding_common.mdx
+++ b/api_docs/kbn_core_custom_branding_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-common
 title: "@kbn/core-custom-branding-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-common plugin
-date: 2023-04-27
+date: 2023-05-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 605e8a961ea89a..42598d9f168ab7 100644
--- a/api_docs/kbn_core_custom_branding_server.mdx
+++ b/api_docs/kbn_core_custom_branding_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server
 title: "@kbn/core-custom-branding-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server plugin
-date: 2023-04-27
+date: 2023-05-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 d9e5c130dbb157..5d4ffbe1f00e87 100644
--- a/api_docs/kbn_core_custom_branding_server_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-internal
 title: "@kbn/core-custom-branding-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 759afc4831342e..7f0e4a56c38d0b 100644
--- a/api_docs/kbn_core_custom_branding_server_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-mocks
 title: "@kbn/core-custom-branding-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 f0865f4004829a..7d7b65f776fb92 100644
--- a/api_docs/kbn_core_deprecations_browser.mdx
+++ b/api_docs/kbn_core_deprecations_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser
 title: "@kbn/core-deprecations-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser plugin
-date: 2023-04-27
+date: 2023-05-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 81573da2698d12..3d86cc1716b270 100644
--- a/api_docs/kbn_core_deprecations_browser_internal.mdx
+++ b/api_docs/kbn_core_deprecations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-internal
 title: "@kbn/core-deprecations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 8523162c47d7d1..ef740606d27c3d 100644
--- a/api_docs/kbn_core_deprecations_browser_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-mocks
 title: "@kbn/core-deprecations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 2a070784bff8fe..4c2387b3b3c1fc 100644
--- a/api_docs/kbn_core_deprecations_common.mdx
+++ b/api_docs/kbn_core_deprecations_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-common
 title: "@kbn/core-deprecations-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-common plugin
-date: 2023-04-27
+date: 2023-05-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 9811666668c707..8435c3dbc60384 100644
--- a/api_docs/kbn_core_deprecations_server.mdx
+++ b/api_docs/kbn_core_deprecations_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server
 title: "@kbn/core-deprecations-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server plugin
-date: 2023-04-27
+date: 2023-05-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 a26d41412afcca..853cef66fa6b12 100644
--- a/api_docs/kbn_core_deprecations_server_internal.mdx
+++ b/api_docs/kbn_core_deprecations_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-internal
 title: "@kbn/core-deprecations-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 916653e28910ef..9a58fbe904a530 100644
--- a/api_docs/kbn_core_deprecations_server_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-mocks
 title: "@kbn/core-deprecations-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 625b679e7c34b1..b6473ecc0926d8 100644
--- a/api_docs/kbn_core_doc_links_browser.mdx
+++ b/api_docs/kbn_core_doc_links_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser
 title: "@kbn/core-doc-links-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser plugin
-date: 2023-04-27
+date: 2023-05-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 6b6197de918ffe..87311c2aed3530 100644
--- a/api_docs/kbn_core_doc_links_browser_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser-mocks
 title: "@kbn/core-doc-links-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 d1d0c8b6ff3cbd..6d3a5d8cca96c2 100644
--- a/api_docs/kbn_core_doc_links_server.mdx
+++ b/api_docs/kbn_core_doc_links_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server
 title: "@kbn/core-doc-links-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server plugin
-date: 2023-04-27
+date: 2023-05-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 02d893ce7fc3f8..1f41d77c2d35ae 100644
--- a/api_docs/kbn_core_doc_links_server_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server-mocks
 title: "@kbn/core-doc-links-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 48e26133f228b1..7cae7548fd7626 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-internal
 title: "@kbn/core-elasticsearch-client-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_core_elasticsearch_client_server_mocks.devdocs.json
index b36b07569b7da5..7cc1932e0cc515 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_mocks.devdocs.json
+++ b/api_docs/kbn_core_elasticsearch_client_server_mocks.devdocs.json
@@ -397,20 +397,6 @@
               "CountRequest",
               " | undefined, options?: ",
               "TransportRequestOptions",
-              " | undefined]>; exists: ",
-              {
-                "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
-                "scope": "common",
-                "docId": "kibKbnCoreElasticsearchClientServerMocksPluginApi",
-                "section": "def-common.ClientApiMockInstance",
-                "text": "ClientApiMockInstance"
-              },
-              "<Promise<boolean>, [params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
               " | undefined]>; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               {
                 "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
@@ -609,7 +595,21 @@
               },
               "<",
               "default",
-              ">; existsSource: ",
+              ">; exists: ",
+              {
+                "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
+                "scope": "common",
+                "docId": "kibKbnCoreElasticsearchClientServerMocksPluginApi",
+                "section": "def-common.ClientApiMockInstance",
+                "text": "ClientApiMockInstance"
+              },
+              "<Promise<boolean>, [params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined]>; existsSource: ",
               {
                 "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
                 "scope": "common",
@@ -1504,20 +1504,6 @@
               "CountRequest",
               " | undefined, options?: ",
               "TransportRequestOptions",
-              " | undefined]>; exists: ",
-              {
-                "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
-                "scope": "common",
-                "docId": "kibKbnCoreElasticsearchClientServerMocksPluginApi",
-                "section": "def-common.ClientApiMockInstance",
-                "text": "ClientApiMockInstance"
-              },
-              "<Promise<boolean>, [params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
               " | undefined]>; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               {
                 "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
@@ -1716,7 +1702,21 @@
               },
               "<",
               "default",
-              ">; existsSource: ",
+              ">; exists: ",
+              {
+                "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
+                "scope": "common",
+                "docId": "kibKbnCoreElasticsearchClientServerMocksPluginApi",
+                "section": "def-common.ClientApiMockInstance",
+                "text": "ClientApiMockInstance"
+              },
+              "<Promise<boolean>, [params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined]>; existsSource: ",
               {
                 "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
                 "scope": "common",
@@ -2565,20 +2565,6 @@
               "CountRequest",
               " | undefined, options?: ",
               "TransportRequestOptions",
-              " | undefined]>; exists: ",
-              {
-                "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
-                "scope": "common",
-                "docId": "kibKbnCoreElasticsearchClientServerMocksPluginApi",
-                "section": "def-common.ClientApiMockInstance",
-                "text": "ClientApiMockInstance"
-              },
-              "<Promise<boolean>, [params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
               " | undefined]>; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               {
                 "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
@@ -2777,7 +2763,21 @@
               },
               "<",
               "default",
-              ">; existsSource: ",
+              ">; exists: ",
+              {
+                "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
+                "scope": "common",
+                "docId": "kibKbnCoreElasticsearchClientServerMocksPluginApi",
+                "section": "def-common.ClientApiMockInstance",
+                "text": "ClientApiMockInstance"
+              },
+              "<Promise<boolean>, [params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined]>; existsSource: ",
               {
                 "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
                 "scope": "common",
@@ -3717,20 +3717,6 @@
           "CountRequest",
           " | undefined, options?: ",
           "TransportRequestOptions",
-          " | undefined]>; exists: ",
-          {
-            "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
-            "scope": "common",
-            "docId": "kibKbnCoreElasticsearchClientServerMocksPluginApi",
-            "section": "def-common.ClientApiMockInstance",
-            "text": "ClientApiMockInstance"
-          },
-          "<Promise<boolean>, [params: ",
-          "ExistsRequest",
-          " | ",
-          "ExistsRequest",
-          ", options?: ",
-          "TransportRequestOptions",
           " | undefined]>; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
           {
             "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
@@ -3929,7 +3915,21 @@
           },
           "<",
           "default",
-          ">; existsSource: ",
+          ">; exists: ",
+          {
+            "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
+            "scope": "common",
+            "docId": "kibKbnCoreElasticsearchClientServerMocksPluginApi",
+            "section": "def-common.ClientApiMockInstance",
+            "text": "ClientApiMockInstance"
+          },
+          "<Promise<boolean>, [params: ",
+          "ExistsRequest",
+          " | ",
+          "ExistsRequest",
+          ", options?: ",
+          "TransportRequestOptions",
+          " | undefined]>; existsSource: ",
           {
             "pluginId": "@kbn/core-elasticsearch-client-server-mocks",
             "scope": "common",
diff --git a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
index df7fc1e1d26f95..f66ebf1b113d1c 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-mocks
 title: "@kbn/core-elasticsearch-client-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_core_elasticsearch_server.devdocs.json
index ee492a19564d3d..0840316d37b04b 100644
--- a/api_docs/kbn_core_elasticsearch_server.devdocs.json
+++ b/api_docs/kbn_core_elasticsearch_server.devdocs.json
@@ -974,7 +974,7 @@
               "Headers used for authentication against Elasticsearch"
             ],
             "signature": [
-              "{ date?: string | string[] | undefined; range?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
+              "{ date?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; range?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
             ],
             "path": "packages/core/elasticsearch/core-elasticsearch-server/src/client/scopeable_request.ts",
             "deprecated": false,
@@ -1174,27 +1174,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -1372,7 +1352,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -2840,27 +2840,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -3038,7 +3018,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -4042,27 +4042,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -4240,7 +4220,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
@@ -5497,27 +5497,7 @@
           "TransportRequestOptions",
           " | undefined): Promise<",
           "CountResponse",
-          ">; }; exists: { (this: That, params: ",
-          "ExistsRequest",
-          " | ",
-          "ExistsRequest",
-          ", options?: ",
-          "TransportRequestOptionsWithOutMeta",
-          " | undefined): Promise<boolean>; (this: That, params: ",
-          "ExistsRequest",
-          " | ",
-          "ExistsRequest",
-          ", options?: ",
-          "TransportRequestOptionsWithMeta",
-          " | undefined): Promise<",
-          "TransportResult",
-          "<boolean, unknown>>; (this: That, params: ",
-          "ExistsRequest",
-          " | ",
-          "ExistsRequest",
-          ", options?: ",
-          "TransportRequestOptions",
-          " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+          ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
           "default",
           "; child: (opts: ",
           "ClientOptions",
@@ -5695,7 +5675,27 @@
           "default",
           "; eql: ",
           "default",
-          "; existsSource: { (this: That, params: ",
+          "; exists: { (this: That, params: ",
+          "ExistsRequest",
+          " | ",
+          "ExistsRequest",
+          ", options?: ",
+          "TransportRequestOptionsWithOutMeta",
+          " | undefined): Promise<boolean>; (this: That, params: ",
+          "ExistsRequest",
+          " | ",
+          "ExistsRequest",
+          ", options?: ",
+          "TransportRequestOptionsWithMeta",
+          " | undefined): Promise<",
+          "TransportResult",
+          "<boolean, unknown>>; (this: That, params: ",
+          "ExistsRequest",
+          " | ",
+          "ExistsRequest",
+          ", options?: ",
+          "TransportRequestOptions",
+          " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
           "ExistsSourceRequest",
           " | ",
           "ExistsSourceRequest",
diff --git a/api_docs/kbn_core_elasticsearch_server.mdx b/api_docs/kbn_core_elasticsearch_server.mdx
index 804495ccbf1c16..deaf83267883c1 100644
--- a/api_docs/kbn_core_elasticsearch_server.mdx
+++ b/api_docs/kbn_core_elasticsearch_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server
 title: "@kbn/core-elasticsearch-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_core_elasticsearch_server_internal.devdocs.json
index 96c31bba827656..9ebc07db2ec229 100644
--- a/api_docs/kbn_core_elasticsearch_server_internal.devdocs.json
+++ b/api_docs/kbn_core_elasticsearch_server_internal.devdocs.json
@@ -228,27 +228,7 @@
                   "TransportRequestOptions",
                   " | undefined): Promise<",
                   "CountResponse",
-                  ">; }; exists: { (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithOutMeta",
-                  " | undefined): Promise<boolean>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithMeta",
-                  " | undefined): Promise<",
-                  "TransportResult",
-                  "<boolean, unknown>>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+                  ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
                   "default",
                   "; child: (opts: ",
                   "ClientOptions",
@@ -426,7 +406,27 @@
                   "default",
                   "; eql: ",
                   "default",
-                  "; existsSource: { (this: That, params: ",
+                  "; exists: { (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithOutMeta",
+                  " | undefined): Promise<boolean>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithMeta",
+                  " | undefined): Promise<",
+                  "TransportResult",
+                  "<boolean, unknown>>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
                   "ExistsSourceRequest",
                   " | ",
                   "ExistsSourceRequest",
@@ -1858,27 +1858,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -2056,7 +2036,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
diff --git a/api_docs/kbn_core_elasticsearch_server_internal.mdx b/api_docs/kbn_core_elasticsearch_server_internal.mdx
index 74258538ff9e10..b8b4498fd1b086 100644
--- a/api_docs/kbn_core_elasticsearch_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-internal
 title: "@kbn/core-elasticsearch-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 3bc56e95f081f5..b62ba1f41f8a11 100644
--- a/api_docs/kbn_core_elasticsearch_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-mocks
 title: "@kbn/core-elasticsearch-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 49e5db0bd7b566..0d60f25824585c 100644
--- a/api_docs/kbn_core_environment_server_internal.mdx
+++ b/api_docs/kbn_core_environment_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-internal
 title: "@kbn/core-environment-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 baf877b08ecf7b..213c67ac863b81 100644
--- a/api_docs/kbn_core_environment_server_mocks.mdx
+++ b/api_docs/kbn_core_environment_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-mocks
 title: "@kbn/core-environment-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 a1c30edc5ff462..5a9f5885482f26 100644
--- a/api_docs/kbn_core_execution_context_browser.mdx
+++ b/api_docs/kbn_core_execution_context_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser
 title: "@kbn/core-execution-context-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser plugin
-date: 2023-04-27
+date: 2023-05-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 6c7703e4a4b6e0..14a456cee398b6 100644
--- a/api_docs/kbn_core_execution_context_browser_internal.mdx
+++ b/api_docs/kbn_core_execution_context_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-internal
 title: "@kbn/core-execution-context-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 cd15dd6255b838..eae15652bc19ed 100644
--- a/api_docs/kbn_core_execution_context_browser_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-mocks
 title: "@kbn/core-execution-context-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 71a9d8bbf44700..fca10f572d26ec 100644
--- a/api_docs/kbn_core_execution_context_common.mdx
+++ b/api_docs/kbn_core_execution_context_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-common
 title: "@kbn/core-execution-context-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-common plugin
-date: 2023-04-27
+date: 2023-05-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 87637a3c30c97c..8583c6b3ab63d7 100644
--- a/api_docs/kbn_core_execution_context_server.mdx
+++ b/api_docs/kbn_core_execution_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server
 title: "@kbn/core-execution-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server plugin
-date: 2023-04-27
+date: 2023-05-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 8a712a2a5d15c9..0422be6d3c19b3 100644
--- a/api_docs/kbn_core_execution_context_server_internal.mdx
+++ b/api_docs/kbn_core_execution_context_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-internal
 title: "@kbn/core-execution-context-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 b0b61230cb7b68..b66f908469f807 100644
--- a/api_docs/kbn_core_execution_context_server_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-mocks
 title: "@kbn/core-execution-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 c517b4468a481f..772f3166c0488d 100644
--- a/api_docs/kbn_core_fatal_errors_browser.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser
 title: "@kbn/core-fatal-errors-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser plugin
-date: 2023-04-27
+date: 2023-05-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 909eb7eb6e1d8d..4500f167b966b7 100644
--- a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser-mocks
 title: "@kbn/core-fatal-errors-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 4e63e73eb6229c..8eb4e0e9a49228 100644
--- a/api_docs/kbn_core_http_browser.mdx
+++ b/api_docs/kbn_core_http_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser
 title: "@kbn/core-http-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser plugin
-date: 2023-04-27
+date: 2023-05-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 66586c0b230615..9636785ee2059f 100644
--- a/api_docs/kbn_core_http_browser_internal.mdx
+++ b/api_docs/kbn_core_http_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-internal
 title: "@kbn/core-http-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 ba622573d70940..8ca8a5b49f307a 100644
--- a/api_docs/kbn_core_http_browser_mocks.mdx
+++ b/api_docs/kbn_core_http_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-mocks
 title: "@kbn/core-http-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 fb60f3e84497be..83cbb13aaaa0b2 100644
--- a/api_docs/kbn_core_http_common.mdx
+++ b/api_docs/kbn_core_http_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-common
 title: "@kbn/core-http-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-common plugin
-date: 2023-04-27
+date: 2023-05-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 71187db72c56fa..d2eef8a7ce1e75 100644
--- a/api_docs/kbn_core_http_context_server_mocks.mdx
+++ b/api_docs/kbn_core_http_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-context-server-mocks
 title: "@kbn/core-http-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-context-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 b5de6010fe42f5..15ba9dd7b39f7b 100644
--- a/api_docs/kbn_core_http_request_handler_context_server.mdx
+++ b/api_docs/kbn_core_http_request_handler_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-request-handler-context-server
 title: "@kbn/core-http-request-handler-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-request-handler-context-server plugin
-date: 2023-04-27
+date: 2023-05-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 08a0d3945eec08..ddc8844d1ac917 100644
--- a/api_docs/kbn_core_http_resources_server.mdx
+++ b/api_docs/kbn_core_http_resources_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server
 title: "@kbn/core-http-resources-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server plugin
-date: 2023-04-27
+date: 2023-05-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 5544bb851ed3e8..9958f9d7658c43 100644
--- a/api_docs/kbn_core_http_resources_server_internal.mdx
+++ b/api_docs/kbn_core_http_resources_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-internal
 title: "@kbn/core-http-resources-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 8a3da9918cfc20..12e3d845dd6369 100644
--- a/api_docs/kbn_core_http_resources_server_mocks.mdx
+++ b/api_docs/kbn_core_http_resources_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-mocks
 title: "@kbn/core-http-resources-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 26235f12fc1f45..a97c6c78e74311 100644
--- a/api_docs/kbn_core_http_router_server_internal.mdx
+++ b/api_docs/kbn_core_http_router_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-internal
 title: "@kbn/core-http-router-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 3fa33775c6449b..c66575db328e39 100644
--- a/api_docs/kbn_core_http_router_server_mocks.mdx
+++ b/api_docs/kbn_core_http_router_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-mocks
 title: "@kbn/core-http-router-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 f9faf5a74ef10c..3ef6e53b436a54 100644
--- a/api_docs/kbn_core_http_server.devdocs.json
+++ b/api_docs/kbn_core_http_server.devdocs.json
@@ -746,7 +746,7 @@
               "The headers associated with the request."
             ],
             "signature": [
-              "{ date?: string | string[] | undefined; range?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
+              "{ date?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; range?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
             ],
             "path": "packages/core/http/core-http-server/src/router/raw_request.ts",
             "deprecated": false,
@@ -4699,7 +4699,7 @@
               "\nReadonly copy of incoming request headers."
             ],
             "signature": [
-              "{ date?: string | string[] | undefined; range?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
+              "{ date?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; range?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
             ],
             "path": "packages/core/http/core-http-server/src/router/request.ts",
             "deprecated": false,
@@ -8206,7 +8206,7 @@
           "\nHttp request headers to read."
         ],
         "signature": [
-          "{ date?: string | string[] | undefined; range?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
+          "{ date?: string | string[] | undefined; warning?: string | string[] | undefined; location?: string | string[] | undefined; from?: string | string[] | undefined; etag?: string | string[] | undefined; accept?: string | string[] | undefined; \"accept-language\"?: string | string[] | undefined; \"accept-patch\"?: string | string[] | undefined; \"accept-ranges\"?: string | string[] | undefined; \"access-control-allow-credentials\"?: string | string[] | undefined; \"access-control-allow-headers\"?: string | string[] | undefined; \"access-control-allow-methods\"?: string | string[] | undefined; \"access-control-allow-origin\"?: string | string[] | undefined; \"access-control-expose-headers\"?: string | string[] | undefined; \"access-control-max-age\"?: string | string[] | undefined; \"access-control-request-headers\"?: string | string[] | undefined; \"access-control-request-method\"?: string | string[] | undefined; age?: string | string[] | undefined; allow?: string | string[] | undefined; \"alt-svc\"?: string | string[] | undefined; authorization?: string | string[] | undefined; \"cache-control\"?: string | string[] | undefined; connection?: string | string[] | undefined; \"content-disposition\"?: string | string[] | undefined; \"content-encoding\"?: string | string[] | undefined; \"content-language\"?: string | string[] | undefined; \"content-length\"?: string | string[] | undefined; \"content-location\"?: string | string[] | undefined; \"content-range\"?: string | string[] | undefined; \"content-type\"?: string | string[] | undefined; cookie?: string | string[] | undefined; expect?: string | string[] | undefined; expires?: string | string[] | undefined; forwarded?: string | string[] | undefined; host?: string | string[] | undefined; \"if-match\"?: string | string[] | undefined; \"if-modified-since\"?: string | string[] | undefined; \"if-none-match\"?: string | string[] | undefined; \"if-unmodified-since\"?: string | string[] | undefined; \"last-modified\"?: string | string[] | undefined; origin?: string | string[] | undefined; pragma?: string | string[] | undefined; \"proxy-authenticate\"?: string | string[] | undefined; \"proxy-authorization\"?: string | string[] | undefined; \"public-key-pins\"?: string | string[] | undefined; range?: string | string[] | undefined; referer?: string | string[] | undefined; \"retry-after\"?: string | string[] | undefined; \"sec-websocket-accept\"?: string | string[] | undefined; \"sec-websocket-extensions\"?: string | string[] | undefined; \"sec-websocket-key\"?: string | string[] | undefined; \"sec-websocket-protocol\"?: string | string[] | undefined; \"sec-websocket-version\"?: string | string[] | undefined; \"set-cookie\"?: string | string[] | undefined; \"strict-transport-security\"?: string | string[] | undefined; tk?: string | string[] | undefined; trailer?: string | string[] | undefined; \"transfer-encoding\"?: string | string[] | undefined; upgrade?: string | string[] | undefined; \"user-agent\"?: string | string[] | undefined; vary?: string | string[] | undefined; via?: string | string[] | undefined; \"www-authenticate\"?: string | string[] | undefined; } & { [header: string]: string | string[] | undefined; }"
         ],
         "path": "packages/core/http/core-http-server/src/router/headers.ts",
         "deprecated": false,
@@ -8512,7 +8512,7 @@
           "\nSet of well-known HTTP headers."
         ],
         "signature": [
-          "\"date\" | \"range\" | \"warning\" | \"location\" | \"from\" | \"etag\" | \"accept\" | \"accept-language\" | \"accept-patch\" | \"accept-ranges\" | \"access-control-allow-credentials\" | \"access-control-allow-headers\" | \"access-control-allow-methods\" | \"access-control-allow-origin\" | \"access-control-expose-headers\" | \"access-control-max-age\" | \"access-control-request-headers\" | \"access-control-request-method\" | \"age\" | \"allow\" | \"alt-svc\" | \"authorization\" | \"cache-control\" | \"connection\" | \"content-disposition\" | \"content-encoding\" | \"content-language\" | \"content-length\" | \"content-location\" | \"content-range\" | \"content-type\" | \"cookie\" | \"expect\" | \"expires\" | \"forwarded\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"origin\" | \"pragma\" | \"proxy-authenticate\" | \"proxy-authorization\" | \"public-key-pins\" | \"referer\" | \"retry-after\" | \"sec-websocket-accept\" | \"sec-websocket-extensions\" | \"sec-websocket-key\" | \"sec-websocket-protocol\" | \"sec-websocket-version\" | \"set-cookie\" | \"strict-transport-security\" | \"tk\" | \"trailer\" | \"transfer-encoding\" | \"upgrade\" | \"user-agent\" | \"vary\" | \"via\" | \"www-authenticate\""
+          "\"date\" | \"warning\" | \"location\" | \"from\" | \"etag\" | \"accept\" | \"accept-language\" | \"accept-patch\" | \"accept-ranges\" | \"access-control-allow-credentials\" | \"access-control-allow-headers\" | \"access-control-allow-methods\" | \"access-control-allow-origin\" | \"access-control-expose-headers\" | \"access-control-max-age\" | \"access-control-request-headers\" | \"access-control-request-method\" | \"age\" | \"allow\" | \"alt-svc\" | \"authorization\" | \"cache-control\" | \"connection\" | \"content-disposition\" | \"content-encoding\" | \"content-language\" | \"content-length\" | \"content-location\" | \"content-range\" | \"content-type\" | \"cookie\" | \"expect\" | \"expires\" | \"forwarded\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"origin\" | \"pragma\" | \"proxy-authenticate\" | \"proxy-authorization\" | \"public-key-pins\" | \"range\" | \"referer\" | \"retry-after\" | \"sec-websocket-accept\" | \"sec-websocket-extensions\" | \"sec-websocket-key\" | \"sec-websocket-protocol\" | \"sec-websocket-version\" | \"set-cookie\" | \"strict-transport-security\" | \"tk\" | \"trailer\" | \"transfer-encoding\" | \"upgrade\" | \"user-agent\" | \"vary\" | \"via\" | \"www-authenticate\""
         ],
         "path": "packages/core/http/core-http-server/src/router/headers.ts",
         "deprecated": false,
@@ -9618,7 +9618,7 @@
           "\nHttp response headers to set."
         ],
         "signature": [
-          "Record<string, string | string[]> | Record<\"date\" | \"range\" | \"warning\" | \"location\" | \"from\" | \"etag\" | \"accept\" | \"accept-language\" | \"accept-patch\" | \"accept-ranges\" | \"access-control-allow-credentials\" | \"access-control-allow-headers\" | \"access-control-allow-methods\" | \"access-control-allow-origin\" | \"access-control-expose-headers\" | \"access-control-max-age\" | \"access-control-request-headers\" | \"access-control-request-method\" | \"age\" | \"allow\" | \"alt-svc\" | \"authorization\" | \"cache-control\" | \"connection\" | \"content-disposition\" | \"content-encoding\" | \"content-language\" | \"content-length\" | \"content-location\" | \"content-range\" | \"content-type\" | \"cookie\" | \"expect\" | \"expires\" | \"forwarded\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"origin\" | \"pragma\" | \"proxy-authenticate\" | \"proxy-authorization\" | \"public-key-pins\" | \"referer\" | \"retry-after\" | \"sec-websocket-accept\" | \"sec-websocket-extensions\" | \"sec-websocket-key\" | \"sec-websocket-protocol\" | \"sec-websocket-version\" | \"set-cookie\" | \"strict-transport-security\" | \"tk\" | \"trailer\" | \"transfer-encoding\" | \"upgrade\" | \"user-agent\" | \"vary\" | \"via\" | \"www-authenticate\", string | string[]>"
+          "Record<string, string | string[]> | Record<\"date\" | \"warning\" | \"location\" | \"from\" | \"etag\" | \"accept\" | \"accept-language\" | \"accept-patch\" | \"accept-ranges\" | \"access-control-allow-credentials\" | \"access-control-allow-headers\" | \"access-control-allow-methods\" | \"access-control-allow-origin\" | \"access-control-expose-headers\" | \"access-control-max-age\" | \"access-control-request-headers\" | \"access-control-request-method\" | \"age\" | \"allow\" | \"alt-svc\" | \"authorization\" | \"cache-control\" | \"connection\" | \"content-disposition\" | \"content-encoding\" | \"content-language\" | \"content-length\" | \"content-location\" | \"content-range\" | \"content-type\" | \"cookie\" | \"expect\" | \"expires\" | \"forwarded\" | \"host\" | \"if-match\" | \"if-modified-since\" | \"if-none-match\" | \"if-unmodified-since\" | \"last-modified\" | \"origin\" | \"pragma\" | \"proxy-authenticate\" | \"proxy-authorization\" | \"public-key-pins\" | \"range\" | \"referer\" | \"retry-after\" | \"sec-websocket-accept\" | \"sec-websocket-extensions\" | \"sec-websocket-key\" | \"sec-websocket-protocol\" | \"sec-websocket-version\" | \"set-cookie\" | \"strict-transport-security\" | \"tk\" | \"trailer\" | \"transfer-encoding\" | \"upgrade\" | \"user-agent\" | \"vary\" | \"via\" | \"www-authenticate\", string | string[]>"
         ],
         "path": "packages/core/http/core-http-server/src/router/headers.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_core_http_server.mdx b/api_docs/kbn_core_http_server.mdx
index f3c4793310333a..2fafa637595024 100644
--- a/api_docs/kbn_core_http_server.mdx
+++ b/api_docs/kbn_core_http_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server
 title: "@kbn/core-http-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server plugin
-date: 2023-04-27
+date: 2023-05-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 0897cbf0704938..d0c31685c24ca4 100644
--- a/api_docs/kbn_core_http_server_internal.mdx
+++ b/api_docs/kbn_core_http_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-internal
 title: "@kbn/core-http-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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.mdx b/api_docs/kbn_core_http_server_mocks.mdx
index 1fed1ae674e8c4..ef6d72b24da296 100644
--- a/api_docs/kbn_core_http_server_mocks.mdx
+++ b/api_docs/kbn_core_http_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-mocks
 title: "@kbn/core-http-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 ccbc486656fccb..568dc159b0a13c 100644
--- a/api_docs/kbn_core_i18n_browser.mdx
+++ b/api_docs/kbn_core_i18n_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser
 title: "@kbn/core-i18n-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser plugin
-date: 2023-04-27
+date: 2023-05-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 6145c9e5c5faf3..b009eac1ac8770 100644
--- a/api_docs/kbn_core_i18n_browser_mocks.mdx
+++ b/api_docs/kbn_core_i18n_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser-mocks
 title: "@kbn/core-i18n-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 1d299f2ed76742..c934cad95a630c 100644
--- a/api_docs/kbn_core_i18n_server.mdx
+++ b/api_docs/kbn_core_i18n_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server
 title: "@kbn/core-i18n-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server plugin
-date: 2023-04-27
+date: 2023-05-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 c5081ad8b16c95..8b5b6274c39d14 100644
--- a/api_docs/kbn_core_i18n_server_internal.mdx
+++ b/api_docs/kbn_core_i18n_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-internal
 title: "@kbn/core-i18n-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 128163b5ece761..7dc4e7833abc1a 100644
--- a/api_docs/kbn_core_i18n_server_mocks.mdx
+++ b/api_docs/kbn_core_i18n_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-mocks
 title: "@kbn/core-i18n-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 dc31f19091d106..18a66737a5683d 100644
--- a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
+++ b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser-mocks
 title: "@kbn/core-injected-metadata-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-injected-metadata-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 5af05c050db794..7540e891be9c46 100644
--- a/api_docs/kbn_core_integrations_browser_internal.mdx
+++ b/api_docs/kbn_core_integrations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-internal
 title: "@kbn/core-integrations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 012b767b464d5b..86ceeda9735ac2 100644
--- a/api_docs/kbn_core_integrations_browser_mocks.mdx
+++ b/api_docs/kbn_core_integrations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-mocks
 title: "@kbn/core-integrations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_core_lifecycle_browser.devdocs.json
index 385975f4c6e4cf..07098591c9d5a0 100644
--- a/api_docs/kbn_core_lifecycle_browser.devdocs.json
+++ b/api_docs/kbn_core_lifecycle_browser.devdocs.json
@@ -653,6 +653,10 @@
                 "plugin": "lens",
                 "path": "x-pack/plugins/lens/public/visualizations/xy/visualization.tsx"
               },
+              {
+                "plugin": "lens",
+                "path": "x-pack/plugins/lens/public/visualizations/xy/visualization.tsx"
+              },
               {
                 "plugin": "lens",
                 "path": "x-pack/plugins/lens/public/app_plugin/mounter.tsx"
@@ -813,10 +817,6 @@
                 "plugin": "cloudSecurityPosture",
                 "path": "x-pack/plugins/cloud_security_posture/public/pages/rules/use_csp_rules.ts"
               },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts"
-              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx"
diff --git a/api_docs/kbn_core_lifecycle_browser.mdx b/api_docs/kbn_core_lifecycle_browser.mdx
index 4e8644902e0b22..61306d31b1ed7f 100644
--- a/api_docs/kbn_core_lifecycle_browser.mdx
+++ b/api_docs/kbn_core_lifecycle_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser
 title: "@kbn/core-lifecycle-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser plugin
-date: 2023-04-27
+date: 2023-05-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 2f482cfc4525a3..1a2a7914281dca 100644
--- a/api_docs/kbn_core_lifecycle_browser_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser-mocks
 title: "@kbn/core-lifecycle-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 b901eb448edf56..357807e5624636 100644
--- a/api_docs/kbn_core_lifecycle_server.mdx
+++ b/api_docs/kbn_core_lifecycle_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server
 title: "@kbn/core-lifecycle-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server plugin
-date: 2023-04-27
+date: 2023-05-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 46cb8c8c142ef1..113105dddcfe04 100644
--- a/api_docs/kbn_core_lifecycle_server_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server-mocks
 title: "@kbn/core-lifecycle-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 54e47f0686bbf1..72a726305091ef 100644
--- a/api_docs/kbn_core_logging_browser_mocks.mdx
+++ b/api_docs/kbn_core_logging_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-browser-mocks
 title: "@kbn/core-logging-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 ae738e7e9e5423..c9ebe9b08d6979 100644
--- a/api_docs/kbn_core_logging_common_internal.mdx
+++ b/api_docs/kbn_core_logging_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-common-internal
 title: "@kbn/core-logging-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-common-internal plugin
-date: 2023-04-27
+date: 2023-05-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 1d7b270aad656d..14560d31985bdd 100644
--- a/api_docs/kbn_core_logging_server.mdx
+++ b/api_docs/kbn_core_logging_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server
 title: "@kbn/core-logging-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server plugin
-date: 2023-04-27
+date: 2023-05-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 c2fbf4bbc276cf..a45c5e27096759 100644
--- a/api_docs/kbn_core_logging_server_internal.mdx
+++ b/api_docs/kbn_core_logging_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-internal
 title: "@kbn/core-logging-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 599f5e3b031e80..ee9c6a809e4bae 100644
--- a/api_docs/kbn_core_logging_server_mocks.mdx
+++ b/api_docs/kbn_core_logging_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-mocks
 title: "@kbn/core-logging-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 bb7cd86e844673..28175f39090315 100644
--- a/api_docs/kbn_core_metrics_collectors_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-internal
 title: "@kbn/core-metrics-collectors-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 e79a5c7fa8711b..09ab73526e8b88 100644
--- a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-mocks
 title: "@kbn/core-metrics-collectors-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 7c640e418fa9a6..952265312411ff 100644
--- a/api_docs/kbn_core_metrics_server.mdx
+++ b/api_docs/kbn_core_metrics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server
 title: "@kbn/core-metrics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server plugin
-date: 2023-04-27
+date: 2023-05-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 58900261bec4da..125c2691abf3e6 100644
--- a/api_docs/kbn_core_metrics_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-internal
 title: "@kbn/core-metrics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 d723894e14b81a..83d8c888d107dc 100644
--- a/api_docs/kbn_core_metrics_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-mocks
 title: "@kbn/core-metrics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 8d8f912d711a2b..e13cc5b122815a 100644
--- a/api_docs/kbn_core_mount_utils_browser.mdx
+++ b/api_docs/kbn_core_mount_utils_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-mount-utils-browser
 title: "@kbn/core-mount-utils-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-mount-utils-browser plugin
-date: 2023-04-27
+date: 2023-05-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 04389acb290848..cae0cafe0ad8d4 100644
--- a/api_docs/kbn_core_node_server.mdx
+++ b/api_docs/kbn_core_node_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server
 title: "@kbn/core-node-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server plugin
-date: 2023-04-27
+date: 2023-05-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 8f7f88924d01b8..c2842c8b495ccb 100644
--- a/api_docs/kbn_core_node_server_internal.mdx
+++ b/api_docs/kbn_core_node_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-internal
 title: "@kbn/core-node-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 8e9dc4ff5e8638..43439adf96ba0e 100644
--- a/api_docs/kbn_core_node_server_mocks.mdx
+++ b/api_docs/kbn_core_node_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-mocks
 title: "@kbn/core-node-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 790406d7770880..512cf7b29ea171 100644
--- a/api_docs/kbn_core_notifications_browser.mdx
+++ b/api_docs/kbn_core_notifications_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser
 title: "@kbn/core-notifications-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser plugin
-date: 2023-04-27
+date: 2023-05-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 fe0f2d771334fb..227ad5921c69cd 100644
--- a/api_docs/kbn_core_notifications_browser_internal.mdx
+++ b/api_docs/kbn_core_notifications_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-internal
 title: "@kbn/core-notifications-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 aa55a000889e40..1e40f2aa0c1e33 100644
--- a/api_docs/kbn_core_notifications_browser_mocks.mdx
+++ b/api_docs/kbn_core_notifications_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-mocks
 title: "@kbn/core-notifications-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 e3076ea5778dad..2fea973911b7f6 100644
--- a/api_docs/kbn_core_overlays_browser.mdx
+++ b/api_docs/kbn_core_overlays_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser
 title: "@kbn/core-overlays-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser plugin
-date: 2023-04-27
+date: 2023-05-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 7f5549dd1924cf..e27df222f8b004 100644
--- a/api_docs/kbn_core_overlays_browser_internal.mdx
+++ b/api_docs/kbn_core_overlays_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-internal
 title: "@kbn/core-overlays-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 7744eb52d45760..7234bec870445f 100644
--- a/api_docs/kbn_core_overlays_browser_mocks.mdx
+++ b/api_docs/kbn_core_overlays_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-mocks
 title: "@kbn/core-overlays-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 e778a3a56e53f4..01d41095411e8d 100644
--- a/api_docs/kbn_core_plugins_browser.mdx
+++ b/api_docs/kbn_core_plugins_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser
 title: "@kbn/core-plugins-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser plugin
-date: 2023-04-27
+date: 2023-05-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 53be8a4dc346a9..ffe33cd248acaa 100644
--- a/api_docs/kbn_core_plugins_browser_mocks.mdx
+++ b/api_docs/kbn_core_plugins_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser-mocks
 title: "@kbn/core-plugins-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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_server.mdx b/api_docs/kbn_core_plugins_server.mdx
index b5ec9f4ec5c47c..97d91ccc21aa5e 100644
--- a/api_docs/kbn_core_plugins_server.mdx
+++ b/api_docs/kbn_core_plugins_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server
 title: "@kbn/core-plugins-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server plugin
-date: 2023-04-27
+date: 2023-05-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 0b47258bfe7a5a..d225043a9292a3 100644
--- a/api_docs/kbn_core_plugins_server_mocks.mdx
+++ b/api_docs/kbn_core_plugins_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server-mocks
 title: "@kbn/core-plugins-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 72a96fd3bf6523..d95c12d28e6a77 100644
--- a/api_docs/kbn_core_preboot_server.mdx
+++ b/api_docs/kbn_core_preboot_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server
 title: "@kbn/core-preboot-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server plugin
-date: 2023-04-27
+date: 2023-05-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 8f35320df7a079..12227d7eefc820 100644
--- a/api_docs/kbn_core_preboot_server_mocks.mdx
+++ b/api_docs/kbn_core_preboot_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server-mocks
 title: "@kbn/core-preboot-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 962a9c15789e61..4553ec2a915424 100644
--- a/api_docs/kbn_core_rendering_browser_mocks.mdx
+++ b/api_docs/kbn_core_rendering_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-browser-mocks
 title: "@kbn/core-rendering-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 b0d53a3695c309..f43f63bc96310f 100644
--- a/api_docs/kbn_core_rendering_server_internal.mdx
+++ b/api_docs/kbn_core_rendering_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-internal
 title: "@kbn/core-rendering-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 e0ce21e79a9ac5..4c1ee03bb616d8 100644
--- a/api_docs/kbn_core_rendering_server_mocks.mdx
+++ b/api_docs/kbn_core_rendering_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-mocks
 title: "@kbn/core-rendering-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 fc8de3573cf9c6..0944dd58b1a0b3 100644
--- a/api_docs/kbn_core_root_server_internal.mdx
+++ b/api_docs/kbn_core_root_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-root-server-internal
 title: "@kbn/core-root-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-root-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_core_saved_objects_api_browser.devdocs.json
index f104ac919f51ef..6c706458d03820 100644
--- a/api_docs/kbn_core_saved_objects_api_browser.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_api_browser.devdocs.json
@@ -2195,10 +2195,6 @@
                 "plugin": "graph",
                 "path": "x-pack/plugins/graph/public/helpers/saved_workspace_utils.ts"
               },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts"
-              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/public/overview/containers/overview_cti_links/index.tsx"
diff --git a/api_docs/kbn_core_saved_objects_api_browser.mdx b/api_docs/kbn_core_saved_objects_api_browser.mdx
index a3b665350a6a23..326b24876205e4 100644
--- a/api_docs/kbn_core_saved_objects_api_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_api_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-browser
 title: "@kbn/core-saved-objects-api-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-browser plugin
-date: 2023-04-27
+date: 2023-05-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.mdx b/api_docs/kbn_core_saved_objects_api_server.mdx
index 29cecd3cf0bfaf..cb39e3460f0b3d 100644
--- a/api_docs/kbn_core_saved_objects_api_server.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server
 title: "@kbn/core-saved-objects-api-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server plugin
-date: 2023-04-27
+date: 2023-05-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_internal.mdx b/api_docs/kbn_core_saved_objects_api_server_internal.mdx
index 70526f1bd19892..c3c1ae1009cd0a 100644
--- a/api_docs/kbn_core_saved_objects_api_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-internal
 title: "@kbn/core-saved-objects-api-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server-internal plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-internal']
 ---
 import kbnCoreSavedObjectsApiServerInternalObj from './kbn_core_saved_objects_api_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
index 55016d9f9cd667..c95317a37a91ff 100644
--- a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-mocks
 title: "@kbn/core-saved-objects-api-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_core_saved_objects_base_server_internal.devdocs.json
index 2ed87324189c4c..ee1fc2c5318711 100644
--- a/api_docs/kbn_core_saved_objects_base_server_internal.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_base_server_internal.devdocs.json
@@ -189,10 +189,10 @@
       },
       {
         "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
-        "id": "def-common.compareModelVersions",
+        "id": "def-common.compareVirtualVersions",
         "type": "Function",
         "tags": [],
-        "label": "compareModelVersions",
+        "label": "compareVirtualVersions",
         "description": [],
         "signature": [
           "({ appVersions, indexVersions, deletedTypes, }: ",
@@ -218,7 +218,7 @@
         "children": [
           {
             "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
-            "id": "def-common.compareModelVersions.$1",
+            "id": "def-common.compareVirtualVersions.$1",
             "type": "Object",
             "tags": [],
             "label": "{\n  appVersions,\n  indexVersions,\n  deletedTypes,\n}",
@@ -422,6 +422,56 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+        "id": "def-common.getCurrentVirtualVersion",
+        "type": "Function",
+        "tags": [],
+        "label": "getCurrentVirtualVersion",
+        "description": [
+          "\nReturns the current virtual version for the given type.\nIt will either be the latest model version if the type\nalready switched to using them (switchToModelVersionAt is set),\nor the latest migration version for the type otherwise."
+        ],
+        "signature": [
+          "(type: ",
+          {
+            "pluginId": "@kbn/core-saved-objects-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSavedObjectsServerPluginApi",
+            "section": "def-common.SavedObjectsType",
+            "text": "SavedObjectsType"
+          },
+          "<any>) => string"
+        ],
+        "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+            "id": "def-common.getCurrentVirtualVersion.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-saved-objects-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSavedObjectsServerPluginApi",
+                "section": "def-common.SavedObjectsType",
+                "text": "SavedObjectsType"
+              },
+              "<any>"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
         "id": "def-common.getIndexForType",
@@ -455,6 +505,54 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+        "id": "def-common.getLatestMigrationVersion",
+        "type": "Function",
+        "tags": [],
+        "label": "getLatestMigrationVersion",
+        "description": [],
+        "signature": [
+          "(type: ",
+          {
+            "pluginId": "@kbn/core-saved-objects-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSavedObjectsServerPluginApi",
+            "section": "def-common.SavedObjectsType",
+            "text": "SavedObjectsType"
+          },
+          "<any>) => string"
+        ],
+        "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+            "id": "def-common.getLatestMigrationVersion.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-saved-objects-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSavedObjectsServerPluginApi",
+                "section": "def-common.SavedObjectsType",
+                "text": "SavedObjectsType"
+              },
+              "<any>"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
         "id": "def-common.getLatestModelVersion",
@@ -597,96 +695,6 @@
         "returnComment": [],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
-        "id": "def-common.getModelVersionsFromMappingMeta",
-        "type": "Function",
-        "tags": [],
-        "label": "getModelVersionsFromMappingMeta",
-        "description": [
-          "\nBuild the version map from the specified source of the provided mappings meta."
-        ],
-        "signature": [
-          "({ meta, source, knownTypes, }: ",
-          "GetModelVersionsFromMappingMetaOpts",
-          ") => ",
-          {
-            "pluginId": "@kbn/core-saved-objects-base-server-internal",
-            "scope": "common",
-            "docId": "kibKbnCoreSavedObjectsBaseServerInternalPluginApi",
-            "section": "def-common.ModelVersionMap",
-            "text": "ModelVersionMap"
-          },
-          " | undefined"
-        ],
-        "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
-            "id": "def-common.getModelVersionsFromMappingMeta.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "{\n  meta,\n  source,\n  knownTypes,\n}",
-            "description": [],
-            "signature": [
-              "GetModelVersionsFromMappingMetaOpts"
-            ],
-            "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
-        "id": "def-common.getModelVersionsFromMappings",
-        "type": "Function",
-        "tags": [],
-        "label": "getModelVersionsFromMappings",
-        "description": [
-          "\nBuild the version map from the specified source of the provided mappings."
-        ],
-        "signature": [
-          "({ mappings, source, knownTypes, }: ",
-          "GetModelVersionsFromMappingsOpts",
-          ") => ",
-          {
-            "pluginId": "@kbn/core-saved-objects-base-server-internal",
-            "scope": "common",
-            "docId": "kibKbnCoreSavedObjectsBaseServerInternalPluginApi",
-            "section": "def-common.ModelVersionMap",
-            "text": "ModelVersionMap"
-          },
-          " | undefined"
-        ],
-        "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
-            "id": "def-common.getModelVersionsFromMappings.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "{\n  mappings,\n  source,\n  knownTypes,\n}",
-            "description": [],
-            "signature": [
-              "GetModelVersionsFromMappingsOpts"
-            ],
-            "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
         "id": "def-common.getProperty",
@@ -884,6 +892,153 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+        "id": "def-common.getVirtualVersionMap",
+        "type": "Function",
+        "tags": [],
+        "label": "getVirtualVersionMap",
+        "description": [
+          "\nReturns a map of virtual model version for the given types.\nSee {@link getCurrentVirtualVersion}"
+        ],
+        "signature": [
+          "(types: ",
+          {
+            "pluginId": "@kbn/core-saved-objects-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSavedObjectsServerPluginApi",
+            "section": "def-common.SavedObjectsType",
+            "text": "SavedObjectsType"
+          },
+          "<any>[]) => ",
+          {
+            "pluginId": "@kbn/core-saved-objects-base-server-internal",
+            "scope": "common",
+            "docId": "kibKbnCoreSavedObjectsBaseServerInternalPluginApi",
+            "section": "def-common.VirtualVersionMap",
+            "text": "VirtualVersionMap"
+          }
+        ],
+        "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+            "id": "def-common.getVirtualVersionMap.$1",
+            "type": "Array",
+            "tags": [],
+            "label": "types",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-saved-objects-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSavedObjectsServerPluginApi",
+                "section": "def-common.SavedObjectsType",
+                "text": "SavedObjectsType"
+              },
+              "<any>[]"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+        "id": "def-common.getVirtualVersionsFromMappingMeta",
+        "type": "Function",
+        "tags": [],
+        "label": "getVirtualVersionsFromMappingMeta",
+        "description": [
+          "\nBuild the version map from the specified source of the provided mappings meta."
+        ],
+        "signature": [
+          "({ meta, source, knownTypes, }: ",
+          "GetModelVersionsFromMappingMetaOpts",
+          ") => ",
+          {
+            "pluginId": "@kbn/core-saved-objects-base-server-internal",
+            "scope": "common",
+            "docId": "kibKbnCoreSavedObjectsBaseServerInternalPluginApi",
+            "section": "def-common.VirtualVersionMap",
+            "text": "VirtualVersionMap"
+          },
+          " | undefined"
+        ],
+        "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+            "id": "def-common.getVirtualVersionsFromMappingMeta.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  meta,\n  source,\n  knownTypes,\n}",
+            "description": [],
+            "signature": [
+              "GetModelVersionsFromMappingMetaOpts"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+        "id": "def-common.getVirtualVersionsFromMappings",
+        "type": "Function",
+        "tags": [],
+        "label": "getVirtualVersionsFromMappings",
+        "description": [
+          "\nBuild the version map from the specified source of the provided mappings."
+        ],
+        "signature": [
+          "({ mappings, source, knownTypes, }: ",
+          "GetModelVersionsFromMappingsOpts",
+          ") => ",
+          {
+            "pluginId": "@kbn/core-saved-objects-base-server-internal",
+            "scope": "common",
+            "docId": "kibKbnCoreSavedObjectsBaseServerInternalPluginApi",
+            "section": "def-common.VirtualVersionMap",
+            "text": "VirtualVersionMap"
+          },
+          " | undefined"
+        ],
+        "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+            "id": "def-common.getVirtualVersionsFromMappings.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  mappings,\n  source,\n  knownTypes,\n}",
+            "description": [],
+            "signature": [
+              "GetModelVersionsFromMappingsOpts"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
         "id": "def-common.isVirtualModelVersion",
@@ -1068,7 +1223,7 @@
               "The latest model version of the types registered in the application"
             ],
             "signature": [
-              "{ [x: string]: number; }"
+              "{ [x: string]: string; }"
             ],
             "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.ts",
             "deprecated": false,
@@ -1084,7 +1239,7 @@
               "The model version stored in the index"
             ],
             "signature": [
-              "{ [x: string]: number; }"
+              "{ [x: string]: string; }"
             ],
             "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.ts",
             "deprecated": false,
@@ -1183,7 +1338,9 @@
         "type": "Type",
         "tags": [],
         "label": "ModelVersionMap",
-        "description": [],
+        "description": [
+          "\nA map of SO type name to Model Version."
+        ],
         "signature": [
           "{ [x: string]: number; }"
         ],
@@ -1254,6 +1411,23 @@
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-saved-objects-base-server-internal",
+        "id": "def-common.VirtualVersionMap",
+        "type": "Type",
+        "tags": [],
+        "label": "VirtualVersionMap",
+        "description": [
+          "\nA map of SO type name to {@link VirtualVersion}."
+        ],
+        "signature": [
+          "{ [x: string]: string; }"
+        ],
+        "path": "packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
       }
     ],
     "objects": [
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 c86307074439df..d5fa0a63ffe324 100644
--- a/api_docs/kbn_core_saved_objects_base_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-internal
 title: "@kbn/core-saved-objects-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 72 | 0 | 52 | 9 |
+| 79 | 0 | 55 | 9 |
 
 ## Common
 
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 06ffbdf8139876..ac1325b1c05788 100644
--- a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-mocks
 title: "@kbn/core-saved-objects-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 c802600494ad7b..08a7f7f001f262 100644
--- a/api_docs/kbn_core_saved_objects_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser
 title: "@kbn/core-saved-objects-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser plugin
-date: 2023-04-27
+date: 2023-05-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 b30d6e2bc48500..588cccbbbd4a69 100644
--- a/api_docs/kbn_core_saved_objects_browser_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-internal
 title: "@kbn/core-saved-objects-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 d8bf8266bd2b21..482e6ce5f02745 100644
--- a/api_docs/kbn_core_saved_objects_browser_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-mocks
 title: "@kbn/core-saved-objects-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 9b9113df93f0ad..9edb57cdae6689 100644
--- a/api_docs/kbn_core_saved_objects_common.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_common.devdocs.json
@@ -361,6 +361,20 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "@kbn/core-saved-objects-common",
+            "id": "def-common.SavedObjectsImportFailure.managed",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "managed",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-common/src/saved_objects_imports.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "@kbn/core-saved-objects-common",
             "id": "def-common.SavedObjectsImportFailure.error",
@@ -821,6 +835,22 @@
             "path": "packages/core/saved-objects/core-saved-objects-common/src/saved_objects_imports.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-saved-objects-common",
+            "id": "def-common.SavedObjectsImportSuccess.managed",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "managed",
+            "description": [
+              "\nFlag indicating if a saved object is managed by Kibana (default=false)\n\nThis can be leveraged by applications to e.g. prevent edits to a managed\nsaved object. Instead, users can be guided to create a copy first and\nmake their edits to the copy."
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-common/src/saved_objects_imports.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -1523,22 +1553,6 @@
             "plugin": "savedObjectsTagging",
             "path": "x-pack/plugins/saved_objects_tagging/public/utils.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
           {
             "plugin": "lists",
             "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts"
@@ -1683,18 +1697,6 @@
             "plugin": "data",
             "path": "src/plugins/data/server/search/saved_objects/search_session_migration.test.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/user_actions/operations/find.ts"
-          },
           {
             "plugin": "synthetics",
             "path": "x-pack/plugins/synthetics/public/apps/synthetics/state/monitor_list/api.ts"
@@ -3036,18 +3038,6 @@
             "plugin": "cases",
             "path": "x-pack/plugins/cases/server/attachment_framework/so_references.ts"
           },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
-          {
-            "plugin": "cases",
-            "path": "x-pack/plugins/cases/server/services/so_references.ts"
-          },
           {
             "plugin": "maps",
             "path": "x-pack/plugins/maps/common/migrations/references.ts"
diff --git a/api_docs/kbn_core_saved_objects_common.mdx b/api_docs/kbn_core_saved_objects_common.mdx
index a563ea1524eda3..2e55ce5ce25c02 100644
--- a/api_docs/kbn_core_saved_objects_common.mdx
+++ b/api_docs/kbn_core_saved_objects_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-common
 title: "@kbn/core-saved-objects-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-common plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-common']
 ---
 import kbnCoreSavedObjectsCommonObj from './kbn_core_saved_objects_common.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 71 | 0 | 39 | 0 |
+| 73 | 0 | 40 | 0 |
 
 ## Common
 
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 3cf92d703c7641..1395fd377174cc 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-internal
 title: "@kbn/core-saved-objects-import-export-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 deb06a6eacf716..072a802c2884b2 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-mocks
 title: "@kbn/core-saved-objects-import-export-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_core_saved_objects_migration_server_internal.devdocs.json
index d9b7b598d7b019..2ec6e2008b1f41 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_internal.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_migration_server_internal.devdocs.json
@@ -2454,27 +2454,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -2652,7 +2632,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
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 9a60e5aced65f5..77f7224395b6d7 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-internal
 title: "@kbn/core-saved-objects-migration-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 90156f9bed2ee1..f9837f90d7b35f 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-mocks
 title: "@kbn/core-saved-objects-migration-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 db878f71855c7b..900706780d56c6 100644
--- a/api_docs/kbn_core_saved_objects_server.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_server.devdocs.json
@@ -7570,6 +7570,22 @@
             "path": "packages/core/saved-objects/core-saved-objects-server/src/import.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-saved-objects-server",
+            "id": "def-common.SavedObjectsImportOptions.managed",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "managed",
+            "description": [
+              "\nIf true, will import as a managed object, else will import as not managed.\n\nThis can be leveraged by applications to e.g. prevent edits to a managed\nsaved object. Instead, users can be guided to create a copy first and\nmake their edits to the copy."
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-server/src/import.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -8776,6 +8792,22 @@
             "path": "packages/core/saved-objects/core-saved-objects-server/src/import.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-saved-objects-server",
+            "id": "def-common.SavedObjectsResolveImportErrorsOptions.managed",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "managed",
+            "description": [
+              "\nIf true, will import as a managed object, else will import as not managed.\n\nThis can be leveraged by applications to e.g. prevent edits to a managed\nsaved object. Instead, users can be guided to create a copy first and\nmake their edits to the copy."
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/core/saved-objects/core-saved-objects-server/src/import.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/kbn_core_saved_objects_server.mdx b/api_docs/kbn_core_saved_objects_server.mdx
index 4fd36961074b21..e7ad364d43c921 100644
--- a/api_docs/kbn_core_saved_objects_server.mdx
+++ b/api_docs/kbn_core_saved_objects_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server
 title: "@kbn/core-saved-objects-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server']
 ---
 import kbnCoreSavedObjectsServerObj from './kbn_core_saved_objects_server.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 510 | 1 | 106 | 4 |
+| 512 | 1 | 106 | 4 |
 
 ## Common
 
diff --git a/api_docs/kbn_core_saved_objects_server_internal.mdx b/api_docs/kbn_core_saved_objects_server_internal.mdx
index 0aff49259eba8f..2d94a1423e1f48 100644
--- a/api_docs/kbn_core_saved_objects_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-internal
 title: "@kbn/core-saved-objects-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 0d384775948b37..9f90c262c567d0 100644
--- a/api_docs/kbn_core_saved_objects_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-mocks
 title: "@kbn/core-saved-objects-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 512702bd0cc25c..7cabdc9d3e20b3 100644
--- a/api_docs/kbn_core_saved_objects_utils_server.mdx
+++ b/api_docs/kbn_core_saved_objects_utils_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-utils-server
 title: "@kbn/core-saved-objects-utils-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-utils-server plugin
-date: 2023-04-27
+date: 2023-05-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_status_common.mdx b/api_docs/kbn_core_status_common.mdx
index 8482b3b1b3865f..d69103579b021b 100644
--- a/api_docs/kbn_core_status_common.mdx
+++ b/api_docs/kbn_core_status_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common
 title: "@kbn/core-status-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common plugin
-date: 2023-04-27
+date: 2023-05-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 9459057d37cd09..262d30ebce8e08 100644
--- a/api_docs/kbn_core_status_common_internal.mdx
+++ b/api_docs/kbn_core_status_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common-internal
 title: "@kbn/core-status-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common-internal plugin
-date: 2023-04-27
+date: 2023-05-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 9c1c532c833bc8..fa2c663855de93 100644
--- a/api_docs/kbn_core_status_server.mdx
+++ b/api_docs/kbn_core_status_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server
 title: "@kbn/core-status-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server plugin
-date: 2023-04-27
+date: 2023-05-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 f8dc4561cee6cc..fbf346ff4f4af0 100644
--- a/api_docs/kbn_core_status_server_internal.mdx
+++ b/api_docs/kbn_core_status_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-internal
 title: "@kbn/core-status-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 988af311b482de..4ed1193d9fc880 100644
--- a/api_docs/kbn_core_status_server_mocks.mdx
+++ b/api_docs/kbn_core_status_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-mocks
 title: "@kbn/core-status-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 06e60f7d57c8a6..7ca3a629205ab6 100644
--- a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
+++ b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-deprecations-getters
 title: "@kbn/core-test-helpers-deprecations-getters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-deprecations-getters plugin
-date: 2023-04-27
+date: 2023-05-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 d7079ea720648f..c1e731ddba06ab 100644
--- a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
+++ b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-http-setup-browser
 title: "@kbn/core-test-helpers-http-setup-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-http-setup-browser plugin
-date: 2023-04-27
+date: 2023-05-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 bc5d7eb7c539f4..09c044e82c0572 100644
--- a/api_docs/kbn_core_test_helpers_kbn_server.mdx
+++ b/api_docs/kbn_core_test_helpers_kbn_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-kbn-server
 title: "@kbn/core-test-helpers-kbn-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-kbn-server plugin
-date: 2023-04-27
+date: 2023-05-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_so_type_serializer.mdx b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
index bccc9a500f96ea..ebf78d0f6071c2 100644
--- a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
+++ b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-so-type-serializer
 title: "@kbn/core-test-helpers-so-type-serializer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-so-type-serializer plugin
-date: 2023-04-27
+date: 2023-05-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 71fd222bbdbe74..862f26f8360306 100644
--- a/api_docs/kbn_core_test_helpers_test_utils.mdx
+++ b/api_docs/kbn_core_test_helpers_test_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-test-utils
 title: "@kbn/core-test-helpers-test-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-test-utils plugin
-date: 2023-04-27
+date: 2023-05-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 dba24e5303d399..8110a4a0613d9e 100644
--- a/api_docs/kbn_core_theme_browser.mdx
+++ b/api_docs/kbn_core_theme_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser
 title: "@kbn/core-theme-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser plugin
-date: 2023-04-27
+date: 2023-05-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_internal.mdx b/api_docs/kbn_core_theme_browser_internal.mdx
index e832bad309f631..d8619f36fcabc4 100644
--- a/api_docs/kbn_core_theme_browser_internal.mdx
+++ b/api_docs/kbn_core_theme_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-internal
 title: "@kbn/core-theme-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-internal']
 ---
 import kbnCoreThemeBrowserInternalObj from './kbn_core_theme_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser_mocks.mdx b/api_docs/kbn_core_theme_browser_mocks.mdx
index 7c68b48c12d8a1..a9ef485e5387d1 100644
--- a/api_docs/kbn_core_theme_browser_mocks.mdx
+++ b/api_docs/kbn_core_theme_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-mocks
 title: "@kbn/core-theme-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 63bab8c956e9b2..0283a2719cbd8a 100644
--- a/api_docs/kbn_core_ui_settings_browser.mdx
+++ b/api_docs/kbn_core_ui_settings_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser
 title: "@kbn/core-ui-settings-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser plugin
-date: 2023-04-27
+date: 2023-05-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 a2d492393524ac..77a874b0c8b1e1 100644
--- a/api_docs/kbn_core_ui_settings_browser_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-internal
 title: "@kbn/core-ui-settings-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-internal plugin
-date: 2023-04-27
+date: 2023-05-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 cb5ee668fccf08..8ef4d9f97f4f03 100644
--- a/api_docs/kbn_core_ui_settings_browser_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-mocks
 title: "@kbn/core-ui-settings-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 a32a908687cca8..aabe3197c8c66c 100644
--- a/api_docs/kbn_core_ui_settings_common.mdx
+++ b/api_docs/kbn_core_ui_settings_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-common
 title: "@kbn/core-ui-settings-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-common plugin
-date: 2023-04-27
+date: 2023-05-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 25ab1078e6aed1..bd9bdb11d80304 100644
--- a/api_docs/kbn_core_ui_settings_server.mdx
+++ b/api_docs/kbn_core_ui_settings_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server
 title: "@kbn/core-ui-settings-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server plugin
-date: 2023-04-27
+date: 2023-05-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 2c4a4ebc2c3539..81fd17e76d2b50 100644
--- a/api_docs/kbn_core_ui_settings_server_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-internal
 title: "@kbn/core-ui-settings-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 9d9994ddda6893..2236c02c290b2c 100644
--- a/api_docs/kbn_core_ui_settings_server_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-mocks
 title: "@kbn/core-ui-settings-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 efb34fe257e4a0..f3ec952e372e56 100644
--- a/api_docs/kbn_core_usage_data_server.mdx
+++ b/api_docs/kbn_core_usage_data_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server
 title: "@kbn/core-usage-data-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server plugin
-date: 2023-04-27
+date: 2023-05-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 17e4ae265f2a0e..dae96d610437cb 100644
--- a/api_docs/kbn_core_usage_data_server_internal.mdx
+++ b/api_docs/kbn_core_usage_data_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-internal
 title: "@kbn/core-usage-data-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-internal plugin
-date: 2023-04-27
+date: 2023-05-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 713bcd6a74eefb..de2e800bb28954 100644
--- a/api_docs/kbn_core_usage_data_server_mocks.mdx
+++ b/api_docs/kbn_core_usage_data_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-mocks
 title: "@kbn/core-usage-data-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 e30b106305a9f4..ebfd18db3f524f 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: 2023-04-27
+date: 2023-05-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 d521e7d08ce0bb..2b13d3142c24e4 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: 2023-04-27
+date: 2023-05-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 ef990ed9dc59b9..d62ee56946fc72 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: 2023-04-27
+date: 2023-05-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 5914643af5bb9a..8fe67a6c2becad 100644
--- a/api_docs/kbn_crypto.mdx
+++ b/api_docs/kbn_crypto.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto
 title: "@kbn/crypto"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto plugin
-date: 2023-04-27
+date: 2023-05-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 e88de155ed6cef..dc4a139fe94fbc 100644
--- a/api_docs/kbn_crypto_browser.mdx
+++ b/api_docs/kbn_crypto_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto-browser
 title: "@kbn/crypto-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto-browser plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto-browser']
 ---
 import kbnCryptoBrowserObj from './kbn_crypto_browser.devdocs.json';
diff --git a/api_docs/kbn_cypress_config.mdx b/api_docs/kbn_cypress_config.mdx
index 4fa6f2621a9f7c..7f47901750fc49 100644
--- a/api_docs/kbn_cypress_config.mdx
+++ b/api_docs/kbn_cypress_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cypress-config
 title: "@kbn/cypress-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cypress-config plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cypress-config']
 ---
 import kbnCypressConfigObj from './kbn_cypress_config.devdocs.json';
diff --git a/api_docs/kbn_datemath.mdx b/api_docs/kbn_datemath.mdx
index b265209255e1b8..83f4cd178be3e2 100644
--- a/api_docs/kbn_datemath.mdx
+++ b/api_docs/kbn_datemath.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-datemath
 title: "@kbn/datemath"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/datemath plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/datemath']
 ---
 import kbnDatemathObj from './kbn_datemath.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_errors.mdx b/api_docs/kbn_dev_cli_errors.mdx
index 6f4dcf7c497c30..da8d00957ce6bf 100644
--- a/api_docs/kbn_dev_cli_errors.mdx
+++ b/api_docs/kbn_dev_cli_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-errors
 title: "@kbn/dev-cli-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-errors plugin
-date: 2023-04-27
+date: 2023-05-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 4d4afd51ef0e25..f1e91918c394c3 100644
--- a/api_docs/kbn_dev_cli_runner.mdx
+++ b/api_docs/kbn_dev_cli_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-runner
 title: "@kbn/dev-cli-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-runner plugin
-date: 2023-04-27
+date: 2023-05-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 9ee8ce793c7cbe..09201cfe221b4d 100644
--- a/api_docs/kbn_dev_proc_runner.mdx
+++ b/api_docs/kbn_dev_proc_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-proc-runner
 title: "@kbn/dev-proc-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-proc-runner plugin
-date: 2023-04-27
+date: 2023-05-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 4e5245d0f6ddfc..8d668d174eeef4 100644
--- a/api_docs/kbn_dev_utils.mdx
+++ b/api_docs/kbn_dev_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-utils
 title: "@kbn/dev-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-utils plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-utils']
 ---
 import kbnDevUtilsObj from './kbn_dev_utils.devdocs.json';
diff --git a/api_docs/kbn_doc_links.devdocs.json b/api_docs/kbn_doc_links.devdocs.json
index 496205404ca2d1..efa47417fc7938 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 apiKeys: string; readonly behavioralAnalytics: string; readonly behavioralAnalyticsEvents: string; readonly bulkApi: string; readonly configuration: string; readonly connectors: string; readonly connectorsAzureBlobStorage: string; readonly connectorsGoogleCloudStorage: string; readonly connectorsMicrosoftSQL: string; readonly connectorsMongoDB: string; readonly connectorsMySQL: string; readonly connectorsNetworkDrive: string; readonly connectorsOracle: string; readonly connectorsPostgreSQL: string; readonly connectorsS3: string; readonly connectorsWorkplaceSearch: string; readonly crawlerExtractionRules: string; readonly crawlerManaging: string; readonly crawlerOverview: string; readonly deployTrainedModels: string; readonly documentLevelSecurity: string; readonly elser: string; readonly engines: string; readonly ingestionApis: string; readonly ingestPipelines: string; readonly languageAnalyzers: string; readonly languageClients: string; readonly licenseManagement: string; readonly machineLearningStart: string; readonly mailService: string; readonly mlDocumentEnrichment: string; readonly start: string; readonly syncRules: string; readonly troubleshootSetup: string; readonly usersAccess: string; }"
+              "{ readonly apiKeys: string; readonly behavioralAnalytics: string; readonly behavioralAnalyticsEvents: string; readonly buildConnector: string; readonly bulkApi: string; readonly configuration: string; readonly connectors: string; readonly connectorsAzureBlobStorage: string; readonly connectorsGoogleCloudStorage: string; readonly connectorsMicrosoftSQL: string; readonly connectorsMongoDB: string; readonly connectorsMySQL: string; readonly connectorsNetworkDrive: string; readonly connectorsOracle: string; readonly connectorsPostgreSQL: string; readonly connectorsS3: string; readonly connectorsWorkplaceSearch: string; readonly crawlerExtractionRules: string; readonly crawlerManaging: string; readonly crawlerOverview: string; readonly deployTrainedModels: string; readonly documentLevelSecurity: string; readonly elser: string; readonly engines: string; readonly ingestionApis: string; readonly ingestPipelines: string; readonly languageAnalyzers: string; readonly languageClients: string; readonly licenseManagement: string; readonly machineLearningStart: string; readonly mailService: string; readonly mlDocumentEnrichment: string; readonly start: string; readonly syncRules: 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 9259f8c14dd1d4..ebde20f97c11e3 100644
--- a/api_docs/kbn_doc_links.mdx
+++ b/api_docs/kbn_doc_links.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-doc-links
 title: "@kbn/doc-links"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/doc-links plugin
-date: 2023-04-27
+date: 2023-05-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 74528d613da823..b156bddfb1fad4 100644
--- a/api_docs/kbn_docs_utils.mdx
+++ b/api_docs/kbn_docs_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-docs-utils
 title: "@kbn/docs-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/docs-utils plugin
-date: 2023-04-27
+date: 2023-05-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 c2dcf776825b19..1890f724661a30 100644
--- a/api_docs/kbn_dom_drag_drop.mdx
+++ b/api_docs/kbn_dom_drag_drop.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dom-drag-drop
 title: "@kbn/dom-drag-drop"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dom-drag-drop plugin
-date: 2023-04-27
+date: 2023-05-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 31cec61a5b9262..3b8acf46301bab 100644
--- a/api_docs/kbn_ebt_tools.mdx
+++ b/api_docs/kbn_ebt_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ebt-tools
 title: "@kbn/ebt-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ebt-tools plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt-tools']
 ---
 import kbnEbtToolsObj from './kbn_ebt_tools.devdocs.json';
diff --git a/api_docs/kbn_ecs.mdx b/api_docs/kbn_ecs.mdx
index c87334df626fb2..8029cf7afce160 100644
--- a/api_docs/kbn_ecs.mdx
+++ b/api_docs/kbn_ecs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ecs
 title: "@kbn/ecs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ecs plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ecs']
 ---
 import kbnEcsObj from './kbn_ecs.devdocs.json';
diff --git a/api_docs/kbn_ecs_data_quality_dashboard.mdx b/api_docs/kbn_ecs_data_quality_dashboard.mdx
index f100981f85de55..41f16366edbc07 100644
--- a/api_docs/kbn_ecs_data_quality_dashboard.mdx
+++ b/api_docs/kbn_ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ecs-data-quality-dashboard
 title: "@kbn/ecs-data-quality-dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ecs-data-quality-dashboard plugin
-date: 2023-04-27
+date: 2023-05-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_es.mdx b/api_docs/kbn_es.mdx
index 357732bf29f753..ff89b967b7d717 100644
--- a/api_docs/kbn_es.mdx
+++ b/api_docs/kbn_es.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es
 title: "@kbn/es"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es plugin
-date: 2023-04-27
+date: 2023-05-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 d6329b1c1c40d8..fb738c1d325bdd 100644
--- a/api_docs/kbn_es_archiver.mdx
+++ b/api_docs/kbn_es_archiver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-archiver
 title: "@kbn/es-archiver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-archiver plugin
-date: 2023-04-27
+date: 2023-05-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 1e06c5d6303d21..cc10622a7a1ad2 100644
--- a/api_docs/kbn_es_errors.mdx
+++ b/api_docs/kbn_es_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-errors
 title: "@kbn/es-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-errors plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_es_query.devdocs.json
index 02a3068d886271..907f96c6e99ddf 100644
--- a/api_docs/kbn_es_query.devdocs.json
+++ b/api_docs/kbn_es_query.devdocs.json
@@ -5328,7 +5328,7 @@
             "label": "function",
             "description": [],
             "signature": [
-              "\"nested\" | \"is\" | \"and\" | \"or\" | \"not\" | \"range\" | \"exists\""
+              "\"nested\" | \"is\" | \"exists\" | \"range\" | \"and\" | \"or\" | \"not\""
             ],
             "path": "packages/kbn-es-query/src/kuery/node_types/types.ts",
             "deprecated": false,
@@ -6425,8 +6425,8 @@
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
                 "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.FunctionTypeBuildNode",
-                "text": "FunctionTypeBuildNode"
+                "section": "def-common.KueryNode",
+                "text": "KueryNode"
               }
             ],
             "path": "packages/kbn-es-query/src/kuery/node_types/node_builder.ts",
@@ -6594,8 +6594,8 @@
                 "pluginId": "@kbn/es-query",
                 "scope": "common",
                 "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.FunctionTypeBuildNode",
-                "text": "FunctionTypeBuildNode"
+                "section": "def-common.KueryNode",
+                "text": "KueryNode"
               }
             ],
             "path": "packages/kbn-es-query/src/kuery/node_types/node_builder.ts",
diff --git a/api_docs/kbn_es_query.mdx b/api_docs/kbn_es_query.mdx
index b8d355922dd2de..89c02f9d827e69 100644
--- a/api_docs/kbn_es_query.mdx
+++ b/api_docs/kbn_es_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-query
 title: "@kbn/es-query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-query plugin
-date: 2023-04-27
+date: 2023-05-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 395dd6b5c51e09..1d46f44755dfde 100644
--- a/api_docs/kbn_es_types.mdx
+++ b/api_docs/kbn_es_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-types
 title: "@kbn/es-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-types plugin
-date: 2023-04-27
+date: 2023-05-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 2d4de7f8999f9f..46b63f6a3ad6e0 100644
--- a/api_docs/kbn_eslint_plugin_imports.mdx
+++ b/api_docs/kbn_eslint_plugin_imports.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-eslint-plugin-imports
 title: "@kbn/eslint-plugin-imports"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/eslint-plugin-imports plugin
-date: 2023-04-27
+date: 2023-05-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_expandable_flyout.mdx b/api_docs/kbn_expandable_flyout.mdx
index 2382e4b08ed549..1afa7c818eb477 100644
--- a/api_docs/kbn_expandable_flyout.mdx
+++ b/api_docs/kbn_expandable_flyout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-expandable-flyout
 title: "@kbn/expandable-flyout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/expandable-flyout plugin
-date: 2023-04-27
+date: 2023-05-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 101502ea0f43e1..2e659e77001b77 100644
--- a/api_docs/kbn_field_types.mdx
+++ b/api_docs/kbn_field_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-types
 title: "@kbn/field-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/field-types plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-types']
 ---
 import kbnFieldTypesObj from './kbn_field_types.devdocs.json';
diff --git a/api_docs/kbn_find_used_node_modules.mdx b/api_docs/kbn_find_used_node_modules.mdx
index 3dab0b2fd6db87..3a7d3d12547ae3 100644
--- a/api_docs/kbn_find_used_node_modules.mdx
+++ b/api_docs/kbn_find_used_node_modules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-find-used-node-modules
 title: "@kbn/find-used-node-modules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/find-used-node-modules plugin
-date: 2023-04-27
+date: 2023-05-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_ftr_common_functional_services.mdx b/api_docs/kbn_ftr_common_functional_services.mdx
index 6c43e30c92d8b3..f54cb36ed63937 100644
--- a/api_docs/kbn_ftr_common_functional_services.mdx
+++ b/api_docs/kbn_ftr_common_functional_services.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-services
 title: "@kbn/ftr-common-functional-services"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ftr-common-functional-services plugin
-date: 2023-04-27
+date: 2023-05-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_generate.mdx b/api_docs/kbn_generate.mdx
index 5c4a85299c1bd1..b8c70b8c2809f6 100644
--- a/api_docs/kbn_generate.mdx
+++ b/api_docs/kbn_generate.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate
 title: "@kbn/generate"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate']
 ---
 import kbnGenerateObj from './kbn_generate.devdocs.json';
diff --git a/api_docs/kbn_generate_csv.mdx b/api_docs/kbn_generate_csv.mdx
index d6f2c89e6bb1ab..e74750969e7766 100644
--- a/api_docs/kbn_generate_csv.mdx
+++ b/api_docs/kbn_generate_csv.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-csv
 title: "@kbn/generate-csv"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-csv plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv']
 ---
 import kbnGenerateCsvObj from './kbn_generate_csv.devdocs.json';
diff --git a/api_docs/kbn_generate_csv_types.mdx b/api_docs/kbn_generate_csv_types.mdx
index 2fee067ad8c17a..d3a4173d07201d 100644
--- a/api_docs/kbn_generate_csv_types.mdx
+++ b/api_docs/kbn_generate_csv_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-csv-types
 title: "@kbn/generate-csv-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-csv-types plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv-types']
 ---
 import kbnGenerateCsvTypesObj from './kbn_generate_csv_types.devdocs.json';
diff --git a/api_docs/kbn_guided_onboarding.mdx b/api_docs/kbn_guided_onboarding.mdx
index 07deba68e13bdd..bdc1d8287d850d 100644
--- a/api_docs/kbn_guided_onboarding.mdx
+++ b/api_docs/kbn_guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-guided-onboarding
 title: "@kbn/guided-onboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/guided-onboarding plugin
-date: 2023-04-27
+date: 2023-05-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 c820a4821bac25..f57f175ed0afdb 100644
--- a/api_docs/kbn_handlebars.mdx
+++ b/api_docs/kbn_handlebars.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-handlebars
 title: "@kbn/handlebars"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/handlebars plugin
-date: 2023-04-27
+date: 2023-05-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 0ac09fdb052548..f70c8e46066bc0 100644
--- a/api_docs/kbn_hapi_mocks.mdx
+++ b/api_docs/kbn_hapi_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-hapi-mocks
 title: "@kbn/hapi-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/hapi-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 f683d4a7aa831d..52a186e26deccd 100644
--- a/api_docs/kbn_health_gateway_server.mdx
+++ b/api_docs/kbn_health_gateway_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-health-gateway-server
 title: "@kbn/health-gateway-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/health-gateway-server plugin
-date: 2023-04-27
+date: 2023-05-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 34a1c3d1992ebb..690880b9ec6673 100644
--- a/api_docs/kbn_home_sample_data_card.mdx
+++ b/api_docs/kbn_home_sample_data_card.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-card
 title: "@kbn/home-sample-data-card"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-card plugin
-date: 2023-04-27
+date: 2023-05-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 9aaf7459be1675..5ee8d6f1927c6e 100644
--- a/api_docs/kbn_home_sample_data_tab.mdx
+++ b/api_docs/kbn_home_sample_data_tab.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-tab
 title: "@kbn/home-sample-data-tab"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-tab plugin
-date: 2023-04-27
+date: 2023-05-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 d00d936014d1e9..5d24a2ab60ea8e 100644
--- a/api_docs/kbn_i18n.mdx
+++ b/api_docs/kbn_i18n.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n
 title: "@kbn/i18n"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n plugin
-date: 2023-04-27
+date: 2023-05-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 55fdd69f8bbdf1..9bc204e9bfcd06 100644
--- a/api_docs/kbn_i18n_react.mdx
+++ b/api_docs/kbn_i18n_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n-react
 title: "@kbn/i18n-react"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n-react plugin
-date: 2023-04-27
+date: 2023-05-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 9e481364f47424..1d68d62adc7566 100644
--- a/api_docs/kbn_import_resolver.mdx
+++ b/api_docs/kbn_import_resolver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-import-resolver
 title: "@kbn/import-resolver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/import-resolver plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/import-resolver']
 ---
 import kbnImportResolverObj from './kbn_import_resolver.devdocs.json';
diff --git a/api_docs/kbn_interpreter.mdx b/api_docs/kbn_interpreter.mdx
index 920949385b4304..8a2aa19a4a8509 100644
--- a/api_docs/kbn_interpreter.mdx
+++ b/api_docs/kbn_interpreter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-interpreter
 title: "@kbn/interpreter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/interpreter plugin
-date: 2023-04-27
+date: 2023-05-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 bbd5bc89098a50..2011412663cf45 100644
--- a/api_docs/kbn_io_ts_utils.mdx
+++ b/api_docs/kbn_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-io-ts-utils
 title: "@kbn/io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/io-ts-utils plugin
-date: 2023-04-27
+date: 2023-05-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 fdbb096a99ffe9..614c09f2ae7c7e 100644
--- a/api_docs/kbn_jest_serializers.mdx
+++ b/api_docs/kbn_jest_serializers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-jest-serializers
 title: "@kbn/jest-serializers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/jest-serializers plugin
-date: 2023-04-27
+date: 2023-05-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 dee3adcbd598ca..cf1fd9220d5c4e 100644
--- a/api_docs/kbn_journeys.mdx
+++ b/api_docs/kbn_journeys.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-journeys
 title: "@kbn/journeys"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/journeys plugin
-date: 2023-04-27
+date: 2023-05-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 ac8c10fd75439d..663904b9c24a94 100644
--- a/api_docs/kbn_json_ast.mdx
+++ b/api_docs/kbn_json_ast.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-json-ast
 title: "@kbn/json-ast"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/json-ast plugin
-date: 2023-04-27
+date: 2023-05-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 35f81141ef2987..6537f8da23e788 100644
--- a/api_docs/kbn_kibana_manifest_schema.mdx
+++ b/api_docs/kbn_kibana_manifest_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-kibana-manifest-schema
 title: "@kbn/kibana-manifest-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/kibana-manifest-schema plugin
-date: 2023-04-27
+date: 2023-05-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 b064ac1d06372f..732ee400e1d113 100644
--- a/api_docs/kbn_language_documentation_popover.mdx
+++ b/api_docs/kbn_language_documentation_popover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-language-documentation-popover
 title: "@kbn/language-documentation-popover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/language-documentation-popover plugin
-date: 2023-04-27
+date: 2023-05-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_logging.mdx b/api_docs/kbn_logging.mdx
index 73b77ab09688b8..fa2b913b562918 100644
--- a/api_docs/kbn_logging.mdx
+++ b/api_docs/kbn_logging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging
 title: "@kbn/logging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging plugin
-date: 2023-04-27
+date: 2023-05-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 66ae59998813e8..3905dd2babfd46 100644
--- a/api_docs/kbn_logging_mocks.mdx
+++ b/api_docs/kbn_logging_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging-mocks
 title: "@kbn/logging-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging-mocks plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging-mocks']
 ---
 import kbnLoggingMocksObj from './kbn_logging_mocks.devdocs.json';
diff --git a/api_docs/kbn_managed_vscode_config.mdx b/api_docs/kbn_managed_vscode_config.mdx
index a6c778a0773737..c22eaf624e6f80 100644
--- a/api_docs/kbn_managed_vscode_config.mdx
+++ b/api_docs/kbn_managed_vscode_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-vscode-config
 title: "@kbn/managed-vscode-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/managed-vscode-config plugin
-date: 2023-04-27
+date: 2023-05-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_mapbox_gl.mdx b/api_docs/kbn_mapbox_gl.mdx
index 34739252d713f1..240428161d7879 100644
--- a/api_docs/kbn_mapbox_gl.mdx
+++ b/api_docs/kbn_mapbox_gl.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mapbox-gl
 title: "@kbn/mapbox-gl"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/mapbox-gl plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mapbox-gl']
 ---
 import kbnMapboxGlObj from './kbn_mapbox_gl.devdocs.json';
diff --git a/api_docs/kbn_ml_agg_utils.mdx b/api_docs/kbn_ml_agg_utils.mdx
index 9e03cc86720849..c355df11ed99e8 100644
--- a/api_docs/kbn_ml_agg_utils.mdx
+++ b/api_docs/kbn_ml_agg_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-agg-utils
 title: "@kbn/ml-agg-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-agg-utils plugin
-date: 2023-04-27
+date: 2023-05-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_date_picker.mdx b/api_docs/kbn_ml_date_picker.mdx
index eb8cce8679e52c..81191e9d2823fe 100644
--- a/api_docs/kbn_ml_date_picker.mdx
+++ b/api_docs/kbn_ml_date_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-date-picker
 title: "@kbn/ml-date-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-date-picker plugin
-date: 2023-04-27
+date: 2023-05-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_error_utils.mdx b/api_docs/kbn_ml_error_utils.mdx
index ae3903918ee8f1..30257a29a8ef46 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: 2023-04-27
+date: 2023-05-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_is_defined.mdx b/api_docs/kbn_ml_is_defined.mdx
index ca48207bb0ba6b..0156a9bf0af567 100644
--- a/api_docs/kbn_ml_is_defined.mdx
+++ b/api_docs/kbn_ml_is_defined.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-defined
 title: "@kbn/ml-is-defined"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-defined plugin
-date: 2023-04-27
+date: 2023-05-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 9e0d723af5baf4..64adbf9b244eb8 100644
--- a/api_docs/kbn_ml_is_populated_object.mdx
+++ b/api_docs/kbn_ml_is_populated_object.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-populated-object
 title: "@kbn/ml-is-populated-object"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-populated-object plugin
-date: 2023-04-27
+date: 2023-05-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_local_storage.mdx b/api_docs/kbn_ml_local_storage.mdx
index 3cab853d922c82..129b6a3c8a23db 100644
--- a/api_docs/kbn_ml_local_storage.mdx
+++ b/api_docs/kbn_ml_local_storage.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-local-storage
 title: "@kbn/ml-local-storage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-local-storage plugin
-date: 2023-04-27
+date: 2023-05-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 9b12a9b00cf936..6ea29342560604 100644
--- a/api_docs/kbn_ml_nested_property.mdx
+++ b/api_docs/kbn_ml_nested_property.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-nested-property
 title: "@kbn/ml-nested-property"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-nested-property plugin
-date: 2023-04-27
+date: 2023-05-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 b8ed4ea9caa8ae..cd7d3acc80dd9e 100644
--- a/api_docs/kbn_ml_number_utils.mdx
+++ b/api_docs/kbn_ml_number_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-number-utils
 title: "@kbn/ml-number-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-number-utils plugin
-date: 2023-04-27
+date: 2023-05-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 36cc36a333ee97..1b2411a1245099 100644
--- a/api_docs/kbn_ml_query_utils.mdx
+++ b/api_docs/kbn_ml_query_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-query-utils
 title: "@kbn/ml-query-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-query-utils plugin
-date: 2023-04-27
+date: 2023-05-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 c43e61a590e7b8..cbae41c4a777fc 100644
--- a/api_docs/kbn_ml_random_sampler_utils.mdx
+++ b/api_docs/kbn_ml_random_sampler_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-random-sampler-utils
 title: "@kbn/ml-random-sampler-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-random-sampler-utils plugin
-date: 2023-04-27
+date: 2023-05-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 4e8e4320b225a8..4d3812c7b5f707 100644
--- a/api_docs/kbn_ml_route_utils.mdx
+++ b/api_docs/kbn_ml_route_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-route-utils
 title: "@kbn/ml-route-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-route-utils plugin
-date: 2023-04-27
+date: 2023-05-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_string_hash.mdx b/api_docs/kbn_ml_string_hash.mdx
index aa780ee9924e1b..9615e65aaff0f6 100644
--- a/api_docs/kbn_ml_string_hash.mdx
+++ b/api_docs/kbn_ml_string_hash.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-string-hash
 title: "@kbn/ml-string-hash"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-string-hash plugin
-date: 2023-04-27
+date: 2023-05-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_trained_models_utils.mdx b/api_docs/kbn_ml_trained_models_utils.mdx
index a4ac124f1af30e..0d21a9307b57a7 100644
--- a/api_docs/kbn_ml_trained_models_utils.mdx
+++ b/api_docs/kbn_ml_trained_models_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-trained-models-utils
 title: "@kbn/ml-trained-models-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-trained-models-utils plugin
-date: 2023-04-27
+date: 2023-05-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_url_state.mdx b/api_docs/kbn_ml_url_state.mdx
index b742eccf846c85..c2d9937e61fb96 100644
--- a/api_docs/kbn_ml_url_state.mdx
+++ b/api_docs/kbn_ml_url_state.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-url-state
 title: "@kbn/ml-url-state"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-url-state plugin
-date: 2023-04-27
+date: 2023-05-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_monaco.mdx b/api_docs/kbn_monaco.mdx
index 8517956aaaa7a2..b08864e93d66a6 100644
--- a/api_docs/kbn_monaco.mdx
+++ b/api_docs/kbn_monaco.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-monaco
 title: "@kbn/monaco"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/monaco plugin
-date: 2023-04-27
+date: 2023-05-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 a9871e61c9a0fe..ddc24ba1342295 100644
--- a/api_docs/kbn_object_versioning.mdx
+++ b/api_docs/kbn_object_versioning.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-object-versioning
 title: "@kbn/object-versioning"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/object-versioning plugin
-date: 2023-04-27
+date: 2023-05-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 9ef7805529af6e..26e89e1e93b11a 100644
--- a/api_docs/kbn_observability_alert_details.mdx
+++ b/api_docs/kbn_observability_alert_details.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alert-details
 title: "@kbn/observability-alert-details"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alert-details plugin
-date: 2023-04-27
+date: 2023-05-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_optimizer.mdx b/api_docs/kbn_optimizer.mdx
index a8b14322c8466e..6b6e9a73f41d7a 100644
--- a/api_docs/kbn_optimizer.mdx
+++ b/api_docs/kbn_optimizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer
 title: "@kbn/optimizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer plugin
-date: 2023-04-27
+date: 2023-05-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 35ca967c901be3..cc6f384034e1ba 100644
--- a/api_docs/kbn_optimizer_webpack_helpers.mdx
+++ b/api_docs/kbn_optimizer_webpack_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer-webpack-helpers
 title: "@kbn/optimizer-webpack-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer-webpack-helpers plugin
-date: 2023-04-27
+date: 2023-05-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 9a6b68fb9cdbfd..1a579c49bd1bea 100644
--- a/api_docs/kbn_osquery_io_ts_types.mdx
+++ b/api_docs/kbn_osquery_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-osquery-io-ts-types
 title: "@kbn/osquery-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/osquery-io-ts-types plugin
-date: 2023-04-27
+date: 2023-05-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_performance_testing_dataset_extractor.mdx b/api_docs/kbn_performance_testing_dataset_extractor.mdx
index 394f13fef0cf75..e989f06b612dca 100644
--- a/api_docs/kbn_performance_testing_dataset_extractor.mdx
+++ b/api_docs/kbn_performance_testing_dataset_extractor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-performance-testing-dataset-extractor
 title: "@kbn/performance-testing-dataset-extractor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/performance-testing-dataset-extractor plugin
-date: 2023-04-27
+date: 2023-05-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_generator.mdx b/api_docs/kbn_plugin_generator.mdx
index b2bc090e92c0de..f81d7cbf6f1050 100644
--- a/api_docs/kbn_plugin_generator.mdx
+++ b/api_docs/kbn_plugin_generator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-generator
 title: "@kbn/plugin-generator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-generator plugin
-date: 2023-04-27
+date: 2023-05-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 f07b34f2e0d6f1..248f2f3dd2ec9d 100644
--- a/api_docs/kbn_plugin_helpers.mdx
+++ b/api_docs/kbn_plugin_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-helpers
 title: "@kbn/plugin-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-helpers plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-helpers']
 ---
 import kbnPluginHelpersObj from './kbn_plugin_helpers.devdocs.json';
diff --git a/api_docs/kbn_random_sampling.devdocs.json b/api_docs/kbn_random_sampling.devdocs.json
new file mode 100644
index 00000000000000..d0980a88604496
--- /dev/null
+++ b/api_docs/kbn_random_sampling.devdocs.json
@@ -0,0 +1,267 @@
+{
+  "id": "@kbn/random-sampling",
+  "client": {
+    "classes": [],
+    "functions": [
+      {
+        "parentPluginId": "@kbn/random-sampling",
+        "id": "def-public.ControlSlider",
+        "type": "Function",
+        "tags": [],
+        "label": "ControlSlider",
+        "description": [],
+        "signature": [
+          "({\n  values,\n  currentValue,\n  disabled = false,\n  disabledReason = '',\n  onChange,\n  'data-test-subj': dataTestSubj,\n}: ",
+          {
+            "pluginId": "@kbn/random-sampling",
+            "scope": "public",
+            "docId": "kibKbnRandomSamplingPluginApi",
+            "section": "def-public.ControlSliderProps",
+            "text": "ControlSliderProps"
+          },
+          ") => JSX.Element"
+        ],
+        "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/random-sampling",
+            "id": "def-public.ControlSlider.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  values,\n  currentValue,\n  disabled = false,\n  disabledReason = '',\n  onChange,\n  'data-test-subj': dataTestSubj,\n}",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/random-sampling",
+                "scope": "public",
+                "docId": "kibKbnRandomSamplingPluginApi",
+                "section": "def-public.ControlSliderProps",
+                "text": "ControlSliderProps"
+              }
+            ],
+            "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/random-sampling",
+        "id": "def-public.RandomSamplingIcon",
+        "type": "Function",
+        "tags": [],
+        "label": "RandomSamplingIcon",
+        "description": [],
+        "signature": [
+          "({ title, titleId, ...props }: ",
+          {
+            "pluginId": "@kbn/random-sampling",
+            "scope": "public",
+            "docId": "kibKbnRandomSamplingPluginApi",
+            "section": "def-public.RandomSamplingIconProps",
+            "text": "RandomSamplingIconProps"
+          },
+          ") => JSX.Element"
+        ],
+        "path": "x-pack/packages/kbn-random-sampling/src/ui/icon/sampling_icon.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/random-sampling",
+            "id": "def-public.RandomSamplingIcon.$1",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "{ title, titleId, ...props }",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/random-sampling",
+                "scope": "public",
+                "docId": "kibKbnRandomSamplingPluginApi",
+                "section": "def-public.RandomSamplingIconProps",
+                "text": "RandomSamplingIconProps"
+              }
+            ],
+            "path": "x-pack/packages/kbn-random-sampling/src/ui/icon/sampling_icon.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
+    "interfaces": [
+      {
+        "parentPluginId": "@kbn/random-sampling",
+        "id": "def-public.ControlSliderProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "ControlSliderProps",
+        "description": [],
+        "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/random-sampling",
+            "id": "def-public.ControlSliderProps.values",
+            "type": "Array",
+            "tags": [],
+            "label": "values",
+            "description": [
+              "Allowed values to show on the Control Slider"
+            ],
+            "signature": [
+              "number[]"
+            ],
+            "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/random-sampling",
+            "id": "def-public.ControlSliderProps.currentValue",
+            "type": "number",
+            "tags": [],
+            "label": "currentValue",
+            "description": [
+              "Current value set"
+            ],
+            "signature": [
+              "number | undefined"
+            ],
+            "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/random-sampling",
+            "id": "def-public.ControlSliderProps.disabled",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "disabled",
+            "description": [
+              "When set will show the control in a disabled state"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/random-sampling",
+            "id": "def-public.ControlSliderProps.disabledReason",
+            "type": "string",
+            "tags": [],
+            "label": "disabledReason",
+            "description": [
+              "An explanation for the disabled state of the control"
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/random-sampling",
+            "id": "def-public.ControlSliderProps.datatestsubj",
+            "type": "string",
+            "tags": [],
+            "label": "'data-test-subj'",
+            "description": [
+              "A way to pass the test id parameter"
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/random-sampling",
+            "id": "def-public.ControlSliderProps.onChange",
+            "type": "Function",
+            "tags": [],
+            "label": "onChange",
+            "description": [
+              "A callback for when the slider value changes"
+            ],
+            "signature": [
+              "(newValue: number) => void"
+            ],
+            "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/random-sampling",
+                "id": "def-public.ControlSliderProps.onChange.$1",
+                "type": "number",
+                "tags": [],
+                "label": "newValue",
+                "description": [],
+                "signature": [
+                  "number"
+                ],
+                "path": "x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
+    "enums": [],
+    "misc": [
+      {
+        "parentPluginId": "@kbn/random-sampling",
+        "id": "def-public.RandomSamplingIconProps",
+        "type": "Type",
+        "tags": [],
+        "label": "RandomSamplingIconProps",
+        "description": [],
+        "signature": [
+          "React.SVGProps<SVGSVGElement> & CustomProps"
+        ],
+        "path": "x-pack/packages/kbn-random-sampling/src/ui/icon/sampling_icon.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": []
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/kbn_random_sampling.mdx b/api_docs/kbn_random_sampling.mdx
new file mode 100644
index 00000000000000..9451927bd999af
--- /dev/null
+++ b/api_docs/kbn_random_sampling.mdx
@@ -0,0 +1,36 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibKbnRandomSamplingPluginApi
+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: 2023-05-03
+tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/random-sampling']
+---
+import kbnRandomSamplingObj from './kbn_random_sampling.devdocs.json';
+
+
+
+Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 13 | 0 | 7 | 0 |
+
+## Client
+
+### Functions
+<DocDefinitionList data={kbnRandomSamplingObj.client.functions}/>
+
+### Interfaces
+<DocDefinitionList data={kbnRandomSamplingObj.client.interfaces}/>
+
+### Consts, variables and types
+<DocDefinitionList data={kbnRandomSamplingObj.client.misc}/>
+
diff --git a/api_docs/kbn_react_field.mdx b/api_docs/kbn_react_field.mdx
index a9dbbc75772906..28fb309cd714cc 100644
--- a/api_docs/kbn_react_field.mdx
+++ b/api_docs/kbn_react_field.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-field
 title: "@kbn/react-field"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-field plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-field']
 ---
 import kbnReactFieldObj from './kbn_react_field.devdocs.json';
diff --git a/api_docs/kbn_repo_file_maps.mdx b/api_docs/kbn_repo_file_maps.mdx
index 557b6db6f39b3f..626a573d3b56ec 100644
--- a/api_docs/kbn_repo_file_maps.mdx
+++ b/api_docs/kbn_repo_file_maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-file-maps
 title: "@kbn/repo-file-maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-file-maps plugin
-date: 2023-04-27
+date: 2023-05-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 eaa603cae4b8d7..c92aeeb95e52e4 100644
--- a/api_docs/kbn_repo_linter.mdx
+++ b/api_docs/kbn_repo_linter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-linter
 title: "@kbn/repo-linter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-linter plugin
-date: 2023-04-27
+date: 2023-05-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 61978f5fed9f1b..e9baf8b225570d 100644
--- a/api_docs/kbn_repo_path.mdx
+++ b/api_docs/kbn_repo_path.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-path
 title: "@kbn/repo-path"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-path plugin
-date: 2023-04-27
+date: 2023-05-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 85bde41daf6ee1..c6de08a9a7b076 100644
--- a/api_docs/kbn_repo_source_classifier.mdx
+++ b/api_docs/kbn_repo_source_classifier.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-source-classifier
 title: "@kbn/repo-source-classifier"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-source-classifier plugin
-date: 2023-04-27
+date: 2023-05-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 deb4c20f85ae60..d716be2d4c275a 100644
--- a/api_docs/kbn_reporting_common.mdx
+++ b/api_docs/kbn_reporting_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-common
 title: "@kbn/reporting-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-common plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-common']
 ---
 import kbnReportingCommonObj from './kbn_reporting_common.devdocs.json';
diff --git a/api_docs/kbn_rison.mdx b/api_docs/kbn_rison.mdx
index f8cf766287711a..2ef816ad624840 100644
--- a/api_docs/kbn_rison.mdx
+++ b/api_docs/kbn_rison.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rison
 title: "@kbn/rison"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rison plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rison']
 ---
 import kbnRisonObj from './kbn_rison.devdocs.json';
diff --git a/api_docs/kbn_rule_data_utils.mdx b/api_docs/kbn_rule_data_utils.mdx
index aa93038ca0337c..022c7c269086a2 100644
--- a/api_docs/kbn_rule_data_utils.mdx
+++ b/api_docs/kbn_rule_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rule-data-utils
 title: "@kbn/rule-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rule-data-utils plugin
-date: 2023-04-27
+date: 2023-05-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 82c4fceebacc20..8b76c5402eb2bf 100644
--- a/api_docs/kbn_saved_objects_settings.mdx
+++ b/api_docs/kbn_saved_objects_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-saved-objects-settings
 title: "@kbn/saved-objects-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/saved-objects-settings plugin
-date: 2023-04-27
+date: 2023-05-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_security_solution_side_nav.mdx b/api_docs/kbn_security_solution_side_nav.mdx
index f3ef1ed7a3ff9a..c6a0e7a8523f64 100644
--- a/api_docs/kbn_security_solution_side_nav.mdx
+++ b/api_docs/kbn_security_solution_side_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-side-nav
 title: "@kbn/security-solution-side-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-side-nav plugin
-date: 2023-04-27
+date: 2023-05-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 25c1ba025965fa..53f8d9797575dd 100644
--- a/api_docs/kbn_security_solution_storybook_config.mdx
+++ b/api_docs/kbn_security_solution_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-storybook-config
 title: "@kbn/security-solution-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-storybook-config plugin
-date: 2023-04-27
+date: 2023-05-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 e77c0f0284f105..591e469a87e805 100644
--- a/api_docs/kbn_securitysolution_autocomplete.mdx
+++ b/api_docs/kbn_securitysolution_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-autocomplete
 title: "@kbn/securitysolution-autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-autocomplete plugin
-date: 2023-04-27
+date: 2023-05-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 248e50836fa192..fca3cd30604cf7 100644
--- a/api_docs/kbn_securitysolution_data_table.mdx
+++ b/api_docs/kbn_securitysolution_data_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-data-table
 title: "@kbn/securitysolution-data-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-data-table plugin
-date: 2023-04-27
+date: 2023-05-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 00db730ac89866..d6aa4378db6106 100644
--- a/api_docs/kbn_securitysolution_ecs.mdx
+++ b/api_docs/kbn_securitysolution_ecs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-ecs
 title: "@kbn/securitysolution-ecs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-ecs plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_securitysolution_es_utils.devdocs.json
index 360332ea75d2d4..422e9ce6d4d24a 100644
--- a/api_docs/kbn_securitysolution_es_utils.devdocs.json
+++ b/api_docs/kbn_securitysolution_es_utils.devdocs.json
@@ -652,27 +652,7 @@
                   "TransportRequestOptions",
                   " | undefined): Promise<",
                   "CountResponse",
-                  ">; }; exists: { (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithOutMeta",
-                  " | undefined): Promise<boolean>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithMeta",
-                  " | undefined): Promise<",
-                  "TransportResult",
-                  "<boolean, unknown>>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+                  ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
                   "default",
                   "; asyncSearch: ",
                   "default",
@@ -846,7 +826,27 @@
                   "default",
                   "; eql: ",
                   "default",
-                  "; existsSource: { (this: That, params: ",
+                  "; exists: { (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithOutMeta",
+                  " | undefined): Promise<boolean>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithMeta",
+                  " | undefined): Promise<",
+                  "TransportResult",
+                  "<boolean, unknown>>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
                   "ExistsSourceRequest",
                   " | ",
                   "ExistsSourceRequest",
@@ -1896,27 +1896,7 @@
                   "TransportRequestOptions",
                   " | undefined): Promise<",
                   "CountResponse",
-                  ">; }; exists: { (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithOutMeta",
-                  " | undefined): Promise<boolean>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithMeta",
-                  " | undefined): Promise<",
-                  "TransportResult",
-                  "<boolean, unknown>>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+                  ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
                   "default",
                   "; asyncSearch: ",
                   "default",
@@ -2090,7 +2070,27 @@
                   "default",
                   "; eql: ",
                   "default",
-                  "; existsSource: { (this: That, params: ",
+                  "; exists: { (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithOutMeta",
+                  " | undefined): Promise<boolean>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithMeta",
+                  " | undefined): Promise<",
+                  "TransportResult",
+                  "<boolean, unknown>>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
                   "ExistsSourceRequest",
                   " | ",
                   "ExistsSourceRequest",
diff --git a/api_docs/kbn_securitysolution_es_utils.mdx b/api_docs/kbn_securitysolution_es_utils.mdx
index 7a360852024f52..f0486920aa07d5 100644
--- a/api_docs/kbn_securitysolution_es_utils.mdx
+++ b/api_docs/kbn_securitysolution_es_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-es-utils
 title: "@kbn/securitysolution-es-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-es-utils plugin
-date: 2023-04-27
+date: 2023-05-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.mdx b/api_docs/kbn_securitysolution_exception_list_components.mdx
index 30a58aa7378121..b777bdd4fe4a1c 100644
--- a/api_docs/kbn_securitysolution_exception_list_components.mdx
+++ b/api_docs/kbn_securitysolution_exception_list_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-exception-list-components
 title: "@kbn/securitysolution-exception-list-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-exception-list-components plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_securitysolution_grouping.devdocs.json
index d3c5052958e2dc..51ab649407413e 100644
--- a/api_docs/kbn_securitysolution_grouping.devdocs.json
+++ b/api_docs/kbn_securitysolution_grouping.devdocs.json
@@ -29,7 +29,7 @@
           "\nComposes grouping query and aggregations"
         ],
         "signature": [
-          "({ additionalFilters, from, groupByFields, rootAggregations, runtimeMappings, size, pageNumber, sort, statsAggregations, to, }: ",
+          "({ additionalFilters, from, groupByField, pageNumber, rootAggregations, runtimeMappings, selectedGroupEsTypes, size, sort, statsAggregations, to, }: ",
           "GroupingQueryArgs",
           ") => ",
           "GroupingQuery"
@@ -43,7 +43,7 @@
             "id": "def-common.getGroupingQuery.$1",
             "type": "Object",
             "tags": [],
-            "label": "{\n  additionalFilters = [],\n  from,\n  groupByFields,\n  rootAggregations,\n  runtimeMappings,\n  size = DEFAULT_GROUP_BY_FIELD_SIZE,\n  pageNumber,\n  sort,\n  statsAggregations,\n  to,\n}",
+            "label": "{\n  additionalFilters = [],\n  from,\n  groupByField,\n  pageNumber,\n  rootAggregations,\n  runtimeMappings,\n  selectedGroupEsTypes,\n  size = DEFAULT_GROUP_BY_FIELD_SIZE,\n  sort,\n  statsAggregations,\n  to,\n}",
             "description": [],
             "signature": [
               "GroupingQueryArgs"
diff --git a/api_docs/kbn_securitysolution_grouping.mdx b/api_docs/kbn_securitysolution_grouping.mdx
index 542a1b3100eaa0..6be11db832d140 100644
--- a/api_docs/kbn_securitysolution_grouping.mdx
+++ b/api_docs/kbn_securitysolution_grouping.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-grouping
 title: "@kbn/securitysolution-grouping"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-grouping plugin
-date: 2023-04-27
+date: 2023-05-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 a0675084691f8f..da9b1975ee8d8c 100644
--- a/api_docs/kbn_securitysolution_hook_utils.mdx
+++ b/api_docs/kbn_securitysolution_hook_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-hook-utils
 title: "@kbn/securitysolution-hook-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-hook-utils plugin
-date: 2023-04-27
+date: 2023-05-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 1026fb24e3956f..bc140e693167e5 100644
--- a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-alerting-types
 title: "@kbn/securitysolution-io-ts-alerting-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-alerting-types plugin
-date: 2023-04-27
+date: 2023-05-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 8e66ad414f36fe..6c452325f060b3 100644
--- a/api_docs/kbn_securitysolution_io_ts_list_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-list-types
 title: "@kbn/securitysolution-io-ts-list-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-list-types plugin
-date: 2023-04-27
+date: 2023-05-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 f9480bb1c2d956..d01b09fe375228 100644
--- a/api_docs/kbn_securitysolution_io_ts_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-types
 title: "@kbn/securitysolution-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-types plugin
-date: 2023-04-27
+date: 2023-05-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 6c78081d9a61e3..ce186564bdb1dd 100644
--- a/api_docs/kbn_securitysolution_io_ts_utils.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-utils
 title: "@kbn/securitysolution-io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-utils plugin
-date: 2023-04-27
+date: 2023-05-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 e53ba3f5d0ceba..9d3ff52b3aaece 100644
--- a/api_docs/kbn_securitysolution_list_api.mdx
+++ b/api_docs/kbn_securitysolution_list_api.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-api
 title: "@kbn/securitysolution-list-api"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-api plugin
-date: 2023-04-27
+date: 2023-05-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 650735cf29a34c..d9aa685039d2d7 100644
--- a/api_docs/kbn_securitysolution_list_constants.mdx
+++ b/api_docs/kbn_securitysolution_list_constants.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-constants
 title: "@kbn/securitysolution-list-constants"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-constants plugin
-date: 2023-04-27
+date: 2023-05-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 a9adb40036705b..37b636a1f0be0f 100644
--- a/api_docs/kbn_securitysolution_list_hooks.mdx
+++ b/api_docs/kbn_securitysolution_list_hooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-hooks
 title: "@kbn/securitysolution-list-hooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-hooks plugin
-date: 2023-04-27
+date: 2023-05-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 51d6bddbee7a05..0597dcfa4a63c3 100644
--- a/api_docs/kbn_securitysolution_list_utils.mdx
+++ b/api_docs/kbn_securitysolution_list_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-utils
 title: "@kbn/securitysolution-list-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-utils plugin
-date: 2023-04-27
+date: 2023-05-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 a5ceffbc37345c..2d6537bd367c15 100644
--- a/api_docs/kbn_securitysolution_rules.mdx
+++ b/api_docs/kbn_securitysolution_rules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-rules
 title: "@kbn/securitysolution-rules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-rules plugin
-date: 2023-04-27
+date: 2023-05-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 192f2a88d64ba0..007fbdca1de89d 100644
--- a/api_docs/kbn_securitysolution_t_grid.mdx
+++ b/api_docs/kbn_securitysolution_t_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-t-grid
 title: "@kbn/securitysolution-t-grid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-t-grid plugin
-date: 2023-04-27
+date: 2023-05-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 842273336e4631..cbd6ebdb425c6d 100644
--- a/api_docs/kbn_securitysolution_utils.mdx
+++ b/api_docs/kbn_securitysolution_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-utils
 title: "@kbn/securitysolution-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-utils plugin
-date: 2023-04-27
+date: 2023-05-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 5afef6be541cd6..9fa521da2b3ab2 100644
--- a/api_docs/kbn_server_http_tools.mdx
+++ b/api_docs/kbn_server_http_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-http-tools
 title: "@kbn/server-http-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-http-tools plugin
-date: 2023-04-27
+date: 2023-05-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 5163561ddde7a2..0e406e1bbdd0f4 100644
--- a/api_docs/kbn_server_route_repository.mdx
+++ b/api_docs/kbn_server_route_repository.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository
 title: "@kbn/server-route-repository"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-route-repository plugin
-date: 2023-04-27
+date: 2023-05-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_project_switcher.mdx b/api_docs/kbn_serverless_project_switcher.mdx
index 5149449fabf87a..da689efc0b3fe8 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: 2023-04-27
+date: 2023-05-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_storybook_config.mdx b/api_docs/kbn_serverless_storybook_config.mdx
index 3bd55feb6a4b9a..d2ba3422364184 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: 2023-04-27
+date: 2023-05-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 e20765aabfcf07..00cd9d0c304ca0 100644
--- a/api_docs/kbn_shared_svg.mdx
+++ b/api_docs/kbn_shared_svg.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-svg
 title: "@kbn/shared-svg"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-svg plugin
-date: 2023-04-27
+date: 2023-05-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 8797ddbc4d499c..35e06badf8de06 100644
--- a/api_docs/kbn_shared_ux_avatar_solution.mdx
+++ b/api_docs/kbn_shared_ux_avatar_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-solution
 title: "@kbn/shared-ux-avatar-solution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-avatar-solution plugin
-date: 2023-04-27
+date: 2023-05-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_avatar_user_profile_components.mdx b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
index e7a9fbffabf866..444059df69ae7e 100644
--- a/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
+++ b/api_docs/kbn_shared_ux_avatar_user_profile_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-user-profile-components
 title: "@kbn/shared-ux-avatar-user-profile-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-avatar-user-profile-components plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-user-profile-components']
 ---
 import kbnSharedUxAvatarUserProfileComponentsObj from './kbn_shared_ux_avatar_user_profile_components.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
index 1e1ed6cf90add7..3db08539e23930 100644
--- a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
+++ b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen
 title: "@kbn/shared-ux-button-exit-full-screen"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-exit-full-screen plugin
-date: 2023-04-27
+date: 2023-05-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_exit_full_screen_mocks.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
index b8b4ad11983540..e089dd7643087a 100644
--- a/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
+++ b/api_docs/kbn_shared_ux_button_exit_full_screen_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen-mocks
 title: "@kbn/shared-ux-button-exit-full-screen-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-exit-full-screen-mocks plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen-mocks']
 ---
 import kbnSharedUxButtonExitFullScreenMocksObj from './kbn_shared_ux_button_exit_full_screen_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_toolbar.mdx b/api_docs/kbn_shared_ux_button_toolbar.mdx
index f0403d588a7c61..b38c931bfe7471 100644
--- a/api_docs/kbn_shared_ux_button_toolbar.mdx
+++ b/api_docs/kbn_shared_ux_button_toolbar.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-toolbar
 title: "@kbn/shared-ux-button-toolbar"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-toolbar plugin
-date: 2023-04-27
+date: 2023-05-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 66a1dc75d018cb..6499696de2e3e0 100644
--- a/api_docs/kbn_shared_ux_card_no_data.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data
 title: "@kbn/shared-ux-card-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data plugin
-date: 2023-04-27
+date: 2023-05-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 91a243ee73b844..a7fe523ec06e8b 100644
--- a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data-mocks
 title: "@kbn/shared-ux-card-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data-mocks plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_shared_ux_chrome_navigation.devdocs.json
new file mode 100644
index 00000000000000..6a03c7eecaf98a
--- /dev/null
+++ b/api_docs/kbn_shared_ux_chrome_navigation.devdocs.json
@@ -0,0 +1,413 @@
+{
+  "id": "@kbn/shared-ux-chrome-navigation",
+  "client": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "common": {
+    "classes": [],
+    "functions": [
+      {
+        "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+        "id": "def-common.Navigation",
+        "type": "Function",
+        "tags": [],
+        "label": "Navigation",
+        "description": [],
+        "signature": [
+          "(props: ",
+          {
+            "pluginId": "@kbn/shared-ux-chrome-navigation",
+            "scope": "common",
+            "docId": "kibKbnSharedUxChromeNavigationPluginApi",
+            "section": "def-common.NavigationProps",
+            "text": "NavigationProps"
+          },
+          ") => JSX.Element"
+        ],
+        "path": "packages/shared-ux/chrome/navigation/src/ui/navigation.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.Navigation.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "props",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/shared-ux-chrome-navigation",
+                "scope": "common",
+                "docId": "kibKbnSharedUxChromeNavigationPluginApi",
+                "section": "def-common.NavigationProps",
+                "text": "NavigationProps"
+              }
+            ],
+            "path": "packages/shared-ux/chrome/navigation/src/ui/navigation.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+        "id": "def-common.NavigationKibanaProvider",
+        "type": "Function",
+        "tags": [],
+        "label": "NavigationKibanaProvider",
+        "description": [
+          "\nKibana-specific Provider that maps dependencies to services."
+        ],
+        "signature": [
+          "({ children, ...dependencies }: React.PropsWithChildren<",
+          "NavigationKibanaDependencies",
+          ">) => JSX.Element"
+        ],
+        "path": "packages/shared-ux/chrome/navigation/src/services.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationKibanaProvider.$1",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "{\n  children,\n  ...dependencies\n}",
+            "description": [],
+            "signature": [
+              "React.PropsWithChildren<",
+              "NavigationKibanaDependencies",
+              ">"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/src/services.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+        "id": "def-common.NavigationProvider",
+        "type": "Function",
+        "tags": [],
+        "label": "NavigationProvider",
+        "description": [
+          "\nA Context Provider that provides services to the component and its dependencies."
+        ],
+        "signature": [
+          "({ children, ...services }: React.PropsWithChildren<",
+          {
+            "pluginId": "@kbn/shared-ux-chrome-navigation",
+            "scope": "common",
+            "docId": "kibKbnSharedUxChromeNavigationPluginApi",
+            "section": "def-common.NavigationServices",
+            "text": "NavigationServices"
+          },
+          ">) => JSX.Element"
+        ],
+        "path": "packages/shared-ux/chrome/navigation/src/services.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationProvider.$1",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "{ children, ...services }",
+            "description": [],
+            "signature": [
+              "React.PropsWithChildren<",
+              {
+                "pluginId": "@kbn/shared-ux-chrome-navigation",
+                "scope": "common",
+                "docId": "kibKbnSharedUxChromeNavigationPluginApi",
+                "section": "def-common.NavigationServices",
+                "text": "NavigationServices"
+              },
+              ">"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/src/services.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
+    "interfaces": [
+      {
+        "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+        "id": "def-common.NavigationProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "NavigationProps",
+        "description": [
+          "\nProps for the `Navigation` component."
+        ],
+        "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationProps.activeNavItemId",
+            "type": "string",
+            "tags": [],
+            "label": "activeNavItemId",
+            "description": [
+              "\nID of sections to initially open\nPath to the nav item is given with hierarchy expressed in dotted notation.\nExample: `my_project.settings.index_management`"
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationProps.solutions",
+            "type": "Array",
+            "tags": [],
+            "label": "solutions",
+            "description": [
+              "\nConfiguration for Solutions' section(s)"
+            ],
+            "signature": [
+              "SolutionProperties",
+              "[]"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationProps.platformConfig",
+            "type": "Object",
+            "tags": [],
+            "label": "platformConfig",
+            "description": [
+              "\nControls over how Platform nav sections appear"
+            ],
+            "signature": [
+              "Partial<",
+              "PlatformConfigSet",
+              "> | undefined"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationProps.homeHref",
+            "type": "string",
+            "tags": [],
+            "label": "homeHref",
+            "description": [
+              "\nTarget for the logo icon"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationProps.linkToCloud",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "linkToCloud",
+            "description": [
+              "\nControl of the link that takes the user to their projects or deployments"
+            ],
+            "signature": [
+              "\"projects\" | \"deployments\" | undefined"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+        "id": "def-common.NavigationServices",
+        "type": "Interface",
+        "tags": [],
+        "label": "NavigationServices",
+        "description": [
+          "\nA list of services that are consumed by this component."
+        ],
+        "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationServices.activeNavItemId",
+            "type": "string",
+            "tags": [],
+            "label": "activeNavItemId",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationServices.basePath",
+            "type": "Object",
+            "tags": [],
+            "label": "basePath",
+            "description": [],
+            "signature": [
+              "{ prepend: (url: string) => string; }"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationServices.loadingCount",
+            "type": "number",
+            "tags": [],
+            "label": "loadingCount",
+            "description": [],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationServices.navIsOpen",
+            "type": "boolean",
+            "tags": [],
+            "label": "navIsOpen",
+            "description": [],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+            "id": "def-common.NavigationServices.navigateToUrl",
+            "type": "Function",
+            "tags": [],
+            "label": "navigateToUrl",
+            "description": [],
+            "signature": [
+              "(url: string, options?: ",
+              {
+                "pluginId": "@kbn/core-application-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreApplicationBrowserPluginApi",
+                "section": "def-common.NavigateToUrlOptions",
+                "text": "NavigateToUrlOptions"
+              },
+              " | undefined) => Promise<void>"
+            ],
+            "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+                "id": "def-common.NavigationServices.navigateToUrl.$1",
+                "type": "string",
+                "tags": [],
+                "label": "url",
+                "description": [],
+                "path": "packages/core/application/core-application-browser/src/contracts.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+                "id": "def-common.NavigationServices.navigateToUrl.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-application-browser",
+                    "scope": "common",
+                    "docId": "kibKbnCoreApplicationBrowserPluginApi",
+                    "section": "def-common.NavigateToUrlOptions",
+                    "text": "NavigateToUrlOptions"
+                  },
+                  " | undefined"
+                ],
+                "path": "packages/core/application/core-application-browser/src/contracts.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
+    "enums": [],
+    "misc": [
+      {
+        "parentPluginId": "@kbn/shared-ux-chrome-navigation",
+        "id": "def-common.NavItemProps",
+        "type": "Type",
+        "tags": [],
+        "label": "NavItemProps",
+        "description": [
+          "\nProps for the `NavItem` component representing the content of a navigational item with optional children."
+        ],
+        "signature": [
+          "Pick<",
+          "EuiSideNavItemType",
+          "<T>, \"id\" | \"name\"> & { items?: ",
+          {
+            "pluginId": "@kbn/shared-ux-chrome-navigation",
+            "scope": "common",
+            "docId": "kibKbnSharedUxChromeNavigationPluginApi",
+            "section": "def-common.NavItemProps",
+            "text": "NavItemProps"
+          },
+          "<T>[] | undefined; href?: string | undefined; }"
+        ],
+        "path": "packages/shared-ux/chrome/navigation/types/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/kbn_shared_ux_chrome_navigation.mdx b/api_docs/kbn_shared_ux_chrome_navigation.mdx
new file mode 100644
index 00000000000000..c87e39685e2b75
--- /dev/null
+++ b/api_docs/kbn_shared_ux_chrome_navigation.mdx
@@ -0,0 +1,36 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibKbnSharedUxChromeNavigationPluginApi
+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: 2023-05-03
+tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-chrome-navigation']
+---
+import kbnSharedUxChromeNavigationObj from './kbn_shared_ux_chrome_navigation.devdocs.json';
+
+
+
+Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 21 | 0 | 11 | 3 |
+
+## Common
+
+### Functions
+<DocDefinitionList data={kbnSharedUxChromeNavigationObj.common.functions}/>
+
+### Interfaces
+<DocDefinitionList data={kbnSharedUxChromeNavigationObj.common.interfaces}/>
+
+### Consts, variables and types
+<DocDefinitionList data={kbnSharedUxChromeNavigationObj.common.misc}/>
+
diff --git a/api_docs/kbn_shared_ux_file_context.mdx b/api_docs/kbn_shared_ux_file_context.mdx
index d30d845b08a294..c517d6926b2012 100644
--- a/api_docs/kbn_shared_ux_file_context.mdx
+++ b/api_docs/kbn_shared_ux_file_context.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-context
 title: "@kbn/shared-ux-file-context"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-context plugin
-date: 2023-04-27
+date: 2023-05-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 0f46adec2a9d29..6c0b55606e9625 100644
--- a/api_docs/kbn_shared_ux_file_image.mdx
+++ b/api_docs/kbn_shared_ux_file_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image
 title: "@kbn/shared-ux-file-image"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image plugin
-date: 2023-04-27
+date: 2023-05-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 2c952f5f59305f..54a3e0c891052c 100644
--- a/api_docs/kbn_shared_ux_file_image_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_image_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image-mocks
 title: "@kbn/shared-ux-file-image-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 83fffb6caee73f..fece448462aef9 100644
--- a/api_docs/kbn_shared_ux_file_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-mocks
 title: "@kbn/shared-ux-file-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 2f48cacf53c4e6..f6e2d370c3cb24 100644
--- a/api_docs/kbn_shared_ux_file_picker.mdx
+++ b/api_docs/kbn_shared_ux_file_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-picker
 title: "@kbn/shared-ux-file-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-picker plugin
-date: 2023-04-27
+date: 2023-05-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.devdocs.json b/api_docs/kbn_shared_ux_file_types.devdocs.json
index bd0ba52bf411ac..6d27ce98cbc43d 100644
--- a/api_docs/kbn_shared_ux_file_types.devdocs.json
+++ b/api_docs/kbn_shared_ux_file_types.devdocs.json
@@ -1207,6 +1207,22 @@
             "path": "packages/shared-ux/file/types/index.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/shared-ux-file-types",
+            "id": "def-common.FileJSON.hash",
+            "type": "Object",
+            "tags": [],
+            "label": "hash",
+            "description": [
+              "\nFile hash information"
+            ],
+            "signature": [
+              "{ [hashName: string]: string | undefined; md5?: string | undefined; sha1?: string | undefined; sha256?: string | undefined; sha384?: string | undefined; sha512?: string | undefined; ssdeep?: string | undefined; tlsh?: string | undefined; } | undefined"
+            ],
+            "path": "packages/shared-ux/file/types/index.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/kbn_shared_ux_file_types.mdx b/api_docs/kbn_shared_ux_file_types.mdx
index d85b386c3c9199..631bd31451d826 100644
--- a/api_docs/kbn_shared_ux_file_types.mdx
+++ b/api_docs/kbn_shared_ux_file_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-types
 title: "@kbn/shared-ux-file-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-types plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-types']
 ---
 import kbnSharedUxFileTypesObj from './kbn_shared_ux_file_types.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 |
 |-------------------|-----------|------------------------|-----------------|
-| 71 | 0 | 9 | 0 |
+| 72 | 0 | 9 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_shared_ux_file_upload.mdx b/api_docs/kbn_shared_ux_file_upload.mdx
index ce8cd67be00c79..08ff07f13c84ac 100644
--- a/api_docs/kbn_shared_ux_file_upload.mdx
+++ b/api_docs/kbn_shared_ux_file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-upload
 title: "@kbn/shared-ux-file-upload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-upload plugin
-date: 2023-04-27
+date: 2023-05-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 6c710ea50ff52d..48d86cabb4d64a 100644
--- a/api_docs/kbn_shared_ux_file_util.mdx
+++ b/api_docs/kbn_shared_ux_file_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-util
 title: "@kbn/shared-ux-file-util"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-util plugin
-date: 2023-04-27
+date: 2023-05-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 986734f31d4e33..922b2c96c05c5b 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app
 title: "@kbn/shared-ux-link-redirect-app"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app plugin
-date: 2023-04-27
+date: 2023-05-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 828c558ebe9b94..19fea05ca91feb 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app-mocks
 title: "@kbn/shared-ux-link-redirect-app-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 ea57a84fb27457..8fe244dd4a83c4 100644
--- a/api_docs/kbn_shared_ux_markdown.mdx
+++ b/api_docs/kbn_shared_ux_markdown.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown
 title: "@kbn/shared-ux-markdown"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown plugin
-date: 2023-04-27
+date: 2023-05-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 7cb1aa1b0a0c6b..e9a95cbb783833 100644
--- a/api_docs/kbn_shared_ux_markdown_mocks.mdx
+++ b/api_docs/kbn_shared_ux_markdown_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown-mocks
 title: "@kbn/shared-ux-markdown-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 7b7273a1186744..ff30952c79a7ab 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data
 title: "@kbn/shared-ux-page-analytics-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data plugin
-date: 2023-04-27
+date: 2023-05-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 3484280d1d2de2..29a3de1a752ac9 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data-mocks
 title: "@kbn/shared-ux-page-analytics-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 e00dcbe751401f..76f390566fdca8 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data
 title: "@kbn/shared-ux-page-kibana-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data plugin
-date: 2023-04-27
+date: 2023-05-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 424fe7ffb701b5..ef9124c41597f6 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data-mocks
 title: "@kbn/shared-ux-page-kibana-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data-mocks plugin
-date: 2023-04-27
+date: 2023-05-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.mdx b/api_docs/kbn_shared_ux_page_kibana_template.mdx
index f73780685b1a6b..5e431297a813c6 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template
 title: "@kbn/shared-ux-page-kibana-template"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template plugin
-date: 2023-04-27
+date: 2023-05-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 099611175d63c1..d3e5e25301266d 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template-mocks
 title: "@kbn/shared-ux-page-kibana-template-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 02b905ff1a6d2b..cb81254f30374f 100644
--- a/api_docs/kbn_shared_ux_page_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data
 title: "@kbn/shared-ux-page-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data plugin
-date: 2023-04-27
+date: 2023-05-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 8fda0b291edce3..a461527a779c82 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config
 title: "@kbn/shared-ux-page-no-data-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config plugin
-date: 2023-04-27
+date: 2023-05-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 535cd3147120f7..7fb7d4cb48a502 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config-mocks
 title: "@kbn/shared-ux-page-no-data-config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 32d03b3ac9b3d2..48e46b7b13b100 100644
--- a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-mocks
 title: "@kbn/shared-ux-page-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 36eaa387bc2de1..07341a00344c41 100644
--- a/api_docs/kbn_shared_ux_page_solution_nav.mdx
+++ b/api_docs/kbn_shared_ux_page_solution_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-solution-nav
 title: "@kbn/shared-ux-page-solution-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-solution-nav plugin
-date: 2023-04-27
+date: 2023-05-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 9402a6e2233d50..109a3cb7589e3e 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views
 title: "@kbn/shared-ux-prompt-no-data-views"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views plugin
-date: 2023-04-27
+date: 2023-05-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 98920b4a643b1c..c165673de169e5 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views-mocks
 title: "@kbn/shared-ux-prompt-no-data-views-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 e7fec9693e2ce7..8640050cd8811f 100644
--- a/api_docs/kbn_shared_ux_prompt_not_found.mdx
+++ b/api_docs/kbn_shared_ux_prompt_not_found.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-not-found
 title: "@kbn/shared-ux-prompt-not-found"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-not-found plugin
-date: 2023-04-27
+date: 2023-05-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 a6b72ffdd1bea5..ee8d3a6300388b 100644
--- a/api_docs/kbn_shared_ux_router.mdx
+++ b/api_docs/kbn_shared_ux_router.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router
 title: "@kbn/shared-ux-router"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router plugin
-date: 2023-04-27
+date: 2023-05-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 a4562955d92362..84a2cb2842f1fb 100644
--- a/api_docs/kbn_shared_ux_router_mocks.mdx
+++ b/api_docs/kbn_shared_ux_router_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router-mocks
 title: "@kbn/shared-ux-router-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router-mocks plugin
-date: 2023-04-27
+date: 2023-05-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 33c152d499466c..edf7e604b02286 100644
--- a/api_docs/kbn_shared_ux_storybook_config.mdx
+++ b/api_docs/kbn_shared_ux_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-config
 title: "@kbn/shared-ux-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-config plugin
-date: 2023-04-27
+date: 2023-05-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 c26481e9703488..ef311ee100eda5 100644
--- a/api_docs/kbn_shared_ux_storybook_mock.mdx
+++ b/api_docs/kbn_shared_ux_storybook_mock.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-mock
 title: "@kbn/shared-ux-storybook-mock"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-mock plugin
-date: 2023-04-27
+date: 2023-05-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 3b7b6b9a1b6aa7..f4db5ec1478e58 100644
--- a/api_docs/kbn_shared_ux_utility.mdx
+++ b/api_docs/kbn_shared_ux_utility.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-utility
 title: "@kbn/shared-ux-utility"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-utility plugin
-date: 2023-04-27
+date: 2023-05-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 b13428ef90dc1f..cf8de373a6dd06 100644
--- a/api_docs/kbn_slo_schema.mdx
+++ b/api_docs/kbn_slo_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-slo-schema
 title: "@kbn/slo-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/slo-schema plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/slo-schema']
 ---
 import kbnSloSchemaObj from './kbn_slo_schema.devdocs.json';
diff --git a/api_docs/kbn_some_dev_log.mdx b/api_docs/kbn_some_dev_log.mdx
index a100aff3a626fb..10d547b2b7147e 100644
--- a/api_docs/kbn_some_dev_log.mdx
+++ b/api_docs/kbn_some_dev_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-some-dev-log
 title: "@kbn/some-dev-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/some-dev-log plugin
-date: 2023-04-27
+date: 2023-05-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_std.mdx b/api_docs/kbn_std.mdx
index d48c83da423a05..b9598aab5c0084 100644
--- a/api_docs/kbn_std.mdx
+++ b/api_docs/kbn_std.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-std
 title: "@kbn/std"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/std plugin
-date: 2023-04-27
+date: 2023-05-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 d020f53a8b5ce0..d507bd5d1d4e7f 100644
--- a/api_docs/kbn_stdio_dev_helpers.mdx
+++ b/api_docs/kbn_stdio_dev_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-stdio-dev-helpers
 title: "@kbn/stdio-dev-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/stdio-dev-helpers plugin
-date: 2023-04-27
+date: 2023-05-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 07f9f3086df7d6..8437558a2387e0 100644
--- a/api_docs/kbn_storybook.mdx
+++ b/api_docs/kbn_storybook.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-storybook
 title: "@kbn/storybook"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/storybook plugin
-date: 2023-04-27
+date: 2023-05-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 86e7ad6d15c6b0..1e9dd0f899a008 100644
--- a/api_docs/kbn_telemetry_tools.mdx
+++ b/api_docs/kbn_telemetry_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-telemetry-tools
 title: "@kbn/telemetry-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/telemetry-tools plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/telemetry-tools']
 ---
 import kbnTelemetryToolsObj from './kbn_telemetry_tools.devdocs.json';
diff --git a/api_docs/kbn_test.mdx b/api_docs/kbn_test.mdx
index aa1a187d203aa5..aea398ca02f80b 100644
--- a/api_docs/kbn_test.mdx
+++ b/api_docs/kbn_test.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test
 title: "@kbn/test"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test']
 ---
 import kbnTestObj from './kbn_test.devdocs.json';
diff --git a/api_docs/kbn_test_jest_helpers.mdx b/api_docs/kbn_test_jest_helpers.mdx
index da5ec02b30f60e..bc6afb7353480d 100644
--- a/api_docs/kbn_test_jest_helpers.mdx
+++ b/api_docs/kbn_test_jest_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-jest-helpers
 title: "@kbn/test-jest-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-jest-helpers plugin
-date: 2023-04-27
+date: 2023-05-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 0f2acce4b6fe0a..8a604e34a1cccf 100644
--- a/api_docs/kbn_test_subj_selector.mdx
+++ b/api_docs/kbn_test_subj_selector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-subj-selector
 title: "@kbn/test-subj-selector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-subj-selector plugin
-date: 2023-04-27
+date: 2023-05-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_tooling_log.mdx b/api_docs/kbn_tooling_log.mdx
index 46d6d562e5acbd..f2da4b3705364b 100644
--- a/api_docs/kbn_tooling_log.mdx
+++ b/api_docs/kbn_tooling_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-tooling-log
 title: "@kbn/tooling-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/tooling-log plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/tooling-log']
 ---
 import kbnToolingLogObj from './kbn_tooling_log.devdocs.json';
diff --git a/api_docs/kbn_ts_projects.mdx b/api_docs/kbn_ts_projects.mdx
index e011d5fa4aed2e..09bfd3a584e7a7 100644
--- a/api_docs/kbn_ts_projects.mdx
+++ b/api_docs/kbn_ts_projects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ts-projects
 title: "@kbn/ts-projects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ts-projects plugin
-date: 2023-04-27
+date: 2023-05-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 c6ec66f3487adf..f9d9f7614ad570 100644
--- a/api_docs/kbn_typed_react_router_config.mdx
+++ b/api_docs/kbn_typed_react_router_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-typed-react-router-config
 title: "@kbn/typed-react-router-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/typed-react-router-config plugin
-date: 2023-04-27
+date: 2023-05-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 a5d7e66a380a4f..e52c311eb30eb7 100644
--- a/api_docs/kbn_ui_actions_browser.mdx
+++ b/api_docs/kbn_ui_actions_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-actions-browser
 title: "@kbn/ui-actions-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-actions-browser plugin
-date: 2023-04-27
+date: 2023-05-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.mdx b/api_docs/kbn_ui_shared_deps_src.mdx
index 83e84dd3754c8d..20c02d3235e26c 100644
--- a/api_docs/kbn_ui_shared_deps_src.mdx
+++ b/api_docs/kbn_ui_shared_deps_src.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-shared-deps-src
 title: "@kbn/ui-shared-deps-src"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-shared-deps-src plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-shared-deps-src']
 ---
 import kbnUiSharedDepsSrcObj from './kbn_ui_shared_deps_src.devdocs.json';
diff --git a/api_docs/kbn_ui_theme.mdx b/api_docs/kbn_ui_theme.mdx
index 3860f9d8263299..50c64a509b0604 100644
--- a/api_docs/kbn_ui_theme.mdx
+++ b/api_docs/kbn_ui_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-theme
 title: "@kbn/ui-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-theme plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-theme']
 ---
 import kbnUiThemeObj from './kbn_ui_theme.devdocs.json';
diff --git a/api_docs/kbn_url_state.mdx b/api_docs/kbn_url_state.mdx
index 4b9e1dd2462890..fb874edf725bc0 100644
--- a/api_docs/kbn_url_state.mdx
+++ b/api_docs/kbn_url_state.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-url-state
 title: "@kbn/url-state"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/url-state plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/url-state']
 ---
 import kbnUrlStateObj from './kbn_url_state.devdocs.json';
diff --git a/api_docs/kbn_user_profile_components.mdx b/api_docs/kbn_user_profile_components.mdx
index 4f65a2f438ca84..cfaa5038e533f5 100644
--- a/api_docs/kbn_user_profile_components.mdx
+++ b/api_docs/kbn_user_profile_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-user-profile-components
 title: "@kbn/user-profile-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/user-profile-components plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/user-profile-components']
 ---
 import kbnUserProfileComponentsObj from './kbn_user_profile_components.devdocs.json';
diff --git a/api_docs/kbn_utility_types.mdx b/api_docs/kbn_utility_types.mdx
index 5e4919dd16064f..e4a664c5ec4288 100644
--- a/api_docs/kbn_utility_types.mdx
+++ b/api_docs/kbn_utility_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types
 title: "@kbn/utility-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types plugin
-date: 2023-04-27
+date: 2023-05-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 aef94718c40742..36334442a2fffc 100644
--- a/api_docs/kbn_utility_types_jest.mdx
+++ b/api_docs/kbn_utility_types_jest.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types-jest
 title: "@kbn/utility-types-jest"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types-jest plugin
-date: 2023-04-27
+date: 2023-05-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 07b1eb02f5fd8b..c64a15a41e8baf 100644
--- a/api_docs/kbn_utils.mdx
+++ b/api_docs/kbn_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utils
 title: "@kbn/utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utils plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utils']
 ---
 import kbnUtilsObj from './kbn_utils.devdocs.json';
diff --git a/api_docs/kbn_yarn_lock_validator.mdx b/api_docs/kbn_yarn_lock_validator.mdx
index dddee1a05874ad..79a4be2a694bc1 100644
--- a/api_docs/kbn_yarn_lock_validator.mdx
+++ b/api_docs/kbn_yarn_lock_validator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-yarn-lock-validator
 title: "@kbn/yarn-lock-validator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/yarn-lock-validator plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/yarn-lock-validator']
 ---
 import kbnYarnLockValidatorObj from './kbn_yarn_lock_validator.devdocs.json';
diff --git a/api_docs/kibana_overview.mdx b/api_docs/kibana_overview.mdx
index 9928e1e161c7c6..a7132ec1c45841 100644
--- a/api_docs/kibana_overview.mdx
+++ b/api_docs/kibana_overview.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaOverview
 title: "kibanaOverview"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaOverview plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaOverview']
 ---
 import kibanaOverviewObj from './kibana_overview.devdocs.json';
diff --git a/api_docs/kibana_react.mdx b/api_docs/kibana_react.mdx
index 46f823f01b2c13..e28e509e7b5275 100644
--- a/api_docs/kibana_react.mdx
+++ b/api_docs/kibana_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaReact
 title: "kibanaReact"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaReact plugin
-date: 2023-04-27
+date: 2023-05-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 a6de3b75fbd2c0..fecb8ae5c8e37e 100644
--- a/api_docs/kibana_utils.mdx
+++ b/api_docs/kibana_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaUtils
 title: "kibanaUtils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaUtils plugin
-date: 2023-04-27
+date: 2023-05-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 3f3e27597cca8a..189284f96aba10 100644
--- a/api_docs/kubernetes_security.mdx
+++ b/api_docs/kubernetes_security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kubernetesSecurity
 title: "kubernetesSecurity"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kubernetesSecurity plugin
-date: 2023-04-27
+date: 2023-05-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 d656ca23a72204..784cb9a567f48e 100644
--- a/api_docs/lens.mdx
+++ b/api_docs/lens.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lens
 title: "lens"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lens plugin
-date: 2023-04-27
+date: 2023-05-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 fddd740bdb8db6..62141fdb6ebf68 100644
--- a/api_docs/license_api_guard.mdx
+++ b/api_docs/license_api_guard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseApiGuard
 title: "licenseApiGuard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseApiGuard plugin
-date: 2023-04-27
+date: 2023-05-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 444de7367a8f9f..15f6d7f10f113f 100644
--- a/api_docs/license_management.mdx
+++ b/api_docs/license_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseManagement
 title: "licenseManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseManagement plugin
-date: 2023-04-27
+date: 2023-05-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 61d7f90a7a5714..c02a2f7c293d58 100644
--- a/api_docs/licensing.mdx
+++ b/api_docs/licensing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licensing
 title: "licensing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licensing plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licensing']
 ---
 import licensingObj from './licensing.devdocs.json';
diff --git a/api_docs/lists.devdocs.json b/api_docs/lists.devdocs.json
index a5d1cf263468f6..3475f58d0d237c 100644
--- a/api_docs/lists.devdocs.json
+++ b/api_docs/lists.devdocs.json
@@ -4253,27 +4253,7 @@
                 "TransportRequestOptions",
                 " | undefined): Promise<",
                 "CountResponse",
-                ">; }; exists: { (this: That, params: ",
-                "ExistsRequest",
-                " | ",
-                "ExistsRequest",
-                ", options?: ",
-                "TransportRequestOptionsWithOutMeta",
-                " | undefined): Promise<boolean>; (this: That, params: ",
-                "ExistsRequest",
-                " | ",
-                "ExistsRequest",
-                ", options?: ",
-                "TransportRequestOptionsWithMeta",
-                " | undefined): Promise<",
-                "TransportResult",
-                "<boolean, unknown>>; (this: That, params: ",
-                "ExistsRequest",
-                " | ",
-                "ExistsRequest",
-                ", options?: ",
-                "TransportRequestOptions",
-                " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+                ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
                 "default",
                 "; child: (opts: ",
                 "ClientOptions",
@@ -4451,7 +4431,27 @@
                 "default",
                 "; eql: ",
                 "default",
-                "; existsSource: { (this: That, params: ",
+                "; exists: { (this: That, params: ",
+                "ExistsRequest",
+                " | ",
+                "ExistsRequest",
+                ", options?: ",
+                "TransportRequestOptionsWithOutMeta",
+                " | undefined): Promise<boolean>; (this: That, params: ",
+                "ExistsRequest",
+                " | ",
+                "ExistsRequest",
+                ", options?: ",
+                "TransportRequestOptionsWithMeta",
+                " | undefined): Promise<",
+                "TransportResult",
+                "<boolean, unknown>>; (this: That, params: ",
+                "ExistsRequest",
+                " | ",
+                "ExistsRequest",
+                ", options?: ",
+                "TransportRequestOptions",
+                " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
                 "ExistsSourceRequest",
                 " | ",
                 "ExistsSourceRequest",
diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx
index 584562d09b4f73..b7b630c3b1dd55 100644
--- a/api_docs/lists.mdx
+++ b/api_docs/lists.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lists
 title: "lists"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lists plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lists']
 ---
 import listsObj from './lists.devdocs.json';
diff --git a/api_docs/management.devdocs.json b/api_docs/management.devdocs.json
index 92bdbd0a808d13..4ca34adc10ea7d 100644
--- a/api_docs/management.devdocs.json
+++ b/api_docs/management.devdocs.json
@@ -772,7 +772,40 @@
       "path": "src/plugins/management/public/types.ts",
       "deprecated": false,
       "trackAdoption": false,
-      "children": [],
+      "children": [
+        {
+          "parentPluginId": "management",
+          "id": "def-public.ManagementStart.setIsSidebarEnabled",
+          "type": "Function",
+          "tags": [],
+          "label": "setIsSidebarEnabled",
+          "description": [],
+          "signature": [
+            "(enabled: boolean) => void"
+          ],
+          "path": "src/plugins/management/public/types.ts",
+          "deprecated": false,
+          "trackAdoption": false,
+          "children": [
+            {
+              "parentPluginId": "management",
+              "id": "def-public.ManagementStart.setIsSidebarEnabled.$1",
+              "type": "boolean",
+              "tags": [],
+              "label": "enabled",
+              "description": [],
+              "signature": [
+                "boolean"
+              ],
+              "path": "src/plugins/management/public/types.ts",
+              "deprecated": false,
+              "trackAdoption": false,
+              "isRequired": true
+            }
+          ],
+          "returnComment": []
+        }
+      ],
       "lifecycle": "start",
       "initialIsOpen": true
     }
diff --git a/api_docs/management.mdx b/api_docs/management.mdx
index 4d0c20d3710876..fc9cc6eb39ae7c 100644
--- a/api_docs/management.mdx
+++ b/api_docs/management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/management
 title: "management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the management plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'management']
 ---
 import managementObj from './management.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/platform-deployment-management](https://github.com/orgs/elasti
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 41 | 0 | 41 | 6 |
+| 43 | 0 | 43 | 6 |
 
 ## Client
 
diff --git a/api_docs/maps.mdx b/api_docs/maps.mdx
index 887eb79fdf90b6..2883767b53ec9e 100644
--- a/api_docs/maps.mdx
+++ b/api_docs/maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/maps
 title: "maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the maps plugin
-date: 2023-04-27
+date: 2023-05-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 40b4df3df656b3..151039ca33bccb 100644
--- a/api_docs/maps_ems.mdx
+++ b/api_docs/maps_ems.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mapsEms
 title: "mapsEms"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the mapsEms plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mapsEms']
 ---
 import mapsEmsObj from './maps_ems.devdocs.json';
diff --git a/api_docs/ml.mdx b/api_docs/ml.mdx
index 6869752efc3495..16de5780c4c2f9 100644
--- a/api_docs/ml.mdx
+++ b/api_docs/ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ml
 title: "ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ml plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ml']
 ---
 import mlObj from './ml.devdocs.json';
diff --git a/api_docs/monitoring.mdx b/api_docs/monitoring.mdx
index 698eb1d218eec5..8961ac6757ee1e 100644
--- a/api_docs/monitoring.mdx
+++ b/api_docs/monitoring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoring
 title: "monitoring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoring plugin
-date: 2023-04-27
+date: 2023-05-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 182c16c901f3ab..8879d964f2ae4e 100644
--- a/api_docs/monitoring_collection.mdx
+++ b/api_docs/monitoring_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoringCollection
 title: "monitoringCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoringCollection plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoringCollection']
 ---
 import monitoringCollectionObj from './monitoring_collection.devdocs.json';
diff --git a/api_docs/navigation.mdx b/api_docs/navigation.mdx
index 894018d6851bfb..461241d893ee58 100644
--- a/api_docs/navigation.mdx
+++ b/api_docs/navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/navigation
 title: "navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the navigation plugin
-date: 2023-04-27
+date: 2023-05-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 dfb07d4c51d993..33d0a94311f8a7 100644
--- a/api_docs/newsfeed.mdx
+++ b/api_docs/newsfeed.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/newsfeed
 title: "newsfeed"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the newsfeed plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'newsfeed']
 ---
 import newsfeedObj from './newsfeed.devdocs.json';
diff --git a/api_docs/notifications.mdx b/api_docs/notifications.mdx
index 220404c1ab3a82..784134a5ac8999 100644
--- a/api_docs/notifications.mdx
+++ b/api_docs/notifications.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/notifications
 title: "notifications"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the notifications plugin
-date: 2023-04-27
+date: 2023-05-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 73041b8266e5d6..5c39a8ab9bfc10 100644
--- a/api_docs/observability.devdocs.json
+++ b/api_docs/observability.devdocs.json
@@ -3900,7 +3900,7 @@
                 "section": "def-common.AppUpdater",
                 "text": "AppUpdater"
               },
-              ">; }) => void; }"
+              ">; }) => void; setIsSidebarEnabled: (isEnabled: boolean) => void; }"
             ],
             "path": "x-pack/plugins/observability/public/plugin.ts",
             "deprecated": false,
@@ -5771,27 +5771,7 @@
                   "TransportRequestOptions",
                   " | undefined): Promise<",
                   "CountResponse",
-                  ">; }; exists: { (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithOutMeta",
-                  " | undefined): Promise<boolean>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithMeta",
-                  " | undefined): Promise<",
-                  "TransportResult",
-                  "<boolean, unknown>>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+                  ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
                   "default",
                   "; child: (opts: ",
                   "ClientOptions",
@@ -5969,7 +5949,27 @@
                   "default",
                   "; eql: ",
                   "default",
-                  "; existsSource: { (this: That, params: ",
+                  "; exists: { (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithOutMeta",
+                  " | undefined): Promise<boolean>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithMeta",
+                  " | undefined): Promise<",
+                  "TransportResult",
+                  "<boolean, unknown>>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
                   "ExistsSourceRequest",
                   " | ",
                   "ExistsSourceRequest",
@@ -7056,27 +7056,7 @@
                   "TransportRequestOptions",
                   " | undefined): Promise<",
                   "CountResponse",
-                  ">; }; exists: { (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithOutMeta",
-                  " | undefined): Promise<boolean>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptionsWithMeta",
-                  " | undefined): Promise<",
-                  "TransportResult",
-                  "<boolean, unknown>>; (this: That, params: ",
-                  "ExistsRequest",
-                  " | ",
-                  "ExistsRequest",
-                  ", options?: ",
-                  "TransportRequestOptions",
-                  " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+                  ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
                   "default",
                   "; child: (opts: ",
                   "ClientOptions",
@@ -7254,7 +7234,27 @@
                   "default",
                   "; eql: ",
                   "default",
-                  "; existsSource: { (this: That, params: ",
+                  "; exists: { (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithOutMeta",
+                  " | undefined): Promise<boolean>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptionsWithMeta",
+                  " | undefined): Promise<",
+                  "TransportResult",
+                  "<boolean, unknown>>; (this: That, params: ",
+                  "ExistsRequest",
+                  " | ",
+                  "ExistsRequest",
+                  ", options?: ",
+                  "TransportRequestOptions",
+                  " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
                   "ExistsSourceRequest",
                   " | ",
                   "ExistsSourceRequest",
diff --git a/api_docs/observability.mdx b/api_docs/observability.mdx
index de1e0716ccfa7a..d07073486aadd2 100644
--- a/api_docs/observability.mdx
+++ b/api_docs/observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observability
 title: "observability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observability plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observability']
 ---
 import observabilityObj from './observability.devdocs.json';
diff --git a/api_docs/observability_onboarding.mdx b/api_docs/observability_onboarding.mdx
index 0be173da90e724..c34b2fa5adf578 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: 2023-04-27
+date: 2023-05-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 3f78cee49cb3a7..68bc21abf7d763 100644
--- a/api_docs/observability_shared.devdocs.json
+++ b/api_docs/observability_shared.devdocs.json
@@ -31,6 +31,22 @@
         "deprecated": false,
         "trackAdoption": false,
         "children": [
+          {
+            "parentPluginId": "observabilityShared",
+            "id": "def-public.ObservabilitySharedPlugin.Unnamed",
+            "type": "Function",
+            "tags": [],
+            "label": "Constructor",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "path": "x-pack/plugins/observability_shared/public/plugin.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "observabilityShared",
             "id": "def-public.ObservabilitySharedPlugin.setup",
@@ -89,7 +105,7 @@
                 "section": "def-common.AppUpdater",
                 "text": "AppUpdater"
               },
-              ">; }) => void; }"
+              ">; }) => void; setIsSidebarEnabled: (isEnabled: boolean) => void; }"
             ],
             "path": "x-pack/plugins/observability_shared/public/plugin.ts",
             "deprecated": false,
@@ -433,8 +449,9 @@
         "label": "ObservabilityPageTemplateProps",
         "description": [],
         "signature": [
+          "Omit<",
           "ObservabilityPageTemplateDependencies",
-          " & Pick<",
+          ", \"isSidebarEnabled$\"> & Pick<",
           "KibanaPageTemplateProps",
           ", \"children\" | \"paddingSize\" | \"data-test-subj\" | \"pageHeader\" | \"restrictWidth\" | \"isEmptyState\" | \"noDataConfig\"> & { showSolutionNav?: boolean | undefined; isPageDataLoaded?: boolean | undefined; pageSectionProps?: ",
           "EuiPageSectionProps",
@@ -494,7 +511,7 @@
             "section": "def-common.AppUpdater",
             "text": "AppUpdater"
           },
-          ">; }) => void; }"
+          ">; }) => void; setIsSidebarEnabled: (isEnabled: boolean) => void; }"
         ],
         "path": "x-pack/plugins/observability_shared/public/plugin.ts",
         "deprecated": false,
diff --git a/api_docs/observability_shared.mdx b/api_docs/observability_shared.mdx
index aa0b5395743b0a..5a9f9f79348f46 100644
--- a/api_docs/observability_shared.mdx
+++ b/api_docs/observability_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityShared
 title: "observabilityShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityShared plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityShared']
 ---
 import observabilitySharedObj from './observability_shared.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/actionable-observability](https://github.com/orgs/elastic/team
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 142 | 0 | 142 | 5 |
+| 143 | 0 | 143 | 5 |
 
 ## Client
 
diff --git a/api_docs/osquery.mdx b/api_docs/osquery.mdx
index 61602bf02ecf6d..d857fe9c022a9d 100644
--- a/api_docs/osquery.mdx
+++ b/api_docs/osquery.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/osquery
 title: "osquery"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the osquery plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'osquery']
 ---
 import osqueryObj from './osquery.devdocs.json';
diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx
index 883632de45d5bb..9c78f9eaba35d7 100644
--- a/api_docs/plugin_directory.mdx
+++ b/api_docs/plugin_directory.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsPluginDirectory
 slug: /kibana-dev-docs/api-meta/plugin-api-directory
 title: Directory
 description: Directory of public APIs available through plugins or packages.
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -15,13 +15,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Count | Plugins or Packages with a <br /> public API | Number of teams |
 |--------------|----------|------------------------|
-| 606 | 501 | 37 |
+| 613 | 507 | 37 |
 
 ### Public API health stats
 
 | API Count | Any Count | Missing comments | Missing exports |
 |--------------|----------|-----------------|--------|
-| 69328 | 526 | 59787 | 1340 |
+| 69608 | 526 | 60031 | 1351 |
 
 ## Plugin Directory
 
@@ -36,7 +36,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibBannersPluginApi" text="banners"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 9 | 0 | 9 | 0 |
 | <DocLink id="kibBfetchPluginApi" text="bfetch"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Considering using bfetch capabilities when fetching large amounts of data. This services supports batching HTTP requests and streaming responses back. | 91 | 1 | 75 | 2 |
 | <DocLink id="kibCanvasPluginApi" text="canvas"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds Canvas application to Kibana | 9 | 0 | 8 | 3 |
-| <DocLink id="kibCasesPluginApi" text="cases"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | The Case management system in Kibana | 96 | 0 | 79 | 32 |
+| <DocLink id="kibCasesPluginApi" text="cases"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | The Case management system in Kibana | 98 | 0 | 81 | 31 |
 | <DocLink id="kibChartsPluginApi" text="charts"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 271 | 16 | 256 | 10 |
 | <DocLink id="kibCloudPluginApi" text="cloud"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 41 | 0 | 11 | 0 |
 | <DocLink id="kibCloudChatPluginApi" text="cloudChat"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | Chat available on Elastic Cloud deployments for quicker assistance. | 1 | 0 | 0 | 0 |
@@ -52,23 +52,23 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibControlsPluginApi" text="controls"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The Controls Plugin contains embeddable components intended to create a simple query interface for end users, and a powerful editing suite that allows dashboard authors to build controls | 301 | 0 | 294 | 13 |
 | crossClusterReplication | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
 | customBranding | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) |  Enables customization of Kibana | 0 | 0 | 0 | 0 |
-| <DocLink id="kibCustomIntegrationsPluginApi" text="customIntegrations"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | Add custom data integrations so they can be displayed in the Fleet integrations app | 271 | 0 | 252 | 1 |
+| <DocLink id="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 | 274 | 0 | 255 | 1 |
 | <DocLink id="kibDashboardPluginApi" text="dashboard"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds the Dashboard app to Kibana | 130 | 0 | 125 | 7 |
 | <DocLink id="kibDashboardEnhancedPluginApi" text="dashboardEnhanced"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 54 | 0 | 51 | 0 |
-| <DocLink id="kibDataPluginApi" text="data"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Data services are useful for searching and querying data from Elasticsearch. Helpful utilities include: a re-usable react query bar, KQL autocomplete, async search, Data Views (Index Patterns) and field formatters. | 3271 | 119 | 2577 | 27 |
+| <DocLink id="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. | 3273 | 119 | 2579 | 27 |
 | <DocLink id="kibDataViewEditorPluginApi" text="dataViewEditor"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin provides the ability to create data views via a modal flyout inside Kibana apps | 16 | 0 | 7 | 0 |
 | <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. | 1029 | 0 | 245 | 2 |
 | <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. | 28 | 3 | 24 | 0 |
 | <DocLink id="kibDevToolsPluginApi" text="devTools"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 10 | 0 | 8 | 2 |
-| <DocLink id="kibDiscoverPluginApi" text="discover"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin contains the Discover application and the saved search embeddable. | 97 | 0 | 78 | 7 |
+| <DocLink id="kibDiscoverPluginApi" text="discover"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin contains the Discover application and the saved search embeddable. | 96 | 0 | 77 | 7 |
 | <DocLink id="kibDiscoverEnhancedPluginApi" text="discoverEnhanced"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 37 | 0 | 35 | 2 |
 | <DocLink id="kibEcsDataQualityDashboardPluginApi" text="ecsDataQualityDashboard"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | APIs used to assess the quality of data in Elasticsearch indexes | 2 | 0 | 0 | 0 |
 | <DocLink id="kibEmbeddablePluginApi" text="embeddable"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds embeddables service to Kibana | 546 | 11 | 444 | 4 |
 | <DocLink id="kibEmbeddableEnhancedPluginApi" text="embeddableEnhanced"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Extends embeddable plugin with more functionality | 14 | 0 | 14 | 0 |
 | <DocLink id="kibEncryptedSavedObjectsPluginApi" text="encryptedSavedObjects"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides encryption and decryption utilities for saved objects containing sensitive information. | 51 | 0 | 44 | 0 |
-| <DocLink id="kibEnterpriseSearchPluginApi" text="enterpriseSearch"/> | [@elastic/enterprise-search-frontend](https://github.com/orgs/elastic/teams/enterprise-search-frontend) | Adds dashboards for discovering and managing Enterprise Search products. | 7 | 0 | 7 | 0 |
+| <DocLink id="kibEnterpriseSearchPluginApi" text="enterpriseSearch"/> | [@elastic/enterprise-search-frontend](https://github.com/orgs/elastic/teams/enterprise-search-frontend) | Adds dashboards for discovering and managing Enterprise Search products. | 9 | 0 | 9 | 0 |
 | <DocLink id="kibEsUiSharedPluginApi" text="esUiShared"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 114 | 3 | 110 | 5 |
 | <DocLink id="kibEventAnnotationPluginApi" text="eventAnnotation"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | The Event Annotation service contains expressions for event annotations | 172 | 30 | 172 | 3 |
 | <DocLink id="kibEventLogPluginApi" text="eventLog"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 116 | 0 | 116 | 11 |
@@ -90,9 +90,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibFeaturesPluginApi" text="features"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 235 | 0 | 99 | 2 |
 | <DocLink id="kibFieldFormatsPluginApi" text="fieldFormats"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Index pattern fields and ambiguous values formatters | 288 | 26 | 249 | 3 |
 | <DocLink id="kibFileUploadPluginApi" text="fileUpload"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | The file upload plugin contains components and services for uploading a file, analyzing its data, and then importing the data into an Elasticsearch index. Supported file types include CSV, TSV, newline-delimited JSON and GeoJSON. | 62 | 0 | 62 | 2 |
-| <DocLink id="kibFilesPluginApi" text="files"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | File upload, download, sharing, and serving over HTTP implementation in Kibana. | 219 | 0 | 10 | 6 |
+| <DocLink id="kibFilesPluginApi" text="files"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | File upload, download, sharing, and serving over HTTP implementation in Kibana. | 239 | 0 | 24 | 9 |
 | <DocLink id="kibFilesManagementPluginApi" text="filesManagement"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Simple UI for managing files in Kibana | 2 | 1 | 2 | 0 |
-| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1110 | 3 | 1005 | 28 |
+| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1110 | 3 | 1005 | 29 |
 | ftrApis | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibGlobalSearchPluginApi" text="globalSearch"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 68 | 0 | 14 | 5 |
 | globalSearchBar | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 0 | 0 | 0 | 0 |
@@ -104,7 +104,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibImageEmbeddablePluginApi" text="imageEmbeddable"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Image embeddable | 3 | 0 | 3 | 1 |
 | <DocLink id="kibIndexLifecycleManagementPluginApi" text="indexLifecycleManagement"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibIndexManagementPluginApi" text="indexManagement"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 177 | 0 | 172 | 3 |
-| <DocLink id="kibInfraPluginApi" text="infra"/> | [@elastic/infra-monitoring-ui](https://github.com/orgs/elastic/teams/infra-monitoring-ui) | This plugin visualizes data from Filebeat and Metricbeat, and integrates with other Observability solutions | 47 | 0 | 44 | 12 |
+| <DocLink id="kibInfraPluginApi" text="infra"/> | [@elastic/infra-monitoring-ui](https://github.com/orgs/elastic/teams/infra-monitoring-ui) | This plugin visualizes data from Filebeat and Metricbeat, and integrates with other Observability solutions | 48 | 0 | 45 | 13 |
 | ingestPipelines | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
 | inputControlVis | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds Input Control visualization to Kibana | 0 | 0 | 0 | 0 |
 | <DocLink id="kibInspectorPluginApi" text="inspector"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 123 | 2 | 96 | 4 |
@@ -120,7 +120,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibLicensingPluginApi" text="licensing"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 117 | 0 | 42 | 10 |
 | <DocLink id="kibListsPluginApi" text="lists"/> | [@elastic/security-solution-platform](https://github.com/orgs/elastic/teams/security-solution-platform) | - | 210 | 0 | 94 | 51 |
 | logstash | [@elastic/logstash](https://github.com/orgs/elastic/teams/logstash) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibManagementPluginApi" text="management"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 41 | 0 | 41 | 6 |
+| <DocLink id="kibManagementPluginApi" text="management"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 43 | 0 | 43 | 6 |
 | <DocLink id="kibMapsPluginApi" text="maps"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | - | 269 | 0 | 268 | 29 |
 | <DocLink id="kibMapsEmsPluginApi" text="mapsEms"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | - | 67 | 0 | 67 | 0 |
 | <DocLink id="kibMlPluginApi" text="ml"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | This plugin provides access to the machine learning features provided by Elastic. | 257 | 9 | 81 | 41 |
@@ -131,7 +131,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibNotificationsPluginApi" text="notifications"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 2 | 0 | 2 | 1 |
 | <DocLink id="kibObservabilityPluginApi" text="observability"/> | [@elastic/actionable-observability](https://github.com/orgs/elastic/teams/actionable-observability) | - | 559 | 43 | 553 | 25 |
 | <DocLink id="kibObservabilityOnboardingPluginApi" text="observabilityOnboarding"/> | [@elastic/apm-ui](https://github.com/orgs/elastic/teams/apm-ui) | - | 7 | 0 | 7 | 0 |
-| <DocLink id="kibObservabilitySharedPluginApi" text="observabilityShared"/> | [@elastic/actionable-observability](https://github.com/orgs/elastic/teams/actionable-observability) | - | 142 | 0 | 142 | 5 |
+| <DocLink id="kibObservabilitySharedPluginApi" text="observabilityShared"/> | [@elastic/actionable-observability](https://github.com/orgs/elastic/teams/actionable-observability) | - | 143 | 0 | 143 | 5 |
 | <DocLink id="kibOsqueryPluginApi" text="osquery"/> | [@elastic/security-defend-workflows](https://github.com/orgs/elastic/teams/security-defend-workflows) | - | 24 | 0 | 24 | 6 |
 | painlessLab | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibPresentationUtilPluginApi" text="presentationUtil"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The Presentation Utility Plugin is a set of common, shared components and toolkits for solutions within the Presentation space, (e.g. Dashboards, Canvas). | 218 | 8 | 164 | 11 |
@@ -151,8 +151,11 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibScreenshottingPluginApi" text="screenshotting"/> | [@elastic/kibana-reporting-services](https://github.com/orgs/elastic/teams/kibana-reporting-services) | Kibana Screenshotting Plugin | 27 | 0 | 8 | 5 |
 | searchprofiler | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibSecurityPluginApi" text="security"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides authentication and authorization features, and exposes functionality to understand the capabilities of the currently authenticated user. | 283 | 0 | 94 | 1 |
-| <DocLink id="kibSecuritySolutionPluginApi" text="securitySolution"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 117 | 0 | 76 | 27 |
+| <DocLink id="kibSecuritySolutionPluginApi" text="securitySolution"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 123 | 0 | 82 | 27 |
 | <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. | 7 | 0 | 6 | 0 |
+| <DocLink id="kibServerlessObservabilityPluginApi" text="serverlessObservability"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Serverless customizations for observability. | 6 | 0 | 6 | 0 |
+| <DocLink id="kibServerlessSearchPluginApi" text="serverlessSearch"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Serverless customizations for search. | 6 | 0 | 6 | 0 |
+| <DocLink id="kibServerlessSecurityPluginApi" text="serverlessSecurity"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Serverless customizations for security. | 6 | 0 | 6 | 0 |
 | <DocLink id="kibSessionViewPluginApi" text="sessionView"/> | [@elastic/sec-cloudnative-integrations](https://github.com/orgs/elastic/teams/sec-cloudnative-integrations) | - | 7 | 0 | 7 | 1 |
 | <DocLink id="kibSharePluginApi" text="share"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Adds URL Service and sharing capabilities to Kibana | 118 | 0 | 59 | 10 |
 | <DocLink id="kibSnapshotRestorePluginApi" text="snapshotRestore"/> | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 22 | 1 | 22 | 1 |
@@ -193,6 +196,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibVisTypeVegaPluginApi" text="visTypeVega"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Registers the vega visualization. Is the elastic version of vega and vega-lite libraries. | 2 | 0 | 2 | 0 |
 | <DocLink id="kibVisTypeVislibPluginApi" text="visTypeVislib"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Contains the vislib visualizations. These are the classical area/line/bar, gauge/goal and heatmap charts. We want to replace them with elastic-charts. | 1 | 0 | 1 | 0 |
 | <DocLink id="kibVisTypeXyPluginApi" text="visTypeXy"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Contains the new xy-axis chart using the elastic-charts library, which will eventually replace the vislib xy-axis charts including bar, area, and line. | 52 | 0 | 50 | 5 |
+| <DocLink id="kibVisualizationUiComponentsPluginApi" text="visualizationUiComponents"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 124 | 0 | 119 | 4 |
 | <DocLink id="kibVisualizationsPluginApi" text="visualizations"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Contains the shared architecture among all the legacy visualizations, e.g. the visualization type registry or the visualization embeddable. | 800 | 12 | 770 | 18 |
 | watcher | [@elastic/platform-deployment-management](https://github.com/orgs/elastic/teams/platform-deployment-management) | - | 0 | 0 | 0 | 0 |
 
@@ -235,7 +239,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnConfigSchemaPluginApi" text="@kbn/config-schema"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 129 | 3 | 127 | 17 |
 | <DocLink id="kibKbnContentManagementContentEditorPluginApi" text="@kbn/content-management-content-editor"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 6 | 0 | 4 | 4 |
 | <DocLink id="kibKbnContentManagementTableListPluginApi" text="@kbn/content-management-table-list"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 21 | 0 | 14 | 5 |
-| <DocLink id="kibKbnContentManagementUtilsPluginApi" text="@kbn/content-management-utils"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 64 | 1 | 15 | 0 |
+| <DocLink id="kibKbnContentManagementUtilsPluginApi" text="@kbn/content-management-utils"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 106 | 1 | 57 | 0 |
 | <DocLink id="kibKbnCoreAnalyticsBrowserPluginApi" text="@kbn/core-analytics-browser"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 4 | 0 | 0 | 0 |
 | <DocLink id="kibKbnCoreAnalyticsBrowserInternalPluginApi" text="@kbn/core-analytics-browser-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 7 | 0 | 7 | 1 |
 | <DocLink id="kibKbnCoreAnalyticsBrowserMocksPluginApi" text="@kbn/core-analytics-browser-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 4 | 0 | 4 | 0 |
@@ -257,7 +261,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnCoreCapabilitiesCommonPluginApi" text="@kbn/core-capabilities-common"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 5 | 0 | 0 | 0 |
 | <DocLink id="kibKbnCoreCapabilitiesServerPluginApi" text="@kbn/core-capabilities-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 16 | 0 | 7 | 0 |
 | <DocLink id="kibKbnCoreCapabilitiesServerMocksPluginApi" text="@kbn/core-capabilities-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 6 | 0 | 6 | 0 |
-| <DocLink id="kibKbnCoreChromeBrowserPluginApi" text="@kbn/core-chrome-browser"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 124 | 0 | 47 | 0 |
+| <DocLink id="kibKbnCoreChromeBrowserPluginApi" text="@kbn/core-chrome-browser"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 136 | 0 | 58 | 0 |
 | <DocLink id="kibKbnCoreChromeBrowserMocksPluginApi" text="@kbn/core-chrome-browser-mocks"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 3 | 0 | 3 | 0 |
 | <DocLink id="kibKbnCoreConfigServerInternalPluginApi" text="@kbn/core-config-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibKbnCoreCustomBrandingBrowserPluginApi" text="@kbn/core-custom-branding-browser"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 8 | 0 | 8 | 0 |
@@ -354,17 +358,17 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnCoreSavedObjectsApiServerPluginApi" text="@kbn/core-saved-objects-api-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 351 | 1 | 5 | 1 |
 | <DocLink id="kibKbnCoreSavedObjectsApiServerInternalPluginApi" text="@kbn/core-saved-objects-api-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 77 | 0 | 55 | 1 |
 | <DocLink id="kibKbnCoreSavedObjectsApiServerMocksPluginApi" text="@kbn/core-saved-objects-api-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 11 | 0 | 11 | 0 |
-| <DocLink id="kibKbnCoreSavedObjectsBaseServerInternalPluginApi" text="@kbn/core-saved-objects-base-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 72 | 0 | 52 | 9 |
+| <DocLink id="kibKbnCoreSavedObjectsBaseServerInternalPluginApi" text="@kbn/core-saved-objects-base-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 79 | 0 | 55 | 9 |
 | <DocLink id="kibKbnCoreSavedObjectsBaseServerMocksPluginApi" text="@kbn/core-saved-objects-base-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsBrowserPluginApi" text="@kbn/core-saved-objects-browser"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 2 | 0 | 1 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsBrowserInternalPluginApi" text="@kbn/core-saved-objects-browser-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 6 | 0 | 6 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsBrowserMocksPluginApi" text="@kbn/core-saved-objects-browser-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 7 | 0 | 7 | 0 |
-| <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" text="@kbn/core-saved-objects-common"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 71 | 0 | 39 | 0 |
+| <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" text="@kbn/core-saved-objects-common"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 73 | 0 | 40 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsImportExportServerInternalPluginApi" text="@kbn/core-saved-objects-import-export-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 25 | 0 | 23 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsImportExportServerMocksPluginApi" text="@kbn/core-saved-objects-import-export-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsMigrationServerInternalPluginApi" text="@kbn/core-saved-objects-migration-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 122 | 0 | 87 | 46 |
 | <DocLink id="kibKbnCoreSavedObjectsMigrationServerMocksPluginApi" text="@kbn/core-saved-objects-migration-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 12 | 0 | 12 | 0 |
-| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" text="@kbn/core-saved-objects-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 510 | 1 | 106 | 4 |
+| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" text="@kbn/core-saved-objects-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 512 | 1 | 106 | 4 |
 | <DocLink id="kibKbnCoreSavedObjectsServerInternalPluginApi" text="@kbn/core-saved-objects-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 69 | 0 | 69 | 4 |
 | <DocLink id="kibKbnCoreSavedObjectsServerMocksPluginApi" text="@kbn/core-saved-objects-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 14 | 0 | 14 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsUtilsServerPluginApi" text="@kbn/core-saved-objects-utils-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 30 | 0 | 6 | 0 |
@@ -464,6 +468,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnPerformanceTestingDatasetExtractorPluginApi" text="@kbn/performance-testing-dataset-extractor"/> | [@elastic/kibana-performance-testing](https://github.com/orgs/elastic/teams/kibana-performance-testing) | - | 3 | 0 | 3 | 1 |
 | <DocLink id="kibKbnPluginGeneratorPluginApi" text="@kbn/plugin-generator"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnPluginHelpersPluginApi" text="@kbn/plugin-helpers"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 1 | 0 | 1 | 0 |
+| <DocLink id="kibKbnRandomSamplingPluginApi" text="@kbn/random-sampling"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 13 | 0 | 7 | 0 |
 | <DocLink id="kibKbnReactFieldPluginApi" text="@kbn/react-field"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 22 | 0 | 9 | 0 |
 | <DocLink id="kibKbnRepoFileMapsPluginApi" text="@kbn/repo-file-maps"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 18 | 0 | 18 | 0 |
 | <DocLink id="kibKbnRepoLinterPluginApi" text="@kbn/repo-linter"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 40 | 0 | 38 | 5 |
@@ -505,12 +510,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnSharedUxButtonToolbarPluginApi" text="@kbn/shared-ux-button-toolbar"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 27 | 0 | 10 | 0 |
 | <DocLink id="kibKbnSharedUxCardNoDataPluginApi" text="@kbn/shared-ux-card-no-data"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 10 | 0 | 4 | 0 |
 | <DocLink id="kibKbnSharedUxCardNoDataMocksPluginApi" text="@kbn/shared-ux-card-no-data-mocks"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 32 | 0 | 28 | 0 |
+| <DocLink id="kibKbnSharedUxChromeNavigationPluginApi" text="@kbn/shared-ux-chrome-navigation"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 21 | 0 | 11 | 3 |
 | <DocLink id="kibKbnSharedUxFileContextPluginApi" text="@kbn/shared-ux-file-context"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 5 | 0 | 4 | 0 |
 | <DocLink id="kibKbnSharedUxFileImagePluginApi" text="@kbn/shared-ux-file-image"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 3 | 0 | 2 | 0 |
 | <DocLink id="kibKbnSharedUxFileImageMocksPluginApi" text="@kbn/shared-ux-file-image-mocks"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibKbnSharedUxFileMocksPluginApi" text="@kbn/shared-ux-file-mocks"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnSharedUxFilePickerPluginApi" text="@kbn/shared-ux-file-picker"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 14 | 0 | 6 | 0 |
-| <DocLink id="kibKbnSharedUxFileTypesPluginApi" text="@kbn/shared-ux-file-types"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 71 | 0 | 9 | 0 |
+| <DocLink id="kibKbnSharedUxFileTypesPluginApi" text="@kbn/shared-ux-file-types"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 72 | 0 | 9 | 0 |
 | <DocLink id="kibKbnSharedUxFileUploadPluginApi" text="@kbn/shared-ux-file-upload"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 7 | 0 | 7 | 1 |
 | <DocLink id="kibKbnSharedUxFileUtilPluginApi" text="@kbn/shared-ux-file-util"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 17 | 0 | 15 | 0 |
 | <DocLink id="kibKbnSharedUxLinkRedirectAppPluginApi" text="@kbn/shared-ux-link-redirect-app"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 17 | 0 | 9 | 0 |
diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx
index 2b6396b06331dd..9dd86842d7beb1 100644
--- a/api_docs/presentation_util.mdx
+++ b/api_docs/presentation_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationUtil
 title: "presentationUtil"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the presentationUtil plugin
-date: 2023-04-27
+date: 2023-05-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 7006f4b542da78..efa67379c8b6cf 100644
--- a/api_docs/profiling.mdx
+++ b/api_docs/profiling.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profiling
 title: "profiling"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the profiling plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profiling']
 ---
 import profilingObj from './profiling.devdocs.json';
diff --git a/api_docs/remote_clusters.mdx b/api_docs/remote_clusters.mdx
index 69fbc2e31a614b..d5cdd1bebe4341 100644
--- a/api_docs/remote_clusters.mdx
+++ b/api_docs/remote_clusters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/remoteClusters
 title: "remoteClusters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the remoteClusters plugin
-date: 2023-04-27
+date: 2023-05-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 ba4cdd9ab4c96f..c83bdb3a62c110 100644
--- a/api_docs/reporting.mdx
+++ b/api_docs/reporting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/reporting
 title: "reporting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the reporting plugin
-date: 2023-04-27
+date: 2023-05-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 69372889d4bd04..377a4fefe322fd 100644
--- a/api_docs/rollup.mdx
+++ b/api_docs/rollup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/rollup
 title: "rollup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the rollup plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'rollup']
 ---
 import rollupObj from './rollup.devdocs.json';
diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx
index 48dc094b5b50d4..712486721bdddf 100644
--- a/api_docs/rule_registry.mdx
+++ b/api_docs/rule_registry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ruleRegistry
 title: "ruleRegistry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ruleRegistry plugin
-date: 2023-04-27
+date: 2023-05-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 57694b8f480189..15de435a4b4863 100644
--- a/api_docs/runtime_fields.mdx
+++ b/api_docs/runtime_fields.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/runtimeFields
 title: "runtimeFields"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the runtimeFields plugin
-date: 2023-04-27
+date: 2023-05-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 4f198ba60896b0..985194658d7460 100644
--- a/api_docs/saved_objects.mdx
+++ b/api_docs/saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjects
 title: "savedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjects plugin
-date: 2023-04-27
+date: 2023-05-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 252364e139c95f..a1a62d0c911cd6 100644
--- a/api_docs/saved_objects_finder.mdx
+++ b/api_docs/saved_objects_finder.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsFinder
 title: "savedObjectsFinder"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsFinder plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsFinder']
 ---
 import savedObjectsFinderObj from './saved_objects_finder.devdocs.json';
diff --git a/api_docs/saved_objects_management.devdocs.json b/api_docs/saved_objects_management.devdocs.json
index 5e33f4d84a296d..18bcb79ec2a962 100644
--- a/api_docs/saved_objects_management.devdocs.json
+++ b/api_docs/saved_objects_management.devdocs.json
@@ -532,7 +532,7 @@
             "label": "obj",
             "description": [],
             "signature": [
-              "{ type: string; id: string; meta: { title?: string | undefined; icon?: string | undefined; }; overwrite?: boolean | undefined; }"
+              "{ type: string; id: string; meta: { title?: string | undefined; icon?: string | undefined; }; managed?: boolean | undefined; overwrite?: boolean | undefined; }"
             ],
             "path": "src/plugins/saved_objects_management/public/lib/process_import_response.ts",
             "deprecated": false,
diff --git a/api_docs/saved_objects_management.mdx b/api_docs/saved_objects_management.mdx
index a15a343637d471..8f9fc9c15db473 100644
--- a/api_docs/saved_objects_management.mdx
+++ b/api_docs/saved_objects_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsManagement
 title: "savedObjectsManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsManagement plugin
-date: 2023-04-27
+date: 2023-05-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 73ed3e1ec7a946..9d98d8a149ccf1 100644
--- a/api_docs/saved_objects_tagging.mdx
+++ b/api_docs/saved_objects_tagging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTagging
 title: "savedObjectsTagging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTagging plugin
-date: 2023-04-27
+date: 2023-05-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 adaa4248398400..4ac35b7a115559 100644
--- a/api_docs/saved_objects_tagging_oss.mdx
+++ b/api_docs/saved_objects_tagging_oss.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTaggingOss
 title: "savedObjectsTaggingOss"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTaggingOss plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTaggingOss']
 ---
 import savedObjectsTaggingOssObj from './saved_objects_tagging_oss.devdocs.json';
diff --git a/api_docs/saved_search.mdx b/api_docs/saved_search.mdx
index 87b52eb6417a51..3ed58a58ffcaf5 100644
--- a/api_docs/saved_search.mdx
+++ b/api_docs/saved_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedSearch
 title: "savedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedSearch plugin
-date: 2023-04-27
+date: 2023-05-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 88102b6e2f0feb..5bf542bf2bd2cc 100644
--- a/api_docs/screenshot_mode.mdx
+++ b/api_docs/screenshot_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotMode
 title: "screenshotMode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotMode plugin
-date: 2023-04-27
+date: 2023-05-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 d60d11b94c3bca..4ad62dbe8e85b3 100644
--- a/api_docs/screenshotting.mdx
+++ b/api_docs/screenshotting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotting
 title: "screenshotting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotting plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotting']
 ---
 import screenshottingObj from './screenshotting.devdocs.json';
diff --git a/api_docs/security.mdx b/api_docs/security.mdx
index c7f3fe3cfa1295..caba439addd796 100644
--- a/api_docs/security.mdx
+++ b/api_docs/security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/security
 title: "security"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the security plugin
-date: 2023-04-27
+date: 2023-05-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 825b3c48f0f8cd..00f734bc8c963c 100644
--- a/api_docs/security_solution.devdocs.json
+++ b/api_docs/security_solution.devdocs.json
@@ -34,7 +34,13 @@
             "text": "PluginSetup"
           },
           ", ",
-          "PluginStart",
+          {
+            "pluginId": "securitySolution",
+            "scope": "public",
+            "docId": "kibSecuritySolutionPluginApi",
+            "section": "def-public.PluginStart",
+            "text": "PluginStart"
+          },
           ", ",
           "SetupPlugins",
           ", ",
@@ -159,7 +165,13 @@
               "<",
               "StartPluginsDependencies",
               ", ",
-              "PluginStart",
+              {
+                "pluginId": "securitySolution",
+                "scope": "public",
+                "docId": "kibSecuritySolutionPluginApi",
+                "section": "def-public.PluginStart",
+                "text": "PluginStart"
+              },
               ">, plugins: ",
               "SetupPlugins",
               ") => ",
@@ -193,7 +205,13 @@
                   "<",
                   "StartPluginsDependencies",
                   ", ",
-                  "PluginStart",
+                  {
+                    "pluginId": "securitySolution",
+                    "scope": "public",
+                    "docId": "kibSecuritySolutionPluginApi",
+                    "section": "def-public.PluginStart",
+                    "text": "PluginStart"
+                  },
                   ">"
                 ],
                 "path": "x-pack/plugins/security_solution/public/plugin.tsx",
@@ -237,7 +255,14 @@
               },
               ", plugins: ",
               "StartPlugins",
-              ") => {}"
+              ") => ",
+              {
+                "pluginId": "securitySolution",
+                "scope": "public",
+                "docId": "kibSecuritySolutionPluginApi",
+                "section": "def-public.PluginStart",
+                "text": "PluginStart"
+              }
             ],
             "path": "x-pack/plugins/security_solution/public/plugin.tsx",
             "deprecated": false,
@@ -1323,6 +1348,70 @@
       ],
       "lifecycle": "setup",
       "initialIsOpen": true
+    },
+    "start": {
+      "parentPluginId": "securitySolution",
+      "id": "def-public.PluginStart",
+      "type": "Interface",
+      "tags": [],
+      "label": "PluginStart",
+      "description": [],
+      "path": "x-pack/plugins/security_solution/public/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [
+        {
+          "parentPluginId": "securitySolution",
+          "id": "def-public.PluginStart.navLinks$",
+          "type": "Object",
+          "tags": [],
+          "label": "navLinks$",
+          "description": [],
+          "signature": [
+            "Observable",
+            "<",
+            "NavigationLink",
+            "[]>"
+          ],
+          "path": "x-pack/plugins/security_solution/public/types.ts",
+          "deprecated": false,
+          "trackAdoption": false
+        },
+        {
+          "parentPluginId": "securitySolution",
+          "id": "def-public.PluginStart.setIsSidebarEnabled",
+          "type": "Function",
+          "tags": [],
+          "label": "setIsSidebarEnabled",
+          "description": [],
+          "signature": [
+            "(isSidebarEnabled: boolean) => void"
+          ],
+          "path": "x-pack/plugins/security_solution/public/types.ts",
+          "deprecated": false,
+          "trackAdoption": false,
+          "children": [
+            {
+              "parentPluginId": "securitySolution",
+              "id": "def-public.PluginStart.setIsSidebarEnabled.$1",
+              "type": "boolean",
+              "tags": [],
+              "label": "isSidebarEnabled",
+              "description": [],
+              "signature": [
+                "boolean"
+              ],
+              "path": "x-pack/plugins/security_solution/public/types.ts",
+              "deprecated": false,
+              "trackAdoption": false,
+              "isRequired": true
+            }
+          ],
+          "returnComment": []
+        }
+      ],
+      "lifecycle": "start",
+      "initialIsOpen": true
     }
   },
   "server": {
@@ -2082,8 +2171,36 @@
     "classes": [],
     "functions": [],
     "interfaces": [],
-    "enums": [],
+    "enums": [
+      {
+        "parentPluginId": "securitySolution",
+        "id": "def-common.SecurityPageName",
+        "type": "Enum",
+        "tags": [],
+        "label": "SecurityPageName",
+        "description": [],
+        "path": "x-pack/plugins/security_solution/common/constants.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      }
+    ],
     "misc": [
+      {
+        "parentPluginId": "securitySolution",
+        "id": "def-common.APP_UI_ID",
+        "type": "string",
+        "tags": [],
+        "label": "APP_UI_ID",
+        "description": [],
+        "signature": [
+          "\"securitySolutionUI\""
+        ],
+        "path": "x-pack/plugins/security_solution/common/constants.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "securitySolution",
         "id": "def-common.ELASTIC_SECURITY_RULE_ID",
diff --git a/api_docs/security_solution.mdx b/api_docs/security_solution.mdx
index 191c989efceee8..8df61c2478f862 100644
--- a/api_docs/security_solution.mdx
+++ b/api_docs/security_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolution
 title: "securitySolution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolution plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolution']
 ---
 import securitySolutionObj from './security_solution.devdocs.json';
@@ -21,13 +21,16 @@ Contact [@elastic/security-solution](https://github.com/orgs/elastic/teams/secur
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 117 | 0 | 76 | 27 |
+| 123 | 0 | 82 | 27 |
 
 ## Client
 
 ### Setup
 <DocDefinitionList data={[securitySolutionObj.client.setup]}/>
 
+### Start
+<DocDefinitionList data={[securitySolutionObj.client.start]}/>
+
 ### Classes
 <DocDefinitionList data={securitySolutionObj.client.classes}/>
 
@@ -53,6 +56,9 @@ Contact [@elastic/security-solution](https://github.com/orgs/elastic/teams/secur
 
 ## Common
 
+### Enums
+<DocDefinitionList data={securitySolutionObj.common.enums}/>
+
 ### Consts, variables and types
 <DocDefinitionList data={securitySolutionObj.common.misc}/>
 
diff --git a/api_docs/serverless.mdx b/api_docs/serverless.mdx
index 69b31bf7651939..b29ca7c697b995 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: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverless']
 ---
 import serverlessObj from './serverless.devdocs.json';
diff --git a/api_docs/serverless_observability.devdocs.json b/api_docs/serverless_observability.devdocs.json
new file mode 100644
index 00000000000000..caecd1a34bae8f
--- /dev/null
+++ b/api_docs/serverless_observability.devdocs.json
@@ -0,0 +1,114 @@
+{
+  "id": "serverlessObservability",
+  "client": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": [],
+    "setup": {
+      "parentPluginId": "serverlessObservability",
+      "id": "def-public.ServerlessObservabilityPluginSetup",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessObservabilityPluginSetup",
+      "description": [],
+      "path": "x-pack/plugins/serverless_observability/public/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "setup",
+      "initialIsOpen": true
+    },
+    "start": {
+      "parentPluginId": "serverlessObservability",
+      "id": "def-public.ServerlessObservabilityPluginStart",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessObservabilityPluginStart",
+      "description": [],
+      "path": "x-pack/plugins/serverless_observability/public/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": [],
+    "setup": {
+      "parentPluginId": "serverlessObservability",
+      "id": "def-server.ServerlessObservabilityPluginSetup",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessObservabilityPluginSetup",
+      "description": [],
+      "path": "x-pack/plugins/serverless_observability/server/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "setup",
+      "initialIsOpen": true
+    },
+    "start": {
+      "parentPluginId": "serverlessObservability",
+      "id": "def-server.ServerlessObservabilityPluginStart",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessObservabilityPluginStart",
+      "description": [],
+      "path": "x-pack/plugins/serverless_observability/server/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [
+      {
+        "parentPluginId": "serverlessObservability",
+        "id": "def-common.PLUGIN_ID",
+        "type": "string",
+        "tags": [],
+        "label": "PLUGIN_ID",
+        "description": [],
+        "signature": [
+          "\"serverlessObservability\""
+        ],
+        "path": "x-pack/plugins/serverless_observability/common/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "serverlessObservability",
+        "id": "def-common.PLUGIN_NAME",
+        "type": "string",
+        "tags": [],
+        "label": "PLUGIN_NAME",
+        "description": [],
+        "signature": [
+          "\"serverlessObservability\""
+        ],
+        "path": "x-pack/plugins/serverless_observability/common/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/serverless_observability.mdx b/api_docs/serverless_observability.mdx
new file mode 100644
index 00000000000000..ad29b0d4f7046d
--- /dev/null
+++ b/api_docs/serverless_observability.mdx
@@ -0,0 +1,46 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibServerlessObservabilityPluginApi
+slug: /kibana-dev-docs/api/serverlessObservability
+title: "serverlessObservability"
+image: https://source.unsplash.com/400x175/?github
+description: API docs for the serverlessObservability plugin
+date: 2023-05-03
+tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessObservability']
+---
+import serverlessObservabilityObj from './serverless_observability.devdocs.json';
+
+Serverless customizations for observability.
+
+Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 6 | 0 | 6 | 0 |
+
+## Client
+
+### Setup
+<DocDefinitionList data={[serverlessObservabilityObj.client.setup]}/>
+
+### Start
+<DocDefinitionList data={[serverlessObservabilityObj.client.start]}/>
+
+## Server
+
+### Setup
+<DocDefinitionList data={[serverlessObservabilityObj.server.setup]}/>
+
+### Start
+<DocDefinitionList data={[serverlessObservabilityObj.server.start]}/>
+
+## Common
+
+### Consts, variables and types
+<DocDefinitionList data={serverlessObservabilityObj.common.misc}/>
+
diff --git a/api_docs/serverless_search.devdocs.json b/api_docs/serverless_search.devdocs.json
new file mode 100644
index 00000000000000..0dda44c3607afc
--- /dev/null
+++ b/api_docs/serverless_search.devdocs.json
@@ -0,0 +1,114 @@
+{
+  "id": "serverlessSearch",
+  "client": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": [],
+    "setup": {
+      "parentPluginId": "serverlessSearch",
+      "id": "def-public.ServerlessSearchPluginSetup",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessSearchPluginSetup",
+      "description": [],
+      "path": "x-pack/plugins/serverless_search/public/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "setup",
+      "initialIsOpen": true
+    },
+    "start": {
+      "parentPluginId": "serverlessSearch",
+      "id": "def-public.ServerlessSearchPluginStart",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessSearchPluginStart",
+      "description": [],
+      "path": "x-pack/plugins/serverless_search/public/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": [],
+    "setup": {
+      "parentPluginId": "serverlessSearch",
+      "id": "def-server.ServerlessSearchPluginSetup",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessSearchPluginSetup",
+      "description": [],
+      "path": "x-pack/plugins/serverless_search/server/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "setup",
+      "initialIsOpen": true
+    },
+    "start": {
+      "parentPluginId": "serverlessSearch",
+      "id": "def-server.ServerlessSearchPluginStart",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessSearchPluginStart",
+      "description": [],
+      "path": "x-pack/plugins/serverless_search/server/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [
+      {
+        "parentPluginId": "serverlessSearch",
+        "id": "def-common.PLUGIN_ID",
+        "type": "string",
+        "tags": [],
+        "label": "PLUGIN_ID",
+        "description": [],
+        "signature": [
+          "\"serverlessSearch\""
+        ],
+        "path": "x-pack/plugins/serverless_search/common/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "serverlessSearch",
+        "id": "def-common.PLUGIN_NAME",
+        "type": "string",
+        "tags": [],
+        "label": "PLUGIN_NAME",
+        "description": [],
+        "signature": [
+          "\"serverlessSearch\""
+        ],
+        "path": "x-pack/plugins/serverless_search/common/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/serverless_search.mdx b/api_docs/serverless_search.mdx
new file mode 100644
index 00000000000000..06108daff3d936
--- /dev/null
+++ b/api_docs/serverless_search.mdx
@@ -0,0 +1,46 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibServerlessSearchPluginApi
+slug: /kibana-dev-docs/api/serverlessSearch
+title: "serverlessSearch"
+image: https://source.unsplash.com/400x175/?github
+description: API docs for the serverlessSearch plugin
+date: 2023-05-03
+tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessSearch']
+---
+import serverlessSearchObj from './serverless_search.devdocs.json';
+
+Serverless customizations for search.
+
+Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 6 | 0 | 6 | 0 |
+
+## Client
+
+### Setup
+<DocDefinitionList data={[serverlessSearchObj.client.setup]}/>
+
+### Start
+<DocDefinitionList data={[serverlessSearchObj.client.start]}/>
+
+## Server
+
+### Setup
+<DocDefinitionList data={[serverlessSearchObj.server.setup]}/>
+
+### Start
+<DocDefinitionList data={[serverlessSearchObj.server.start]}/>
+
+## Common
+
+### Consts, variables and types
+<DocDefinitionList data={serverlessSearchObj.common.misc}/>
+
diff --git a/api_docs/serverless_security.devdocs.json b/api_docs/serverless_security.devdocs.json
new file mode 100644
index 00000000000000..058c09fd913604
--- /dev/null
+++ b/api_docs/serverless_security.devdocs.json
@@ -0,0 +1,114 @@
+{
+  "id": "serverlessSecurity",
+  "client": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": [],
+    "setup": {
+      "parentPluginId": "serverlessSecurity",
+      "id": "def-public.ServerlessSecurityPluginSetup",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessSecurityPluginSetup",
+      "description": [],
+      "path": "x-pack/plugins/serverless_security/public/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "setup",
+      "initialIsOpen": true
+    },
+    "start": {
+      "parentPluginId": "serverlessSecurity",
+      "id": "def-public.ServerlessSecurityPluginStart",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessSecurityPluginStart",
+      "description": [],
+      "path": "x-pack/plugins/serverless_security/public/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": [],
+    "setup": {
+      "parentPluginId": "serverlessSecurity",
+      "id": "def-server.ServerlessSecurityPluginSetup",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessSecurityPluginSetup",
+      "description": [],
+      "path": "x-pack/plugins/serverless_security/server/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "setup",
+      "initialIsOpen": true
+    },
+    "start": {
+      "parentPluginId": "serverlessSecurity",
+      "id": "def-server.ServerlessSecurityPluginStart",
+      "type": "Interface",
+      "tags": [],
+      "label": "ServerlessSecurityPluginStart",
+      "description": [],
+      "path": "x-pack/plugins/serverless_security/server/types.ts",
+      "deprecated": false,
+      "trackAdoption": false,
+      "children": [],
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [
+      {
+        "parentPluginId": "serverlessSecurity",
+        "id": "def-common.PLUGIN_ID",
+        "type": "string",
+        "tags": [],
+        "label": "PLUGIN_ID",
+        "description": [],
+        "signature": [
+          "\"serverlessSecurity\""
+        ],
+        "path": "x-pack/plugins/serverless_security/common/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "serverlessSecurity",
+        "id": "def-common.PLUGIN_NAME",
+        "type": "string",
+        "tags": [],
+        "label": "PLUGIN_NAME",
+        "description": [],
+        "signature": [
+          "\"serverlessSecurity\""
+        ],
+        "path": "x-pack/plugins/serverless_security/common/index.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/serverless_security.mdx b/api_docs/serverless_security.mdx
new file mode 100644
index 00000000000000..877017f422a819
--- /dev/null
+++ b/api_docs/serverless_security.mdx
@@ -0,0 +1,46 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibServerlessSecurityPluginApi
+slug: /kibana-dev-docs/api/serverlessSecurity
+title: "serverlessSecurity"
+image: https://source.unsplash.com/400x175/?github
+description: API docs for the serverlessSecurity plugin
+date: 2023-05-03
+tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessSecurity']
+---
+import serverlessSecurityObj from './serverless_security.devdocs.json';
+
+Serverless customizations for security.
+
+Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 6 | 0 | 6 | 0 |
+
+## Client
+
+### Setup
+<DocDefinitionList data={[serverlessSecurityObj.client.setup]}/>
+
+### Start
+<DocDefinitionList data={[serverlessSecurityObj.client.start]}/>
+
+## Server
+
+### Setup
+<DocDefinitionList data={[serverlessSecurityObj.server.setup]}/>
+
+### Start
+<DocDefinitionList data={[serverlessSecurityObj.server.start]}/>
+
+## Common
+
+### Consts, variables and types
+<DocDefinitionList data={serverlessSecurityObj.common.misc}/>
+
diff --git a/api_docs/session_view.mdx b/api_docs/session_view.mdx
index 3a6116597f3a05..3856334d2e9493 100644
--- a/api_docs/session_view.mdx
+++ b/api_docs/session_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/sessionView
 title: "sessionView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the sessionView plugin
-date: 2023-04-27
+date: 2023-05-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 d3a04ae12366dc..cdb7a63466de4e 100644
--- a/api_docs/share.mdx
+++ b/api_docs/share.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/share
 title: "share"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the share plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'share']
 ---
 import shareObj from './share.devdocs.json';
diff --git a/api_docs/snapshot_restore.mdx b/api_docs/snapshot_restore.mdx
index ed472c418e1a87..1c263f492fa9ad 100644
--- a/api_docs/snapshot_restore.mdx
+++ b/api_docs/snapshot_restore.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/snapshotRestore
 title: "snapshotRestore"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the snapshotRestore plugin
-date: 2023-04-27
+date: 2023-05-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 6a73e47b1e2e99..d7fc45a1b6d68d 100644
--- a/api_docs/spaces.mdx
+++ b/api_docs/spaces.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/spaces
 title: "spaces"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the spaces plugin
-date: 2023-04-27
+date: 2023-05-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 ed7e7d080f1d41..2ea2cbe75639ce 100644
--- a/api_docs/stack_alerts.mdx
+++ b/api_docs/stack_alerts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackAlerts
 title: "stackAlerts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackAlerts plugin
-date: 2023-04-27
+date: 2023-05-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 218d201b660a5b..e15a93a28abe6d 100644
--- a/api_docs/stack_connectors.mdx
+++ b/api_docs/stack_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackConnectors
 title: "stackConnectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackConnectors plugin
-date: 2023-04-27
+date: 2023-05-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 e5865130c4776a..e04449544af4b1 100644
--- a/api_docs/task_manager.mdx
+++ b/api_docs/task_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/taskManager
 title: "taskManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the taskManager plugin
-date: 2023-04-27
+date: 2023-05-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 a213a3af8305db..60a5f58adc3a09 100644
--- a/api_docs/telemetry.mdx
+++ b/api_docs/telemetry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetry
 title: "telemetry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetry plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetry']
 ---
 import telemetryObj from './telemetry.devdocs.json';
diff --git a/api_docs/telemetry_collection_manager.devdocs.json b/api_docs/telemetry_collection_manager.devdocs.json
index 0cc262ea12f139..7556db94efa9e1 100644
--- a/api_docs/telemetry_collection_manager.devdocs.json
+++ b/api_docs/telemetry_collection_manager.devdocs.json
@@ -244,27 +244,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -442,7 +422,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
diff --git a/api_docs/telemetry_collection_manager.mdx b/api_docs/telemetry_collection_manager.mdx
index 28c654ba361933..5752437a56229d 100644
--- a/api_docs/telemetry_collection_manager.mdx
+++ b/api_docs/telemetry_collection_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionManager
 title: "telemetryCollectionManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionManager plugin
-date: 2023-04-27
+date: 2023-05-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 a79bdb42519ba4..b7c47e1f0d4bf9 100644
--- a/api_docs/telemetry_collection_xpack.mdx
+++ b/api_docs/telemetry_collection_xpack.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionXpack
 title: "telemetryCollectionXpack"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionXpack plugin
-date: 2023-04-27
+date: 2023-05-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 983bf84a162157..38e6070682fffa 100644
--- a/api_docs/telemetry_management_section.mdx
+++ b/api_docs/telemetry_management_section.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryManagementSection
 title: "telemetryManagementSection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryManagementSection plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryManagementSection']
 ---
 import telemetryManagementSectionObj from './telemetry_management_section.devdocs.json';
diff --git a/api_docs/threat_intelligence.mdx b/api_docs/threat_intelligence.mdx
index b18cf3b2b53415..d3f8c1544b9c0a 100644
--- a/api_docs/threat_intelligence.mdx
+++ b/api_docs/threat_intelligence.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/threatIntelligence
 title: "threatIntelligence"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the threatIntelligence plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'threatIntelligence']
 ---
 import threatIntelligenceObj from './threat_intelligence.devdocs.json';
diff --git a/api_docs/timelines.devdocs.json b/api_docs/timelines.devdocs.json
index e4d3828ddeef08..9726c2e6914101 100644
--- a/api_docs/timelines.devdocs.json
+++ b/api_docs/timelines.devdocs.json
@@ -4327,6 +4327,10 @@
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/common/lib/kuery/index.ts"
           },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/lib/kuery/index.ts"
+          },
           {
             "plugin": "securitySolution",
             "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
diff --git a/api_docs/timelines.mdx b/api_docs/timelines.mdx
index 2e69c632ffc669..9555c3506824ce 100644
--- a/api_docs/timelines.mdx
+++ b/api_docs/timelines.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/timelines
 title: "timelines"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the timelines plugin
-date: 2023-04-27
+date: 2023-05-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 fc32b21d58ede1..68694441a9ce87 100644
--- a/api_docs/transform.mdx
+++ b/api_docs/transform.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/transform
 title: "transform"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the transform plugin
-date: 2023-04-27
+date: 2023-05-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 e5228f222fd153..268a508829116a 100644
--- a/api_docs/triggers_actions_ui.devdocs.json
+++ b/api_docs/triggers_actions_ui.devdocs.json
@@ -5870,7 +5870,9 @@
           "EuiDataGridToolBarAdditionalControlsOptions",
           " | undefined; showInspectButton?: boolean | undefined; toolbarVisibility?: ",
           "EuiDataGridToolBarVisibilityOptions",
-          " | undefined; } & Partial<Pick<",
+          " | undefined; shouldHighlightRow?: ((alert: ",
+          "EcsFieldsResponse",
+          ") => boolean) | undefined; } & Partial<Pick<",
           "EuiDataGridProps",
           ", \"gridStyle\" | \"rowHeightsOptions\">>"
         ],
diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx
index 2be185fee6d5aa..41ab0804ebfda4 100644
--- a/api_docs/triggers_actions_ui.mdx
+++ b/api_docs/triggers_actions_ui.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/triggersActionsUi
 title: "triggersActionsUi"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the triggersActionsUi plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'triggersActionsUi']
 ---
 import triggersActionsUiObj from './triggers_actions_ui.devdocs.json';
diff --git a/api_docs/ui_actions.mdx b/api_docs/ui_actions.mdx
index f117e0cbf7d60c..595755198644de 100644
--- a/api_docs/ui_actions.mdx
+++ b/api_docs/ui_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActions
 title: "uiActions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActions plugin
-date: 2023-04-27
+date: 2023-05-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 bb79914c3eda29..11205b7ddeefbe 100644
--- a/api_docs/ui_actions_enhanced.mdx
+++ b/api_docs/ui_actions_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActionsEnhanced
 title: "uiActionsEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActionsEnhanced plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActionsEnhanced']
 ---
 import uiActionsEnhancedObj from './ui_actions_enhanced.devdocs.json';
diff --git a/api_docs/unified_field_list.devdocs.json b/api_docs/unified_field_list.devdocs.json
index c07ccbf4416d21..b6337f09e6eba8 100644
--- a/api_docs/unified_field_list.devdocs.json
+++ b/api_docs/unified_field_list.devdocs.json
@@ -361,7 +361,7 @@
             "section": "def-public.FieldPopoverFooterProps",
             "text": "FieldPopoverFooterProps"
           },
-          ">) => JSX.Element | null"
+          ">) => JSX.Element"
         ],
         "path": "src/plugins/unified_field_list/public/components/field_popover/field_popover_footer.tsx",
         "deprecated": false,
diff --git a/api_docs/unified_field_list.mdx b/api_docs/unified_field_list.mdx
index d8f2a8deb70a46..59949026897de4 100644
--- a/api_docs/unified_field_list.mdx
+++ b/api_docs/unified_field_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedFieldList
 title: "unifiedFieldList"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedFieldList plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedFieldList']
 ---
 import unifiedFieldListObj from './unified_field_list.devdocs.json';
diff --git a/api_docs/unified_histogram.mdx b/api_docs/unified_histogram.mdx
index d291087a46522d..983357fc9c3f42 100644
--- a/api_docs/unified_histogram.mdx
+++ b/api_docs/unified_histogram.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedHistogram
 title: "unifiedHistogram"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedHistogram plugin
-date: 2023-04-27
+date: 2023-05-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 0e4eb30a87f090..79b7dc9dc0a918 100644
--- a/api_docs/unified_search.mdx
+++ b/api_docs/unified_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch
 title: "unifiedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch plugin
-date: 2023-04-27
+date: 2023-05-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 3b85c9cf9e2ea2..07930688590c3b 100644
--- a/api_docs/unified_search_autocomplete.mdx
+++ b/api_docs/unified_search_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch-autocomplete
 title: "unifiedSearch.autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch.autocomplete plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch.autocomplete']
 ---
 import unifiedSearchAutocompleteObj from './unified_search_autocomplete.devdocs.json';
diff --git a/api_docs/url_forwarding.mdx b/api_docs/url_forwarding.mdx
index a63a95f30dbb68..e55b441c42ccdc 100644
--- a/api_docs/url_forwarding.mdx
+++ b/api_docs/url_forwarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/urlForwarding
 title: "urlForwarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the urlForwarding plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'urlForwarding']
 ---
 import urlForwardingObj from './url_forwarding.devdocs.json';
diff --git a/api_docs/usage_collection.devdocs.json b/api_docs/usage_collection.devdocs.json
index 0f4c06857c3b82..83239792457c05 100644
--- a/api_docs/usage_collection.devdocs.json
+++ b/api_docs/usage_collection.devdocs.json
@@ -513,27 +513,7 @@
               "TransportRequestOptions",
               " | undefined): Promise<",
               "CountResponse",
-              ">; }; exists: { (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithOutMeta",
-              " | undefined): Promise<boolean>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptionsWithMeta",
-              " | undefined): Promise<",
-              "TransportResult",
-              "<boolean, unknown>>; (this: That, params: ",
-              "ExistsRequest",
-              " | ",
-              "ExistsRequest",
-              ", options?: ",
-              "TransportRequestOptions",
-              " | undefined): Promise<boolean>; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              ">; }; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kRollup]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
               "default",
               "; child: (opts: ",
               "ClientOptions",
@@ -711,7 +691,27 @@
               "default",
               "; eql: ",
               "default",
-              "; existsSource: { (this: That, params: ",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
               "ExistsSourceRequest",
               " | ",
               "ExistsSourceRequest",
diff --git a/api_docs/usage_collection.mdx b/api_docs/usage_collection.mdx
index cdd492ce334bb9..51828f2914265c 100644
--- a/api_docs/usage_collection.mdx
+++ b/api_docs/usage_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/usageCollection
 title: "usageCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the usageCollection plugin
-date: 2023-04-27
+date: 2023-05-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 bc247134a86ad4..f9d06dfeb91373 100644
--- a/api_docs/ux.mdx
+++ b/api_docs/ux.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ux
 title: "ux"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ux plugin
-date: 2023-04-27
+date: 2023-05-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 a6e83cc1abcc98..6b32e305259fcd 100644
--- a/api_docs/vis_default_editor.mdx
+++ b/api_docs/vis_default_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visDefaultEditor
 title: "visDefaultEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visDefaultEditor plugin
-date: 2023-04-27
+date: 2023-05-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 88312cf7645d60..59324f4deb9ac6 100644
--- a/api_docs/vis_type_gauge.mdx
+++ b/api_docs/vis_type_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeGauge
 title: "visTypeGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeGauge plugin
-date: 2023-04-27
+date: 2023-05-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 a9c4786d09fbdb..c4838001eac2b5 100644
--- a/api_docs/vis_type_heatmap.mdx
+++ b/api_docs/vis_type_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeHeatmap
 title: "visTypeHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeHeatmap plugin
-date: 2023-04-27
+date: 2023-05-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 b12590d79925d4..4797a56652fec1 100644
--- a/api_docs/vis_type_pie.mdx
+++ b/api_docs/vis_type_pie.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypePie
 title: "visTypePie"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypePie plugin
-date: 2023-04-27
+date: 2023-05-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 97b172360d220c..f72aad7a9ca364 100644
--- a/api_docs/vis_type_table.mdx
+++ b/api_docs/vis_type_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTable
 title: "visTypeTable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTable plugin
-date: 2023-04-27
+date: 2023-05-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 77e153dce6d31f..4436ef9577f43e 100644
--- a/api_docs/vis_type_timelion.mdx
+++ b/api_docs/vis_type_timelion.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimelion
 title: "visTypeTimelion"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimelion plugin
-date: 2023-04-27
+date: 2023-05-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 09456773083e7e..362d30ed33a621 100644
--- a/api_docs/vis_type_timeseries.mdx
+++ b/api_docs/vis_type_timeseries.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimeseries
 title: "visTypeTimeseries"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimeseries plugin
-date: 2023-04-27
+date: 2023-05-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 0752971706bc29..3373cf73bb9883 100644
--- a/api_docs/vis_type_vega.mdx
+++ b/api_docs/vis_type_vega.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVega
 title: "visTypeVega"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVega plugin
-date: 2023-04-27
+date: 2023-05-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 b80e05eec94777..6d8cceaf320205 100644
--- a/api_docs/vis_type_vislib.mdx
+++ b/api_docs/vis_type_vislib.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVislib
 title: "visTypeVislib"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVislib plugin
-date: 2023-04-27
+date: 2023-05-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 5268b7aa8ef229..39ceec2a4c4923 100644
--- a/api_docs/vis_type_xy.mdx
+++ b/api_docs/vis_type_xy.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeXy
 title: "visTypeXy"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeXy plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeXy']
 ---
 import visTypeXyObj from './vis_type_xy.devdocs.json';
diff --git a/api_docs/visualization_ui_components.devdocs.json b/api_docs/visualization_ui_components.devdocs.json
new file mode 100644
index 00000000000000..aa98a976edc244
--- /dev/null
+++ b/api_docs/visualization_ui_components.devdocs.json
@@ -0,0 +1,2112 @@
+{
+  "id": "visualizationUiComponents",
+  "client": {
+    "classes": [],
+    "functions": [
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.chroma",
+        "type": "Function",
+        "tags": [],
+        "label": "chroma",
+        "description": [
+          "\nChroma.js is a tiny library for all kinds of color conversions and color scales."
+        ],
+        "signature": [
+          "ChromaStatic"
+        ],
+        "path": "node_modules/@types/chroma-js/index.d.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.chroma",
+        "type": "Function",
+        "tags": [],
+        "label": "chroma",
+        "description": [],
+        "signature": [
+          "ChromaStatic"
+        ],
+        "path": "node_modules/@types/chroma-js/index.d.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.ColorPicker",
+        "type": "Function",
+        "tags": [],
+        "label": "ColorPicker",
+        "description": [],
+        "signature": [
+          "({ label, disableHelpTooltip, disabled, setConfig, defaultColor, overwriteColor, showAlpha, }: { overwriteColor?: string | null | undefined; defaultColor?: string | null | undefined; setConfig: (config: { color?: string | undefined; }) => void; label?: string | undefined; disableHelpTooltip?: boolean | undefined; disabled?: boolean | undefined; showAlpha?: boolean | undefined; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.ColorPicker.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  label,\n  disableHelpTooltip,\n  disabled,\n  setConfig,\n  defaultColor,\n  overwriteColor,\n  showAlpha,\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.ColorPicker.$1.overwriteColor",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "overwriteColor",
+                "description": [],
+                "signature": [
+                  "string | null | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.ColorPicker.$1.defaultColor",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "defaultColor",
+                "description": [],
+                "signature": [
+                  "string | null | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.ColorPicker.$1.setConfig",
+                "type": "Function",
+                "tags": [],
+                "label": "setConfig",
+                "description": [],
+                "signature": [
+                  "(config: { color?: string | undefined; }) => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.ColorPicker.$1.setConfig.$1",
+                    "type": "Object",
+                    "tags": [],
+                    "label": "config",
+                    "description": [],
+                    "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "children": [
+                      {
+                        "parentPluginId": "visualizationUiComponents",
+                        "id": "def-public.ColorPicker.$1.setConfig.$1.color",
+                        "type": "string",
+                        "tags": [],
+                        "label": "color",
+                        "description": [],
+                        "signature": [
+                          "string | undefined"
+                        ],
+                        "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                        "deprecated": false,
+                        "trackAdoption": false
+                      }
+                    ]
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.ColorPicker.$1.label",
+                "type": "string",
+                "tags": [],
+                "label": "label",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.ColorPicker.$1.disableHelpTooltip",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "disableHelpTooltip",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.ColorPicker.$1.disabled",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "disabled",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.ColorPicker.$1.showAlpha",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "showAlpha",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/color_picker.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.DebouncedInput",
+        "type": "Function",
+        "tags": [],
+        "label": "DebouncedInput",
+        "description": [
+          "\nWhen testing this component, mock the \"debounce\" function in lodash (see this module test for an example)"
+        ],
+        "signature": [
+          "(props: Props) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/debounced_input.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.DebouncedInput.$1",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "props",
+            "description": [],
+            "signature": [
+              "Props"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/debounced_input.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.DimensionButton",
+        "type": "Function",
+        "tags": [],
+        "label": "DimensionButton",
+        "description": [],
+        "signature": [
+          "({\n  groupLabel,\n  children,\n  onClick,\n  onRemoveClick,\n  accessorConfig,\n  label,\n  message,\n  ...otherProps // from Drag&Drop integration\n}: { className?: string | undefined; groupLabel: string; children: React.ReactElement<any, string | React.JSXElementConstructor<any>>; onClick: (id: string) => void; onRemoveClick: (id: string) => void; accessorConfig: ",
+          {
+            "pluginId": "visualizationUiComponents",
+            "scope": "public",
+            "docId": "kibVisualizationUiComponentsPluginApi",
+            "section": "def-public.AccessorConfig",
+            "text": "AccessorConfig"
+          },
+          "; label: string; message?: ",
+          "Message",
+          " | undefined; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.DimensionButton.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  groupLabel,\n  children,\n  onClick,\n  onRemoveClick,\n  accessorConfig,\n  label,\n  message,\n  ...otherProps // from Drag&Drop integration\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionButton.$1.className",
+                "type": "string",
+                "tags": [],
+                "label": "className",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionButton.$1.groupLabel",
+                "type": "string",
+                "tags": [],
+                "label": "groupLabel",
+                "description": [],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionButton.$1.children",
+                "type": "Object",
+                "tags": [],
+                "label": "children",
+                "description": [],
+                "signature": [
+                  "React.ReactElement<any, string | React.JSXElementConstructor<any>>"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionButton.$1.onClick",
+                "type": "Function",
+                "tags": [],
+                "label": "onClick",
+                "description": [],
+                "signature": [
+                  "(id: string) => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.DimensionButton.$1.onClick.$1",
+                    "type": "string",
+                    "tags": [],
+                    "label": "id",
+                    "description": [],
+                    "signature": [
+                      "string"
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionButton.$1.onRemoveClick",
+                "type": "Function",
+                "tags": [],
+                "label": "onRemoveClick",
+                "description": [],
+                "signature": [
+                  "(id: string) => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.DimensionButton.$1.onRemoveClick.$1",
+                    "type": "string",
+                    "tags": [],
+                    "label": "id",
+                    "description": [],
+                    "signature": [
+                      "string"
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionButton.$1.accessorConfig",
+                "type": "Object",
+                "tags": [],
+                "label": "accessorConfig",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "visualizationUiComponents",
+                    "scope": "public",
+                    "docId": "kibVisualizationUiComponentsPluginApi",
+                    "section": "def-public.AccessorConfig",
+                    "text": "AccessorConfig"
+                  }
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionButton.$1.label",
+                "type": "string",
+                "tags": [],
+                "label": "label",
+                "description": [],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionButton.$1.message",
+                "type": "Object",
+                "tags": [],
+                "label": "message",
+                "description": [],
+                "signature": [
+                  "Message",
+                  " | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.DimensionEditorSection",
+        "type": "Function",
+        "tags": [],
+        "label": "DimensionEditorSection",
+        "description": [],
+        "signature": [
+          "({ children, title, }: { title?: string | undefined; children?: React.ReactNode | React.ReactNode[]; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/dimension_editor_section.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.DimensionEditorSection.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  children,\n  title,\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/dimension_editor_section.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionEditorSection.$1.title",
+                "type": "string",
+                "tags": [],
+                "label": "title",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_editor_section.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DimensionEditorSection.$1.children",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "children",
+                "description": [],
+                "signature": [
+                  "React.ReactNode | React.ReactNode[]"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/dimension_editor_section.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.DragDropBuckets",
+        "type": "Function",
+        "tags": [],
+        "label": "DragDropBuckets",
+        "description": [],
+        "signature": [
+          "({\n  items,\n  onDragStart,\n  onDragEnd,\n  droppableId,\n  children,\n  bgColor,\n}: { items: T[]; droppableId: string; children: React.ReactElement<any, string | React.JSXElementConstructor<any>>[]; onDragStart?: (() => void) | undefined; onDragEnd?: ((items: T[]) => void) | undefined; bgColor?: \"warning\" | \"success\" | \"subdued\" | \"primary\" | \"accent\" | \"danger\" | \"transparent\" | \"plain\" | undefined; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.DragDropBuckets.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  items,\n  onDragStart,\n  onDragEnd,\n  droppableId,\n  children,\n  bgColor,\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DragDropBuckets.$1.items",
+                "type": "Array",
+                "tags": [],
+                "label": "items",
+                "description": [],
+                "signature": [
+                  "T[]"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DragDropBuckets.$1.droppableId",
+                "type": "string",
+                "tags": [],
+                "label": "droppableId",
+                "description": [],
+                "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DragDropBuckets.$1.children",
+                "type": "Array",
+                "tags": [],
+                "label": "children",
+                "description": [],
+                "signature": [
+                  "React.ReactElement<any, string | React.JSXElementConstructor<any>>[]"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DragDropBuckets.$1.onDragStart",
+                "type": "Function",
+                "tags": [],
+                "label": "onDragStart",
+                "description": [],
+                "signature": [
+                  "(() => void) | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DragDropBuckets.$1.onDragEnd",
+                "type": "Function",
+                "tags": [],
+                "label": "onDragEnd",
+                "description": [],
+                "signature": [
+                  "((items: T[]) => void) | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.DragDropBuckets.$1.onDragEnd.$1",
+                    "type": "Array",
+                    "tags": [],
+                    "label": "items",
+                    "description": [],
+                    "signature": [
+                      "T[]"
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.DragDropBuckets.$1.bgColor",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "bgColor",
+                "description": [],
+                "signature": [
+                  "\"warning\" | \"success\" | \"subdued\" | \"primary\" | \"accent\" | \"danger\" | \"transparent\" | \"plain\" | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.DraggableBucketContainer",
+        "type": "Function",
+        "tags": [],
+        "label": "DraggableBucketContainer",
+        "description": [],
+        "signature": [
+          "({ id, children, isInsidePanel, Container, ...bucketContainerProps }: ",
+          "Assign",
+          "<Omit<",
+          "BucketContainerProps",
+          ", \"draggableProvided\">, { id: string; children: React.ReactNode; isInsidePanel?: boolean | undefined; Container?: React.FunctionComponent<",
+          "BucketContainerProps",
+          "> | undefined; }, ",
+          "Diff",
+          "<Omit<",
+          "BucketContainerProps",
+          ", \"draggableProvided\">, { id: string; children: React.ReactNode; isInsidePanel?: boolean | undefined; Container?: React.FunctionComponent<",
+          "BucketContainerProps",
+          "> | undefined; }> & ",
+          "Intersection",
+          "<{ id: string; children: React.ReactNode; isInsidePanel?: boolean | undefined; Container?: React.FunctionComponent<",
+          "BucketContainerProps",
+          "> | undefined; }, Omit<",
+          "BucketContainerProps",
+          ", \"draggableProvided\">> & ",
+          "Diff",
+          "<{ id: string; children: React.ReactNode; isInsidePanel?: boolean | undefined; Container?: React.FunctionComponent<",
+          "BucketContainerProps",
+          "> | undefined; }, Omit<",
+          "BucketContainerProps",
+          ", \"draggableProvided\">>>) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.DraggableBucketContainer.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  id,\n  children,\n  isInsidePanel,\n  Container = DefaultBucketContainer,\n  ...bucketContainerProps\n}",
+            "description": [],
+            "signature": [
+              "Assign",
+              "<Omit<",
+              "BucketContainerProps",
+              ", \"draggableProvided\">, { id: string; children: React.ReactNode; isInsidePanel?: boolean | undefined; Container?: React.FunctionComponent<",
+              "BucketContainerProps",
+              "> | undefined; }, ",
+              "Diff",
+              "<Omit<",
+              "BucketContainerProps",
+              ", \"draggableProvided\">, { id: string; children: React.ReactNode; isInsidePanel?: boolean | undefined; Container?: React.FunctionComponent<",
+              "BucketContainerProps",
+              "> | undefined; }> & ",
+              "Intersection",
+              "<{ id: string; children: React.ReactNode; isInsidePanel?: boolean | undefined; Container?: React.FunctionComponent<",
+              "BucketContainerProps",
+              "> | undefined; }, Omit<",
+              "BucketContainerProps",
+              ", \"draggableProvided\">> & ",
+              "Diff",
+              "<{ id: string; children: React.ReactNode; isInsidePanel?: boolean | undefined; Container?: React.FunctionComponent<",
+              "BucketContainerProps",
+              "> | undefined; }, Omit<",
+              "BucketContainerProps",
+              ", \"draggableProvided\">>>"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.FieldPicker",
+        "type": "Function",
+        "tags": [],
+        "label": "FieldPicker",
+        "description": [],
+        "signature": [
+          "({\n  selectedOptions,\n  options,\n  onChoose,\n  onDelete,\n  fieldIsInvalid,\n  ['data-test-subj']: dataTestSub,\n  ...rest\n}: ",
+          "FieldPickerProps",
+          "<T>) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/field_picker/field_picker.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.FieldPicker.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  selectedOptions,\n  options,\n  onChoose,\n  onDelete,\n  fieldIsInvalid,\n  ['data-test-subj']: dataTestSub,\n  ...rest\n}",
+            "description": [],
+            "signature": [
+              "FieldPickerProps",
+              "<T>"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/field_picker/field_picker.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.FieldsBucketContainer",
+        "type": "Function",
+        "tags": [],
+        "label": "FieldsBucketContainer",
+        "description": [],
+        "signature": [
+          "({ idx, onRemoveClick, removeTitle, children, draggableProvided, isNotRemovable, isNotDraggable, isDragging, \"data-test-subj\": dataTestSubj, }: ",
+          "BucketContainerProps",
+          ") => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/fields_bucket_container.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.FieldsBucketContainer.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  idx,\n  onRemoveClick,\n  removeTitle,\n  children,\n  draggableProvided,\n  isNotRemovable,\n  isNotDraggable,\n  isDragging,\n  'data-test-subj': dataTestSubj = 'lns-fieldsBucketContainer',\n}",
+            "description": [],
+            "signature": [
+              "BucketContainerProps"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/fields_bucket_container.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.FilterQueryInput",
+        "type": "Function",
+        "tags": [],
+        "label": "FilterQueryInput",
+        "description": [],
+        "signature": [
+          "({\n  inputFilter,\n  onChange,\n  dataView,\n  helpMessage,\n  label = filterByLabel,\n  initiallyOpen,\n  ['data-test-subj']: dataTestSubj,\n  queryInputServices,\n  appName,\n}: { inputFilter: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.Query",
+            "text": "Query"
+          },
+          " | undefined; onChange: (query: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.Query",
+            "text": "Query"
+          },
+          ") => void; dataView: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.DataViewBase",
+            "text": "DataViewBase"
+          },
+          "; helpMessage?: string | null | undefined; label?: string | undefined; initiallyOpen?: boolean | undefined; \"data-test-subj\"?: string | undefined; queryInputServices: ",
+          "QueryInputServices",
+          "; appName: string; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.FilterQueryInput.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  inputFilter,\n  onChange,\n  dataView,\n  helpMessage,\n  label = filterByLabel,\n  initiallyOpen,\n  ['data-test-subj']: dataTestSubj,\n  queryInputServices,\n  appName,\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.inputFilter",
+                "type": "Object",
+                "tags": [],
+                "label": "inputFilter",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.Query",
+                    "text": "Query"
+                  },
+                  " | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.onChange",
+                "type": "Function",
+                "tags": [],
+                "label": "onChange",
+                "description": [],
+                "signature": [
+                  "(query: ",
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.Query",
+                    "text": "Query"
+                  },
+                  ") => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.FilterQueryInput.$1.onChange.$1",
+                    "type": "Object",
+                    "tags": [],
+                    "label": "query",
+                    "description": [],
+                    "signature": [
+                      {
+                        "pluginId": "@kbn/es-query",
+                        "scope": "common",
+                        "docId": "kibKbnEsQueryPluginApi",
+                        "section": "def-common.Query",
+                        "text": "Query"
+                      }
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.dataView",
+                "type": "Object",
+                "tags": [],
+                "label": "dataView",
+                "description": [],
+                "signature": [
+                  "{ fields: ",
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.DataViewFieldBase",
+                    "text": "DataViewFieldBase"
+                  },
+                  "[]; id?: string | undefined; title: string; }"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.helpMessage",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "helpMessage",
+                "description": [],
+                "signature": [
+                  "string | null | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.label",
+                "type": "string",
+                "tags": [],
+                "label": "label",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.initiallyOpen",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "initiallyOpen",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.datatestsubj",
+                "type": "string",
+                "tags": [],
+                "label": "['data-test-subj']",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.queryInputServices",
+                "type": "Object",
+                "tags": [],
+                "label": "queryInputServices",
+                "description": [],
+                "signature": [
+                  "QueryInputServices"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.FilterQueryInput.$1.appName",
+                "type": "string",
+                "tags": [],
+                "label": "appName",
+                "description": [],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.IconSelect",
+        "type": "Function",
+        "tags": [],
+        "label": "IconSelect",
+        "description": [],
+        "signature": [
+          "({\n  value,\n  onChange,\n  customIconSet,\n  defaultIcon = 'empty',\n}: { value?: Icon | undefined; onChange: (newIcon: Icon) => void; customIconSet: ",
+          {
+            "pluginId": "visualizationUiComponents",
+            "scope": "public",
+            "docId": "kibVisualizationUiComponentsPluginApi",
+            "section": "def-public.IconSet",
+            "text": "IconSet"
+          },
+          "<Icon>; defaultIcon?: string | undefined; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.IconSelect.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  value,\n  onChange,\n  customIconSet,\n  defaultIcon = 'empty',\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.IconSelect.$1.value",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "value",
+                "description": [],
+                "signature": [
+                  "Icon | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.IconSelect.$1.onChange",
+                "type": "Function",
+                "tags": [],
+                "label": "onChange",
+                "description": [],
+                "signature": [
+                  "(newIcon: Icon) => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.IconSelect.$1.onChange.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "newIcon",
+                    "description": [],
+                    "signature": [
+                      "Icon"
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.IconSelect.$1.customIconSet",
+                "type": "Array",
+                "tags": [],
+                "label": "customIconSet",
+                "description": [],
+                "signature": [
+                  "{ value: Icon; label: string; icon?: ",
+                  "IconType",
+                  " | Icon | undefined; shouldRotate?: boolean | undefined; canFill?: boolean | undefined; }[]"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.IconSelect.$1.defaultIcon",
+                "type": "string",
+                "tags": [],
+                "label": "defaultIcon",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.IconSelectSetting",
+        "type": "Function",
+        "tags": [],
+        "label": "IconSelectSetting",
+        "description": [],
+        "signature": [
+          "({\n  currentIcon,\n  setIcon,\n  customIconSet,\n  defaultIcon = 'empty',\n}: { currentIcon?: Icon | undefined; setIcon: (icon: Icon) => void; customIconSet: ",
+          {
+            "pluginId": "visualizationUiComponents",
+            "scope": "public",
+            "docId": "kibVisualizationUiComponentsPluginApi",
+            "section": "def-public.IconSet",
+            "text": "IconSet"
+          },
+          "<Icon>; defaultIcon?: string | undefined; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.IconSelectSetting.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  currentIcon,\n  setIcon,\n  customIconSet,\n  defaultIcon = 'empty',\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.IconSelectSetting.$1.currentIcon",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "currentIcon",
+                "description": [],
+                "signature": [
+                  "Icon | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.IconSelectSetting.$1.setIcon",
+                "type": "Function",
+                "tags": [],
+                "label": "setIcon",
+                "description": [],
+                "signature": [
+                  "(icon: Icon) => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.IconSelectSetting.$1.setIcon.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "icon",
+                    "description": [],
+                    "signature": [
+                      "Icon"
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.IconSelectSetting.$1.customIconSet",
+                "type": "Array",
+                "tags": [],
+                "label": "customIconSet",
+                "description": [],
+                "signature": [
+                  "{ value: Icon; label: string; icon?: ",
+                  "IconType",
+                  " | Icon | undefined; shouldRotate?: boolean | undefined; canFill?: boolean | undefined; }[]"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.IconSelectSetting.$1.defaultIcon",
+                "type": "string",
+                "tags": [],
+                "label": "defaultIcon",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.isQueryValid",
+        "type": "Function",
+        "tags": [],
+        "label": "isQueryValid",
+        "description": [],
+        "signature": [
+          "(input: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.Query",
+            "text": "Query"
+          },
+          ", dataView: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.DataViewBase",
+            "text": "DataViewBase"
+          },
+          ") => boolean"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/query_input/helpers.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.isQueryValid.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "input",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Query",
+                "text": "Query"
+              }
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/query_input/helpers.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.isQueryValid.$2",
+            "type": "Object",
+            "tags": [],
+            "label": "dataView",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.DataViewBase",
+                "text": "DataViewBase"
+              }
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/query_input/helpers.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.NameInput",
+        "type": "Function",
+        "tags": [],
+        "label": "NameInput",
+        "description": [],
+        "signature": [
+          "({ value, onChange, defaultValue, }: { value: string; onChange: (value: string) => void; defaultValue?: string | undefined; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/name_input.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.NameInput.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  value,\n  onChange,\n  defaultValue,\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/name_input.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.NameInput.$1.value",
+                "type": "string",
+                "tags": [],
+                "label": "value",
+                "description": [],
+                "path": "src/plugins/visualization_ui_components/public/components/name_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.NameInput.$1.onChange",
+                "type": "Function",
+                "tags": [],
+                "label": "onChange",
+                "description": [],
+                "signature": [
+                  "(value: string) => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/name_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.NameInput.$1.onChange.$1",
+                    "type": "string",
+                    "tags": [],
+                    "label": "value",
+                    "description": [],
+                    "signature": [
+                      "string"
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/name_input.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.NameInput.$1.defaultValue",
+                "type": "string",
+                "tags": [],
+                "label": "defaultValue",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/name_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.NewBucketButton",
+        "type": "Function",
+        "tags": [],
+        "label": "NewBucketButton",
+        "description": [],
+        "signature": [
+          "({ label, onClick, isDisabled, className, \"data-test-subj\": dataTestSubj, }: NewBucketButtonProps) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/new_bucket_button.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.NewBucketButton.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  label,\n  onClick,\n  isDisabled,\n  className,\n  'data-test-subj': dataTestSubj = 'lns-newBucket-add',\n}",
+            "description": [],
+            "signature": [
+              "NewBucketButtonProps"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/drag_drop_bucket/new_bucket_button.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.QueryInput",
+        "type": "Function",
+        "tags": [],
+        "label": "QueryInput",
+        "description": [],
+        "signature": [
+          "({ value, onChange, dataView, isInvalid, onSubmit, disableAutoFocus, [\"data-test-subj\"]: dataTestSubj, placeholder, appName, services: { data, uiSettings, http, notifications, docLinks, storage, unifiedSearch, dataViews }, }: { value: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.Query",
+            "text": "Query"
+          },
+          "; onChange: (input: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.Query",
+            "text": "Query"
+          },
+          ") => void; dataView: string | { type: \"id\" | \"title\"; value: string; }; isInvalid: boolean; onSubmit: () => void; disableAutoFocus?: boolean | undefined; 'data-test-subj'?: string | undefined; placeholder?: string | undefined; appName: string; services: ",
+          "QueryInputServices",
+          "; }) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.QueryInput.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  value,\n  onChange,\n  dataView,\n  isInvalid,\n  onSubmit,\n  disableAutoFocus,\n  ['data-test-subj']: dataTestSubj,\n  placeholder,\n  appName,\n  services: { data, uiSettings, http, notifications, docLinks, storage, unifiedSearch, dataViews },\n}",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.value",
+                "type": "Object",
+                "tags": [],
+                "label": "value",
+                "description": [],
+                "signature": [
+                  "{ query: string | { [key: string]: any; }; language: string; }"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.onChange",
+                "type": "Function",
+                "tags": [],
+                "label": "onChange",
+                "description": [],
+                "signature": [
+                  "(input: ",
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.Query",
+                    "text": "Query"
+                  },
+                  ") => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.QueryInput.$1.onChange.$1",
+                    "type": "Object",
+                    "tags": [],
+                    "label": "input",
+                    "description": [],
+                    "signature": [
+                      {
+                        "pluginId": "@kbn/es-query",
+                        "scope": "common",
+                        "docId": "kibKbnEsQueryPluginApi",
+                        "section": "def-common.Query",
+                        "text": "Query"
+                      }
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.dataView",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "dataView",
+                "description": [],
+                "signature": [
+                  "string | { type: \"id\" | \"title\"; value: string; }"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.isInvalid",
+                "type": "boolean",
+                "tags": [],
+                "label": "isInvalid",
+                "description": [],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.onSubmit",
+                "type": "Function",
+                "tags": [],
+                "label": "onSubmit",
+                "description": [],
+                "signature": [
+                  "() => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.disableAutoFocus",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "disableAutoFocus",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.datatestsubj",
+                "type": "string",
+                "tags": [],
+                "label": "'data-test-subj'",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.placeholder",
+                "type": "string",
+                "tags": [],
+                "label": "placeholder",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.appName",
+                "type": "string",
+                "tags": [],
+                "label": "appName",
+                "description": [],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.QueryInput.$1.services",
+                "type": "Object",
+                "tags": [],
+                "label": "services",
+                "description": [],
+                "signature": [
+                  "QueryInputServices"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.TooltipWrapper",
+        "type": "Function",
+        "tags": [],
+        "label": "TooltipWrapper",
+        "description": [],
+        "signature": [
+          "({ children, condition, tooltipContent, ...tooltipProps }: React.PropsWithChildren<TooltipWrapperProps>) => JSX.Element"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/tooltip_wrapper.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.TooltipWrapper.$1",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "{\n  children,\n  condition,\n  tooltipContent,\n  ...tooltipProps\n}",
+            "description": [],
+            "signature": [
+              "React.PropsWithChildren<TooltipWrapperProps>"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/tooltip_wrapper.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.TruncatedLabel",
+        "type": "Function",
+        "tags": [],
+        "label": "TruncatedLabel",
+        "description": [],
+        "signature": [
+          "React.NamedExoticComponent<{ label: string; search: string; width: number; font: string; }>"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/field_picker/truncated_label.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "returnComment": [],
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.TruncatedLabel.$1",
+            "type": "Uncategorized",
+            "tags": [],
+            "label": "props",
+            "description": [],
+            "signature": [
+              "P"
+            ],
+            "path": "node_modules/@types/react/index.d.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.useDebouncedValue",
+        "type": "Function",
+        "tags": [],
+        "label": "useDebouncedValue",
+        "description": [
+          "\nDebounces value changes and updates inputValue on root state changes if no debounced changes\nare in flight because the user is currently modifying the value.\n\n* allowFalsyValue: update upstream with all falsy values but null or undefined\n\nWhen testing this function mock the \"debounce\" function in lodash (see this module test for an example)"
+        ],
+        "signature": [
+          "<T>({ onChange, value, defaultValue, }: { onChange: (val: T) => void; value: T; defaultValue?: T | undefined; }, { allowFalsyValue }?: { allowFalsyValue?: boolean | undefined; }) => { inputValue: T; handleInputChange: (val: T) => void; initialValue: T; }"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/debounced_value.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.useDebouncedValue.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n    onChange,\n    value,\n    defaultValue,\n  }",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/debounced_value.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.useDebouncedValue.$1.onChange",
+                "type": "Function",
+                "tags": [],
+                "label": "onChange",
+                "description": [],
+                "signature": [
+                  "(val: T) => void"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "visualizationUiComponents",
+                    "id": "def-public.useDebouncedValue.$1.onChange.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "val",
+                    "description": [],
+                    "signature": [
+                      "T"
+                    ],
+                    "path": "src/plugins/visualization_ui_components/public/components/debounced_value.ts",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.useDebouncedValue.$1.value",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "value",
+                "description": [],
+                "signature": [
+                  "T"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.useDebouncedValue.$1.defaultValue",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "defaultValue",
+                "description": [],
+                "signature": [
+                  "T | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.useDebouncedValue.$2",
+            "type": "Object",
+            "tags": [],
+            "label": "{ allowFalsyValue }",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/debounced_value.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "visualizationUiComponents",
+                "id": "def-public.useDebouncedValue.$2.allowFalsyValue",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "allowFalsyValue",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "src/plugins/visualization_ui_components/public/components/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.validateQuery",
+        "type": "Function",
+        "tags": [],
+        "label": "validateQuery",
+        "description": [],
+        "signature": [
+          "(input: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.Query",
+            "text": "Query"
+          },
+          " | undefined, dataView: ",
+          {
+            "pluginId": "@kbn/es-query",
+            "scope": "common",
+            "docId": "kibKbnEsQueryPluginApi",
+            "section": "def-common.DataViewBase",
+            "text": "DataViewBase"
+          },
+          ") => { isValid: boolean; error: string | undefined; }"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/query_input/helpers.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.validateQuery.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "input",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Query",
+                "text": "Query"
+              },
+              " | undefined"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/query_input/helpers.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": false
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.validateQuery.$2",
+            "type": "Object",
+            "tags": [],
+            "label": "dataView",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.DataViewBase",
+                "text": "DataViewBase"
+              }
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/query_input/helpers.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
+    "interfaces": [
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.AccessorConfig",
+        "type": "Interface",
+        "tags": [],
+        "label": "AccessorConfig",
+        "description": [],
+        "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.AccessorConfig.columnId",
+            "type": "string",
+            "tags": [],
+            "label": "columnId",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.AccessorConfig.triggerIconType",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "triggerIconType",
+            "description": [],
+            "signature": [
+              "\"none\" | \"color\" | \"aggregate\" | \"disabled\" | \"custom\" | \"colorBy\" | \"invisible\" | undefined"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.AccessorConfig.customIcon",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "customIcon",
+            "description": [],
+            "signature": [
+              "IconType",
+              " | undefined"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.AccessorConfig.color",
+            "type": "string",
+            "tags": [],
+            "label": "color",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.AccessorConfig.palette",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "palette",
+            "description": [],
+            "signature": [
+              "string[] | { color: string; stop: number; }[] | undefined"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.FieldOptionValue",
+        "type": "Interface",
+        "tags": [],
+        "label": "FieldOptionValue",
+        "description": [],
+        "path": "src/plugins/visualization_ui_components/public/components/field_picker/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.FieldOptionValue.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"field\""
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/field_picker/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.FieldOptionValue.field",
+            "type": "string",
+            "tags": [],
+            "label": "field",
+            "description": [],
+            "path": "src/plugins/visualization_ui_components/public/components/field_picker/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "visualizationUiComponents",
+            "id": "def-public.FieldOptionValue.dataType",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "dataType",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "visualizationUiComponents",
+                "scope": "public",
+                "docId": "kibVisualizationUiComponentsPluginApi",
+                "section": "def-public.DataType",
+                "text": "DataType"
+              },
+              " | undefined"
+            ],
+            "path": "src/plugins/visualization_ui_components/public/components/field_picker/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
+    "enums": [],
+    "misc": [
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.DataType",
+        "type": "Type",
+        "tags": [],
+        "label": "DataType",
+        "description": [],
+        "signature": [
+          "\"string\" | \"number\" | \"boolean\" | \"date\" | FieldOnlyDataType"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/field_picker/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.FieldOption",
+        "type": "Type",
+        "tags": [],
+        "label": "FieldOption",
+        "description": [],
+        "signature": [
+          "FieldValue<T> & ",
+          "EuiComboBoxOptionOption",
+          "<T>"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/field_picker/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "visualizationUiComponents",
+        "id": "def-public.IconSet",
+        "type": "Type",
+        "tags": [],
+        "label": "IconSet",
+        "description": [],
+        "signature": [
+          "{ value: T; label: string; icon?: ",
+          "IconType",
+          " | T | undefined; shouldRotate?: boolean | undefined; canFill?: boolean | undefined; }[]"
+        ],
+        "path": "src/plugins/visualization_ui_components/public/components/icon_select.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": []
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/visualization_ui_components.mdx b/api_docs/visualization_ui_components.mdx
new file mode 100644
index 00000000000000..d2ae96e1626e62
--- /dev/null
+++ b/api_docs/visualization_ui_components.mdx
@@ -0,0 +1,36 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibVisualizationUiComponentsPluginApi
+slug: /kibana-dev-docs/api/visualizationUiComponents
+title: "visualizationUiComponents"
+image: https://source.unsplash.com/400x175/?github
+description: API docs for the visualizationUiComponents plugin
+date: 2023-05-03
+tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizationUiComponents']
+---
+import visualizationUiComponentsObj from './visualization_ui_components.devdocs.json';
+
+
+
+Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 124 | 0 | 119 | 4 |
+
+## Client
+
+### Functions
+<DocDefinitionList data={visualizationUiComponentsObj.client.functions}/>
+
+### Interfaces
+<DocDefinitionList data={visualizationUiComponentsObj.client.interfaces}/>
+
+### Consts, variables and types
+<DocDefinitionList data={visualizationUiComponentsObj.client.misc}/>
+
diff --git a/api_docs/visualizations.devdocs.json b/api_docs/visualizations.devdocs.json
index 0a85a5ed12f73e..3c973d02d801c5 100644
--- a/api_docs/visualizations.devdocs.json
+++ b/api_docs/visualizations.devdocs.json
@@ -14545,7 +14545,7 @@
         "label": "Operation",
         "description": [],
         "signature": [
-          "\"min\" | \"max\" | \"sum\" | \"median\" | \"count\" | \"range\" | \"filters\" | \"date_histogram\" | \"percentile\" | \"average\" | \"terms\" | \"cumulative_sum\" | \"moving_average\" | \"unique_count\" | \"standard_deviation\" | \"percentile_rank\" | \"last_value\" | \"counter_rate\" | \"differences\" | \"formula\" | \"static_value\" | \"normalize_by_unit\""
+          "\"min\" | \"max\" | \"sum\" | \"median\" | \"count\" | \"filters\" | \"range\" | \"date_histogram\" | \"percentile\" | \"average\" | \"terms\" | \"cumulative_sum\" | \"moving_average\" | \"unique_count\" | \"standard_deviation\" | \"percentile_rank\" | \"last_value\" | \"counter_rate\" | \"differences\" | \"formula\" | \"static_value\" | \"normalize_by_unit\""
         ],
         "path": "src/plugins/visualizations/common/convert_to_lens/types/operations.ts",
         "deprecated": false,
@@ -14575,7 +14575,7 @@
         "label": "OperationWithSourceField",
         "description": [],
         "signature": [
-          "\"min\" | \"max\" | \"sum\" | \"median\" | \"count\" | \"range\" | \"filters\" | \"date_histogram\" | \"percentile\" | \"average\" | \"terms\" | \"unique_count\" | \"standard_deviation\" | \"percentile_rank\" | \"last_value\""
+          "\"min\" | \"max\" | \"sum\" | \"median\" | \"count\" | \"filters\" | \"range\" | \"date_histogram\" | \"percentile\" | \"average\" | \"terms\" | \"unique_count\" | \"standard_deviation\" | \"percentile_rank\" | \"last_value\""
         ],
         "path": "src/plugins/visualizations/common/convert_to_lens/types/operations.ts",
         "deprecated": false,
diff --git a/api_docs/visualizations.mdx b/api_docs/visualizations.mdx
index 1075faecd932eb..061ad30f50d74e 100644
--- a/api_docs/visualizations.mdx
+++ b/api_docs/visualizations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visualizations
 title: "visualizations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visualizations plugin
-date: 2023-04-27
+date: 2023-05-03
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizations']
 ---
 import visualizationsObj from './visualizations.devdocs.json';
diff --git a/config/serverless.es.yml b/config/serverless.es.yml
index dfbff923489a05..c52efbccad0aae 100644
--- a/config/serverless.es.yml
+++ b/config/serverless.es.yml
@@ -1,2 +1,15 @@
+# Search Project Config
+
+## Disable APM and Uptime, enable Enterprise Search
+xpack.apm.enabled: false
+xpack.uptime.enabled: false
+enterpriseSearch.enabled: true
+
+## Enable the Serverless Search plugin
+xpack.serverless.search.enabled: true
+
+## Set the home route
 uiSettings.overrides.defaultRoute: /app/enterprise_search/content/search_indices
+
+## Set the dev project switcher current type
 xpack.serverless.plugin.developer.projectSwitcher.currentType: 'search'
diff --git a/config/serverless.oblt.yml b/config/serverless.oblt.yml
index dd62007fa0dfbe..5b9bb95c22cce7 100644
--- a/config/serverless.oblt.yml
+++ b/config/serverless.oblt.yml
@@ -1,3 +1,18 @@
-uiSettings.overrides.defaultRoute: /app/observability/overview
+# Observability Project config
+
+## Disable plugins
+enterpriseSearch.enabled: false
+xpack.cloudSecurityPosture.enabled: false
+xpack.securitySolution.enabled: false
+
+## Enable the Serverless Obsersability plugin
+xpack.serverless.observability.enabled: true
+
+## Configure plugins
 xpack.infra.logs.app_target: discover
+
+## Set the home route
+uiSettings.overrides.defaultRoute: /app/observability/overview
+
+## Set the dev project switch current type
 xpack.serverless.plugin.developer.projectSwitcher.currentType: 'observability'
diff --git a/config/serverless.security.yml b/config/serverless.security.yml
index e906e82191409f..f01186a6ceecf5 100644
--- a/config/serverless.security.yml
+++ b/config/serverless.security.yml
@@ -1,2 +1,16 @@
+# Security Project config
+
+## Disable plugins
+enterpriseSearch.enabled: false
+xpack.apm.enabled: false
+xpack.observability.enabled: false
+xpack.uptime.enabled: false
+
+## Enable the Serverless Security plugin
+xpack.serverless.security.enabled: true
+
+## Set the home route
 uiSettings.overrides.defaultRoute: /app/security/get_started
+
+## Set the dev project switcher current type
 xpack.serverless.plugin.developer.projectSwitcher.currentType: 'security'
diff --git a/docs/apm/troubleshooting.asciidoc b/docs/apm/troubleshooting.asciidoc
index c4b0994fdc533a..339645fe50e5c7 100644
--- a/docs/apm/troubleshooting.asciidoc
+++ b/docs/apm/troubleshooting.asciidoc
@@ -93,8 +93,8 @@ Instead, we should strip away the unique information and group our transactions
 In this case, that means naming all blog transactions, `/blog`, and all documentation transactions, `/guide`.
 
 If you feel like you'd be losing valuable information by following this naming convention, don't fret!
-You can always add additional metadata to your transactions using {apm-guide-ref}/metadata.html#labels-fields[labels] (indexed) or
-{apm-guide-ref}/metadata.html#custom-fields[custom context] (non-indexed).
+You can always add additional metadata to your transactions using {apm-guide-ref}/data-model-metadata.html#data-model-labels[labels] (indexed) or
+{apm-guide-ref}/data-model-metadata.html#data-model-custom[custom context] (non-indexed).
 
 After ensuring you've correctly named your transactions,
 you might still see errors in the APM app related to transaction group limit reached:
@@ -167,7 +167,7 @@ see <<no-apm-data-found>> for further troubleshooting.
 *Ensure a field is searchable*
 There are two things you can do to if you'd like to ensure a field is searchable:
 
-1. Index your additional data as {apm-guide-ref}/metadata.html[labels] instead.
+1. Index your additional data as {apm-guide-ref}/data-model-metadata.html[labels] instead.
 These are dynamic by default, which means they will be indexed and become searchable and aggregatable.
 
 2. Create a custom mapping for the field.
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 412a9e8b5569e3..e218387d643413 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -407,6 +407,10 @@ The plugin exposes the static DefaultEditorController class to consume.
 |WARNING: Missing README.
 
 
+|{kib-repo}blob/{branch}/src/plugins/visualization_ui_components/README.md[visualizationUiComponents]
+|A series of UI components pulled out of Lens to make them available outside Lens.
+
+
 |===
 
 [discrete]
@@ -710,6 +714,18 @@ Kibana.
 |
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/serverless_observability/README.mdx[serverlessObservability]
+|This plugin contains configuration and code used to create a Serverless Observability project.  It leverages universal configuration and other APIs in the serverless plugin to configure Kibana.
+
+
+|{kib-repo}blob/{branch}/x-pack/plugins/serverless_search/README.mdx[serverlessSearch]
+|This plugin contains configuration and code used to create a Serverless Search project.  It leverages universal configuration and other APIs in the serverless plugin to configure Kibana.
+
+
+|{kib-repo}blob/{branch}/x-pack/plugins/serverless_security/README.mdx[serverlessSecurity]
+|This plugin contains configuration and code used to create a Serverless Security project.  It leverages universal configuration and other APIs in the serverless plugin to configure Kibana.
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/session_view/README.md[sessionView]
 |Session View is meant to provide a visualization into what is going on in a particular Linux environment where the agent is running. It looks likes a terminal emulator; however, it is a tool for introspecting process activity and understanding user and service behaviour in your Linux servers and infrastructure. It is a time-ordered series of process executions displayed in a tree over time.
 
diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
index 383fae89bad6bf..ba41d20112ad19 100644
--- a/docs/settings/alert-action-settings.asciidoc
+++ b/docs/settings/alert-action-settings.asciidoc
@@ -1,10 +1,14 @@
-[role="xpack"]
 [[alert-action-settings-kb]]
-=== Alerting and action settings in {kib}
+== Alerting and action settings in {kib}
 ++++
 <titleabbrev>Alerting and action settings</titleabbrev>
 ++++
 
+:description: Learn about the settings that affect {kib} {alert-features}.
+:tags-products: [kibana, alerting]
+:tags-content-type: [reference]
+:tags-user-goals: [configure]
+
 Alerting and actions are enabled by default in {kib}, but require you to configure the following:
 
 . <<using-kibana-with-security,Set up {kib} to work with {stack} {security-features}>>.
@@ -15,7 +19,7 @@ You can configure the following settings in the `kibana.yml` file.
 
 [float]
 [[general-alert-action-settings]]
-==== General settings
+=== General settings
 
 `xpack.encryptedSavedObjects.encryptionKey`::
 A string of 32 or more characters used to encrypt sensitive properties on alerting rules and actions before they're stored in {es}. Third party credentials &mdash; such as the username and password used to connect to an SMTP service &mdash; are an example of encrypted properties.
@@ -29,7 +33,7 @@ Be sure to back up the encryption key value somewhere safe, as your alerting rul
 
 [float]
 [[action-settings]]
-==== Action settings
+=== Action settings
 
 `xpack.actions.allowedHosts` {ess-icon}::
 A list of hostnames that {kib} is allowed to connect to when built-in actions are triggered. It defaults to `[*]`, allowing any host, but keep in mind the potential for SSRF attacks when hosts are not explicitly added to the allowed hosts. An empty list `[]` can be used to block built-in actions from making any external connections.
@@ -71,7 +75,7 @@ xpack.actions.customHostSettings:
     ssl:
       verificationMode: 'none'
 --
-
++
 The settings in `xpack.actions.customHostSettings` can be used to override the
 global option `xpack.actions.ssl.verificationMode` and provide customized TLS
 settings on a per-server basis. Set `xpack.actions.ssl.verificationMode` to the
@@ -107,7 +111,7 @@ The options `smtp.ignoreTLS` and `smtp.requireTLS` can not both be set to true.
 Default: `false`.
 
 `xpack.actions.customHostSettings[n].ssl.rejectUnauthorized`::
-Deprecated. Use <<action-config-custom-host-verification-mode,`xpack.actions.customHostSettings.ssl.verificationMode`>> instead. A boolean value indicating whether to bypass server certificate validation.
+deprecated:[8.0.0] Use <<action-config-custom-host-verification-mode,`xpack.actions.customHostSettings.ssl.verificationMode`>> instead. A boolean value indicating whether to bypass server certificate validation.
 Overrides the general `xpack.actions.rejectUnauthorized` configuration
 for requests made for this hostname/port.
 
@@ -127,7 +131,7 @@ the files cannot be made available.
 
 [[action-config-email-domain-allowlist]] `xpack.actions.email.domain_allowlist`  {ess-icon}::
 A list of allowed email domains which can be used with the email connector. When this setting is not used, all email domains are allowed. When this setting is used, if any email is attempted to be sent that (a) includes an addressee with an email domain that is not in the allowlist, or (b) includes a from address domain that is not in the allowlist, it will fail with a message indicating the email is not allowed.
-
++
 WARNING: This feature is available in {kib} 7.17.4 and 8.3.0 onwards but is not supported in {kib} 8.0, 8.1 or 8.2. As such, this setting should be removed before upgrading from 7.17 to 8.0, 8.1 or 8.2. It is possible to configure the settings in 7.17.4 and then upgrade to 8.3.0 directly.
 
 `xpack.actions.enableFooterInEmail` {ess-icon}::
@@ -160,8 +164,6 @@ proxy in tunneling mode, and display some of the interaction between the client
 --
 curl --verbose --proxytunnel --proxy http://localhost:8080 http://example.com
 --
-+
-
 
 `xpack.actions.proxyBypassHosts` {ess-icon}::
 Specifies hostnames which should not use the proxy, if using a proxy for actions. The value is an array of hostnames as strings.  By default, all hosts will use the proxy, but if an action's hostname is in this list, the proxy will not be used.  The settings `xpack.actions.proxyBypassHosts` and `xpack.actions.proxyOnlyHosts` cannot be used at the same time.
@@ -173,14 +175,14 @@ Specifies hostnames which should only use the proxy, if using a proxy for action
 Specifies HTTP headers for the proxy, if using a proxy for actions. Default: {}.
 
 `xpack.actions.proxyRejectUnauthorizedCertificates` {ess-icon}::
-Deprecated. Use <<action-config-proxy-verification-mode,`xpack.actions.ssl.proxyVerificationMode`>> instead. Set to `false` to bypass certificate validation for the proxy, if using a proxy for actions. Default: `true`.
+deprecated:[8.0.0] Use <<action-config-proxy-verification-mode,`xpack.actions.ssl.proxyVerificationMode`>> instead. Set to `false` to bypass certificate validation for the proxy, if using a proxy for actions. Default: `true`.
 
 [[action-config-proxy-verification-mode]]`xpack.actions.ssl.proxyVerificationMode` {ess-icon}::
 Controls the verification for the proxy server certificate that Kibana receives when making an outbound SSL/TLS connection to the proxy server. Valid values are `full`, `certificate`, and `none`.
 Use `full` to perform hostname verification, `certificate` to skip hostname verification, and `none` to skip verification. Default: `full`. <<elasticsearch-ssl-verificationMode,Equivalent {kib} setting>>.
 
 `xpack.actions.rejectUnauthorized` {ess-icon}::
-Deprecated. Use <<action-config-verification-mode,`xpack.actions.ssl.verificationMode`>> instead. Set to `false` to bypass certificate validation for actions. Default: `true`.
+deprecated:[8.0.0] Use <<action-config-verification-mode,`xpack.actions.ssl.verificationMode`>> instead. Set to `false` to bypass certificate validation for actions. Default: `true`.
 +
 As an alternative to setting `xpack.actions.rejectUnauthorized`, you can use the setting
 `xpack.actions.customHostSettings` to set SSL options for specific servers.
@@ -206,9 +208,8 @@ For example, `20m`, `24h`, `7d`, `1w`. Default: `60s`.
 Specifies the maximum number of times an action can be attempted to run. Can be minimum 1 and maximum 10.
 
 `xpack.actions.run.connectorTypeOverrides` {ess-icon}::
-Overrides the configs under `xpack.actions.run` for the connector type with the given ID. List the connector type identifier and its settings in an array of objects.
+Overrides the configs under `xpack.actions.run` for the connector type with the given ID. List the connector type identifier and its settings in an array of objects. For example:
 +
-For example:
 [source,yaml]
 --
 xpack.actions.run:
@@ -220,7 +221,7 @@ xpack.actions.run:
 
 [float]
 [[alert-settings]]
-==== Alerting settings
+=== Alerting settings
 
 `xpack.alerting.maxEphemeralActionsPerAlert` {ess-icon}::
 deprecated:[8.8.0]
@@ -257,9 +258,8 @@ Specifies the default timeout for tasks associated with all types of rules. The
 For example, `20m`, `24h`, `7d`, `1w`. Default: `5m`.
 
 `xpack.alerting.rules.run.ruleTypeOverrides` {ess-icon}::
-Overrides the configs under `xpack.alerting.rules.run` for the rule type with the given ID. List the rule identifier and its settings in an array of objects.
+Overrides the configs under `xpack.alerting.rules.run` for the rule type with the given ID. List the rule identifier and its settings in an array of objects. For example:
 +
-For example:
 [source,yaml]
 --
 xpack.alerting.rules.run:
@@ -270,9 +270,8 @@ xpack.alerting.rules.run:
 --
 
 `xpack.alerting.rules.run.actions.connectorTypeOverrides` {ess-icon}::
-Overrides the configs under `xpack.alerting.rules.run.actions` for the connector type with the given ID. List the connector type identifier and its settings in an array of objects.
+Overrides the configs under `xpack.alerting.rules.run.actions` for the connector type with the given ID. List the connector type identifier and its settings in an array of objects. For example:
 +
-For example:
 [source,yaml]
 --
 xpack.alerting.rules.run:
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index ca8eaf10583af8..efa58a34d4853e 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -619,7 +619,7 @@ Set this value to false to disable the Upgrade Assistant UI. *Default: true*
 Set this value to change the {kib} interface language.
 Valid locales are: `en`, `zh-CN`, `ja-JP`. *Default: `en`*
 
-include::{kib-repo-dir}/settings/alert-action-settings.asciidoc[]
+include::{kib-repo-dir}/settings/alert-action-settings.asciidoc[leveloffset=+1]
 include::{kib-repo-dir}/settings/apm-settings.asciidoc[]
 include::{kib-repo-dir}/settings/banners-settings.asciidoc[]
 include::{kib-repo-dir}/settings/cases-settings.asciidoc[leveloffset=+1]
diff --git a/examples/search_examples/server/fibonacci_strategy.ts b/examples/search_examples/server/fibonacci_strategy.ts
index 8317834dcbb3d4..8a33872cdb7e72 100644
--- a/examples/search_examples/server/fibonacci_strategy.ts
+++ b/examples/search_examples/server/fibonacci_strategy.ts
@@ -8,6 +8,7 @@
 
 import { v4 as uuidv4 } from 'uuid';
 import { ISearchStrategy } from '@kbn/data-plugin/server';
+import { of } from 'rxjs';
 import { FibonacciRequest, FibonacciResponse } from '../common/types';
 
 export const fibonacciStrategyProvider = (): ISearchStrategy<
@@ -40,10 +41,7 @@ export const fibonacciStrategyProvider = (): ISearchStrategy<
       const took = Date.now() - started;
       const values = sequence.slice(0, loaded);
 
-      // Usually we'd do something like "of()" but for some reason it breaks in tests with the error
-      // "You provided an invalid object where a stream was expected." which is why we have to cast
-      // down below as well
-      return [{ id, loaded, total, isRunning, isPartial, rawResponse: { took, values } }];
+      return of({ id, loaded, total, isRunning, isPartial, rawResponse: { took, values } });
     },
     cancel: async (id: string) => {
       responseMap.delete(id);
diff --git a/fleet_packages.json b/fleet_packages.json
index 34d807ac46b9c1..2345a87a91cea7 100644
--- a/fleet_packages.json
+++ b/fleet_packages.json
@@ -24,7 +24,7 @@
 [
   {
     "name": "apm",
-    "version": "8.8.0-preview-1680182372",
+    "version": "8.9.0-preview-1682533168",
     "forceAlignStackVersion": true,
     "allowSyncToPrerelease": true
   },
@@ -52,6 +52,6 @@
   },
   {
     "name": "security_detection_engine",
-    "version": "8.7.2"
+    "version": "8.8.1"
   }
 ]
\ No newline at end of file
diff --git a/package.json b/package.json
index c43034fb928df6..a85349f9841e85 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.6.0-canary.3",
     "@elastic/ems-client": "8.4.0",
-    "@elastic/eui": "77.1.1",
+    "@elastic/eui": "77.1.2",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.1",
@@ -474,6 +474,7 @@
     "@kbn/maps-ems-plugin": "link:src/plugins/maps_ems",
     "@kbn/maps-plugin": "link:x-pack/plugins/maps",
     "@kbn/ml-agg-utils": "link:x-pack/packages/ml/agg_utils",
+    "@kbn/ml-anomaly-utils": "link:x-pack/packages/ml/anomaly_utils",
     "@kbn/ml-date-picker": "link:x-pack/packages/ml/date_picker",
     "@kbn/ml-error-utils": "link:x-pack/packages/ml/error_utils",
     "@kbn/ml-is-defined": "link:x-pack/packages/ml/is_defined",
@@ -511,6 +512,7 @@
     "@kbn/preboot-example-plugin": "link:examples/preboot_example",
     "@kbn/presentation-util-plugin": "link:src/plugins/presentation_util",
     "@kbn/profiling-plugin": "link:x-pack/plugins/profiling",
+    "@kbn/random-sampling": "link:x-pack/packages/kbn-random-sampling",
     "@kbn/react-field": "link:packages/kbn-react-field",
     "@kbn/remote-clusters-plugin": "link:x-pack/plugins/remote_clusters",
     "@kbn/rendering-plugin": "link:test/plugin_functional/plugins/rendering_plugin",
@@ -575,7 +577,10 @@
     "@kbn/server-http-tools": "link:packages/kbn-server-http-tools",
     "@kbn/server-route-repository": "link:packages/kbn-server-route-repository",
     "@kbn/serverless": "link:x-pack/plugins/serverless",
+    "@kbn/serverless-observability": "link:x-pack/plugins/serverless_observability",
     "@kbn/serverless-project-switcher": "link:packages/serverless/project_switcher",
+    "@kbn/serverless-search": "link:x-pack/plugins/serverless_search",
+    "@kbn/serverless-security": "link:x-pack/plugins/serverless_security",
     "@kbn/serverless-types": "link:packages/serverless/types",
     "@kbn/session-notifications-plugin": "link:test/plugin_functional/plugins/session_notifications",
     "@kbn/session-view-plugin": "link:x-pack/plugins/session_view",
@@ -592,6 +597,7 @@
     "@kbn/shared-ux-card-no-data": "link:packages/shared-ux/card/no_data/impl",
     "@kbn/shared-ux-card-no-data-mocks": "link:packages/shared-ux/card/no_data/mocks",
     "@kbn/shared-ux-card-no-data-types": "link:packages/shared-ux/card/no_data/types",
+    "@kbn/shared-ux-chrome-navigation": "link:packages/shared-ux/chrome/navigation",
     "@kbn/shared-ux-file-context": "link:packages/shared-ux/file/context",
     "@kbn/shared-ux-file-image": "link:packages/shared-ux/file/image/impl",
     "@kbn/shared-ux-file-image-mocks": "link:packages/shared-ux/file/image/mocks",
@@ -705,6 +711,7 @@
     "@kbn/vis-type-vega-plugin": "link:src/plugins/vis_types/vega",
     "@kbn/vis-type-vislib-plugin": "link:src/plugins/vis_types/vislib",
     "@kbn/vis-type-xy-plugin": "link:src/plugins/vis_types/xy",
+    "@kbn/visualization-ui-components": "link:src/plugins/visualization_ui_components",
     "@kbn/visualizations-plugin": "link:src/plugins/visualizations",
     "@kbn/watcher-plugin": "link:x-pack/plugins/watcher",
     "@loaders.gl/core": "^2.3.1",
@@ -735,7 +742,7 @@
     "@turf/distance": "6.0.1",
     "@turf/helpers": "6.0.1",
     "@turf/length": "^6.0.2",
-    "@xstate/react": "^3.0.2",
+    "@xstate/react": "^3.2.1",
     "JSONStream": "1.3.5",
     "abort-controller": "^3.0.0",
     "adm-zip": "^0.5.9",
@@ -958,7 +965,7 @@
     "vinyl": "^2.2.0",
     "whatwg-fetch": "^3.0.0",
     "xml2js": "^0.4.22",
-    "xstate": "^4.35.2",
+    "xstate": "^4.37.1",
     "xterm": "^5.1.0",
     "yauzl": "^2.10.0",
     "yazl": "^2.5.1"
@@ -1013,6 +1020,7 @@
     "@kbn/babel-register": "link:packages/kbn-babel-register",
     "@kbn/babel-transform": "link:packages/kbn-babel-transform",
     "@kbn/bazel-runner": "link:packages/kbn-bazel-runner",
+    "@kbn/check-mappings-update-cli": "link:packages/kbn-check-mappings-update-cli",
     "@kbn/ci-stats-core": "link:packages/kbn-ci-stats-core",
     "@kbn/ci-stats-performance-metrics": "link:packages/kbn-ci-stats-performance-metrics",
     "@kbn/ci-stats-reporter": "link:packages/kbn-ci-stats-reporter",
@@ -1343,14 +1351,14 @@
     "cssnano": "^5.1.12",
     "cssnano-preset-default": "^5.2.12",
     "csstype": "^3.0.2",
-    "cypress": "^12.6.0",
-    "cypress-axe": "^1.3.0",
+    "cypress": "^12.10.0",
+    "cypress-axe": "^1.4.0",
     "cypress-file-upload": "^5.0.8",
-    "cypress-multi-reporters": "^1.6.2",
+    "cypress-multi-reporters": "^1.6.3",
     "cypress-pipe": "^2.0.0",
     "cypress-react-selector": "^3.0.0",
     "cypress-real-events": "^1.7.6",
-    "cypress-recurse": "^1.27.0",
+    "cypress-recurse": "^1.31.2",
     "date-fns": "^2.29.3",
     "debug": "^2.6.9",
     "delete-empty": "^2.0.0",
@@ -1364,7 +1372,7 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-module-utils": "^2.6.2",
     "eslint-plugin-ban": "^1.5.2",
-    "eslint-plugin-cypress": "^2.12.1",
+    "eslint-plugin-cypress": "^2.13.2",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-jest": "^24.5.0",
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.ts b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
similarity index 92%
rename from packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.ts
rename to packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
index 0087c5d019f987..0e18b5b72c3671 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.test.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 import React from 'react';
 import * as Rx from 'rxjs';
 import { toArray } from 'rxjs/operators';
@@ -19,6 +19,7 @@ import { notificationServiceMock } from '@kbn/core-notifications-browser-mocks';
 import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
 import { customBrandingServiceMock } from '@kbn/core-custom-branding-browser-mocks';
 import { getAppInfo } from '@kbn/core-application-browser-internal';
+import { findTestSubject } from '@kbn/test-jest-helpers';
 import { ChromeService } from './chrome_service';
 
 class FakeApp implements App {
@@ -176,6 +177,41 @@ describe('start', () => {
       // Don't capture the snapshot because it's 600+ lines long.
       expect(shallow(React.createElement(() => chrome.getHeaderComponent()))).toBeDefined();
     });
+
+    it('renders the default project side navigation', async () => {
+      const { chrome } = await start();
+
+      chrome.setChromeStyle('project');
+
+      const component = mount(chrome.getHeaderComponent());
+
+      const projectHeader = findTestSubject(component, 'kibanaProjectHeader');
+      expect(projectHeader.length).toBe(1);
+
+      const defaultProjectSideNav = findTestSubject(component, 'defaultProjectSideNav');
+      expect(defaultProjectSideNav.length).toBe(1);
+    });
+
+    it('renders the custom project side navigation', async () => {
+      const { chrome } = await start();
+
+      const MyNav = function MyNav() {
+        return <div data-test-subj="customProjectSideNav">HELLO</div>;
+      };
+      chrome.setChromeStyle('project');
+      chrome.project.setSideNavComponent(MyNav);
+
+      const component = mount(chrome.getHeaderComponent());
+
+      const projectHeader = findTestSubject(component, 'kibanaProjectHeader');
+      expect(projectHeader.length).toBe(1);
+
+      const defaultProjectSideNav = findTestSubject(component, 'defaultProjectSideNav');
+      expect(defaultProjectSideNav.length).toBe(0); // Default side nav not mounted
+
+      const customProjectSideNav = findTestSubject(component, 'customProjectSideNav');
+      expect(customProjectSideNav.text()).toBe('HELLO');
+    });
   });
 
   describe('visibility', () => {
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
index 41362b3d80dcd8..7620b6b5cc1536 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
@@ -12,6 +12,7 @@ import { BehaviorSubject, combineLatest, merge, type Observable, of, ReplaySubje
 import { flatMap, map, takeUntil } from 'rxjs/operators';
 import { parse } from 'url';
 import { EuiLink } from '@elastic/eui';
+import useObservable from 'react-use/lib/useObservable';
 import type { InternalInjectedMetadataStart } from '@kbn/core-injected-metadata-browser-internal';
 import type { DocLinksStart } from '@kbn/core-doc-links-browser';
 import type { HttpStart } from '@kbn/core-http-browser';
@@ -27,14 +28,17 @@ import type {
   ChromeHelpExtension,
   ChromeUserBanner,
   ChromeStyle,
+  ChromeProjectNavigation,
 } from '@kbn/core-chrome-browser';
 import type { CustomBrandingStart } from '@kbn/core-custom-branding-browser';
+import type { SideNavComponent as ISideNavComponent } from '@kbn/core-chrome-browser';
 import { KIBANA_ASK_ELASTIC_LINK } from './constants';
 import { DocTitleService } from './doc_title';
 import { NavControlsService } from './nav_controls';
 import { NavLinksService } from './nav_links';
+import { ProjectNavigationService } from './project_navigation';
 import { RecentlyAccessedService } from './recently_accessed';
-import { Header, ProjectHeader } from './ui';
+import { Header, ProjectHeader, ProjectSideNavigation } from './ui';
 import type { InternalChromeStart } from './types';
 
 const IS_LOCKED_KEY = 'core.chrome.isLocked';
@@ -63,6 +67,7 @@ export class ChromeService {
   private readonly navLinks = new NavLinksService();
   private readonly recentlyAccessed = new RecentlyAccessedService();
   private readonly docTitle = new DocTitleService();
+  private readonly projectNavigation = new ProjectNavigationService();
 
   constructor(private readonly params: ConstructorParams) {}
 
@@ -147,6 +152,7 @@ export class ChromeService {
 
     const navControls = this.navControls.start();
     const navLinks = this.navLinks.start({ application, http });
+    const projectNavigation = this.projectNavigation.start({ application, navLinks });
     const recentlyAccessed = await this.recentlyAccessed.start({ http });
     const docTitle = this.docTitle.start({ document: window.document });
     const { customBranding$ } = customBranding;
@@ -170,6 +176,14 @@ export class ChromeService {
       chromeStyle$.next(style);
     };
 
+    const setProjectSideNavComponent = (component: ISideNavComponent | null) => {
+      projectNavigation.setProjectSideNavComponent(component);
+    };
+
+    const setProjectNavigation = (config: ChromeProjectNavigation) => {
+      projectNavigation.setProjectNavigation(config);
+    };
+
     const isIE = () => {
       const ua = window.navigator.userAgent;
       const msie = ua.indexOf('MSIE '); // IE 10 or older
@@ -211,8 +225,28 @@ export class ChromeService {
     }
 
     const getHeaderComponent = () => {
-      const Component = ({ style$ }: { style$: typeof chromeStyle$ }) => {
-        if (style$.getValue() === 'project') {
+      if (chromeStyle$.getValue() === 'project') {
+        // const projectNavigationConfig = projectNavigation.getProjectNavigation$();
+        // TODO: Uncommented when we support the project navigation config
+        // if (!projectNavigationConfig) {
+        //   throw new Erorr(`Project navigation config must be provided for project.`);
+        // }
+
+        const projectNavigationComponent$ = projectNavigation.getProjectSideNavComponent$();
+
+        const ProjectHeaderWithNavigation = () => {
+          const CustomSideNavComponent = useObservable(projectNavigationComponent$, undefined);
+
+          let SideNavComponent: ISideNavComponent = () => null;
+
+          if (CustomSideNavComponent !== undefined) {
+            // We have the state from the Observable
+            SideNavComponent =
+              CustomSideNavComponent.current !== null
+                ? CustomSideNavComponent.current
+                : ProjectSideNavigation;
+          }
+
           return (
             <ProjectHeader
               {...{
@@ -226,41 +260,45 @@ export class ChromeService {
               navControlsRight$={navControls.getRight$()}
               kibanaDocLink={docLinks.links.kibana.guide}
               kibanaVersion={injectedMetadata.getKibanaVersion()}
-            />
+            >
+              {/* TODO: pass down the SideNavCompProps once they are defined  */}
+              <SideNavComponent />
+            </ProjectHeader>
           );
-        }
-
-        return (
-          <Header
-            loadingCount$={http.getLoadingCount$()}
-            application={application}
-            headerBanner$={headerBanner$.pipe(takeUntil(this.stop$))}
-            badge$={badge$.pipe(takeUntil(this.stop$))}
-            basePath={http.basePath}
-            breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))}
-            breadcrumbsAppendExtension$={breadcrumbsAppendExtension$.pipe(takeUntil(this.stop$))}
-            customNavLink$={customNavLink$.pipe(takeUntil(this.stop$))}
-            kibanaDocLink={docLinks.links.kibana.guide}
-            forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
-            globalHelpExtensionMenuLinks$={globalHelpExtensionMenuLinks$}
-            helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
-            helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))}
-            homeHref={http.basePath.prepend('/app/home')}
-            isVisible$={this.isVisible$}
-            kibanaVersion={injectedMetadata.getKibanaVersion()}
-            navLinks$={navLinks.getNavLinks$()}
-            recentlyAccessed$={recentlyAccessed.get$()}
-            navControlsLeft$={navControls.getLeft$()}
-            navControlsCenter$={navControls.getCenter$()}
-            navControlsRight$={navControls.getRight$()}
-            navControlsExtension$={navControls.getExtension$()}
-            onIsLockedUpdate={setIsNavDrawerLocked}
-            isLocked$={getIsNavDrawerLocked$}
-            customBranding$={customBranding$}
-          />
-        );
-      };
-      return <Component {...{ style$: chromeStyle$ }} />;
+        };
+
+        return <ProjectHeaderWithNavigation />;
+      }
+
+      return (
+        <Header
+          loadingCount$={http.getLoadingCount$()}
+          application={application}
+          headerBanner$={headerBanner$.pipe(takeUntil(this.stop$))}
+          badge$={badge$.pipe(takeUntil(this.stop$))}
+          basePath={http.basePath}
+          breadcrumbs$={breadcrumbs$.pipe(takeUntil(this.stop$))}
+          breadcrumbsAppendExtension$={breadcrumbsAppendExtension$.pipe(takeUntil(this.stop$))}
+          customNavLink$={customNavLink$.pipe(takeUntil(this.stop$))}
+          kibanaDocLink={docLinks.links.kibana.guide}
+          forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
+          globalHelpExtensionMenuLinks$={globalHelpExtensionMenuLinks$}
+          helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
+          helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))}
+          homeHref={http.basePath.prepend('/app/home')}
+          isVisible$={this.isVisible$}
+          kibanaVersion={injectedMetadata.getKibanaVersion()}
+          navLinks$={navLinks.getNavLinks$()}
+          recentlyAccessed$={recentlyAccessed.get$()}
+          navControlsLeft$={navControls.getLeft$()}
+          navControlsCenter$={navControls.getCenter$()}
+          navControlsRight$={navControls.getRight$()}
+          navControlsExtension$={navControls.getExtension$()}
+          onIsLockedUpdate={setIsNavDrawerLocked}
+          isLocked$={getIsNavDrawerLocked$}
+          customBranding$={customBranding$}
+        />
+      );
     };
 
     return {
@@ -335,6 +373,10 @@ export class ChromeService {
       getBodyClasses$: () => bodyClasses$.pipe(takeUntil(this.stop$)),
       setChromeStyle,
       getChromeStyle$: () => chromeStyle$.pipe(takeUntil(this.stop$)),
+      project: {
+        setNavigation: setProjectNavigation,
+        setSideNavComponent: setProjectSideNavComponent,
+      },
     };
   }
 
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts
new file mode 100644
index 00000000000000..5485faed25610a
--- /dev/null
+++ b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { ProjectNavigationService } from './project_navigation_service';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
new file mode 100644
index 00000000000000..97b696c18f6cb8
--- /dev/null
+++ b/packages/core/chrome/core-chrome-browser-internal/src/project_navigation/project_navigation_service.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { InternalApplicationStart } from '@kbn/core-application-browser-internal';
+import {
+  ChromeNavLinks,
+  ChromeProjectNavigation,
+  SideNavComponent,
+} from '@kbn/core-chrome-browser';
+import { BehaviorSubject } from 'rxjs';
+
+interface StartDeps {
+  application: InternalApplicationStart;
+  navLinks: ChromeNavLinks;
+}
+
+export class ProjectNavigationService {
+  private customProjectSideNavComponent$ = new BehaviorSubject<{
+    current: SideNavComponent | null;
+  }>({ current: null });
+  private projectNavigation$ = new BehaviorSubject<ChromeProjectNavigation | undefined>(undefined);
+
+  public start({ application, navLinks }: StartDeps) {
+    // TODO: use application, navLink and projectNavigation$ to:
+    // 1. validate projectNavigation$ against navLinks,
+    // 2. filter disabled/missing links from projectNavigation
+    // 3. keep track of currently active link / path (path will be used to highlight the link in the sidenav and display part of the breadcrumbs)
+
+    return {
+      setProjectNavigation: (projectNavigation: ChromeProjectNavigation) => {
+        this.projectNavigation$.next(projectNavigation);
+      },
+      getProjectNavigation$: () => {
+        return this.projectNavigation$.asObservable();
+      },
+      setProjectSideNavComponent: (component: SideNavComponent | null) => {
+        this.customProjectSideNavComponent$.next({ current: component });
+      },
+      getProjectSideNavComponent$: () => {
+        return this.customProjectSideNavComponent$.asObservable();
+      },
+    };
+  }
+}
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 38c5a7fdf48544..d32e7d27d6f163 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -216,7 +216,7 @@ Array [
       class="euiHorizontalRule euiHorizontalRule--full emotion-euiHorizontalRule-full"
     />
     <div
-      class="euiFlexItem eui-yScroll emotion-euiFlexItem-grow-1"
+      class="euiFlexItem kbnCollapsibleNav__solutions emotion-euiFlexItem-grow-1"
     >
       <div
         class="euiAccordion euiAccordion-isOpen euiCollapsibleNavGroup euiCollapsibleNavGroup--withHeading"
@@ -863,6 +863,7 @@ exports[`CollapsibleNav renders the default nav 1`] = `
   <EuiCollapsibleNav
     aria-label="Primary"
     button={<button />}
+    className="kbnCollapsibleNav"
     data-test-subj="collapsibleNav"
     id="collapsibe-nav"
     isOpen={false}
@@ -1048,6 +1049,7 @@ exports[`CollapsibleNav renders the default nav 2`] = `
   <EuiCollapsibleNav
     aria-label="Primary"
     button={<button />}
+    className="kbnCollapsibleNav"
     data-test-subj="collapsibleNav"
     id="collapsibe-nav"
     isOpen={false}
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.scss b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.scss
index 5f84863ad73094..a121ac4c02b254 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.scss
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.scss
@@ -1,9 +1,29 @@
+$screenHeightBreakpoint: $euiSize * 15;
+
+.kbnCollapsibleNav {
+  @media (max-height: $screenHeightBreakpoint) {
+    overflow-y: auto;
+  }
+}
+
 .kbnCollapsibleNav__recentsListGroup {
   @include euiYScroll;
   max-height: $euiSize * 10;
   margin-right: -$euiSizeS;
 }
 
+.kbnCollapsibleNav__solutions {
+  @include euiYScroll;
+
+  /**
+   * Allows the solutions nav group to be viewed on
+   * very small screen sizes and when the browser Zoom is high
+   */
+  @media (max-height: $screenHeightBreakpoint) {
+    flex: 1 0 auto;
+  }
+}
+
 /**
  * 1. Increase the hit area of the link (anchor)
  * 2. Only show the text underline when hovering on the text/anchor portion
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx
index 2d9d88d9a461ba..886ae8599c806a 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/header/collapsible_nav.tsx
@@ -161,6 +161,7 @@ export function CollapsibleNav({
       button={button}
       ownFocus={false}
       size={248}
+      className="kbnCollapsibleNav"
     >
       {customNavLink && (
         <>
@@ -280,7 +281,7 @@ export function CollapsibleNav({
 
       <EuiHorizontalRule margin="none" />
 
-      <EuiFlexItem className="eui-yScroll">
+      <EuiFlexItem className="kbnCollapsibleNav__solutions">
         {/* Kibana, Observability, Security, and Management sections */}
         {orderedCategories.map((categoryName) => {
           const category = categoryDictionary[categoryName]!;
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts b/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts
index 7a5ecadd26f23b..89c9b560ad0180 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/index.ts
@@ -7,6 +7,6 @@
  */
 
 export { Header } from './header';
-export { ProjectHeader } from './project';
+export { ProjectHeader, SideNavigation as ProjectSideNavigation } from './project';
 export { LoadingIndicator } from './loading_indicator';
 export type { NavType } from './header';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
index e85ae262c3bb72..208f3aac7100dd 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/header.tsx
@@ -34,12 +34,14 @@ interface Props {
   kibanaVersion: string;
   application: InternalApplicationStart;
   navControlsRight$: Observable<ChromeNavControl[]>;
+  children: React.ReactNode;
 }
 
 export const ProjectHeader = ({
   application,
   kibanaDocLink,
   kibanaVersion,
+  children,
   ...observables
 }: Props) => {
   const renderLogo = () => (
@@ -53,7 +55,7 @@ export const ProjectHeader = ({
 
   return (
     <>
-      <EuiHeader position="fixed">
+      <EuiHeader position="fixed" data-test-subj="kibanaProjectHeader">
         <EuiHeaderSection grow={false}>
           <EuiHeaderSectionItem border="right">{renderLogo()}</EuiHeaderSectionItem>
           <EuiHeaderSectionItem>
@@ -81,9 +83,7 @@ export const ProjectHeader = ({
         </EuiHeaderSection>
       </EuiHeader>
       <Router history={application.history}>
-        <ProjectNavigation>
-          <span />
-        </ProjectNavigation>
+        <ProjectNavigation>{children}</ProjectNavigation>
       </Router>
     </>
   );
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts
index af18e057731b07..93f6c4ad054ce4 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/index.ts
@@ -7,3 +7,4 @@
  */
 
 export { ProjectHeader } from './header';
+export { SideNavigation } from './side_navigation';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx
index 20549325ec851b..445a80cca586d4 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/navigation.tsx
@@ -11,7 +11,7 @@ import useLocalStorage from 'react-use/lib/useLocalStorage';
 import { css } from '@emotion/react';
 
 import { i18n } from '@kbn/i18n';
-import { EuiButtonIcon, EuiCollapsibleNav, EuiThemeProvider, useEuiTheme } from '@elastic/eui';
+import { EuiButtonIcon, EuiCollapsibleNav } from '@elastic/eui';
 
 const LOCAL_STORAGE_IS_OPEN_KEY = 'PROJECT_NAVIGATION_OPEN' as const;
 const SIZE_OPEN = 248;
@@ -33,8 +33,6 @@ const closedAriaLabel = i18n.translate('core.ui.chrome.projectNav.collapsibleNav
 });
 
 export const ProjectNavigation: React.FC = ({ children }) => {
-  const { euiTheme, colorMode } = useEuiTheme();
-
   const [isOpen, setIsOpen] = useLocalStorage(LOCAL_STORAGE_IS_OPEN_KEY, true);
 
   const toggleOpen = useCallback(() => {
@@ -43,34 +41,31 @@ export const ProjectNavigation: React.FC = ({ children }) => {
 
   const collabsibleNavCSS = css`
     border-inline-end-width: 1,
-    background: ${euiTheme.colors.darkestShade},
     display: flex,
     flex-direction: row,
   `;
 
   return (
-    <EuiThemeProvider colorMode={colorMode === 'DARK' ? 'LIGHT' : 'DARK'}>
-      <EuiCollapsibleNav
-        css={collabsibleNavCSS}
-        isOpen={true}
-        showButtonIfDocked={true}
-        onClose={toggleOpen}
-        isDocked={true}
-        size={isOpen ? SIZE_OPEN : SIZE_CLOSED}
-        hideCloseButton={false}
-        button={
-          <span css={buttonCSS}>
-            <EuiButtonIcon
-              iconType={isOpen ? 'menuLeft' : 'menuRight'}
-              aria-label={isOpen ? openAriaLabel : closedAriaLabel}
-              color="text"
-              onClick={toggleOpen}
-            />
-          </span>
-        }
-      >
-        {isOpen && children}
-      </EuiCollapsibleNav>
-    </EuiThemeProvider>
+    <EuiCollapsibleNav
+      css={collabsibleNavCSS}
+      isOpen={true}
+      showButtonIfDocked={true}
+      onClose={toggleOpen}
+      isDocked={true}
+      size={isOpen ? SIZE_OPEN : SIZE_CLOSED}
+      hideCloseButton={false}
+      button={
+        <span css={buttonCSS}>
+          <EuiButtonIcon
+            iconType={isOpen ? 'menuLeft' : 'menuRight'}
+            aria-label={isOpen ? openAriaLabel : closedAriaLabel}
+            color={isOpen ? 'ghost' : 'text'}
+            onClick={toggleOpen}
+          />
+        </span>
+      }
+    >
+      {isOpen && children}
+    </EuiCollapsibleNav>
   );
 };
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/string_progress_bar.tsx b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/side_navigation.tsx
similarity index 51%
rename from src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/string_progress_bar.tsx
rename to packages/core/chrome/core-chrome-browser-internal/src/ui/project/side_navigation.tsx
index 34bcbfcaf113e5..a76d760170a1aa 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/string_progress_bar.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/ui/project/side_navigation.tsx
@@ -5,18 +5,14 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
 import React from 'react';
-import { EuiProgress } from '@elastic/eui';
-
-interface Props {
-  percent: number;
-  count: number;
-  value: string;
-}
-
-export function StringFieldProgressBar({ value, percent, count }: Props) {
-  const ariaLabel = `${value}: ${count} (${percent}%)`;
+import { EuiText } from '@elastic/eui';
+import type { SideNavComponent } from '@kbn/core-chrome-browser';
 
-  return <EuiProgress value={percent} max={100} color="success" aria-label={ariaLabel} size="s" />;
-}
+export const SideNavigation: SideNavComponent = () => {
+  return (
+    <div data-test-subj="defaultProjectSideNav">
+      <EuiText color="white">TODO - Build navigation from config</EuiText>
+    </div>
+  );
+};
diff --git a/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts b/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
index c7c62c78112771..7025608bc969de 100644
--- a/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
+++ b/packages/core/chrome/core-chrome-browser-mocks/src/chrome_service.mock.ts
@@ -63,6 +63,10 @@ const createStartContractMock = () => {
     getBodyClasses$: jest.fn(),
     getChromeStyle$: jest.fn(),
     setChromeStyle: jest.fn(),
+    project: {
+      setNavigation: jest.fn(),
+      setSideNavComponent: jest.fn(),
+    },
   };
   startContract.navLinks.getAll.mockReturnValue([]);
   startContract.getIsVisible$.mockReturnValue(new BehaviorSubject(false));
diff --git a/packages/core/chrome/core-chrome-browser/index.ts b/packages/core/chrome/core-chrome-browser/index.ts
index 1d2dca4c957bc5..dbf2cc59bb2804 100644
--- a/packages/core/chrome/core-chrome-browser/index.ts
+++ b/packages/core/chrome/core-chrome-browser/index.ts
@@ -29,4 +29,9 @@ export type {
   ChromeStart,
   ChromeStyle,
   ChromeUserBanner,
+  ChromeProjectNavigationLink,
+  ChromeProjectNavigation,
+  ChromeProjectNavigationNode,
+  SideNavCompProps,
+  SideNavComponent,
 } from './src';
diff --git a/packages/core/chrome/core-chrome-browser/src/contracts.ts b/packages/core/chrome/core-chrome-browser/src/contracts.ts
index 3f6f756e2d2b13..5930b0e34e341a 100644
--- a/packages/core/chrome/core-chrome-browser/src/contracts.ts
+++ b/packages/core/chrome/core-chrome-browser/src/contracts.ts
@@ -14,7 +14,8 @@ import type { ChromeNavControls } from './nav_controls';
 import type { ChromeHelpExtension } from './help_extension';
 import type { ChromeBreadcrumb, ChromeBreadcrumbsAppendExtension } from './breadcrumb';
 import type { ChromeBadge, ChromeStyle, ChromeUserBanner } from './types';
-import { ChromeGlobalHelpExtensionMenuLink } from './help_extension';
+import type { ChromeGlobalHelpExtensionMenuLink } from './help_extension';
+import type { ChromeProjectNavigation, SideNavComponent } from './project_navigation';
 
 /**
  * ChromeStart allows plugins to customize the global chrome header UI and
@@ -161,4 +162,26 @@ export interface ChromeStart {
    * Get an observable of the current style type of the chrome.
    */
   getChromeStyle$(): Observable<ChromeStyle>;
+  /**
+   * Configuration for serverless projects
+   */
+  project: {
+    /**
+     * Sets the project navigation config to be used for rendering project navigation.
+     * It is used for default project sidenav, project breadcrumbs, tracking active deep link.
+     * @param projectNavigation The project navigation config
+     *
+     * @remarks Has no effect if the chrome style is not `project`.
+     */
+    setNavigation(projectNavigation: ChromeProjectNavigation): void;
+
+    /**
+     * Set custom project sidenav component to be used instead of the default project sidenav.
+     * @param getter A function returning a CustomNavigationComponent.
+     * This component will receive Chrome navigation state as props (not yet implemented)
+     *
+     * @remarks Has no effect if the chrome style is not `project`.
+     */
+    setSideNavComponent(component: SideNavComponent | null): void;
+  };
 }
diff --git a/packages/core/chrome/core-chrome-browser/src/index.ts b/packages/core/chrome/core-chrome-browser/src/index.ts
index 89ba12d616d0e1..1810c0ec0bac70 100644
--- a/packages/core/chrome/core-chrome-browser/src/index.ts
+++ b/packages/core/chrome/core-chrome-browser/src/index.ts
@@ -27,3 +27,11 @@ export type {
   ChromeRecentlyAccessedHistoryItem,
 } from './recently_accessed';
 export type { ChromeBadge, ChromeUserBanner, ChromeStyle } from './types';
+
+export type {
+  ChromeProjectNavigation,
+  ChromeProjectNavigationNode,
+  ChromeProjectNavigationLink,
+  SideNavCompProps,
+  SideNavComponent,
+} from './project_navigation';
diff --git a/packages/core/chrome/core-chrome-browser/src/project_navigation.ts b/packages/core/chrome/core-chrome-browser/src/project_navigation.ts
new file mode 100644
index 00000000000000..da5140d55266c6
--- /dev/null
+++ b/packages/core/chrome/core-chrome-browser/src/project_navigation.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { ComponentType } from 'react';
+
+/** @internal */
+type AppId = string;
+
+/** @internal */
+type DeepLinkId = string;
+
+/** @internal */
+export type AppDeepLinkId = `${AppId}:${DeepLinkId}`;
+
+/** @public */
+export type ChromeProjectNavigationLink = AppId | AppDeepLinkId;
+
+/** @public */
+export interface ChromeProjectNavigationNode {
+  id?: string;
+  link?: ChromeProjectNavigationLink;
+  children?: ChromeProjectNavigationNode[];
+
+  title?: string;
+  icon?: string;
+}
+
+/** @public */
+export interface ChromeProjectNavigation {
+  navigationTree: ChromeProjectNavigationNode[];
+}
+
+/** @public */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface SideNavCompProps {
+  // TODO: provide the Chrome state to the component through props
+  // e.g. "navTree", "activeRoute", "recentItems"...
+}
+
+/** @public */
+export type SideNavComponent = ComponentType<SideNavCompProps>;
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 c1396daf1aa66d..033400b6b2455c 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
@@ -97,7 +97,8 @@ export class ElasticsearchService
     const esNodesCompatibility$ = pollEsNodesVersion({
       internalClient: this.client.asInternalUser,
       log: this.log,
-      ignoreVersionMismatch: config.ignoreVersionMismatch,
+      ignoreVersionMismatch:
+        config.ignoreVersionMismatch || this.coreContext.env.cliArgs.serverless === true,
       esVersionCheckInterval: config.healthCheckDelay.asMilliseconds(),
       kibanaVersion: this.kibanaVersion,
     }).pipe(takeUntil(this.stop$), shareReplay({ refCount: true, bufferSize: 1 }));
diff --git a/packages/core/plugins/core-plugins-server-internal/src/constants.ts b/packages/core/plugins/core-plugins-server-internal/src/constants.ts
new file mode 100644
index 00000000000000..8e99df42bd5013
--- /dev/null
+++ b/packages/core/plugins/core-plugins-server-internal/src/constants.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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.
+ */
+
+/**
+ * @internal
+ */
+export const ENABLE_ALL_PLUGINS_CONFIG_PATH = 'forceEnableAllPlugins' as const;
+
+/**
+ * Set this to true in the raw configuration passed to {@link Root} to force
+ * enable all plugins.
+ * @internal
+ */
+export const PLUGIN_SYSTEM_ENABLE_ALL_PLUGINS_CONFIG_PATH =
+  `plugins.${ENABLE_ALL_PLUGINS_CONFIG_PATH}` as const;
diff --git a/packages/core/plugins/core-plugins-server-internal/src/plugins_config.test.ts b/packages/core/plugins/core-plugins-server-internal/src/plugins_config.test.ts
index 2513d51616ef6f..9bab4ad803aaa0 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/plugins_config.test.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/plugins_config.test.ts
@@ -31,4 +31,15 @@ describe('PluginsConfig', () => {
     const config = new PluginsConfig(rawConfig, env);
     expect(config.additionalPluginPaths).toEqual(['some-path', 'another-path']);
   });
+
+  it('retrieves shouldEnableAllPlugins', () => {
+    const env = Env.createDefault(REPO_ROOT, getEnvOptions({ cliArgs: { dev: true } }));
+    const rawConfig: any = {
+      initialize: true,
+      paths: ['some-path', 'another-path'],
+      forceEnableAllPlugins: true,
+    };
+    const config = new PluginsConfig(rawConfig, env);
+    expect(config.shouldEnableAllPlugins).toBe(true);
+  });
 });
diff --git a/packages/core/plugins/core-plugins-server-internal/src/plugins_config.ts b/packages/core/plugins/core-plugins-server-internal/src/plugins_config.ts
index 8de7a0471c6507..717bac7c669e3b 100644
--- a/packages/core/plugins/core-plugins-server-internal/src/plugins_config.ts
+++ b/packages/core/plugins/core-plugins-server-internal/src/plugins_config.ts
@@ -7,9 +7,12 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
+import { get } from 'lodash';
 import { Env } from '@kbn/config';
 import type { ServiceConfigDescriptor } from '@kbn/core-base-server-internal';
 
+import { ENABLE_ALL_PLUGINS_CONFIG_PATH } from './constants';
+
 const configSchema = schema.object({
   initialize: schema.boolean({ defaultValue: true }),
 
@@ -17,9 +20,16 @@ const configSchema = schema.object({
    * Defines an array of directories where another plugin should be loaded from.
    */
   paths: schema.arrayOf(schema.string(), { defaultValue: [] }),
+  /**
+   * Internal config, not intended to be used by end users. Only for specific
+   * internal purposes.
+   */
+  forceEnableAllPlugins: schema.maybe(schema.boolean({ defaultValue: false })),
 });
 
-export type PluginsConfigType = TypeOf<typeof configSchema>;
+type InternalPluginsConfigType = TypeOf<typeof configSchema>;
+
+export type PluginsConfigType = Omit<InternalPluginsConfigType, '__internal__'>;
 
 export const config: ServiceConfigDescriptor<PluginsConfigType> = {
   path: 'plugins',
@@ -43,9 +53,17 @@ export class PluginsConfig {
    */
   public readonly additionalPluginPaths: readonly string[];
 
+  /**
+   * Whether to enable all plugins.
+   *
+   * @note this is intended to be an undocumented setting.
+   */
+  public readonly shouldEnableAllPlugins: boolean;
+
   constructor(rawConfig: PluginsConfigType, env: Env) {
     this.initialize = rawConfig.initialize;
     this.pluginSearchPaths = env.pluginSearchPaths;
     this.additionalPluginPaths = rawConfig.paths;
+    this.shouldEnableAllPlugins = get(rawConfig, ENABLE_ALL_PLUGINS_CONFIG_PATH, false);
   }
 }
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 b8f8b5d2b9be5b..288a9a8e330381 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
@@ -24,7 +24,7 @@ import { PluginDiscoveryError } from './discovery';
 import { PluginWrapper } from './plugin';
 import { PluginsService } from './plugins_service';
 import { PluginsSystem } from './plugins_system';
-import { config } from './plugins_config';
+import { config, PluginsConfigType } from './plugins_config';
 import { take } from 'rxjs/operators';
 import type { PluginConfigDescriptor } from '@kbn/core-plugins-server';
 import { DiscoveredPlugin, PluginType } from '@kbn/core-base-common';
@@ -32,6 +32,7 @@ import { DiscoveredPlugin, PluginType } from '@kbn/core-base-common';
 const MockPluginsSystem: jest.Mock<PluginsSystem<PluginType>> = PluginsSystem as any;
 
 let pluginsService: PluginsService;
+let pluginsConfig: PluginsConfigType;
 let config$: BehaviorSubject<Record<string, any>>;
 let configService: ConfigService;
 let coreId: symbol;
@@ -130,7 +131,8 @@ async function testSetup() {
   coreId = Symbol('core');
   env = Env.createDefault(REPO_ROOT, getEnvOptions());
 
-  config$ = new BehaviorSubject<Record<string, any>>({ plugins: { initialize: true } });
+  pluginsConfig = { initialize: true, paths: [] };
+  config$ = new BehaviorSubject<Record<string, any>>({ plugins: pluginsConfig });
   const rawConfigService = rawConfigServiceMock.create({ rawConfig$: config$ });
   configService = new ConfigService(rawConfigService, env, logger);
   await configService.setSchema(config.path, config.schema);
@@ -496,6 +498,52 @@ describe('PluginsService', () => {
       `);
     });
 
+    describe('forceEnableAllPlugins', () => {
+      it('enables all plugins when "true"', async () => {
+        (pluginsConfig as any).forceEnableAllPlugins = true;
+        jest
+          .spyOn(configService, 'isEnabledAtPath')
+          .mockImplementation((path) => Promise.resolve(!path.includes('disabled')));
+        prebootMockPluginSystem.setupPlugins.mockResolvedValue(new Map());
+        standardMockPluginSystem.setupPlugins.mockResolvedValue(new Map());
+        await pluginsService.setup(setupDeps);
+
+        mockDiscover.mockReturnValue({
+          error$: from([]),
+          plugin$: from([
+            createPlugin('explicitly-disabled-plugin-preboot', {
+              type: PluginType.preboot,
+              disabled: true,
+              path: 'path-1-preboot',
+              configPath: 'path-1-preboot',
+            }),
+            createPlugin('explicitly-disabled-plugin-standard', {
+              disabled: true,
+              path: 'path-1-standard',
+              configPath: 'path-1-standard',
+            }),
+            createPlugin('plugin-with-missing-required-deps-preboot', {
+              type: PluginType.preboot,
+              path: 'path-2-preboot',
+              configPath: 'path-2-preboot',
+              requiredPlugins: ['missing-plugin-preboot'],
+            }),
+          ]),
+        });
+
+        await pluginsService.discover({ environment: environmentPreboot, node: nodePreboot });
+        await pluginsService.preboot(prebootDeps);
+
+        expect(loggingSystemMock.collect(logger).info).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            "Plugin \\"plugin-with-missing-required-deps-preboot\\" has been disabled since the following direct or transitive dependencies are missing, disabled, or have incompatible types: [missing-plugin-preboot]",
+          ],
+        ]
+      `);
+      });
+    });
+
     it('does not throw in case of mutual plugin dependencies', async () => {
       const prebootPlugins = [
         createPlugin('first-plugin-preboot', {
@@ -725,6 +773,7 @@ describe('PluginsService', () => {
             resolve(REPO_ROOT, '..', 'kibana-extra'),
             resolve(REPO_ROOT, 'plugins'),
           ],
+          shouldEnableAllPlugins: false,
         },
         coreContext: { coreId, env, logger, configService },
         instanceInfo: { uuid: 'uuid' },
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 556cd8331b454f..280fa38c043441 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
@@ -282,11 +282,19 @@ export class PluginsService implements CoreService<PluginsServiceSetup, PluginsS
       }
     }
 
+    const config = await firstValueFrom(this.config$);
+    const enableAllPlugins = config.shouldEnableAllPlugins;
+    if (enableAllPlugins) {
+      this.log.warn('Detected override configuration; will enable all plugins');
+    }
+
     // Validate config and handle enabled statuses.
     // NOTE: We can't do both in the same previous loop because some plugins' deprecations may affect others.
     // Hence, we need all the deprecations to be registered before accessing any config parameter.
     for (const plugin of plugins) {
-      const isEnabled = await this.coreContext.configService.isEnabledAtPath(plugin.configPath);
+      const isEnabled =
+        enableAllPlugins ||
+        (await this.coreContext.configService.isEnabledAtPath(plugin.configPath));
 
       if (pluginEnableStatuses.has(plugin.name)) {
         throw new Error(`Plugin with id "${plugin.name}" is already registered!`);
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_utils.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_utils.ts
index afafd67fcab3a6..1ffc5fcde62d86 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_utils.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/internal_utils.ts
@@ -293,11 +293,5 @@ export function setManaged({
   optionsManaged?: boolean;
   objectManaged?: boolean;
 }): boolean {
-  if (optionsManaged !== undefined) {
-    return optionsManaged;
-  } else if (optionsManaged === undefined && objectManaged !== undefined) {
-    return objectManaged;
-  } else {
-    return false;
-  }
+  return optionsManaged ?? objectManaged ?? false;
 }
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/index.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/index.ts
index 3c7ecbbb971b4f..420c5949768076 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/index.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/index.ts
@@ -50,13 +50,17 @@ export {
   modelVersionToVirtualVersion,
   getModelVersionMapForTypes,
   getLatestModelVersion,
+  getCurrentVirtualVersion,
+  getLatestMigrationVersion,
+  getVirtualVersionMap,
   type ModelVersionMap,
-  compareModelVersions,
+  type VirtualVersionMap,
+  compareVirtualVersions,
   type CompareModelVersionMapParams,
   type CompareModelVersionStatus,
   type CompareModelVersionDetails,
   type CompareModelVersionResult,
-  getModelVersionsFromMappings,
-  getModelVersionsFromMappingMeta,
+  getVirtualVersionsFromMappings,
+  getVirtualVersionsFromMappingMeta,
   getModelVersionDelta,
 } from './src/model_version';
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/legacy_alias/types.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/legacy_alias/types.ts
index 9148b4e903c822..b0fc589e30c3dc 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/legacy_alias/types.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/legacy_alias/types.ts
@@ -59,4 +59,10 @@ export interface LegacyUrlAlias {
    * created because of saved object conversion, then we will display a toast telling the user that the object has a new URL.
    */
   purpose?: 'savedObjectConversion' | 'savedObjectImport';
+  /**
+   * Flag indicating if a saved object is managed by Kibana (default=false).
+   * Only used when upserting a saved object. If the saved object already
+   * exist this option has no effect.
+   */
+  managed?: boolean;
 }
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/mappings/index.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/mappings/index.ts
index ee51fa9aaf4bb3..779ff28fb077c0 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/mappings/index.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/mappings/index.ts
@@ -9,6 +9,8 @@
 export { getTypes, getProperty, getRootProperties, getRootPropertiesObjects } from './lib';
 export type {
   SavedObjectsTypeMappingDefinitions,
+  V2AlgoIndexMappingMeta,
+  ZdtAlgoIndexMappingMeta,
   IndexMappingMeta,
   IndexMapping,
   IndexTypesMap,
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/mappings/types.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/mappings/types.ts
index c756f0534db67d..a8c74646de1b11 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/mappings/types.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/mappings/types.ts
@@ -59,7 +59,7 @@ export interface IndexMapping {
 export type IndexTypesMap = Record<string, string[]>;
 
 /** @internal */
-export interface IndexMappingMeta {
+export interface V2AlgoIndexMappingMeta {
   /**
    * A dictionary of key -> md5 hash (e.g. 'dashboard': '24234qdfa3aefa3wa')
    * with each key being a root-level mapping property, and each value being
@@ -74,18 +74,22 @@ export interface IndexMappingMeta {
    * @remark: Only defined for indices using the v2 migration algorithm.
    */
   indexTypesMap?: IndexTypesMap;
+}
+
+/** @internal */
+export interface ZdtAlgoIndexMappingMeta {
   /**
-   * The current model versions of the mapping of the index.
+   * The current virtual version of the mapping of the index.
    *
    * @remark: Only defined for indices using the zdt migration algorithm.
    */
-  mappingVersions?: { [k: string]: number };
+  mappingVersions?: { [k: string]: string };
   /**
-   * The current model versions of the documents of the index.
+   * The current virtual versions of the documents of the index.
    *
    * @remark: Only defined for indices using the zdt migration algorithm.
    */
-  docVersions?: { [k: string]: number };
+  docVersions?: { [k: string]: string };
   /**
    * Info about the current state of the migration.
    * Should only be present if a migration is in progress or was interrupted.
@@ -95,6 +99,9 @@ export interface IndexMappingMeta {
   migrationState?: IndexMappingMigrationStateMeta;
 }
 
+/** @internal */
+export type IndexMappingMeta = V2AlgoIndexMappingMeta & ZdtAlgoIndexMappingMeta;
+
 /** @internal */
 export interface IndexMappingMigrationStateMeta {
   /**
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/conversion.test.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/conversion.test.ts
index b65bdbce41b7a4..3c89894058f578 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/conversion.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/conversion.test.ts
@@ -11,6 +11,7 @@ import {
   virtualVersionToModelVersion,
   modelVersionToVirtualVersion,
   assertValidModelVersion,
+  assertValidVirtualVersion,
 } from './conversion';
 
 describe('isVirtualModelVersion', () => {
@@ -103,3 +104,19 @@ describe('assertValidModelVersion', () => {
     expect(assertValidModelVersion('3')).toEqual(3);
   });
 });
+
+describe('assertValidVirtualVersion', () => {
+  it('throws if the provided value is not a valid semver', () => {
+    expect(() => assertValidVirtualVersion('foooo')).toThrowErrorMatchingInlineSnapshot(
+      `"Virtual versions must be valid semver versions"`
+    );
+    expect(() => assertValidVirtualVersion('1.2.3.4.5.6.7')).toThrowErrorMatchingInlineSnapshot(
+      `"Virtual versions must be valid semver versions"`
+    );
+  });
+
+  it('returns the virtual version', () => {
+    expect(assertValidVirtualVersion('7.17.5')).toEqual('7.17.5');
+    expect(assertValidVirtualVersion('10.3.0')).toEqual('10.3.0');
+  });
+});
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/conversion.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/conversion.ts
index c3765ca3c9be99..b10b85084eca51 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/conversion.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/conversion.ts
@@ -89,6 +89,14 @@ export const assertValidModelVersion = (modelVersion: string | number): number =
   return modelVersion;
 };
 
+export const assertValidVirtualVersion = (virtualVersion: string): string => {
+  const semver = Semver.parse(virtualVersion);
+  if (!semver) {
+    throw new Error('Virtual versions must be valid semver versions');
+  }
+  return virtualVersion;
+};
+
 const _isVirtualModelVersion = (semver: Semver.SemVer): boolean => {
   return semver.major === modelVersionVirtualMajor && semver.patch === 0;
 };
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/get_version_delta.test.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/get_version_delta.test.ts
index 521ddd2a0efc38..4c1bbeaf7f9401 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/get_version_delta.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/get_version_delta.test.ts
@@ -12,12 +12,12 @@ describe('getModelVersionDelta', () => {
   it('generates an upward delta', () => {
     const result = getModelVersionDelta({
       currentVersions: {
-        a: 1,
-        b: 1,
+        a: '10.1.0',
+        b: '10.1.0',
       },
       targetVersions: {
-        a: 2,
-        b: 3,
+        a: '10.2.0',
+        b: '10.3.0',
       },
       deletedTypes: [],
     });
@@ -26,13 +26,13 @@ describe('getModelVersionDelta', () => {
     expect(result.diff).toEqual([
       {
         name: 'a',
-        current: 1,
-        target: 2,
+        current: '10.1.0',
+        target: '10.2.0',
       },
       {
         name: 'b',
-        current: 1,
-        target: 3,
+        current: '10.1.0',
+        target: '10.3.0',
       },
     ]);
   });
@@ -40,12 +40,12 @@ describe('getModelVersionDelta', () => {
   it('generates a downward delta', () => {
     const result = getModelVersionDelta({
       currentVersions: {
-        a: 4,
-        b: 2,
+        a: '10.4.0',
+        b: '10.2.0',
       },
       targetVersions: {
-        a: 1,
-        b: 1,
+        a: '10.1.0',
+        b: '7.17.2',
       },
       deletedTypes: [],
     });
@@ -54,13 +54,13 @@ describe('getModelVersionDelta', () => {
     expect(result.diff).toEqual([
       {
         name: 'a',
-        current: 4,
-        target: 1,
+        current: '10.4.0',
+        target: '10.1.0',
       },
       {
         name: 'b',
-        current: 2,
-        target: 1,
+        current: '10.2.0',
+        target: '7.17.2',
       },
     ]);
   });
@@ -68,12 +68,12 @@ describe('getModelVersionDelta', () => {
   it('generates a noop delta', () => {
     const result = getModelVersionDelta({
       currentVersions: {
-        a: 4,
-        b: 2,
+        a: '10.4.0',
+        b: '8.9.2',
       },
       targetVersions: {
-        a: 4,
-        b: 2,
+        a: '10.4.0',
+        b: '8.9.2',
       },
       deletedTypes: [],
     });
@@ -85,11 +85,11 @@ describe('getModelVersionDelta', () => {
   it('ignores deleted types', () => {
     const result = getModelVersionDelta({
       currentVersions: {
-        a: 1,
-        b: 3,
+        a: '10.1.0',
+        b: '10.3.0',
       },
       targetVersions: {
-        a: 2,
+        a: '10.2.0',
       },
       deletedTypes: ['b'],
     });
@@ -98,8 +98,8 @@ describe('getModelVersionDelta', () => {
     expect(result.diff).toEqual([
       {
         name: 'a',
-        current: 1,
-        target: 2,
+        current: '10.1.0',
+        target: '10.2.0',
       },
     ]);
   });
@@ -108,12 +108,12 @@ describe('getModelVersionDelta', () => {
     expect(() =>
       getModelVersionDelta({
         currentVersions: {
-          a: 1,
-          b: 2,
+          a: '10.1.0',
+          b: '10.2.0',
         },
         targetVersions: {
-          a: 2,
-          b: 1,
+          a: '10.2.0',
+          b: '10.1.0',
         },
         deletedTypes: [],
       })
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/get_version_delta.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/get_version_delta.ts
index f39c52b47f9f7d..2426bc4a5770f1 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/get_version_delta.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/get_version_delta.ts
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import type { ModelVersionMap } from './version_map';
-import { compareModelVersions } from './version_compare';
+import type { VirtualVersionMap, VirtualVersion } from './version_map';
+import { compareVirtualVersions } from './version_compare';
 
 interface GetModelVersionDeltaOpts {
-  currentVersions: ModelVersionMap;
-  targetVersions: ModelVersionMap;
+  currentVersions: VirtualVersionMap;
+  targetVersions: VirtualVersionMap;
   deletedTypes: string[];
 }
 
@@ -26,9 +26,9 @@ interface ModelVersionDeltaTypeResult {
   /** the name of the type */
   name: string;
   /** the current version the type is at */
-  current: number;
+  current: VirtualVersion;
   /** the target version the type should go to */
-  target: number;
+  target: VirtualVersion;
 }
 
 /**
@@ -41,7 +41,7 @@ export const getModelVersionDelta = ({
   targetVersions,
   deletedTypes,
 }: GetModelVersionDeltaOpts): ModelVersionDeltaResult => {
-  const compared = compareModelVersions({
+  const compared = compareVirtualVersions({
     indexVersions: currentVersions,
     appVersions: targetVersions,
     deletedTypes,
@@ -78,8 +78,8 @@ const getTypeDelta = ({
   targetVersions,
 }: {
   type: string;
-  currentVersions: ModelVersionMap;
-  targetVersions: ModelVersionMap;
+  currentVersions: VirtualVersionMap;
+  targetVersions: VirtualVersionMap;
 }): ModelVersionDeltaTypeResult => {
   const currentVersion = currentVersions[type];
   const targetVersion = targetVersions[type];
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/index.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/index.ts
index 2179199921a822..7279470d26b8f2 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/index.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/index.ts
@@ -16,17 +16,21 @@ export {
 export {
   getModelVersionMapForTypes,
   getLatestModelVersion,
+  getCurrentVirtualVersion,
+  getVirtualVersionMap,
+  getLatestMigrationVersion,
   type ModelVersionMap,
+  type VirtualVersionMap,
 } from './version_map';
 export {
-  compareModelVersions,
+  compareVirtualVersions,
   type CompareModelVersionMapParams,
   type CompareModelVersionStatus,
   type CompareModelVersionDetails,
   type CompareModelVersionResult,
 } from './version_compare';
 export {
-  getModelVersionsFromMappings,
-  getModelVersionsFromMappingMeta,
+  getVirtualVersionsFromMappings,
+  getVirtualVersionsFromMappingMeta,
 } from './model_version_from_mappings';
 export { getModelVersionDelta } from './get_version_delta';
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.test.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.test.ts
index 8fea10f11f6b1c..ec8d36a53fa9d5 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.test.ts
@@ -7,7 +7,7 @@
  */
 
 import type { IndexMapping, IndexMappingMeta } from '../mappings';
-import { getModelVersionsFromMappings } from './model_version_from_mappings';
+import { getVirtualVersionsFromMappings } from './model_version_from_mappings';
 
 describe('getModelVersionsFromMappings', () => {
   const createIndexMapping = (parts: Partial<IndexMappingMeta> = {}): IndexMapping => ({
@@ -20,41 +20,41 @@ describe('getModelVersionsFromMappings', () => {
   it('retrieves the version map from docVersions', () => {
     const mappings = createIndexMapping({
       docVersions: {
-        foo: 3,
-        bar: 5,
+        foo: '10.3.0',
+        bar: '8.16.2',
       },
     });
-    const versionMap = getModelVersionsFromMappings({ mappings, source: 'docVersions' });
+    const versionMap = getVirtualVersionsFromMappings({ mappings, source: 'docVersions' });
 
     expect(versionMap).toEqual({
-      foo: 3,
-      bar: 5,
+      foo: '10.3.0',
+      bar: '8.16.2',
     });
   });
 
   it('retrieves the version map from mappingVersions', () => {
     const mappings = createIndexMapping({
       mappingVersions: {
-        foo: 2,
-        bar: 7,
+        foo: '10.2.0',
+        bar: '7.17.0',
       },
     });
-    const versionMap = getModelVersionsFromMappings({ mappings, source: 'mappingVersions' });
+    const versionMap = getVirtualVersionsFromMappings({ mappings, source: 'mappingVersions' });
 
     expect(versionMap).toEqual({
-      foo: 2,
-      bar: 7,
+      foo: '10.2.0',
+      bar: '7.17.0',
     });
   });
 
   it('returns undefined for docVersions if meta field is not present', () => {
     const mappings = createIndexMapping({
       mappingVersions: {
-        foo: 3,
-        bar: 5,
+        foo: '10.3.0',
+        bar: '10.5.0',
       },
     });
-    const versionMap = getModelVersionsFromMappings({ mappings, source: 'docVersions' });
+    const versionMap = getVirtualVersionsFromMappings({ mappings, source: 'docVersions' });
 
     expect(versionMap).toBeUndefined();
   });
@@ -62,11 +62,11 @@ describe('getModelVersionsFromMappings', () => {
   it('returns undefined for mappingVersions if meta field is not present', () => {
     const mappings = createIndexMapping({
       docVersions: {
-        foo: 3,
-        bar: 5,
+        foo: '10.3.0',
+        bar: '10.5.0',
       },
     });
-    const versionMap = getModelVersionsFromMappings({ mappings, source: 'mappingVersions' });
+    const versionMap = getVirtualVersionsFromMappings({ mappings, source: 'mappingVersions' });
 
     expect(versionMap).toBeUndefined();
   });
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts
index 01fc57d46462bb..8dc28969d8476d 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/model_version_from_mappings.ts
@@ -7,8 +7,8 @@
  */
 
 import type { IndexMapping, IndexMappingMeta } from '../mappings';
-import type { ModelVersionMap } from './version_map';
-import { assertValidModelVersion } from './conversion';
+import type { VirtualVersionMap } from './version_map';
+import { assertValidVirtualVersion } from './conversion';
 
 export interface GetModelVersionsFromMappingsOpts {
   mappings: IndexMapping;
@@ -20,16 +20,16 @@ export interface GetModelVersionsFromMappingsOpts {
 /**
  * Build the version map from the specified source of the provided mappings.
  */
-export const getModelVersionsFromMappings = ({
+export const getVirtualVersionsFromMappings = ({
   mappings,
   source,
   knownTypes,
-}: GetModelVersionsFromMappingsOpts): ModelVersionMap | undefined => {
+}: GetModelVersionsFromMappingsOpts): VirtualVersionMap | undefined => {
   if (!mappings._meta) {
     return undefined;
   }
 
-  return getModelVersionsFromMappingMeta({
+  return getVirtualVersionsFromMappingMeta({
     meta: mappings._meta,
     source,
     knownTypes,
@@ -46,20 +46,20 @@ export interface GetModelVersionsFromMappingMetaOpts {
 /**
  * Build the version map from the specified source of the provided mappings meta.
  */
-export const getModelVersionsFromMappingMeta = ({
+export const getVirtualVersionsFromMappingMeta = ({
   meta,
   source,
   knownTypes,
-}: GetModelVersionsFromMappingMetaOpts): ModelVersionMap | undefined => {
+}: GetModelVersionsFromMappingMetaOpts): VirtualVersionMap | undefined => {
   const indexVersions = source === 'mappingVersions' ? meta.mappingVersions : meta.docVersions;
   if (!indexVersions) {
     return undefined;
   }
   const typeSet = knownTypes ? new Set(knownTypes) : undefined;
 
-  return Object.entries(indexVersions).reduce<ModelVersionMap>((map, [type, rawVersion]) => {
+  return Object.entries(indexVersions).reduce<VirtualVersionMap>((map, [type, rawVersion]) => {
     if (!typeSet || typeSet.has(type)) {
-      map[type] = assertValidModelVersion(rawVersion);
+      map[type] = assertValidVirtualVersion(rawVersion);
     }
     return map;
   }, {});
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.test.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.test.ts
index eba6fe1837cce7..64feb07455eb38 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.test.ts
@@ -6,18 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { compareModelVersions } from './version_compare';
+import { compareVirtualVersions } from './version_compare';
 
 describe('compareModelVersions', () => {
   it('returns the correct value for greater app version', () => {
-    const result = compareModelVersions({
+    const result = compareVirtualVersions({
       appVersions: {
-        foo: 3,
-        bar: 2,
+        foo: '10.3.0',
+        bar: '10.2.0',
       },
       indexVersions: {
-        foo: 2,
-        bar: 2,
+        foo: '10.2.0',
+        bar: '10.2.0',
       },
       deletedTypes: [],
     });
@@ -26,14 +26,14 @@ describe('compareModelVersions', () => {
   });
 
   it('returns the correct value for lesser app version', () => {
-    const result = compareModelVersions({
+    const result = compareVirtualVersions({
       appVersions: {
-        foo: 1,
-        bar: 2,
+        foo: '10.1.0',
+        bar: '10.2.0',
       },
       indexVersions: {
-        foo: 2,
-        bar: 2,
+        foo: '10.2.0',
+        bar: '10.2.0',
       },
       deletedTypes: [],
     });
@@ -42,14 +42,14 @@ describe('compareModelVersions', () => {
   });
 
   it('returns the correct value for equal versions', () => {
-    const result = compareModelVersions({
+    const result = compareVirtualVersions({
       appVersions: {
-        foo: 2,
-        bar: 2,
+        foo: '10.2.0',
+        bar: '10.2.0',
       },
       indexVersions: {
-        foo: 2,
-        bar: 2,
+        foo: '10.2.0',
+        bar: '10.2.0',
       },
       deletedTypes: [],
     });
@@ -58,13 +58,13 @@ describe('compareModelVersions', () => {
   });
 
   it('handles new types not being present in the index', () => {
-    const result = compareModelVersions({
+    const result = compareVirtualVersions({
       appVersions: {
-        foo: 2,
-        new: 1,
+        foo: '10.2.0',
+        bar: '10.1.0',
       },
       indexVersions: {
-        foo: 2,
+        foo: '10.2.0',
       },
       deletedTypes: [],
     });
@@ -73,13 +73,13 @@ describe('compareModelVersions', () => {
   });
 
   it('handles types not being present in the app', () => {
-    const result = compareModelVersions({
+    const result = compareVirtualVersions({
       appVersions: {
-        foo: 3,
+        foo: '10.3.0',
       },
       indexVersions: {
-        foo: 2,
-        old: 1,
+        foo: '10.2.0',
+        old: '10.1.0',
       },
       deletedTypes: [],
     });
@@ -88,16 +88,16 @@ describe('compareModelVersions', () => {
   });
 
   it('returns the correct value for conflicts', () => {
-    const result = compareModelVersions({
+    const result = compareVirtualVersions({
       appVersions: {
-        a: 3,
-        b: 3,
-        c: 3,
+        a: '10.3.0',
+        b: '10.3.0',
+        c: '10.3.0',
       },
       indexVersions: {
-        a: 2,
-        b: 3,
-        c: 4,
+        a: '10.2.0',
+        b: '10.3.0',
+        c: '10.4.0',
       },
       deletedTypes: [],
     });
@@ -106,16 +106,16 @@ describe('compareModelVersions', () => {
   });
 
   it('properly lists the details', () => {
-    const result = compareModelVersions({
+    const result = compareVirtualVersions({
       appVersions: {
-        a: 3,
-        b: 3,
-        c: 3,
+        a: '10.3.0',
+        b: '10.3.0',
+        c: '10.3.0',
       },
       indexVersions: {
-        a: 2,
-        b: 3,
-        c: 4,
+        a: '10.2.0',
+        b: '10.3.0',
+        c: '10.4.0',
       },
       deletedTypes: [],
     });
@@ -126,13 +126,13 @@ describe('compareModelVersions', () => {
   });
 
   it('ignores deleted types when comparing', () => {
-    const result = compareModelVersions({
+    const result = compareVirtualVersions({
       appVersions: {
-        a: 3,
+        a: '10.3.0',
       },
       indexVersions: {
-        a: 2,
-        b: 3,
+        a: '10.2.0',
+        b: '10.3.0',
       },
       deletedTypes: ['b'],
     });
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.ts
index 9b8d14b7fd8622..6d250167cb4e2d 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_compare.ts
@@ -6,13 +6,14 @@
  * Side Public License, v 1.
  */
 
-import type { ModelVersionMap } from './version_map';
+import Semver from 'semver';
+import type { VirtualVersionMap } from './version_map';
 
 export interface CompareModelVersionMapParams {
   /** The latest model version of the types registered in the application */
-  appVersions: ModelVersionMap;
+  appVersions: VirtualVersionMap;
   /** The model version stored in the index */
-  indexVersions: ModelVersionMap;
+  indexVersions: VirtualVersionMap;
   /** The list of deleted types to exclude during the compare process */
   deletedTypes: string[];
 }
@@ -37,7 +38,7 @@ export interface CompareModelVersionResult {
   details: CompareModelVersionDetails;
 }
 
-export const compareModelVersions = ({
+export const compareVirtualVersions = ({
   appVersions,
   indexVersions,
   deletedTypes,
@@ -53,14 +54,19 @@ export const compareModelVersions = ({
   };
 
   allTypes.forEach((type) => {
-    const appVersion = appVersions[type] ?? 0;
-    const indexVersion = indexVersions[type] ?? 0;
+    const appVersion = appVersions[type] ?? '0.0.0';
+    const indexVersion = indexVersions[type] ?? '0.0.0';
 
-    if (appVersion > indexVersion) {
+    const comparison = Semver.compare(appVersion, indexVersion);
+
+    if (comparison > 0) {
+      // app version greater than index version
       details.greater.push(type);
-    } else if (appVersion < indexVersion) {
+    } else if (comparison < 0) {
+      // app version lower than index version
       details.lesser.push(type);
     } else {
+      // // app version equal to index version
       details.equal.push(type);
     }
   });
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.test.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.test.ts
index aafb83ab96009f..1849809c516f92 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.test.ts
@@ -7,7 +7,13 @@
  */
 
 import type { SavedObjectsType, SavedObjectsModelVersion } from '@kbn/core-saved-objects-server';
-import { getModelVersionMapForTypes, getLatestModelVersion } from './version_map';
+import {
+  getModelVersionMapForTypes,
+  getLatestModelVersion,
+  getLatestMigrationVersion,
+  getCurrentVirtualVersion,
+  getVirtualVersionMap,
+} from './version_map';
 
 describe('ModelVersion map utilities', () => {
   const buildType = (parts: Partial<SavedObjectsType> = {}): SavedObjectsType => ({
@@ -24,6 +30,8 @@ describe('ModelVersion map utilities', () => {
     },
   });
 
+  const dummyMigration = jest.fn();
+
   describe('getLatestModelVersion', () => {
     it('returns 0 when no model versions are registered', () => {
       expect(getLatestModelVersion(buildType({ modelVersions: {} }))).toEqual(0);
@@ -116,4 +124,141 @@ describe('ModelVersion map utilities', () => {
       });
     });
   });
+
+  describe('getLatestMigrationVersion', () => {
+    it('returns 0.0.0 when no migrations are registered', () => {
+      expect(getLatestMigrationVersion(buildType({ migrations: {} }))).toEqual('0.0.0');
+      expect(getLatestMigrationVersion(buildType({ migrations: undefined }))).toEqual('0.0.0');
+    });
+
+    it('throws if an invalid version is provided', () => {
+      expect(() =>
+        getLatestMigrationVersion(
+          buildType({
+            migrations: {
+              foo: dummyMigration,
+              '8.6.0': dummyMigration,
+            },
+          })
+        )
+      ).toThrowError();
+    });
+
+    it('returns the latest registered version', () => {
+      expect(
+        getLatestMigrationVersion(
+          buildType({
+            migrations: {
+              '7.17.2': dummyMigration,
+              '8.6.0': dummyMigration,
+            },
+          })
+        )
+      ).toEqual('8.6.0');
+    });
+
+    it('accepts provider functions', () => {
+      expect(
+        getLatestMigrationVersion(
+          buildType({
+            migrations: () => ({
+              '7.17.2': dummyMigration,
+              '8.4.0': dummyMigration,
+            }),
+          })
+        )
+      ).toEqual('8.4.0');
+    });
+
+    it('supports unordered maps', () => {
+      expect(
+        getLatestMigrationVersion(
+          buildType({
+            migrations: {
+              '7.17.2': dummyMigration,
+              '8.7.0': dummyMigration,
+              '8.2.0': dummyMigration,
+            },
+          })
+        )
+      ).toEqual('8.7.0');
+    });
+  });
+
+  describe('getCurrentVirtualVersion', () => {
+    it('returns the latest registered migration if switchToModelVersionAt is unset', () => {
+      expect(
+        getCurrentVirtualVersion(
+          buildType({
+            migrations: {
+              '7.17.2': dummyMigration,
+              '8.6.0': dummyMigration,
+            },
+            modelVersions: {
+              1: dummyModelVersion(),
+            },
+          })
+        )
+      ).toEqual('8.6.0');
+    });
+
+    it('returns the virtual version of the latest model version if switchToModelVersionAt is set', () => {
+      expect(
+        getCurrentVirtualVersion(
+          buildType({
+            switchToModelVersionAt: '8.7.0',
+            migrations: {
+              '7.17.2': dummyMigration,
+              '8.6.0': dummyMigration,
+            },
+            modelVersions: {
+              1: dummyModelVersion(),
+            },
+          })
+        )
+      ).toEqual('10.1.0');
+    });
+  });
+
+  describe('getVirtualVersionMap', () => {
+    it('returns the virtual version for each of the provided types', () => {
+      expect(
+        getVirtualVersionMap([
+          buildType({
+            name: 'foo',
+            switchToModelVersionAt: '8.7.0',
+            migrations: {
+              '7.17.2': dummyMigration,
+              '8.6.0': dummyMigration,
+            },
+            modelVersions: {
+              1: dummyModelVersion(),
+            },
+          }),
+          buildType({
+            name: 'bar',
+            migrations: {
+              '7.17.2': dummyMigration,
+              '8.6.0': dummyMigration,
+            },
+            modelVersions: {
+              1: dummyModelVersion(),
+            },
+          }),
+          buildType({
+            name: 'dolly',
+            switchToModelVersionAt: '8.7.0',
+            migrations: {
+              '7.17.2': dummyMigration,
+              '8.6.0': dummyMigration,
+            },
+          }),
+        ])
+      ).toEqual({
+        foo: '10.1.0',
+        bar: '8.6.0',
+        dolly: '10.0.0',
+      });
+    });
+  });
 });
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts
index dd05e64dbcbef4..aafac41df794aa 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/model_version/version_map.ts
@@ -6,11 +6,32 @@
  * Side Public License, v 1.
  */
 
+import Semver from 'semver';
 import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
-import { assertValidModelVersion } from './conversion';
+import { assertValidModelVersion, modelVersionToVirtualVersion } from './conversion';
 
+/**
+ * Represents the virtual version of a given SO type.
+ * The virtual version is a compatibility format between the old
+ * migration system's versioning, based on the stack version, and the new model versioning.
+ *
+ * A virtual version is a plain semver version. Depending on its major version value, the
+ * underlying version can be the following:
+ * - Major < 10: Old migrations system (stack versions), using the equivalent value (e.g `8.7.0` => migration version `8.7.0`)
+ * - Major == 10: Model versions, using the `10.{modelVersion}.0` format (e.g `10.3.0` => model version 3)
+ */
+export type VirtualVersion = string;
+
+/**
+ * A map of SO type name to Model Version.
+ */
 export type ModelVersionMap = Record<string, number>;
 
+/**
+ * A map of SO type name to {@link VirtualVersion}.
+ */
+export type VirtualVersionMap = Record<string, VirtualVersion>;
+
 /**
  * Returns the latest registered model version number for the given type.
  */
@@ -22,6 +43,14 @@ export const getLatestModelVersion = (type: SavedObjectsType): number => {
   }, 0);
 };
 
+export const getLatestMigrationVersion = (type: SavedObjectsType): string => {
+  const migrationMap =
+    typeof type.migrations === 'function' ? type.migrations() : type.migrations ?? {};
+  return Object.keys(migrationMap).reduce<string>((memo, current) => {
+    return Semver.gt(memo, current) ? memo : current;
+  }, '0.0.0');
+};
+
 /**
  * Build a version map for the given types.
  */
@@ -31,3 +60,29 @@ export const getModelVersionMapForTypes = (types: SavedObjectsType[]): ModelVers
     return versionMap;
   }, {});
 };
+
+/**
+ * Returns the current virtual version for the given type.
+ * It will either be the latest model version if the type
+ * already switched to using them (switchToModelVersionAt is set),
+ * or the latest migration version for the type otherwise.
+ */
+export const getCurrentVirtualVersion = (type: SavedObjectsType): string => {
+  if (type.switchToModelVersionAt) {
+    const modelVersion = getLatestModelVersion(type);
+    return modelVersionToVirtualVersion(modelVersion);
+  } else {
+    return getLatestMigrationVersion(type);
+  }
+};
+
+/**
+ * Returns a map of virtual model version for the given types.
+ * See {@link getCurrentVirtualVersion}
+ */
+export const getVirtualVersionMap = (types: SavedObjectsType[]): VirtualVersionMap => {
+  return types.reduce<VirtualVersionMap>((versionMap, type) => {
+    versionMap[type.name] = getCurrentVirtualVersion(type);
+    return versionMap;
+  }, {});
+};
diff --git a/packages/core/saved-objects/core-saved-objects-common/src/saved_objects_imports.ts b/packages/core/saved-objects/core-saved-objects-common/src/saved_objects_imports.ts
index 7d6700ed3b47c6..85d221c0c58aff 100644
--- a/packages/core/saved-objects/core-saved-objects-common/src/saved_objects_imports.ts
+++ b/packages/core/saved-objects/core-saved-objects-common/src/saved_objects_imports.ts
@@ -91,6 +91,7 @@ export interface SavedObjectsImportFailure {
    * If `overwrite` is specified, an attempt was made to overwrite an existing object.
    */
   overwrite?: boolean;
+  managed?: boolean;
   error:
     | SavedObjectsImportConflictError
     | SavedObjectsImportAmbiguousConflictError
@@ -125,6 +126,14 @@ export interface SavedObjectsImportSuccess {
    * If `overwrite` is specified, this object overwrote an existing one (or will do so, in the case of a pending resolution).
    */
   overwrite?: boolean;
+  /**
+   * Flag indicating if a saved object is managed by Kibana (default=false)
+   *
+   * This can be leveraged by applications to e.g. prevent edits to a managed
+   * saved object. Instead, users can be guided to create a copy first and
+   * make their edits to the copy.
+   */
+  managed?: boolean;
 }
 
 /**
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.test.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.test.ts
index 66a010b548a4ae..8e6576de34e019 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.test.ts
@@ -80,10 +80,12 @@ describe('#importSavedObjectsFromStream', () => {
         management: { icon: `${type}-icon` },
       } as any),
     importHooks = {},
+    managed,
   }: {
     createNewCopies?: boolean;
     getTypeImpl?: (name: string) => any;
     importHooks?: Record<string, SavedObjectsImportHook[]>;
+    managed?: boolean;
   } = {}): ImportSavedObjectsOptions => {
     readStream = new Readable();
     savedObjectsClient = savedObjectsClientMock.create();
@@ -98,19 +100,23 @@ describe('#importSavedObjectsFromStream', () => {
       namespace,
       createNewCopies,
       importHooks,
+      managed,
     };
   };
   const createObject = ({
     type = 'foo-type',
     title = 'some-title',
-  }: { type?: string; title?: string } = {}): SavedObject<{
+    managed = undefined, // explicitly declare undefined so as not set to test against existing objects
+  }: { type?: string; title?: string; managed?: boolean } = {}): SavedObject<{
     title: string;
+    managed?: boolean;
   }> => {
     return {
       type,
       id: uuidv4(),
       references: [],
       attributes: { title },
+      managed,
     };
   };
   const createError = (): SavedObjectsImportFailure => {
@@ -320,6 +326,55 @@ describe('#importSavedObjectsFromStream', () => {
           importStateMap,
           overwrite,
           namespace,
+          managed: options.managed,
+        };
+        expect(mockCreateSavedObjects).toHaveBeenCalledWith(createSavedObjectsParams);
+      });
+
+      test('creates managed saved objects', async () => {
+        const options = setupOptions({ managed: true });
+        const collectedObjects = [createObject({ managed: true })];
+        const filteredObjects = [createObject({ managed: false })];
+        const errors = [createError(), createError(), createError(), createError()];
+        mockCollectSavedObjects.mockResolvedValue({
+          errors: [errors[0]],
+          collectedObjects,
+          importStateMap: new Map([
+            ['foo', {}],
+            ['bar', {}],
+            ['baz', { isOnlyReference: true }],
+          ]),
+        });
+        mockCheckReferenceOrigins.mockResolvedValue({
+          importStateMap: new Map([['baz', { isOnlyReference: true, destinationId: 'newId1' }]]),
+        });
+        mockValidateReferences.mockResolvedValue([errors[1]]);
+        mockCheckConflicts.mockResolvedValue({
+          errors: [errors[2]],
+          filteredObjects,
+          importStateMap: new Map([['foo', { destinationId: 'newId2' }]]),
+          pendingOverwrites: new Set(),
+        });
+        mockCheckOriginConflicts.mockResolvedValue({
+          errors: [errors[3]],
+          importStateMap: new Map([['bar', { destinationId: 'newId3' }]]),
+          pendingOverwrites: new Set(),
+        });
+
+        await importSavedObjectsFromStream(options);
+        const importStateMap = new Map([
+          ['foo', { destinationId: 'newId2' }],
+          ['bar', { destinationId: 'newId3' }],
+          ['baz', { isOnlyReference: true, destinationId: 'newId1' }],
+        ]);
+        const createSavedObjectsParams = {
+          objects: collectedObjects,
+          accumulatedErrors: errors,
+          savedObjectsClient,
+          importStateMap,
+          overwrite,
+          namespace,
+          managed: options.managed,
         };
         expect(mockCreateSavedObjects).toHaveBeenCalledWith(createSavedObjectsParams);
       });
@@ -383,6 +438,118 @@ describe('#importSavedObjectsFromStream', () => {
         expect(mockCreateSavedObjects).toHaveBeenCalledWith(createSavedObjectsParams);
       });
     });
+
+    describe('managed option', () => {
+      test('if not provided, calls create without an override', async () => {
+        const options = setupOptions({ createNewCopies: true }); // weithout `managed` set
+        const collectedObjects = [
+          createObject({ type: 'foo', managed: true }),
+          createObject({ type: 'bar', title: 'bar-title', managed: false }),
+        ];
+        const errors = [createError(), createError()];
+        mockCollectSavedObjects.mockResolvedValue({
+          errors: [errors[0]],
+          collectedObjects,
+          importStateMap: new Map([
+            ['foo', {}],
+            ['bar', { isOnlyReference: true }],
+          ]),
+        });
+        mockCheckReferenceOrigins.mockResolvedValue({
+          importStateMap: new Map([['bar', { isOnlyReference: true, destinationId: 'newId' }]]),
+        });
+        mockValidateReferences.mockResolvedValue([errors[1]]);
+        mockRegenerateIds.mockReturnValue(new Map([['foo', { destinationId: `randomId1` }]]));
+
+        await importSavedObjectsFromStream(options);
+        const importStateMap: ImportStateMap = new Map([
+          ['foo', { destinationId: `randomId1` }],
+          ['bar', { isOnlyReference: true, destinationId: 'newId' }],
+        ]);
+        const createSavedObjectsParams = {
+          objects: collectedObjects,
+          accumulatedErrors: errors,
+          savedObjectsClient,
+          importStateMap,
+          overwrite,
+          namespace,
+          managed: undefined,
+        };
+        expect(mockCreateSavedObjects).toHaveBeenCalledWith(createSavedObjectsParams);
+      }); // assert that the call to create will not override the object props.
+
+      test('creates managed saved objects, overriding existing `managed` value', async () => {
+        const options = setupOptions({ createNewCopies: true, managed: true });
+        const collectedObjects = [createObject({ managed: false })];
+        const errors = [createError(), createError()];
+        mockCollectSavedObjects.mockResolvedValue({
+          errors: [errors[0]],
+          collectedObjects,
+          importStateMap: new Map([
+            ['foo', {}],
+            ['bar', { isOnlyReference: true }],
+          ]),
+        });
+        mockCheckReferenceOrigins.mockResolvedValue({
+          importStateMap: new Map([['bar', { isOnlyReference: true, destinationId: 'newId' }]]),
+        });
+        mockValidateReferences.mockResolvedValue([errors[1]]);
+        mockRegenerateIds.mockReturnValue(new Map([['foo', { destinationId: `randomId1` }]]));
+
+        await importSavedObjectsFromStream(options);
+        // assert that the importStateMap is correctly composed of the results from the three modules
+        const importStateMap: ImportStateMap = new Map([
+          ['foo', { destinationId: `randomId1` }],
+          ['bar', { isOnlyReference: true, destinationId: 'newId' }],
+        ]);
+        const createSavedObjectsParams = {
+          objects: collectedObjects,
+          accumulatedErrors: errors,
+          savedObjectsClient,
+          importStateMap,
+          overwrite,
+          namespace,
+          managed: true,
+        };
+        expect(mockCreateSavedObjects).toHaveBeenCalledWith(createSavedObjectsParams);
+      });
+
+      test('creates and converts objects from managed to unmanaged', async () => {
+        const options = setupOptions({ createNewCopies: true, managed: false });
+        const collectedObjects = [createObject({ managed: true })];
+        const errors = [createError(), createError()];
+        mockCollectSavedObjects.mockResolvedValue({
+          errors: [errors[0]],
+          collectedObjects,
+          importStateMap: new Map([
+            ['foo', {}],
+            ['bar', { isOnlyReference: true }],
+          ]),
+        });
+        mockCheckReferenceOrigins.mockResolvedValue({
+          importStateMap: new Map([['bar', { isOnlyReference: true, destinationId: 'newId' }]]),
+        });
+        mockValidateReferences.mockResolvedValue([errors[1]]);
+        mockRegenerateIds.mockReturnValue(new Map([['foo', { destinationId: `randomId1` }]]));
+
+        await importSavedObjectsFromStream(options);
+        // assert that the importStateMap is correctly composed of the results from the three modules
+        const importStateMap: ImportStateMap = new Map([
+          ['foo', { destinationId: `randomId1` }],
+          ['bar', { isOnlyReference: true, destinationId: 'newId' }],
+        ]);
+        const createSavedObjectsParams = {
+          objects: collectedObjects,
+          accumulatedErrors: errors,
+          savedObjectsClient,
+          importStateMap,
+          overwrite,
+          namespace,
+          managed: false,
+        };
+        expect(mockCreateSavedObjects).toHaveBeenCalledWith(createSavedObjectsParams);
+      });
+    });
   });
 
   describe('results', () => {
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.ts
index 8650e082c4163a..9d150386cee4dd 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/import_saved_objects.ts
@@ -54,6 +54,10 @@ export interface ImportSavedObjectsOptions {
    * different Kibana versions (e.g. generate legacy URL aliases for all imported objects that have to change IDs).
    */
   compatibilityMode?: boolean;
+  /**
+   * If provided, Kibana will apply the given option to the `managed` property.
+   */
+  managed?: boolean;
 }
 
 /**
@@ -73,6 +77,7 @@ export async function importSavedObjectsFromStream({
   namespace,
   refresh,
   compatibilityMode,
+  managed,
 }: ImportSavedObjectsOptions): Promise<SavedObjectsImportResponse> {
   let errorAccumulator: SavedObjectsImportFailure[] = [];
   const supportedTypes = typeRegistry.getImportableAndExportableTypes().map((type) => type.name);
@@ -82,6 +87,7 @@ export async function importSavedObjectsFromStream({
     readStream,
     objectLimit,
     supportedTypes,
+    managed,
   });
   errorAccumulator = [...errorAccumulator, ...collectSavedObjectsResult.errors];
   // Map of all IDs for objects that we are attempting to import, and any references that are not included in the read stream;
@@ -154,12 +160,13 @@ export async function importSavedObjectsFromStream({
     namespace,
     refresh,
     compatibilityMode,
+    managed,
   };
   const createSavedObjectsResult = await createSavedObjects(createSavedObjectsParams);
   errorAccumulator = [...errorAccumulator, ...createSavedObjectsResult.errors];
 
   const successResults = createSavedObjectsResult.createdObjects.map((createdObject) => {
-    const { type, id, destinationId, originId } = createdObject;
+    const { type, id, destinationId, originId, managed: createdObjectManaged } = createdObject;
     const getTitle = typeRegistry.getType(type)?.management?.getTitle;
     const meta = {
       title: getTitle ? getTitle(createdObject) : createdObject.attributes.title,
@@ -170,6 +177,7 @@ export async function importSavedObjectsFromStream({
       type,
       id,
       meta,
+      managed: createdObjectManaged ?? managed,
       ...(attemptedOverwrite && { overwrite: true }),
       ...(destinationId && { destinationId }),
       ...(destinationId && !originId && !createNewCopies && { createNewCopy: true }),
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.test.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.test.ts
index 73a1f9913a4deb..b44ae1c48aa10f 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.test.ts
@@ -51,6 +51,13 @@ describe('collectSavedObjects()', () => {
     attributes: { title: 'my title 2' },
     references: [{ type: 'c', id: '3', name: 'c3' }],
   };
+  const obj3 = {
+    type: 'bz',
+    id: '33',
+    attributes: { title: 'my title z' },
+    references: [{ type: 'b', id: '2', name: 'b2' }],
+    managed: true,
+  };
 
   describe('module calls', () => {
     test('limit stream with empty input stream is called with null', async () => {
@@ -63,14 +70,15 @@ describe('collectSavedObjects()', () => {
     });
 
     test('limit stream with non-empty input stream is called with all objects', async () => {
-      const readStream = createReadStream(obj1, obj2);
+      const readStream = createReadStream(obj1, obj2, obj3);
       const supportedTypes = [obj2.type];
       await collectSavedObjects({ readStream, supportedTypes, objectLimit });
 
       expect(createLimitStream).toHaveBeenCalledWith(objectLimit);
-      expect(limitStreamPush).toHaveBeenCalledTimes(3);
+      expect(limitStreamPush).toHaveBeenCalledTimes(4);
       expect(limitStreamPush).toHaveBeenNthCalledWith(1, obj1);
       expect(limitStreamPush).toHaveBeenNthCalledWith(2, obj2);
+      expect(limitStreamPush).toHaveBeenNthCalledWith(3, obj3);
       expect(limitStreamPush).toHaveBeenLastCalledWith(null);
     });
 
@@ -82,13 +90,14 @@ describe('collectSavedObjects()', () => {
     });
 
     test('get non-unique entries with non-empty input stream is called with all entries', async () => {
-      const readStream = createReadStream(obj1, obj2);
+      const readStream = createReadStream(obj1, obj2, obj3);
       const supportedTypes = [obj2.type];
       await collectSavedObjects({ readStream, supportedTypes, objectLimit });
 
       expect(getNonUniqueEntries).toHaveBeenCalledWith([
         { type: obj1.type, id: obj1.id },
         { type: obj2.type, id: obj2.id },
+        { type: obj3.type, id: obj3.id },
       ]);
     });
 
@@ -101,7 +110,7 @@ describe('collectSavedObjects()', () => {
     });
 
     test('filter with non-empty input stream is called with all objects of supported types', async () => {
-      const readStream = createReadStream(obj1, obj2);
+      const readStream = createReadStream(obj1, obj2, obj3);
       const filter = jest.fn();
       const supportedTypes = [obj2.type];
       await collectSavedObjects({ readStream, supportedTypes, objectLimit, filter });
@@ -139,8 +148,8 @@ describe('collectSavedObjects()', () => {
       const result = await collectSavedObjects({ readStream, supportedTypes, objectLimit });
 
       const collectedObjects = [
-        { ...obj1, typeMigrationVersion: '' },
-        { ...obj2, typeMigrationVersion: '' },
+        { ...obj1, typeMigrationVersion: '', managed: false },
+        { ...obj2, typeMigrationVersion: '', managed: false },
       ];
       const importStateMap = new Map([
         [`a:1`, {}], // a:1 is included because it is present in the collected objects
@@ -166,7 +175,7 @@ describe('collectSavedObjects()', () => {
       const supportedTypes = [obj1.type];
       const result = await collectSavedObjects({ readStream, supportedTypes, objectLimit });
 
-      const collectedObjects = [{ ...obj1, typeMigrationVersion: '' }];
+      const collectedObjects = [{ ...obj1, typeMigrationVersion: '', managed: false }];
       const importStateMap = new Map([
         [`a:1`, {}], // a:1 is included because it is present in the collected objects
         [`b:2`, { isOnlyReference: true }], // b:2 was filtered out due to an unsupported type; b:2 is included because a:1 has a reference to b:2, but this is marked as `isOnlyReference` because b:2 is not present in the collected objects
@@ -180,8 +189,8 @@ describe('collectSavedObjects()', () => {
 
     test('keeps the original migration versions', async () => {
       const collectedObjects = [
-        { ...obj1, migrationVersion: { a: '1.0.0' } },
-        { ...obj2, typeMigrationVersion: '2.0.0' },
+        { ...obj1, migrationVersion: { a: '1.0.0' }, managed: false },
+        { ...obj2, typeMigrationVersion: '2.0.0', managed: false },
       ];
 
       const readStream = createReadStream(...collectedObjects);
@@ -218,9 +227,10 @@ describe('collectSavedObjects()', () => {
           supportedTypes,
           objectLimit,
           filter,
+          managed: false,
         });
 
-        const collectedObjects = [{ ...obj2, typeMigrationVersion: '' }];
+        const collectedObjects = [{ ...obj2, typeMigrationVersion: '', managed: false }];
         const importStateMap = new Map([
           // a:1 was filtered out due to an unsupported type; a:1 is not included because there are no other references to a:1
           [`b:2`, {}], // b:2 is included because it is present in the collected objects
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.ts
index 92d8476759548c..d5362e8cdc5813 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/collect_saved_objects.ts
@@ -25,6 +25,7 @@ interface CollectSavedObjectsOptions {
   objectLimit: number;
   filter?: (obj: SavedObject) => boolean;
   supportedTypes: string[];
+  managed?: boolean;
 }
 
 export async function collectSavedObjects({
@@ -32,6 +33,7 @@ export async function collectSavedObjects({
   objectLimit,
   filter,
   supportedTypes,
+  managed,
 }: CollectSavedObjectsOptions) {
   const errors: SavedObjectsImportFailure[] = [];
   const entries: Array<{ type: string; id: string }> = [];
@@ -68,6 +70,9 @@ export async function collectSavedObjects({
       return {
         ...obj,
         ...(!obj.migrationVersion && !obj.typeMigrationVersion ? { typeMigrationVersion: '' } : {}),
+        // override any managed flag on an object with that given as an option otherwise set the default to avoid having to do that with a core migration transform
+        // this is a bulk operation, applied to all objects being imported
+        ...{ managed: managed ?? obj.managed ?? false },
       };
     }),
     createConcatStream([]),
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.test.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.test.ts
index 6938c251992f52..ac6831626f2f2e 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.test.ts
@@ -19,31 +19,53 @@ import {
 
 type CreateSavedObjectsParams = Parameters<typeof createSavedObjects>[0];
 
+interface CreateOptions {
+  type: string;
+  id: string;
+  originId?: string;
+  managed?: boolean;
+}
+/** Utility function to add default `managed` flag to objects that don't have one declared. */
+const addManagedDefault = (objs: SavedObject[]) =>
+  objs.map((obj) => ({ ...obj, managed: obj.managed ?? false }));
 /**
  * Function to create a realistic-looking import object given a type, ID, and optional originId
  */
-const createObject = (type: string, id: string, originId?: string): SavedObject => ({
+const createObject = (createOptions: CreateOptions): SavedObject => {
+  const { type, id, originId, managed } = createOptions;
+  return {
+    type,
+    id,
+    attributes: {},
+    references: [
+      { name: 'name-1', type: 'other-type', id: 'other-id' }, // object that is not present
+      { name: 'name-2', type: MULTI_NS_TYPE, id: 'id-1' }, // object that is present, but does not have an importStateMap entry
+      { name: 'name-3', type: MULTI_NS_TYPE, id: 'id-3' }, // object that is present and has an importStateMap entry
+    ],
+    ...(originId && { originId }),
+    ...(managed && { managed }),
+  };
+};
+
+const createOptionsFrom = (type: string, id: string, originId?: string, managed?: boolean) => ({
   type,
   id,
-  attributes: {},
-  references: [
-    { name: 'name-1', type: 'other-type', id: 'other-id' }, // object that is not present
-    { name: 'name-2', type: MULTI_NS_TYPE, id: 'id-1' }, // object that is present, but does not have an importStateMap entry
-    { name: 'name-3', type: MULTI_NS_TYPE, id: 'id-3' }, // object that is present and has an importStateMap entry
-  ],
-  ...(originId && { originId }),
+  originId,
+  managed,
 });
 
 const createLegacyUrlAliasObject = (
   sourceId: string,
   targetId: string,
   targetType: string,
-  targetNamespace: string = 'default'
+  targetNamespace: string = 'default',
+  managed?: boolean
 ): SavedObject<LegacyUrlAlias> => ({
   type: LEGACY_URL_ALIAS_TYPE,
   id: `${targetNamespace}:${targetType}:${sourceId}`,
   attributes: { sourceId, targetNamespace, targetType, targetId, purpose: 'savedObjectImport' },
   references: [],
+  managed: managed ?? false,
 });
 
 const MULTI_NS_TYPE = 'multi';
@@ -51,19 +73,19 @@ const OTHER_TYPE = 'other';
 /**
  * Create a variety of different objects to exercise different import / result scenarios
  */
-const obj1 = createObject(MULTI_NS_TYPE, 'id-1', 'originId-a'); // -> success
-const obj2 = createObject(MULTI_NS_TYPE, 'id-2', 'originId-b'); // -> conflict
-const obj3 = createObject(MULTI_NS_TYPE, 'id-3', 'originId-c'); // -> conflict (with known importId and omitOriginId=true)
-const obj4 = createObject(MULTI_NS_TYPE, 'id-4', 'originId-d'); // -> conflict (with known importId)
-const obj5 = createObject(MULTI_NS_TYPE, 'id-5', 'originId-e'); // -> unresolvable conflict
-const obj6 = createObject(MULTI_NS_TYPE, 'id-6'); // -> success
-const obj7 = createObject(MULTI_NS_TYPE, 'id-7'); // -> conflict
-const obj8 = createObject(MULTI_NS_TYPE, 'id-8'); // -> conflict (with known importId)
-const obj9 = createObject(MULTI_NS_TYPE, 'id-9'); // -> unresolvable conflict
-const obj10 = createObject(OTHER_TYPE, 'id-10', 'originId-f'); // -> success
-const obj11 = createObject(OTHER_TYPE, 'id-11', 'originId-g'); // -> conflict
-const obj12 = createObject(OTHER_TYPE, 'id-12'); // -> success
-const obj13 = createObject(OTHER_TYPE, 'id-13'); // -> conflict
+const obj1 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-1', 'originId-a', true)); // -> success
+const obj2 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-2', 'originId-b')); // -> conflict
+const obj3 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-3', 'originId-c')); // -> conflict (with known importId and omitOriginId=true)
+const obj4 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-4', 'originId-d')); // -> conflict (with known importId)
+const obj5 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-5', 'originId-e')); // -> unresolvable conflict
+const obj6 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-6', undefined, true)); // -> success
+const obj7 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-7')); // -> conflict
+const obj8 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-8')); // -> conflict (with known importId)
+const obj9 = createObject(createOptionsFrom(MULTI_NS_TYPE, 'id-9')); // -> unresolvable conflict
+const obj10 = createObject(createOptionsFrom(OTHER_TYPE, 'id-10', 'originId-f')); // -> success
+const obj11 = createObject(createOptionsFrom(OTHER_TYPE, 'id-11', 'originId-g')); // -> conflict
+const obj12 = createObject(createOptionsFrom(OTHER_TYPE, 'id-12')); // -> success
+const obj13 = createObject(createOptionsFrom(OTHER_TYPE, 'id-13')); // -> conflict
 // non-multi-namespace types shouldn't have origin IDs, but we include test cases to ensure it's handled gracefully
 // non-multi-namespace types by definition cannot result in an unresolvable conflict, so we don't include test cases for those
 const importId3 = 'id-foo';
@@ -71,7 +93,7 @@ const importId4 = 'id-bar';
 const importId8 = 'id-baz';
 const importStateMap = new Map([
   [`${obj3.type}:${obj3.id}`, { destinationId: importId3, omitOriginId: true }],
-  [`${obj4.type}:${obj4.id}`, { destinationId: importId4 }],
+  [`${obj4.type}:${obj4.id}`, { destinationId: importId4, managed: true }],
   [`${obj8.type}:${obj8.id}`, { destinationId: importId8 }],
 ]);
 
@@ -92,6 +114,7 @@ describe('#createSavedObjects', () => {
     namespace?: string;
     overwrite?: boolean;
     compatibilityMode?: boolean;
+    managed?: boolean;
   }): CreateSavedObjectsParams => {
     savedObjectsClient = savedObjectsClientMock.create();
     bulkCreate = savedObjectsClient.bulkCreate;
@@ -99,7 +122,7 @@ describe('#createSavedObjects', () => {
   };
 
   const getExpectedBulkCreateArgsObjects = (objects: SavedObject[], retry?: boolean) =>
-    objects.map(({ type, id, attributes, originId }) => ({
+    objects.map(({ type, id, attributes, originId, managed }) => ({
       type,
       id: retry ? `new-id-for-${id}` : id, // if this was a retry, we regenerated the id -- this is mocked below
       attributes,
@@ -110,13 +133,19 @@ describe('#createSavedObjects', () => {
       ],
       // if the import object had an originId, and/or if we regenerated the id, expect an originId to be included in the create args
       ...((originId || retry) && { originId: originId || id }),
+      ...(managed && { managed }),
     }));
 
   const expectBulkCreateArgs = {
     objects: (n: number, objects: SavedObject[], retry?: boolean) => {
       const expectedObjects = getExpectedBulkCreateArgsObjects(objects, retry);
       const expectedOptions = expect.any(Object);
-      expect(bulkCreate).toHaveBeenNthCalledWith(n, expectedObjects, expectedOptions);
+      const expectedObjectsWithManagedDefault = addManagedDefault(expectedObjects);
+      expect(bulkCreate).toHaveBeenNthCalledWith(
+        n,
+        expectedObjectsWithManagedDefault,
+        expectedOptions
+      );
     },
     legacyUrlAliases: (n: number, expectedAliasObjects: SavedObject[]) => {
       const expectedOptions = expect.any(Object);
@@ -131,14 +160,16 @@ describe('#createSavedObjects', () => {
 
   const getResultMock = {
     success: (
-      { type, id, attributes, references, originId }: SavedObject,
-      { namespace }: CreateSavedObjectsParams
+      { type, id, attributes, references, originId, managed: objectManaged }: SavedObject,
+      { namespace, managed }: CreateSavedObjectsParams
     ): SavedObject => ({
       type,
       id,
       attributes,
       references,
       ...(originId && { originId }),
+      ...((managed && { managed }) ??
+        (objectManaged && { managed: objectManaged }) ?? { managed: false }),
       version: 'some-version',
       updated_at: 'some-date',
       namespaces: [namespace ?? 'default'],
@@ -253,7 +284,7 @@ describe('#createSavedObjects', () => {
       }
     });
 
-    test('calls bulkCreate when unresolvable errors or no errors are present', async () => {
+    test('calls bulkCreate when unresolvable errors or no errors are present with docs that have managed set', async () => {
       for (const error of unresolvableErrors) {
         const options = setupParams({ objects: objs, accumulatedErrors: [error] });
         setupMockResults(options);
@@ -269,6 +300,7 @@ describe('#createSavedObjects', () => {
 
     test('when in compatibility mode, calls bulkCreate for legacy URL aliases when unresolvable errors or no errors are present', async () => {
       for (const error of unresolvableErrors) {
+        // options are ok, they return objects as declared
         const options = setupParams({
           objects: objs,
           accumulatedErrors: [error],
@@ -288,8 +320,8 @@ describe('#createSavedObjects', () => {
     });
   });
 
-  it('filters out version from objects before create', async () => {
-    const options = setupParams({ objects: [{ ...obj1, version: 'foo' }] });
+  it('filters out version from objects before create and accepts managed', async () => {
+    const options = setupParams({ objects: [{ ...obj1, version: 'foo' }] }); // here optionsManaged is undefined
     bulkCreate.mockResolvedValue({ saved_objects: [getResultMock.success(obj1, options)] });
 
     await createSavedObjects(options);
@@ -299,8 +331,15 @@ describe('#createSavedObjects', () => {
   const testBulkCreateObjects = async ({
     namespace,
     compatibilityMode,
-  }: { namespace?: string; compatibilityMode?: boolean } = {}) => {
-    const options = setupParams({ objects: objs, namespace, compatibilityMode });
+    managed,
+  }: { namespace?: string; compatibilityMode?: boolean; managed?: boolean } = {}) => {
+    const objsWithMissingManaged = addManagedDefault(objs);
+    const options = setupParams({
+      objects: objsWithMissingManaged,
+      namespace,
+      compatibilityMode,
+      managed,
+    });
     setupMockResults(options);
 
     await createSavedObjects(options);
@@ -310,7 +349,8 @@ describe('#createSavedObjects', () => {
     const x4 = { ...obj4, id: importId4 }; // this import object already has an originId
     const x8 = { ...obj8, id: importId8, originId: obj8.id }; // this import object doesn't have an originId, so it is set before create
     const argObjs = [obj1, obj2, x3, x4, obj5, obj6, obj7, x8, obj9, obj10, obj11, obj12, obj13];
-    expectBulkCreateArgs.objects(1, argObjs);
+    const argObjsWithMissingManaged = addManagedDefault(argObjs);
+    expectBulkCreateArgs.objects(1, argObjsWithMissingManaged);
 
     if (compatibilityMode) {
       // Rewrite namespace in the legacy URL alias.
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.ts
index a8de0bfc927507..9f0f98484d594f 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/create_saved_objects.ts
@@ -30,6 +30,14 @@ export interface CreateSavedObjectsParams<T> {
    * different Kibana versions (e.g. generate legacy URL aliases for all imported objects that have to change IDs).
    */
   compatibilityMode?: boolean;
+  /**
+   * If true, create the object as managed.
+   *
+   * This can be leveraged by applications to e.g. prevent edits to a managed
+   * saved object. Instead, users can be guided to create a copy first and
+   * make their edits to the copy.
+   */
+  managed?: boolean;
 }
 
 export interface CreateSavedObjectsResult<T> {
@@ -50,6 +58,7 @@ export const createSavedObjects = async <T>({
   overwrite,
   refresh,
   compatibilityMode,
+  managed,
 }: CreateSavedObjectsParams<T>): Promise<CreateSavedObjectsResult<T>> => {
   // filter out any objects that resulted in errors
   const errorSet = accumulatedErrors.reduce(
@@ -96,7 +105,12 @@ export const createSavedObjects = async <T>({
         ...(!importStateValue.omitOriginId && { originId: originId ?? object.id }),
       };
     }
-    return { ...object, ...(references && { references }), ...(originId && { originId }) };
+    return {
+      ...object,
+      ...(references && { references }),
+      ...(originId && { originId }),
+      ...{ managed: managed ?? object.managed ?? false },
+    };
   });
 
   const resolvableErrors = ['conflict', 'ambiguous_conflict', 'missing_references'];
@@ -150,6 +164,7 @@ export const createSavedObjects = async <T>({
           targetId: result.id,
           purpose: 'savedObjectImport',
         },
+        ...{ managed: managed ?? false }, // we can safey create each doc with the given managed flag, even if it's set as the default, bulkCreate would "override" this otherwise.
       });
     }
   }
@@ -165,7 +180,6 @@ export const createSavedObjects = async <T>({
           })
         ).saved_objects
       : [];
-
   return {
     createdObjects: remappedResults.filter((obj) => !obj.error),
     errors: extractErrors(remappedResults, objects, legacyUrlAliasResults, legacyUrlAliases),
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.test.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.test.ts
index 26499dcefaf88d..5340139fe1ca07 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.test.ts
@@ -31,6 +31,7 @@ describe('extractErrors()', () => {
         type: 'dashboard',
         attributes: { title: 'My Dashboard 1' },
         references: [],
+        managed: false,
       },
       {
         id: '2',
@@ -38,6 +39,7 @@ describe('extractErrors()', () => {
         attributes: { title: 'My Dashboard 2' },
         references: [],
         error: SavedObjectsErrorHelpers.createConflictError('dashboard', '2').output.payload,
+        managed: false,
       },
       {
         id: '3',
@@ -45,6 +47,7 @@ describe('extractErrors()', () => {
         attributes: { title: 'My Dashboard 3' },
         references: [],
         error: SavedObjectsErrorHelpers.createBadRequestError().output.payload,
+        managed: false,
       },
       {
         id: '4',
@@ -53,6 +56,7 @@ describe('extractErrors()', () => {
         references: [],
         error: SavedObjectsErrorHelpers.createConflictError('dashboard', '4').output.payload,
         destinationId: 'foo',
+        managed: false,
       },
     ];
     const result = extractErrors(savedObjects, savedObjects, [], new Map());
@@ -63,6 +67,7 @@ describe('extractErrors()', () => {
             "type": "conflict",
           },
           "id": "2",
+          "managed": false,
           "meta": Object {
             "title": "My Dashboard 2",
           },
@@ -76,6 +81,7 @@ describe('extractErrors()', () => {
             "type": "unknown",
           },
           "id": "3",
+          "managed": false,
           "meta": Object {
             "title": "My Dashboard 3",
           },
@@ -87,6 +93,7 @@ describe('extractErrors()', () => {
             "type": "conflict",
           },
           "id": "4",
+          "managed": false,
           "meta": Object {
             "title": "My Dashboard 4",
           },
@@ -104,6 +111,7 @@ describe('extractErrors()', () => {
         attributes: { title: 'My Dashboard 1' },
         references: [],
         destinationId: 'one',
+        managed: false,
       },
       {
         id: '2',
@@ -111,6 +119,7 @@ describe('extractErrors()', () => {
         attributes: { title: 'My Dashboard 2' },
         references: [],
         error: SavedObjectsErrorHelpers.createConflictError('dashboard', '2').output.payload,
+        managed: false,
       },
       {
         id: '3',
@@ -118,6 +127,7 @@ describe('extractErrors()', () => {
         attributes: { title: 'My Dashboard 3' },
         references: [],
         destinationId: 'three',
+        managed: false,
       },
     ];
 
@@ -135,6 +145,7 @@ describe('extractErrors()', () => {
             purpose: 'savedObjectImport',
           },
           references: [],
+          managed: false,
         },
       ],
       [
@@ -150,6 +161,7 @@ describe('extractErrors()', () => {
             purpose: 'savedObjectImport',
           },
           references: [],
+          managed: false,
         },
       ],
     ]);
@@ -176,6 +188,7 @@ describe('extractErrors()', () => {
             "type": "conflict",
           },
           "id": "2",
+          "managed": false,
           "meta": Object {
             "title": "My Dashboard 2",
           },
@@ -189,6 +202,7 @@ describe('extractErrors()', () => {
             "type": "unknown",
           },
           "id": "default:dashboard:3",
+          "managed": false,
           "meta": Object {
             "title": "Legacy URL alias (3 -> three)",
           },
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.ts
index 1f9ee579f39d58..0dad94a37df930 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/lib/extract_errors.ts
@@ -38,6 +38,7 @@ export function extractErrors(
             type: 'conflict',
             ...(destinationId && { destinationId }),
           },
+          managed: savedObject.managed,
         });
         continue;
       }
@@ -49,6 +50,7 @@ export function extractErrors(
           ...savedObject.error,
           type: 'unknown',
         },
+        managed: savedObject.managed,
       });
     }
   }
@@ -70,6 +72,7 @@ export function extractErrors(
           ...legacyUrlAliasResult.error,
           type: 'unknown',
         },
+        managed: legacyUrlAlias.managed,
       });
     }
   }
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.test.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.test.ts
index ded3cb788eb9af..5b2a145b54dd6f 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.test.ts
@@ -92,12 +92,14 @@ describe('#importSavedObjectsFromStream', () => {
         management: { icon: `${type}-icon` },
       } as any),
     importHooks = {},
+    managed,
   }: {
     retries?: SavedObjectsImportRetry[];
     createNewCopies?: boolean;
     compatibilityMode?: boolean;
     getTypeImpl?: (name: string) => any;
     importHooks?: Record<string, SavedObjectsImportHook[]>;
+    managed?: boolean;
   } = {}): ResolveSavedObjectsImportErrorsOptions => {
     readStream = new Readable();
     savedObjectsClient = savedObjectsClientMock.create();
@@ -115,6 +117,7 @@ describe('#importSavedObjectsFromStream', () => {
       namespace,
       createNewCopies,
       compatibilityMode,
+      managed,
     };
   };
 
@@ -128,7 +131,8 @@ describe('#importSavedObjectsFromStream', () => {
   };
   const createObject = (
     references?: SavedObjectReference[],
-    { type = 'foo-type', title = 'some-title' }: { type?: string; title?: string } = {}
+    { type = 'foo-type', title = 'some-title' }: { type?: string; title?: string } = {},
+    managed?: boolean
   ): SavedObject<{
     title: string;
   }> => {
@@ -137,6 +141,7 @@ describe('#importSavedObjectsFromStream', () => {
       id: uuidv4(),
       references: references || [],
       attributes: { title },
+      managed: managed ?? false, // apply the default that real createSavedObjects applies
     };
   };
   const createError = (): SavedObjectsImportFailure => {
@@ -590,6 +595,62 @@ describe('#importSavedObjectsFromStream', () => {
         });
       });
     });
+    describe('with managed option', () => {
+      test('applies managed option to overwritten objects if specified', async () => {
+        const objectCreated = createObject();
+        const objectsToOverwrite = [{ ...objectCreated, managed: true }];
+        const objectsToNotOverwrite = [createObject()];
+        mockSplitOverwrites.mockReturnValue({ objectsToOverwrite, objectsToNotOverwrite });
+        mockCreateSavedObjects.mockResolvedValueOnce({
+          errors: [createError()], // this error will NOT be passed to the second `mockCreateSavedObjects` call
+          createdObjects: [],
+        });
+
+        await resolveSavedObjectsImportErrors(setupOptions({ managed: true }));
+        const partialCreateSavedObjectsParams = {
+          accumulatedErrors: [],
+          savedObjectsClient,
+          importStateMap: new Map(),
+          namespace,
+          managed: true,
+        };
+        expect(mockCreateSavedObjects).toHaveBeenNthCalledWith(1, {
+          ...partialCreateSavedObjectsParams,
+          objects: objectsToOverwrite,
+          overwrite: true,
+        });
+        expect(mockCreateSavedObjects).toHaveBeenNthCalledWith(2, {
+          ...partialCreateSavedObjectsParams,
+          objects: objectsToNotOverwrite,
+        });
+      });
+      test('if not specified, sets a default for objects that do not have managed specified', async () => {
+        const objectsToNotOverwrite = [{ ...createObject(), managed: false }];
+        const objectsToOverwrite = [createObject()];
+        mockSplitOverwrites.mockReturnValue({ objectsToOverwrite, objectsToNotOverwrite });
+        mockCreateSavedObjects.mockResolvedValueOnce({
+          errors: [createError()], // this error will NOT be passed to the second `mockCreateSavedObjects` call
+          createdObjects: [],
+        });
+
+        await resolveSavedObjectsImportErrors(setupOptions());
+        const partialCreateSavedObjectsParams = {
+          accumulatedErrors: [],
+          savedObjectsClient,
+          importStateMap: new Map(),
+          namespace,
+        };
+        expect(mockCreateSavedObjects).toHaveBeenNthCalledWith(1, {
+          ...partialCreateSavedObjectsParams,
+          objects: objectsToOverwrite,
+          overwrite: true,
+        });
+        expect(mockCreateSavedObjects).toHaveBeenNthCalledWith(2, {
+          ...partialCreateSavedObjectsParams,
+          objects: objectsToNotOverwrite,
+        });
+      });
+    });
   });
 
   describe('results', () => {
@@ -664,12 +725,14 @@ describe('#importSavedObjectsFromStream', () => {
           id: obj1.id,
           meta: { title: obj1.attributes.title, icon: `${obj1.type}-icon` },
           overwrite: true,
+          managed: false,
         },
         {
           type: obj2.type,
           id: obj2.id,
           meta: { title: obj2.attributes.title, icon: `${obj2.type}-icon` },
           destinationId: obj2.destinationId,
+          managed: false,
         },
         {
           type: obj3.type,
@@ -677,6 +740,7 @@ describe('#importSavedObjectsFromStream', () => {
           meta: { title: obj3.attributes.title, icon: `${obj3.type}-icon` },
           destinationId: obj3.destinationId,
           createNewCopy: true,
+          managed: false,
         },
       ];
       const errors = [
@@ -727,12 +791,14 @@ describe('#importSavedObjectsFromStream', () => {
           id: obj1.id,
           overwrite: true,
           meta: { title: 'getTitle-foo', icon: `${obj1.type}-icon` },
+          managed: false,
         },
         {
           type: obj2.type,
           id: obj2.id,
           overwrite: true,
           meta: { title: 'bar-title', icon: `${obj2.type}-icon` },
+          managed: false,
         },
       ];
 
@@ -771,5 +837,120 @@ describe('#importSavedObjectsFromStream', () => {
         warnings: [],
       });
     });
+
+    test('does not apply a default for `managed` when not specified', async () => {
+      const obj1 = createObject([], { type: 'foo' }, true);
+      const obj2 = createObject([], { type: 'bar', title: 'bar-title' });
+
+      const options = setupOptions({
+        getTypeImpl: (type) => {
+          if (type === 'foo') {
+            return {
+              management: { getTitle: () => 'getTitle-foo', icon: `${type}-icon` },
+            };
+          }
+          return {
+            management: { icon: `${type}-icon` },
+          };
+        },
+      });
+      mockCheckConflicts.mockResolvedValue({
+        errors: [],
+        filteredObjects: [],
+        importStateMap: new Map(),
+        pendingOverwrites: new Set(),
+      });
+      mockCreateSavedObjects
+        .mockResolvedValueOnce({
+          errors: [],
+          createdObjects: [obj1, { ...obj2, managed: false }],
+        }) // default applied in createSavedObjects
+        .mockResolvedValueOnce({ errors: [], createdObjects: [] });
+
+      const result = await resolveSavedObjectsImportErrors(options);
+      // successResults only includes the imported object's type, id, and destinationId (if a new one was generated)
+      const successResults = [
+        {
+          type: obj1.type,
+          id: obj1.id,
+          overwrite: true,
+          meta: { title: 'getTitle-foo', icon: `${obj1.type}-icon` },
+          managed: true,
+        },
+        {
+          type: obj2.type,
+          id: obj2.id,
+          overwrite: true,
+          meta: { title: 'bar-title', icon: `${obj2.type}-icon` },
+          managed: false,
+        },
+      ];
+
+      expect(result).toEqual({
+        success: true,
+        successCount: 2,
+        successResults,
+        warnings: [],
+      });
+    }); // assert that the documents being imported retain their prop or have the default applied
+    test('applies `managed` to objects', async () => {
+      const obj1 = createObject([], { type: 'foo' }, true);
+      const obj2 = createObject([], { type: 'bar', title: 'bar-title' });
+
+      const options = setupOptions({
+        getTypeImpl: (type) => {
+          if (type === 'foo') {
+            return {
+              management: { getTitle: () => 'getTitle-foo', icon: `${type}-icon` },
+            };
+          }
+          return {
+            management: { icon: `${type}-icon` },
+          };
+        },
+        managed: true,
+      });
+      mockCheckConflicts.mockResolvedValue({
+        errors: [],
+        filteredObjects: [],
+        importStateMap: new Map(),
+        pendingOverwrites: new Set(),
+      });
+      mockCreateSavedObjects
+        .mockResolvedValueOnce({
+          errors: [],
+          createdObjects: [
+            { ...obj1, managed: true },
+            { ...obj2, managed: true },
+          ],
+        }) // default applied in createSavedObjects
+        .mockResolvedValueOnce({ errors: [], createdObjects: [] });
+
+      const result = await resolveSavedObjectsImportErrors(options);
+      // successResults only includes the imported object's type, id, and destinationId (if a new one was generated)
+      const successResults = [
+        {
+          type: obj1.type,
+          id: obj1.id,
+          overwrite: true,
+          meta: { title: 'getTitle-foo', icon: `${obj1.type}-icon` },
+          managed: true,
+        },
+        {
+          type: obj2.type,
+          id: obj2.id,
+          overwrite: true,
+          meta: { title: 'bar-title', icon: `${obj2.type}-icon` },
+          managed: true,
+        },
+      ];
+
+      expect(result).toEqual({
+        success: true,
+        successCount: 2,
+        successResults,
+        warnings: [],
+      });
+    }); // assert that the documents being imported retain their prop or have the default applied
   });
 });
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.ts
index 8abacbeb310a40..ade85f02988c58 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/resolve_import_errors.ts
@@ -60,6 +60,10 @@ export interface ResolveSavedObjectsImportErrorsOptions {
    * different Kibana versions (e.g. generate legacy URL aliases for all imported objects that have to change IDs).
    */
   compatibilityMode?: boolean;
+  /** If true, will create objects as managed.
+   * This property allows plugin authors to implement read-only UI's
+   */
+  managed?: boolean;
 }
 
 /**
@@ -78,6 +82,7 @@ export async function resolveSavedObjectsImportErrors({
   namespace,
   createNewCopies,
   compatibilityMode,
+  managed,
 }: ResolveSavedObjectsImportErrorsOptions): Promise<SavedObjectsImportResponse> {
   // throw a BadRequest error if we see invalid retries
   validateRetries(retries);
@@ -93,6 +98,7 @@ export async function resolveSavedObjectsImportErrors({
     objectLimit,
     filter,
     supportedTypes,
+    managed,
   });
   // Map of all IDs for objects that we are attempting to import, and any references that are not included in the read stream;
   // each value is empty by default
@@ -112,6 +118,7 @@ export async function resolveSavedObjectsImportErrors({
 
   // Replace references
   for (const savedObject of collectSavedObjectsResult.collectedObjects) {
+    // collectedObjects already have managed flag set
     const refMap = retriesReferencesMap.get(`${savedObject.type}:${savedObject.id}`);
     if (!refMap) {
       continue;
@@ -205,13 +212,14 @@ export async function resolveSavedObjectsImportErrors({
     overwrite?: boolean
   ) => {
     const createSavedObjectsParams = {
-      objects,
+      objects, // these objects only have a title, no other properties
       accumulatedErrors,
       savedObjectsClient,
       importStateMap,
       namespace,
       overwrite,
       compatibilityMode,
+      managed,
     };
     const { createdObjects, errors: bulkCreateErrors } = await createSavedObjects(
       createSavedObjectsParams
@@ -235,6 +243,7 @@ export async function resolveSavedObjectsImportErrors({
           ...(overwrite && { overwrite }),
           ...(destinationId && { destinationId }),
           ...(destinationId && !originId && !createNewCopies && { createNewCopy: true }),
+          ...{ managed: createdObject.managed ?? managed ?? false }, // double sure that this already exists but doing a check just in case
         };
       }),
     ];
diff --git a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/saved_objects_importer.ts b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/saved_objects_importer.ts
index 0a2b39993cd591..2c87395c255cdc 100644
--- a/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/saved_objects_importer.ts
+++ b/packages/core/saved-objects/core-saved-objects-import-export-server-internal/src/import/saved_objects_importer.ts
@@ -57,6 +57,7 @@ export class SavedObjectsImporter implements ISavedObjectsImporter {
     overwrite,
     refresh,
     compatibilityMode,
+    managed,
   }: SavedObjectsImportOptions): Promise<SavedObjectsImportResponse> {
     return importSavedObjectsFromStream({
       readStream,
@@ -69,6 +70,7 @@ export class SavedObjectsImporter implements ISavedObjectsImporter {
       savedObjectsClient: this.#savedObjectsClient,
       typeRegistry: this.#typeRegistry,
       importHooks: this.#importHooks,
+      managed,
     });
   }
 
@@ -78,6 +80,7 @@ export class SavedObjectsImporter implements ISavedObjectsImporter {
     compatibilityMode,
     namespace,
     retries,
+    managed,
   }: SavedObjectsResolveImportErrorsOptions): Promise<SavedObjectsImportResponse> {
     return resolveSavedObjectsImportErrors({
       readStream,
@@ -89,6 +92,7 @@ export class SavedObjectsImporter implements ISavedObjectsImporter {
       savedObjectsClient: this.#savedObjectsClient,
       typeRegistry: this.#typeRegistry,
       importHooks: this.#importHooks,
+      managed,
     });
   }
 }
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/actions/update_index_meta.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/actions/update_index_meta.test.ts
index 6ed55ccb49ebef..d597e2927663b3 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/actions/update_index_meta.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/actions/update_index_meta.test.ts
@@ -17,8 +17,8 @@ describe('updateIndexMeta', () => {
     const index = '.kibana_1';
     const meta: IndexMappingMeta = {
       mappingVersions: {
-        foo: 1,
-        bar: 1,
+        foo: '10.1.0',
+        bar: '10.1.0',
       },
     };
 
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/context/create_context.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/context/create_context.ts
index c31d4bc799b3b5..82234823d973ae 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/context/create_context.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/context/create_context.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { getModelVersionMapForTypes } from '@kbn/core-saved-objects-base-server-internal';
+import { getVirtualVersionMap } from '@kbn/core-saved-objects-base-server-internal';
 import { REMOVED_TYPES } from '../../core';
 import type { MigrateIndexOptions } from '../migrate_index';
 import type { MigratorContext } from './types';
@@ -33,7 +33,7 @@ export const createContext = ({
     kibanaVersion,
     indexPrefix,
     types,
-    typeModelVersions: getModelVersionMapForTypes(types.map((type) => typeRegistry.getType(type)!)),
+    typeVirtualVersions: getVirtualVersionMap(types.map((type) => typeRegistry.getType(type)!)),
     elasticsearchClient,
     typeRegistry,
     serializer,
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/context/types.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/context/types.ts
index 95ca7282daf579..58887418eb35a1 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/context/types.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/context/types.ts
@@ -12,7 +12,7 @@ import type {
   ISavedObjectsSerializer,
 } from '@kbn/core-saved-objects-server';
 import type {
-  ModelVersionMap,
+  VirtualVersionMap,
   SavedObjectsMigrationConfigType,
 } from '@kbn/core-saved-objects-base-server-internal';
 import type { DocLinks } from '@kbn/doc-links';
@@ -30,8 +30,8 @@ export interface MigratorContext {
   readonly indexPrefix: string;
   /** Name of the types that are living in the index */
   readonly types: string[];
-  /** Model versions for the registered types */
-  readonly typeModelVersions: ModelVersionMap;
+  /** Virtual versions for the registered types */
+  readonly typeVirtualVersions: VirtualVersionMap;
   /** The client to use for communications with ES */
   readonly elasticsearchClient: ElasticsearchClient;
   /** The maximum number of retries to attempt for a failing action */
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 d8c176af4be0a9..05cb283d378a62 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
@@ -38,7 +38,7 @@ describe('Stage: init', () => {
       aliases: {},
       mappings: {
         properties: {},
-        _meta: { mappingVersions: { foo: 1, bar: 1 } },
+        _meta: { mappingVersions: { foo: '10.1.0', bar: '10.1.0' } },
       },
       settings: {},
     },
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_document_model_version.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_document_model_version.test.ts
index c3d3fd67422b93..3595b5fb43cd4d 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_document_model_version.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_document_model_version.test.ts
@@ -49,8 +49,8 @@ describe('Stage: updateDocumentModelVersion', () => {
   it('updates state.currentIndexMeta when successful', () => {
     const state = createState({
       currentIndexMeta: {
-        mappingVersions: { foo: 1, bar: 2 },
-        docVersions: { foo: 0, bar: 0 },
+        mappingVersions: { foo: '10.1.0', bar: '10.2.0' },
+        docVersions: { foo: '0.0.0', bar: '0.0.0' },
         migrationState: {
           convertingDocuments: true,
         },
@@ -63,8 +63,8 @@ describe('Stage: updateDocumentModelVersion', () => {
     const newState = updateDocumentModelVersion(state, res, context);
 
     expect(newState.currentIndexMeta).toEqual({
-      mappingVersions: { foo: 1, bar: 2 },
-      docVersions: { foo: 1, bar: 2 },
+      mappingVersions: { foo: '10.1.0', bar: '10.2.0' },
+      docVersions: { foo: '10.1.0', bar: '10.2.0' },
       migrationState: {
         convertingDocuments: false,
       },
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_document_model_version.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_document_model_version.ts
index ea3ea142cbd19c..94c0923df267d6 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_document_model_version.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_document_model_version.ts
@@ -24,7 +24,7 @@ export const updateDocumentModelVersion: ModelStage<
     controlState: 'UPDATE_DOCUMENT_MODEL_VERSIONS_WAIT_FOR_INSTANCES',
     currentIndexMeta: setMetaDocMigrationComplete({
       meta: state.currentIndexMeta,
-      versions: context.typeModelVersions,
+      versions: context.typeVirtualVersions,
     }),
   };
 };
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_mapping_model_version.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_mapping_model_version.test.ts
index b21ec69a531f0c..ea053570b74e8f 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_mapping_model_version.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_mapping_model_version.test.ts
@@ -42,7 +42,7 @@ describe('Stage: updateMappingModelVersion', () => {
     expect(newState.currentIndexMeta).toEqual(
       setMetaMappingMigrationComplete({
         meta: state.currentIndexMeta,
-        versions: context.typeModelVersions,
+        versions: context.typeVirtualVersions,
       })
     );
   });
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_mapping_model_version.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_mapping_model_version.ts
index 946c4a4ab1ef33..54cb5cff6d24a8 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_mapping_model_version.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/model/stages/update_mapping_model_version.ts
@@ -24,7 +24,7 @@ export const updateMappingModelVersion: ModelStage<
     controlState: state.aliasActions.length ? 'UPDATE_ALIASES' : 'INDEX_STATE_UPDATE_DONE',
     currentIndexMeta: setMetaMappingMigrationComplete({
       meta: state.currentIndexMeta,
-      versions: context.typeModelVersions,
+      versions: context.typeVirtualVersions,
     }),
   };
 };
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 d9135fff65a3e4..00684ec46f85cf 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
@@ -85,7 +85,7 @@ describe('actions', () => {
       expect(setMetaMappingMigrationCompleteMock).toHaveBeenCalledTimes(1);
       expect(setMetaMappingMigrationCompleteMock).toHaveBeenCalledWith({
         meta: state.currentIndexMeta,
-        versions: context.typeModelVersions,
+        versions: context.typeVirtualVersions,
       });
     });
 
@@ -123,7 +123,7 @@ describe('actions', () => {
       expect(setMetaDocMigrationCompleteMock).toHaveBeenCalledTimes(1);
       expect(setMetaDocMigrationCompleteMock).toHaveBeenCalledWith({
         meta: state.currentIndexMeta,
-        versions: context.typeModelVersions,
+        versions: context.typeVirtualVersions,
       });
     });
 
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 cb3e1b5b5ad273..2e6a785704b8a7 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
@@ -84,7 +84,7 @@ export const nextActionMap = (context: MigratorContext) => {
         index: state.currentIndex,
         meta: setMetaMappingMigrationComplete({
           meta: state.currentIndexMeta,
-          versions: context.typeModelVersions,
+          versions: context.typeVirtualVersions,
         }),
       }),
     UPDATE_ALIASES: (state: UpdateAliasesState) =>
@@ -172,7 +172,7 @@ export const nextActionMap = (context: MigratorContext) => {
         index: state.currentIndex,
         meta: setMetaDocMigrationComplete({
           meta: state.currentIndexMeta,
-          versions: context.typeModelVersions,
+          versions: context.typeVirtualVersions,
         }),
       }),
     UPDATE_DOCUMENT_MODEL_VERSIONS_WAIT_FOR_INSTANCES: (
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/test_helpers/context.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/test_helpers/context.ts
index 0dafc36108b935..6fb5eb180d71e6 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/test_helpers/context.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/test_helpers/context.ts
@@ -31,9 +31,9 @@ export const createContextMock = (
     kibanaVersion: '8.7.0',
     indexPrefix: '.kibana',
     types: ['foo', 'bar'],
-    typeModelVersions: {
-      foo: 1,
-      bar: 2,
+    typeVirtualVersions: {
+      foo: '10.1.0',
+      bar: '10.2.0',
     },
     documentMigrator: createDocumentMigrator(),
     migrationConfig: {
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/build_index_mappings.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/build_index_mappings.test.ts
index 35354001f6803b..6469ebb7f060a8 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/build_index_mappings.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/build_index_mappings.test.ts
@@ -69,14 +69,14 @@ describe('buildIndexMeta', () => {
 
     expect(meta).toEqual({
       mappingVersions: {
-        foo: 2,
-        bar: 1,
-        dolly: 3,
+        foo: '10.2.0',
+        bar: '10.1.0',
+        dolly: '10.3.0',
       },
       docVersions: {
-        foo: 2,
-        bar: 1,
-        dolly: 3,
+        foo: '10.2.0',
+        bar: '10.1.0',
+        dolly: '10.3.0',
       },
       migrationState: {
         convertingDocuments: false,
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/build_index_mappings.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/build_index_mappings.ts
index a75ebd4dbdc1ec..2157f3798d4db7 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/build_index_mappings.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/build_index_mappings.ts
@@ -11,7 +11,7 @@ import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
 import {
   type IndexMapping,
   type IndexMappingMeta,
-  getModelVersionMapForTypes,
+  getVirtualVersionMap,
 } from '@kbn/core-saved-objects-base-server-internal';
 import { getBaseMappings, buildTypesMappings } from '../../core';
 
@@ -48,11 +48,11 @@ interface BuildIndexMetaOpts {
  * @param types The list of all registered SO types.
  */
 export const buildIndexMeta = ({ types }: BuildIndexMetaOpts): IndexMappingMeta => {
-  const modelVersions = getModelVersionMapForTypes(types);
+  const typeVersions = getVirtualVersionMap(types);
 
   return {
-    mappingVersions: modelVersions,
-    docVersions: modelVersions,
+    mappingVersions: typeVersions,
+    docVersions: typeVersions,
     migrationState: {
       convertingDocuments: false,
     },
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 a0e03552ed9465..8d7cbe657758c8 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
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-export const getModelVersionsFromMappingsMock = jest.fn();
-export const compareModelVersionsMock = jest.fn();
-export const getModelVersionMapForTypesMock = jest.fn();
+export const getVirtualVersionsFromMappingsMock = jest.fn();
+export const compareVirtualVersionsMock = jest.fn();
+export const getVirtualVersionMapMock = jest.fn();
 
 jest.doMock('@kbn/core-saved-objects-base-server-internal', () => {
   const actual = jest.requireActual('@kbn/core-saved-objects-base-server-internal');
   return {
     ...actual,
-    getModelVersionsFromMappings: getModelVersionsFromMappingsMock,
-    compareModelVersions: compareModelVersionsMock,
-    getModelVersionMapForTypes: getModelVersionMapForTypesMock,
+    getVirtualVersionsFromMappings: getVirtualVersionsFromMappingsMock,
+    compareVirtualVersions: compareVirtualVersionsMock,
+    getVirtualVersionMap: getVirtualVersionMapMock,
   };
 });
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 8430f1f8984263..528855417e90f2 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
@@ -7,14 +7,14 @@
  */
 
 import {
-  compareModelVersionsMock,
-  getModelVersionsFromMappingsMock,
-  getModelVersionMapForTypesMock,
+  compareVirtualVersionsMock,
+  getVirtualVersionMapMock,
+  getVirtualVersionsFromMappingsMock,
 } from './check_version_compatibility.test.mocks';
 import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
 import type {
   IndexMapping,
-  ModelVersionMap,
+  VirtualVersionMap,
   CompareModelVersionResult,
 } from '@kbn/core-saved-objects-base-server-internal';
 import { checkVersionCompatibility } from './check_version_compatibility';
@@ -27,9 +27,9 @@ describe('checkVersionCompatibility', () => {
   let mappings: IndexMapping;
 
   beforeEach(() => {
-    compareModelVersionsMock.mockReset().mockReturnValue({});
-    getModelVersionsFromMappingsMock.mockReset().mockReturnValue({});
-    getModelVersionMapForTypesMock.mockReset().mockReturnValue({ status: 'equal' });
+    compareVirtualVersionsMock.mockReset().mockReturnValue({});
+    getVirtualVersionMapMock.mockReset().mockReturnValue({});
+    getVirtualVersionsFromMappingsMock.mockReset().mockReturnValue({ status: 'equal' });
 
     types = [createType({ name: 'foo' }), createType({ name: 'bar' })];
 
@@ -46,8 +46,8 @@ describe('checkVersionCompatibility', () => {
       deletedTypes,
     });
 
-    expect(getModelVersionMapForTypesMock).toHaveBeenCalledTimes(1);
-    expect(getModelVersionMapForTypesMock).toHaveBeenCalledWith(types);
+    expect(getVirtualVersionMapMock).toHaveBeenCalledTimes(1);
+    expect(getVirtualVersionMapMock).toHaveBeenCalledWith(types);
   });
 
   it('calls getModelVersionsFromMappings with the correct parameters', () => {
@@ -58,8 +58,8 @@ describe('checkVersionCompatibility', () => {
       deletedTypes,
     });
 
-    expect(getModelVersionsFromMappingsMock).toHaveBeenCalledTimes(1);
-    expect(getModelVersionsFromMappingsMock).toHaveBeenCalledWith({
+    expect(getVirtualVersionsFromMappingsMock).toHaveBeenCalledTimes(1);
+    expect(getVirtualVersionsFromMappingsMock).toHaveBeenCalledWith({
       mappings,
       source: 'mappingVersions',
       knownTypes: ['foo', 'bar'],
@@ -67,11 +67,11 @@ describe('checkVersionCompatibility', () => {
   });
 
   it('calls compareModelVersions with the correct parameters', () => {
-    const appVersions: ModelVersionMap = { foo: 2, bar: 2 };
-    const indexVersions: ModelVersionMap = { foo: 1, bar: 1 };
+    const appVersions: VirtualVersionMap = { foo: '10.2.0', bar: '10.2.0' };
+    const indexVersions: VirtualVersionMap = { foo: '10.1.0', bar: '10.1.0' };
 
-    getModelVersionMapForTypesMock.mockReturnValue(appVersions);
-    getModelVersionsFromMappingsMock.mockReturnValue(indexVersions);
+    getVirtualVersionMapMock.mockReturnValue(appVersions);
+    getVirtualVersionsFromMappingsMock.mockReturnValue(indexVersions);
 
     checkVersionCompatibility({
       types,
@@ -80,8 +80,8 @@ describe('checkVersionCompatibility', () => {
       deletedTypes,
     });
 
-    expect(compareModelVersionsMock).toHaveBeenCalledTimes(1);
-    expect(compareModelVersionsMock).toHaveBeenCalledWith({
+    expect(compareVirtualVersionsMock).toHaveBeenCalledTimes(1);
+    expect(compareVirtualVersionsMock).toHaveBeenCalledWith({
       appVersions,
       indexVersions,
       deletedTypes,
@@ -97,7 +97,7 @@ describe('checkVersionCompatibility', () => {
         equal: [],
       },
     };
-    compareModelVersionsMock.mockReturnValue(expected);
+    compareVirtualVersionsMock.mockReturnValue(expected);
 
     const result = checkVersionCompatibility({
       types,
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 c231645fb7993a..651875e92c4382 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
@@ -8,9 +8,9 @@
 
 import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
 import {
-  getModelVersionsFromMappings,
-  compareModelVersions,
-  getModelVersionMapForTypes,
+  getVirtualVersionsFromMappings,
+  compareVirtualVersions,
+  getVirtualVersionMap,
   type IndexMapping,
   type CompareModelVersionResult,
 } from '@kbn/core-saved-objects-base-server-internal';
@@ -28,8 +28,8 @@ export const checkVersionCompatibility = ({
   source,
   deletedTypes,
 }: CheckVersionCompatibilityOpts): CompareModelVersionResult => {
-  const appVersions = getModelVersionMapForTypes(types);
-  const indexVersions = getModelVersionsFromMappings({
+  const appVersions = getVirtualVersionMap(types);
+  const indexVersions = getVirtualVersionsFromMappings({
     mappings,
     source,
     knownTypes: types.map((type) => type.name),
@@ -37,5 +37,5 @@ export const checkVersionCompatibility = ({
   if (!indexVersions) {
     throw new Error(`Cannot check version: ${source} not present in the mapping meta`);
   }
-  return compareModelVersions({ appVersions, indexVersions, deletedTypes });
+  return compareVirtualVersions({ appVersions, indexVersions, deletedTypes });
 };
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 ce0cba20f427c5..9e711dd6daaf11 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,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import type { SavedObjectsModelVersion } from '@kbn/core-saved-objects-server';
 import type { IndexMappingMeta } from '@kbn/core-saved-objects-base-server-internal';
 import { generateAdditiveMappingDiff } from './generate_additive_mapping_diff';
 import { createType } from '../test_helpers';
@@ -13,20 +14,24 @@ import { createType } from '../test_helpers';
 describe('generateAdditiveMappingDiff', () => {
   const deletedTypes = ['deletedType'];
 
+  const stubMigration = jest.fn();
+  const stubModelVersion: SavedObjectsModelVersion = { modelChange: { type: 'expansion' } };
+
   const getTypes = () => {
     const foo = createType({
       name: 'foo',
+      switchToModelVersionAt: '8.0.0',
       modelVersions: {
-        1: { modelChange: { type: 'expansion' } },
-        2: { modelChange: { type: 'expansion' } },
+        1: stubModelVersion,
+        2: stubModelVersion,
       },
       mappings: { properties: { fooProp: { type: 'text' } } },
     });
     const bar = createType({
       name: 'bar',
-      modelVersions: {
-        1: { modelChange: { type: 'expansion' } },
-        2: { modelChange: { type: 'expansion' } },
+      migrations: {
+        '8.0.0': stubMigration,
+        '8.5.0': stubMigration,
       },
       mappings: { properties: { barProp: { type: 'text' } } },
     });
@@ -39,8 +44,8 @@ describe('generateAdditiveMappingDiff', () => {
     const types = [foo, bar];
     const meta: IndexMappingMeta = {
       mappingVersions: {
-        foo: 1,
-        bar: 1,
+        foo: '10.1.0',
+        bar: '7.9.0',
       },
     };
 
@@ -61,8 +66,8 @@ describe('generateAdditiveMappingDiff', () => {
     const types = [foo, bar];
     const meta: IndexMappingMeta = {
       mappingVersions: {
-        foo: 1,
-        bar: 2,
+        foo: '10.1.0',
+        bar: '8.5.0',
       },
     };
 
@@ -82,9 +87,9 @@ describe('generateAdditiveMappingDiff', () => {
     const types = [foo, bar];
     const meta: IndexMappingMeta = {
       mappingVersions: {
-        foo: 1,
-        bar: 1,
-        deletedType: 42,
+        foo: '10.1.0',
+        bar: '8.2.0',
+        deletedType: '10.2.0',
       },
     };
 
@@ -105,8 +110,8 @@ describe('generateAdditiveMappingDiff', () => {
     const types = [foo, bar];
     const meta: IndexMappingMeta = {
       mappingVersions: {
-        foo: 1,
-        bar: 3,
+        foo: '10.1.0',
+        bar: '10.1.0',
       },
     };
 
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 400e01e999797f..0ef7437b2d6c34 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
@@ -12,8 +12,8 @@ import type {
 } from '@kbn/core-saved-objects-server';
 import {
   IndexMappingMeta,
-  getModelVersionsFromMappingMeta,
-  getModelVersionMapForTypes,
+  getVirtualVersionsFromMappingMeta,
+  getVirtualVersionMap,
   getModelVersionDelta,
 } from '@kbn/core-saved-objects-base-server-internal';
 
@@ -35,8 +35,8 @@ export const generateAdditiveMappingDiff = ({
   meta,
   deletedTypes,
 }: GenerateAdditiveMappingsDiffOpts): SavedObjectsMappingProperties => {
-  const typeVersions = getModelVersionMapForTypes(types);
-  const mappingVersion = getModelVersionsFromMappingMeta({
+  const typeVersions = getVirtualVersionMap(types);
+  const mappingVersion = getVirtualVersionsFromMappingMeta({
     meta,
     source: 'mappingVersions',
     knownTypes: types.map((type) => type.name),
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/outdated_documents_query.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/outdated_documents_query.test.ts
index f39016b7d86a1f..fb72061735effc 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/outdated_documents_query.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/outdated_documents_query.test.ts
@@ -16,10 +16,13 @@ const dummyModelVersion: SavedObjectsModelVersion = {
   },
 };
 
+const dummyMigration = jest.fn();
+
 describe('getOutdatedDocumentsQuery', () => {
-  it('generates the correct query', () => {
+  it('generates the correct query for types using model versions', () => {
     const fooType = createType({
       name: 'foo',
+      switchToModelVersionAt: '8.8.0',
       modelVersions: {
         1: dummyModelVersion,
         2: dummyModelVersion,
@@ -27,6 +30,7 @@ describe('getOutdatedDocumentsQuery', () => {
     });
     const barType = createType({
       name: 'bar',
+      switchToModelVersionAt: '8.8.0',
       modelVersions: {
         1: dummyModelVersion,
         2: dummyModelVersion,
@@ -50,40 +54,11 @@ describe('getOutdatedDocumentsQuery', () => {
                       "type": "foo",
                     },
                   },
+                ],
+                "must_not": Array [
                   Object {
-                    "bool": Object {
-                      "should": Array [
-                        Object {
-                          "bool": Object {
-                            "must": Object {
-                              "exists": Object {
-                                "field": "migrationVersion",
-                              },
-                            },
-                            "must_not": Object {
-                              "term": Object {
-                                "migrationVersion.foo": "10.2.0",
-                              },
-                            },
-                          },
-                        },
-                        Object {
-                          "bool": Object {
-                            "must_not": Array [
-                              Object {
-                                "exists": Object {
-                                  "field": "migrationVersion",
-                                },
-                              },
-                              Object {
-                                "term": Object {
-                                  "typeMigrationVersion": "10.2.0",
-                                },
-                              },
-                            ],
-                          },
-                        },
-                      ],
+                    "term": Object {
+                      "typeMigrationVersion": "10.2.0",
                     },
                   },
                 ],
@@ -97,40 +72,148 @@ describe('getOutdatedDocumentsQuery', () => {
                       "type": "bar",
                     },
                   },
+                ],
+                "must_not": Array [
                   Object {
-                    "bool": Object {
-                      "should": Array [
-                        Object {
-                          "bool": Object {
-                            "must": Object {
-                              "exists": Object {
-                                "field": "migrationVersion",
-                              },
-                            },
-                            "must_not": Object {
-                              "term": Object {
-                                "migrationVersion.bar": "10.3.0",
-                              },
-                            },
-                          },
-                        },
-                        Object {
-                          "bool": Object {
-                            "must_not": Array [
-                              Object {
-                                "exists": Object {
-                                  "field": "migrationVersion",
-                                },
-                              },
-                              Object {
-                                "term": Object {
-                                  "typeMigrationVersion": "10.3.0",
-                                },
-                              },
-                            ],
-                          },
-                        },
-                      ],
+                    "term": Object {
+                      "typeMigrationVersion": "10.3.0",
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      }
+    `);
+  });
+
+  it('generates the correct query for types still using old migrations', () => {
+    const fooType = createType({
+      name: 'foo',
+      migrations: {
+        '7.17.2': dummyMigration,
+        '8.5.0': dummyMigration,
+      },
+    });
+    const barType = createType({
+      name: 'bar',
+      migrations: () => ({
+        '7.15.5': dummyMigration,
+        '8.7.2': dummyMigration,
+      }),
+    });
+
+    const query = getOutdatedDocumentsQuery({
+      types: [fooType, barType],
+    });
+
+    expect(query).toMatchInlineSnapshot(`
+      Object {
+        "bool": Object {
+          "should": Array [
+            Object {
+              "bool": Object {
+                "must": Array [
+                  Object {
+                    "term": Object {
+                      "type": "foo",
+                    },
+                  },
+                ],
+                "must_not": Array [
+                  Object {
+                    "term": Object {
+                      "typeMigrationVersion": "8.5.0",
+                    },
+                  },
+                ],
+              },
+            },
+            Object {
+              "bool": Object {
+                "must": Array [
+                  Object {
+                    "term": Object {
+                      "type": "bar",
+                    },
+                  },
+                ],
+                "must_not": Array [
+                  Object {
+                    "term": Object {
+                      "typeMigrationVersion": "8.7.2",
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      }
+    `);
+  });
+
+  it('generates the correct query for mixed types', () => {
+    const fooType = createType({
+      name: 'foo',
+      migrations: {
+        '7.17.2': dummyMigration,
+        '8.5.0': dummyMigration,
+      },
+      switchToModelVersionAt: '8.8.0',
+      modelVersions: {
+        1: dummyModelVersion,
+        2: dummyModelVersion,
+      },
+    });
+    const barType = createType({
+      name: 'bar',
+      migrations: () => ({
+        '7.15.5': dummyMigration,
+        '8.7.2': dummyMigration,
+      }),
+    });
+
+    const query = getOutdatedDocumentsQuery({
+      types: [fooType, barType],
+    });
+
+    expect(query).toMatchInlineSnapshot(`
+      Object {
+        "bool": Object {
+          "should": Array [
+            Object {
+              "bool": Object {
+                "must": Array [
+                  Object {
+                    "term": Object {
+                      "type": "foo",
+                    },
+                  },
+                ],
+                "must_not": Array [
+                  Object {
+                    "term": Object {
+                      "typeMigrationVersion": "10.2.0",
+                    },
+                  },
+                ],
+              },
+            },
+            Object {
+              "bool": Object {
+                "must": Array [
+                  Object {
+                    "term": Object {
+                      "type": "bar",
+                    },
+                  },
+                ],
+                "must_not": Array [
+                  Object {
+                    "term": Object {
+                      "typeMigrationVersion": "8.7.2",
                     },
                   },
                 ],
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/outdated_documents_query.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/outdated_documents_query.ts
index e15a2e447b5542..40495654e6146a 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/outdated_documents_query.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/outdated_documents_query.ts
@@ -8,10 +8,7 @@
 
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import type { SavedObjectsType } from '@kbn/core-saved-objects-server';
-import {
-  getModelVersionMapForTypes,
-  modelVersionToVirtualVersion,
-} from '@kbn/core-saved-objects-base-server-internal';
+import { getVirtualVersionMap } from '@kbn/core-saved-objects-base-server-internal';
 
 interface GetOutdatedDocumentsQueryOps {
   types: SavedObjectsType[];
@@ -23,36 +20,15 @@ export const getOutdatedDocumentsQuery = ({
   // Note: in theory, we could check the difference of model version with the index's
   // and narrow the search filter only on the type that have different versions.
   // however, it feels safer to just search for all outdated document, just in case.
-  const modelVersions = getModelVersionMapForTypes(types);
+  const virtualVersions = getVirtualVersionMap(types);
   return {
     bool: {
       should: types.map((type) => {
-        const virtualVersion = modelVersionToVirtualVersion(modelVersions[type.name]);
+        const virtualVersion = virtualVersions[type.name];
         return {
           bool: {
-            must: [
-              { term: { type: type.name } },
-              {
-                bool: {
-                  should: [
-                    {
-                      bool: {
-                        must: { exists: { field: 'migrationVersion' } },
-                        must_not: { term: { [`migrationVersion.${type.name}`]: virtualVersion } },
-                      },
-                    },
-                    {
-                      bool: {
-                        must_not: [
-                          { exists: { field: 'migrationVersion' } },
-                          { term: { typeMigrationVersion: virtualVersion } },
-                        ],
-                      },
-                    },
-                  ],
-                },
-              },
-            ],
+            must: [{ term: { type: type.name } }],
+            must_not: [{ term: { typeMigrationVersion: virtualVersion } }],
           },
         };
       }),
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/update_index_meta.test.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/update_index_meta.test.ts
index 4298c6b0270725..da9654400bf6f8 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/update_index_meta.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/update_index_meta.test.ts
@@ -8,7 +8,7 @@
 
 import type {
   IndexMappingMeta,
-  ModelVersionMap,
+  VirtualVersionMap,
 } from '@kbn/core-saved-objects-base-server-internal';
 import {
   setMetaDocMigrationStarted,
@@ -18,12 +18,12 @@ import {
 
 const getDefaultMeta = (): IndexMappingMeta => ({
   mappingVersions: {
-    foo: 1,
-    bar: 1,
+    foo: '10.1.0',
+    bar: '10.1.0',
   },
   docVersions: {
-    foo: 1,
-    bar: 1,
+    foo: '10.1.0',
+    bar: '10.1.0',
   },
   migrationState: {
     convertingDocuments: false,
@@ -33,7 +33,7 @@ const getDefaultMeta = (): IndexMappingMeta => ({
 describe('setMetaMappingMigrationComplete', () => {
   it('updates the meta to set the mappingVersions', () => {
     const meta: IndexMappingMeta = getDefaultMeta();
-    const versions: ModelVersionMap = { foo: 3, bar: 2 };
+    const versions: VirtualVersionMap = { foo: '10.3.0', bar: '10.2.0' };
 
     const updated = setMetaMappingMigrationComplete({ meta, versions });
 
@@ -67,7 +67,7 @@ describe('setMetaDocMigrationComplete', () => {
         convertingDocuments: true,
       },
     };
-    const versions: ModelVersionMap = { foo: 3, bar: 2 };
+    const versions: VirtualVersionMap = { foo: '10.3.0', bar: '10.2.0' };
 
     const updated = setMetaDocMigrationComplete({ meta, versions });
 
diff --git a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/update_index_meta.ts b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/update_index_meta.ts
index 73d693d4a1f1a5..2d06f5adcb3783 100644
--- a/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/update_index_meta.ts
+++ b/packages/core/saved-objects/core-saved-objects-migration-server-internal/src/zdt/utils/update_index_meta.ts
@@ -8,7 +8,7 @@
 
 import type {
   IndexMappingMeta,
-  ModelVersionMap,
+  VirtualVersionMap,
 } from '@kbn/core-saved-objects-base-server-internal';
 
 export const setMetaMappingMigrationComplete = ({
@@ -16,7 +16,7 @@ export const setMetaMappingMigrationComplete = ({
   versions,
 }: {
   meta: IndexMappingMeta;
-  versions: ModelVersionMap;
+  versions: VirtualVersionMap;
 }): IndexMappingMeta => {
   return {
     ...meta,
@@ -44,7 +44,7 @@ export const setMetaDocMigrationComplete = ({
   versions,
 }: {
   meta: IndexMappingMeta;
-  versions: ModelVersionMap;
+  versions: VirtualVersionMap;
 }): IndexMappingMeta => {
   return {
     ...meta,
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/import_dashboards.test.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/import_dashboards.test.ts
index d6382efd673fa7..156f9f42f792bd 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/import_dashboards.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/legacy_import_export/lib/import_dashboards.test.ts
@@ -31,11 +31,12 @@ describe('importDashboards(req)', () => {
         type: 'visualization',
         attributes: { visState: '{}' },
         references: [],
+        managed: true,
       },
     ];
   });
 
-  test('should call bulkCreate with each asset, filtering out any version if present', async () => {
+  test('should call bulkCreate with each asset, filtering out any version and managed if present', async () => {
     await importDashboards(savedObjectClient, importedObjects, { overwrite: false, exclude: [] });
 
     expect(savedObjectClient.bulkCreate).toHaveBeenCalledTimes(1);
diff --git a/packages/core/saved-objects/core-saved-objects-server/src/import.ts b/packages/core/saved-objects/core-saved-objects-server/src/import.ts
index a10fcd4a237a9f..90d33e9339c436 100644
--- a/packages/core/saved-objects/core-saved-objects-server/src/import.ts
+++ b/packages/core/saved-objects/core-saved-objects-server/src/import.ts
@@ -69,6 +69,14 @@ export interface SavedObjectsImportOptions {
    * different Kibana versions (e.g. generate legacy URL aliases for all imported objects that have to change IDs).
    */
   compatibilityMode?: boolean;
+  /**
+   * If true, will import as a managed object, else will import as not managed.
+   *
+   * This can be leveraged by applications to e.g. prevent edits to a managed
+   * saved object. Instead, users can be guided to create a copy first and
+   * make their edits to the copy.
+   */
+  managed?: boolean;
 }
 
 /**
@@ -89,6 +97,14 @@ export interface SavedObjectsResolveImportErrorsOptions {
    * different Kibana versions (e.g. generate legacy URL aliases for all imported objects that have to change IDs).
    */
   compatibilityMode?: boolean;
+  /**
+   * If true, will import as a managed object, else will import as not managed.
+   *
+   * This can be leveraged by applications to e.g. prevent edits to a managed
+   * saved object. Instead, users can be guided to create a copy first and
+   * make their edits to the copy.
+   */
+  managed?: boolean;
 }
 
 export type CreatedObject<T> = SavedObject<T> & { destinationId?: string };
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/apm/apm_fields.ts b/packages/kbn-apm-synthtrace-client/src/lib/apm/apm_fields.ts
index d5efb1dbc2c97d..911271f5841525 100644
--- a/packages/kbn-apm-synthtrace-client/src/lib/apm/apm_fields.ts
+++ b/packages/kbn-apm-synthtrace-client/src/lib/apm/apm_fields.ts
@@ -12,6 +12,8 @@ export type ApmApplicationMetricFields = Partial<{
   'system.process.memory.size': number;
   'system.memory.actual.free': number;
   'system.memory.total': number;
+  'system.process.cgroup.memory.mem.limit.bytes': number;
+  'system.process.cgroup.memory.mem.usage.bytes': number;
   'system.cpu.total.norm.pct': number;
   'system.process.memory.rss.bytes': number;
   'system.process.cpu.total.norm.pct': number;
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 7cb321a6a3f672..0ffc68615c0b5f 100644
--- a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx
+++ b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.test.tsx
@@ -191,4 +191,32 @@ describe('useDataGridColumnsCellActions', () => {
       expect(mockCloseCellPopover).toHaveBeenCalled();
     });
   });
+
+  it('should return empty array of actions when list of fields is empty', async () => {
+    const { result, waitForNextUpdate } = renderHook(useDataGridColumnsCellActions, {
+      initialProps: {
+        ...useDataGridColumnsCellActionsProps,
+        fields: [],
+      },
+    });
+
+    await waitForNextUpdate();
+
+    expect(result.current).toBeInstanceOf(Array);
+    expect(result.current.length).toBe(0);
+  });
+
+  it('should return empty array of actions when list of fields is undefined', async () => {
+    const { result, waitForNextUpdate } = renderHook(useDataGridColumnsCellActions, {
+      initialProps: {
+        ...useDataGridColumnsCellActionsProps,
+        fields: undefined,
+      },
+    });
+
+    await waitForNextUpdate();
+
+    expect(result.current).toBeInstanceOf(Array);
+    expect(result.current.length).toBe(0);
+  });
 });
diff --git a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx
index 344e4a058ad441..29130042180321 100644
--- a/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx
+++ b/packages/kbn-cell-actions/src/hooks/use_data_grid_column_cell_actions.tsx
@@ -30,7 +30,7 @@ interface BulkField extends Pick<CellActionField, 'name' | 'type'> {
 
 export interface UseDataGridColumnsCellActionsProps
   extends Pick<CellActionsProps, 'triggerId' | 'metadata' | 'disabledActionTypes'> {
-  fields: BulkField[];
+  fields?: BulkField[];
   dataGridRef: MutableRefObject<EuiDataGridRefProps | null>;
 }
 export type UseDataGridColumnsCellActions<
@@ -46,11 +46,11 @@ export const useDataGridColumnsCellActions: UseDataGridColumnsCellActions = ({
 }) => {
   const bulkContexts: CellActionCompatibilityContext[] = useMemo(
     () =>
-      fields.map(({ values, ...field }) => ({
+      fields?.map(({ values, ...field }) => ({
         field, // we are getting the actions for the whole column field, so the compatibility check will be done without the value
         trigger: { id: triggerId },
         metadata,
-      })),
+      })) ?? [],
     [fields, triggerId, metadata]
   );
 
@@ -60,11 +60,13 @@ export const useDataGridColumnsCellActions: UseDataGridColumnsCellActions = ({
 
   const columnsCellActions = useMemo<EuiDataGridColumnCellAction[][]>(() => {
     if (loading) {
-      return fields.map(() => [
-        () => <EuiLoadingSpinner size="s" data-test-subj="dataGridColumnCellAction-loading" />,
-      ]);
+      return (
+        fields?.map(() => [
+          () => <EuiLoadingSpinner size="s" data-test-subj="dataGridColumnCellAction-loading" />,
+        ]) ?? []
+      );
     }
-    if (!columnsActions) {
+    if (!columnsActions || !fields || fields.length === 0) {
       return [];
     }
     return columnsActions.map((actions, columnIndex) =>
diff --git a/packages/kbn-check-mappings-update-cli/README.md b/packages/kbn-check-mappings-update-cli/README.md
new file mode 100644
index 00000000000000..d9a65be30634e4
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/README.md
@@ -0,0 +1,7 @@
+# @kbn/check-mappings-update-cli
+
+Saved Objects CLI tool that can be used to check whether a snapshot of current
+mappings (i.e., mappings on main) is compatible with mappings we can extract
+from the current code.
+
+See `node scripts/check_mappings_update --help` for more info.
\ No newline at end of file
diff --git a/packages/kbn-check-mappings-update-cli/current_mappings.json b/packages/kbn-check-mappings-update-cli/current_mappings.json
new file mode 100644
index 00000000000000..32b4ad91d1903d
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/current_mappings.json
@@ -0,0 +1,2827 @@
+{
+  "core-usage-stats": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "legacy-url-alias": {
+    "dynamic": false,
+    "properties": {
+      "sourceId": {
+        "type": "keyword"
+      },
+      "targetNamespace": {
+        "type": "keyword"
+      },
+      "targetType": {
+        "type": "keyword"
+      },
+      "targetId": {
+        "type": "keyword"
+      },
+      "resolveCounter": {
+        "type": "long"
+      },
+      "disabled": {
+        "type": "boolean"
+      }
+    }
+  },
+  "config": {
+    "dynamic": false,
+    "properties": {
+      "buildNum": {
+        "type": "keyword"
+      }
+    }
+  },
+  "config-global": {
+    "dynamic": false,
+    "properties": {
+      "buildNum": {
+        "type": "keyword"
+      }
+    }
+  },
+  "usage-counters": {
+    "dynamic": false,
+    "properties": {
+      "domainId": {
+        "type": "keyword"
+      }
+    }
+  },
+  "task": {
+    "dynamic": false,
+    "properties": {
+      "taskType": {
+        "type": "keyword"
+      },
+      "scheduledAt": {
+        "type": "date"
+      },
+      "runAt": {
+        "type": "date"
+      },
+      "retryAt": {
+        "type": "date"
+      },
+      "enabled": {
+        "type": "boolean"
+      },
+      "schedule": {
+        "properties": {
+          "interval": {
+            "type": "keyword"
+          }
+        }
+      },
+      "attempts": {
+        "type": "integer"
+      },
+      "status": {
+        "type": "keyword"
+      },
+      "scope": {
+        "type": "keyword"
+      },
+      "ownerId": {
+        "type": "keyword"
+      }
+    }
+  },
+  "guided-onboarding-guide-state": {
+    "dynamic": false,
+    "properties": {
+      "guideId": {
+        "type": "keyword"
+      },
+      "isActive": {
+        "type": "boolean"
+      }
+    }
+  },
+  "guided-onboarding-plugin-state": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "ui-metric": {
+    "properties": {
+      "count": {
+        "type": "integer"
+      }
+    }
+  },
+  "application_usage_totals": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "application_usage_daily": {
+    "dynamic": false,
+    "properties": {
+      "timestamp": {
+        "type": "date"
+      }
+    }
+  },
+  "event_loop_delays_daily": {
+    "dynamic": false,
+    "properties": {
+      "lastUpdatedAt": {
+        "type": "date"
+      }
+    }
+  },
+  "url": {
+    "dynamic": false,
+    "properties": {
+      "slug": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "accessDate": {
+        "type": "date"
+      },
+      "createDate": {
+        "type": "date"
+      }
+    }
+  },
+  "index-pattern": {
+    "dynamic": false,
+    "properties": {
+      "title": {
+        "type": "text"
+      },
+      "type": {
+        "type": "keyword"
+      },
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      }
+    }
+  },
+  "sample-data-telemetry": {
+    "properties": {
+      "installCount": {
+        "type": "long"
+      },
+      "unInstallCount": {
+        "type": "long"
+      }
+    }
+  },
+  "space": {
+    "dynamic": false,
+    "properties": {
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 2048
+          }
+        }
+      }
+    }
+  },
+  "spaces-usage-stats": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "exception-list-agnostic": {
+    "properties": {
+      "_tags": {
+        "type": "keyword"
+      },
+      "created_at": {
+        "type": "keyword"
+      },
+      "created_by": {
+        "type": "keyword"
+      },
+      "description": {
+        "type": "keyword"
+      },
+      "immutable": {
+        "type": "boolean"
+      },
+      "list_id": {
+        "type": "keyword"
+      },
+      "list_type": {
+        "type": "keyword"
+      },
+      "meta": {
+        "type": "keyword"
+      },
+      "name": {
+        "fields": {
+          "text": {
+            "type": "text"
+          }
+        },
+        "type": "keyword"
+      },
+      "tags": {
+        "fields": {
+          "text": {
+            "type": "text"
+          }
+        },
+        "type": "keyword"
+      },
+      "tie_breaker_id": {
+        "type": "keyword"
+      },
+      "type": {
+        "type": "keyword"
+      },
+      "updated_by": {
+        "type": "keyword"
+      },
+      "version": {
+        "type": "keyword"
+      },
+      "comments": {
+        "properties": {
+          "comment": {
+            "type": "keyword"
+          },
+          "created_at": {
+            "type": "keyword"
+          },
+          "created_by": {
+            "type": "keyword"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "updated_at": {
+            "type": "keyword"
+          },
+          "updated_by": {
+            "type": "keyword"
+          }
+        }
+      },
+      "entries": {
+        "properties": {
+          "entries": {
+            "properties": {
+              "field": {
+                "type": "keyword"
+              },
+              "operator": {
+                "type": "keyword"
+              },
+              "type": {
+                "type": "keyword"
+              },
+              "value": {
+                "fields": {
+                  "text": {
+                    "type": "text"
+                  }
+                },
+                "type": "keyword"
+              }
+            }
+          },
+          "field": {
+            "type": "keyword"
+          },
+          "list": {
+            "properties": {
+              "id": {
+                "type": "keyword"
+              },
+              "type": {
+                "type": "keyword"
+              }
+            }
+          },
+          "operator": {
+            "type": "keyword"
+          },
+          "type": {
+            "type": "keyword"
+          },
+          "value": {
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            },
+            "type": "keyword"
+          }
+        }
+      },
+      "expire_time": {
+        "type": "date"
+      },
+      "item_id": {
+        "type": "keyword"
+      },
+      "os_types": {
+        "type": "keyword"
+      }
+    }
+  },
+  "exception-list": {
+    "properties": {
+      "_tags": {
+        "type": "keyword"
+      },
+      "created_at": {
+        "type": "keyword"
+      },
+      "created_by": {
+        "type": "keyword"
+      },
+      "description": {
+        "type": "keyword"
+      },
+      "immutable": {
+        "type": "boolean"
+      },
+      "list_id": {
+        "type": "keyword"
+      },
+      "list_type": {
+        "type": "keyword"
+      },
+      "meta": {
+        "type": "keyword"
+      },
+      "name": {
+        "fields": {
+          "text": {
+            "type": "text"
+          }
+        },
+        "type": "keyword"
+      },
+      "tags": {
+        "fields": {
+          "text": {
+            "type": "text"
+          }
+        },
+        "type": "keyword"
+      },
+      "tie_breaker_id": {
+        "type": "keyword"
+      },
+      "type": {
+        "type": "keyword"
+      },
+      "updated_by": {
+        "type": "keyword"
+      },
+      "version": {
+        "type": "keyword"
+      },
+      "comments": {
+        "properties": {
+          "comment": {
+            "type": "keyword"
+          },
+          "created_at": {
+            "type": "keyword"
+          },
+          "created_by": {
+            "type": "keyword"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "updated_at": {
+            "type": "keyword"
+          },
+          "updated_by": {
+            "type": "keyword"
+          }
+        }
+      },
+      "entries": {
+        "properties": {
+          "entries": {
+            "properties": {
+              "field": {
+                "type": "keyword"
+              },
+              "operator": {
+                "type": "keyword"
+              },
+              "type": {
+                "type": "keyword"
+              },
+              "value": {
+                "fields": {
+                  "text": {
+                    "type": "text"
+                  }
+                },
+                "type": "keyword"
+              }
+            }
+          },
+          "field": {
+            "type": "keyword"
+          },
+          "list": {
+            "properties": {
+              "id": {
+                "type": "keyword"
+              },
+              "type": {
+                "type": "keyword"
+              }
+            }
+          },
+          "operator": {
+            "type": "keyword"
+          },
+          "type": {
+            "type": "keyword"
+          },
+          "value": {
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            },
+            "type": "keyword"
+          }
+        }
+      },
+      "expire_time": {
+        "type": "date"
+      },
+      "item_id": {
+        "type": "keyword"
+      },
+      "os_types": {
+        "type": "keyword"
+      }
+    }
+  },
+  "telemetry": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "file": {
+    "dynamic": false,
+    "properties": {
+      "created": {
+        "type": "date"
+      },
+      "Updated": {
+        "type": "date"
+      },
+      "name": {
+        "type": "text"
+      },
+      "user": {
+        "type": "flattened"
+      },
+      "Status": {
+        "type": "keyword"
+      },
+      "mime_type": {
+        "type": "keyword"
+      },
+      "extension": {
+        "type": "keyword"
+      },
+      "size": {
+        "type": "long"
+      },
+      "Meta": {
+        "type": "flattened"
+      },
+      "FileKind": {
+        "type": "keyword"
+      },
+      "hash": {
+        "dynamic": false,
+        "properties": {}
+      }
+    }
+  },
+  "fileShare": {
+    "dynamic": false,
+    "properties": {
+      "created": {
+        "type": "date"
+      },
+      "valid_until": {
+        "type": "long"
+      },
+      "token": {
+        "type": "keyword"
+      },
+      "name": {
+        "type": "keyword"
+      }
+    }
+  },
+  "action": {
+    "dynamic": false,
+    "properties": {
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "actionTypeId": {
+        "type": "keyword"
+      }
+    }
+  },
+  "action_task_params": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "connector_token": {
+    "dynamic": false,
+    "properties": {
+      "connectorId": {
+        "type": "keyword"
+      },
+      "tokenType": {
+        "type": "keyword"
+      }
+    }
+  },
+  "query": {
+    "dynamic": false,
+    "properties": {
+      "title": {
+        "type": "text"
+      },
+      "description": {
+        "type": "text"
+      }
+    }
+  },
+  "kql-telemetry": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "search-session": {
+    "dynamic": false,
+    "properties": {
+      "sessionId": {
+        "type": "keyword"
+      },
+      "created": {
+        "type": "date"
+      },
+      "realmType": {
+        "type": "keyword"
+      },
+      "realmName": {
+        "type": "keyword"
+      },
+      "username": {
+        "type": "keyword"
+      }
+    }
+  },
+  "search-telemetry": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "file-upload-usage-collection-telemetry": {
+    "properties": {
+      "file_upload": {
+        "properties": {
+          "index_creation_count": {
+            "type": "long"
+          }
+        }
+      }
+    }
+  },
+  "alert": {
+    "dynamic": false,
+    "properties": {
+      "enabled": {
+        "type": "boolean"
+      },
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "normalizer": "lowercase"
+          }
+        }
+      },
+      "tags": {
+        "type": "keyword"
+      },
+      "alertTypeId": {
+        "type": "keyword"
+      },
+      "schedule": {
+        "properties": {
+          "interval": {
+            "type": "keyword"
+          }
+        }
+      },
+      "consumer": {
+        "type": "keyword"
+      },
+      "legacyId": {
+        "type": "keyword"
+      },
+      "actions": {
+        "dynamic": false,
+        "type": "nested",
+        "properties": {
+          "group": {
+            "type": "keyword"
+          },
+          "actionRef": {
+            "type": "keyword"
+          },
+          "actionTypeId": {
+            "type": "keyword"
+          }
+        }
+      },
+      "params": {
+        "type": "flattened",
+        "ignore_above": 4096
+      },
+      "mapped_params": {
+        "properties": {
+          "risk_score": {
+            "type": "float"
+          },
+          "severity": {
+            "type": "keyword"
+          }
+        }
+      },
+      "scheduledTaskId": {
+        "type": "keyword"
+      },
+      "createdBy": {
+        "type": "keyword"
+      },
+      "updatedBy": {
+        "type": "keyword"
+      },
+      "createdAt": {
+        "type": "date"
+      },
+      "updatedAt": {
+        "type": "date"
+      },
+      "throttle": {
+        "type": "keyword"
+      },
+      "notifyWhen": {
+        "type": "keyword"
+      },
+      "muteAll": {
+        "type": "boolean"
+      },
+      "mutedInstanceIds": {
+        "type": "keyword"
+      },
+      "monitoring": {
+        "properties": {
+          "run": {
+            "properties": {
+              "calculated_metrics": {
+                "properties": {
+                  "p50": {
+                    "type": "long"
+                  },
+                  "p95": {
+                    "type": "long"
+                  },
+                  "p99": {
+                    "type": "long"
+                  },
+                  "success_ratio": {
+                    "type": "float"
+                  }
+                }
+              },
+              "last_run": {
+                "properties": {
+                  "timestamp": {
+                    "type": "date"
+                  },
+                  "metrics": {
+                    "properties": {
+                      "duration": {
+                        "type": "long"
+                      },
+                      "total_search_duration_ms": {
+                        "type": "long"
+                      },
+                      "total_indexing_duration_ms": {
+                        "type": "long"
+                      },
+                      "total_alerts_detected": {
+                        "type": "float"
+                      },
+                      "total_alerts_created": {
+                        "type": "float"
+                      },
+                      "gap_duration_s": {
+                        "type": "float"
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "revision": {
+        "type": "long"
+      },
+      "snoozeSchedule": {
+        "type": "nested",
+        "properties": {
+          "id": {
+            "type": "keyword"
+          },
+          "duration": {
+            "type": "long"
+          },
+          "skipRecurrences": {
+            "type": "date",
+            "format": "strict_date_time"
+          }
+        }
+      },
+      "executionStatus": {
+        "properties": {
+          "numberOfTriggeredActions": {
+            "type": "long"
+          },
+          "status": {
+            "type": "keyword"
+          },
+          "lastExecutionDate": {
+            "type": "date"
+          },
+          "lastDuration": {
+            "type": "long"
+          },
+          "error": {
+            "properties": {
+              "reason": {
+                "type": "keyword"
+              },
+              "message": {
+                "type": "keyword"
+              }
+            }
+          },
+          "warning": {
+            "properties": {
+              "reason": {
+                "type": "keyword"
+              },
+              "message": {
+                "type": "keyword"
+              }
+            }
+          }
+        }
+      },
+      "lastRun": {
+        "properties": {
+          "outcome": {
+            "type": "keyword"
+          },
+          "outcomeOrder": {
+            "type": "float"
+          },
+          "alertsCount": {
+            "properties": {
+              "active": {
+                "type": "float"
+              },
+              "new": {
+                "type": "float"
+              },
+              "recovered": {
+                "type": "float"
+              },
+              "ignored": {
+                "type": "float"
+              }
+            }
+          }
+        }
+      },
+      "running": {
+        "type": "boolean"
+      }
+    }
+  },
+  "api_key_pending_invalidation": {
+    "properties": {
+      "apiKeyId": {
+        "type": "keyword"
+      },
+      "createdAt": {
+        "type": "date"
+      }
+    }
+  },
+  "rules-settings": {
+    "dynamic": false,
+    "properties": {
+      "flapping": {
+        "properties": {}
+      }
+    }
+  },
+  "maintenance-window": {
+    "dynamic": false,
+    "properties": {
+      "enabled": {
+        "type": "boolean"
+      },
+      "events": {
+        "type": "date_range",
+        "format": "epoch_millis||strict_date_optional_time"
+      }
+    }
+  },
+  "search": {
+    "dynamic": false,
+    "properties": {
+      "title": {
+        "type": "text"
+      },
+      "description": {
+        "type": "text"
+      }
+    }
+  },
+  "tag": {
+    "properties": {
+      "name": {
+        "type": "text"
+      },
+      "description": {
+        "type": "text"
+      },
+      "color": {
+        "type": "text"
+      }
+    }
+  },
+  "graph-workspace": {
+    "properties": {
+      "description": {
+        "type": "text"
+      },
+      "kibanaSavedObjectMeta": {
+        "properties": {
+          "searchSourceJSON": {
+            "type": "text"
+          }
+        }
+      },
+      "numLinks": {
+        "type": "integer"
+      },
+      "numVertices": {
+        "type": "integer"
+      },
+      "title": {
+        "type": "text"
+      },
+      "version": {
+        "type": "integer"
+      },
+      "wsState": {
+        "type": "text"
+      },
+      "legacyIndexPatternRef": {
+        "type": "text",
+        "index": false
+      }
+    }
+  },
+  "visualization": {
+    "dynamic": false,
+    "properties": {
+      "description": {
+        "type": "text"
+      },
+      "kibanaSavedObjectMeta": {
+        "properties": {}
+      },
+      "title": {
+        "type": "text"
+      },
+      "version": {
+        "type": "integer"
+      }
+    }
+  },
+  "dashboard": {
+    "properties": {
+      "description": {
+        "type": "text"
+      },
+      "hits": {
+        "type": "integer",
+        "index": false,
+        "doc_values": false
+      },
+      "kibanaSavedObjectMeta": {
+        "properties": {
+          "searchSourceJSON": {
+            "type": "text",
+            "index": false
+          }
+        }
+      },
+      "optionsJSON": {
+        "type": "text",
+        "index": false
+      },
+      "panelsJSON": {
+        "type": "text",
+        "index": false
+      },
+      "refreshInterval": {
+        "properties": {
+          "display": {
+            "type": "keyword",
+            "index": false,
+            "doc_values": false
+          },
+          "pause": {
+            "type": "boolean",
+            "index": false,
+            "doc_values": false
+          },
+          "section": {
+            "type": "integer",
+            "index": false,
+            "doc_values": false
+          },
+          "value": {
+            "type": "integer",
+            "index": false,
+            "doc_values": false
+          }
+        }
+      },
+      "controlGroupInput": {
+        "properties": {
+          "controlStyle": {
+            "type": "keyword",
+            "index": false,
+            "doc_values": false
+          },
+          "chainingSystem": {
+            "type": "keyword",
+            "index": false,
+            "doc_values": false
+          },
+          "panelsJSON": {
+            "type": "text",
+            "index": false
+          },
+          "ignoreParentSettingsJSON": {
+            "type": "text",
+            "index": false
+          }
+        }
+      },
+      "timeFrom": {
+        "type": "keyword",
+        "index": false,
+        "doc_values": false
+      },
+      "timeRestore": {
+        "type": "boolean",
+        "index": false,
+        "doc_values": false
+      },
+      "timeTo": {
+        "type": "keyword",
+        "index": false,
+        "doc_values": false
+      },
+      "title": {
+        "type": "text"
+      },
+      "version": {
+        "type": "integer"
+      }
+    }
+  },
+  "lens": {
+    "properties": {
+      "title": {
+        "type": "text"
+      },
+      "description": {
+        "type": "text"
+      },
+      "visualizationType": {
+        "type": "keyword"
+      },
+      "state": {
+        "dynamic": false,
+        "properties": {}
+      }
+    }
+  },
+  "lens-ui-telemetry": {
+    "properties": {
+      "name": {
+        "type": "keyword"
+      },
+      "type": {
+        "type": "keyword"
+      },
+      "date": {
+        "type": "date"
+      },
+      "count": {
+        "type": "integer"
+      }
+    }
+  },
+  "map": {
+    "properties": {
+      "description": {
+        "type": "text"
+      },
+      "title": {
+        "type": "text"
+      },
+      "version": {
+        "type": "integer"
+      },
+      "mapStateJSON": {
+        "type": "text"
+      },
+      "layerListJSON": {
+        "type": "text"
+      },
+      "uiStateJSON": {
+        "type": "text"
+      },
+      "bounds": {
+        "dynamic": false,
+        "properties": {}
+      }
+    }
+  },
+  "cases-comments": {
+    "dynamic": false,
+    "properties": {
+      "comment": {
+        "type": "text"
+      },
+      "owner": {
+        "type": "keyword"
+      },
+      "type": {
+        "type": "keyword"
+      },
+      "actions": {
+        "properties": {
+          "type": {
+            "type": "keyword"
+          }
+        }
+      },
+      "alertId": {
+        "type": "keyword"
+      },
+      "created_at": {
+        "type": "date"
+      },
+      "created_by": {
+        "properties": {
+          "username": {
+            "type": "keyword"
+          }
+        }
+      },
+      "externalReferenceAttachmentTypeId": {
+        "type": "keyword"
+      },
+      "persistableStateAttachmentTypeId": {
+        "type": "keyword"
+      },
+      "pushed_at": {
+        "type": "date"
+      },
+      "updated_at": {
+        "type": "date"
+      }
+    }
+  },
+  "cases-configure": {
+    "dynamic": false,
+    "properties": {
+      "created_at": {
+        "type": "date"
+      },
+      "closure_type": {
+        "type": "keyword"
+      },
+      "owner": {
+        "type": "keyword"
+      }
+    }
+  },
+  "cases-connector-mappings": {
+    "dynamic": false,
+    "properties": {
+      "owner": {
+        "type": "keyword"
+      }
+    }
+  },
+  "cases": {
+    "dynamic": false,
+    "properties": {
+      "assignees": {
+        "properties": {
+          "uid": {
+            "type": "keyword"
+          }
+        }
+      },
+      "closed_at": {
+        "type": "date"
+      },
+      "closed_by": {
+        "properties": {
+          "username": {
+            "type": "keyword"
+          },
+          "full_name": {
+            "type": "keyword"
+          },
+          "email": {
+            "type": "keyword"
+          },
+          "profile_uid": {
+            "type": "keyword"
+          }
+        }
+      },
+      "created_at": {
+        "type": "date"
+      },
+      "created_by": {
+        "properties": {
+          "username": {
+            "type": "keyword"
+          },
+          "full_name": {
+            "type": "keyword"
+          },
+          "email": {
+            "type": "keyword"
+          },
+          "profile_uid": {
+            "type": "keyword"
+          }
+        }
+      },
+      "duration": {
+        "type": "unsigned_long"
+      },
+      "description": {
+        "type": "text"
+      },
+      "connector": {
+        "properties": {
+          "name": {
+            "type": "text"
+          },
+          "type": {
+            "type": "keyword"
+          },
+          "fields": {
+            "properties": {
+              "key": {
+                "type": "text"
+              },
+              "value": {
+                "type": "text"
+              }
+            }
+          }
+        }
+      },
+      "external_service": {
+        "properties": {
+          "pushed_at": {
+            "type": "date"
+          },
+          "pushed_by": {
+            "properties": {
+              "username": {
+                "type": "keyword"
+              },
+              "full_name": {
+                "type": "keyword"
+              },
+              "email": {
+                "type": "keyword"
+              },
+              "profile_uid": {
+                "type": "keyword"
+              }
+            }
+          },
+          "connector_name": {
+            "type": "keyword"
+          },
+          "external_id": {
+            "type": "keyword"
+          },
+          "external_title": {
+            "type": "text"
+          },
+          "external_url": {
+            "type": "text"
+          }
+        }
+      },
+      "owner": {
+        "type": "keyword"
+      },
+      "title": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "status": {
+        "type": "short"
+      },
+      "tags": {
+        "type": "keyword"
+      },
+      "updated_at": {
+        "type": "date"
+      },
+      "updated_by": {
+        "properties": {
+          "username": {
+            "type": "keyword"
+          },
+          "full_name": {
+            "type": "keyword"
+          },
+          "email": {
+            "type": "keyword"
+          },
+          "profile_uid": {
+            "type": "keyword"
+          }
+        }
+      },
+      "settings": {
+        "properties": {
+          "syncAlerts": {
+            "type": "boolean"
+          }
+        }
+      },
+      "severity": {
+        "type": "short"
+      },
+      "total_alerts": {
+        "type": "integer"
+      },
+      "total_comments": {
+        "type": "integer"
+      }
+    }
+  },
+  "cases-user-actions": {
+    "dynamic": false,
+    "properties": {
+      "action": {
+        "type": "keyword"
+      },
+      "created_at": {
+        "type": "date"
+      },
+      "created_by": {
+        "properties": {
+          "username": {
+            "type": "keyword"
+          }
+        }
+      },
+      "payload": {
+        "dynamic": false,
+        "properties": {
+          "connector": {
+            "properties": {
+              "type": {
+                "type": "keyword"
+              }
+            }
+          },
+          "comment": {
+            "properties": {
+              "type": {
+                "type": "keyword"
+              },
+              "externalReferenceAttachmentTypeId": {
+                "type": "keyword"
+              },
+              "persistableStateAttachmentTypeId": {
+                "type": "keyword"
+              }
+            }
+          },
+          "assignees": {
+            "properties": {
+              "uid": {
+                "type": "keyword"
+              }
+            }
+          }
+        }
+      },
+      "owner": {
+        "type": "keyword"
+      },
+      "type": {
+        "type": "keyword"
+      }
+    }
+  },
+  "cases-telemetry": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "canvas-element": {
+    "dynamic": false,
+    "properties": {
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "help": {
+        "type": "text"
+      },
+      "content": {
+        "type": "text"
+      },
+      "image": {
+        "type": "text"
+      },
+      "@timestamp": {
+        "type": "date"
+      },
+      "@created": {
+        "type": "date"
+      }
+    }
+  },
+  "canvas-workpad": {
+    "dynamic": false,
+    "properties": {
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "@timestamp": {
+        "type": "date"
+      },
+      "@created": {
+        "type": "date"
+      }
+    }
+  },
+  "canvas-workpad-template": {
+    "dynamic": false,
+    "properties": {
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "help": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "tags": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "template_key": {
+        "type": "keyword"
+      }
+    }
+  },
+  "ingest_manager_settings": {
+    "properties": {
+      "fleet_server_hosts": {
+        "type": "keyword"
+      },
+      "has_seen_add_data_notice": {
+        "type": "boolean",
+        "index": false
+      },
+      "prerelease_integrations_enabled": {
+        "type": "boolean"
+      }
+    }
+  },
+  "ingest-agent-policies": {
+    "properties": {
+      "name": {
+        "type": "keyword"
+      },
+      "schema_version": {
+        "type": "version"
+      },
+      "description": {
+        "type": "text"
+      },
+      "namespace": {
+        "type": "keyword"
+      },
+      "is_managed": {
+        "type": "boolean"
+      },
+      "is_default": {
+        "type": "boolean"
+      },
+      "is_default_fleet_server": {
+        "type": "boolean"
+      },
+      "status": {
+        "type": "keyword"
+      },
+      "unenroll_timeout": {
+        "type": "integer"
+      },
+      "inactivity_timeout": {
+        "type": "integer"
+      },
+      "updated_at": {
+        "type": "date"
+      },
+      "updated_by": {
+        "type": "keyword"
+      },
+      "revision": {
+        "type": "integer"
+      },
+      "monitoring_enabled": {
+        "type": "keyword",
+        "index": false
+      },
+      "is_preconfigured": {
+        "type": "keyword"
+      },
+      "data_output_id": {
+        "type": "keyword"
+      },
+      "monitoring_output_id": {
+        "type": "keyword"
+      },
+      "download_source_id": {
+        "type": "keyword"
+      },
+      "fleet_server_host_id": {
+        "type": "keyword"
+      },
+      "agent_features": {
+        "properties": {
+          "name": {
+            "type": "keyword"
+          },
+          "enabled": {
+            "type": "boolean"
+          }
+        }
+      }
+    }
+  },
+  "ingest-outputs": {
+    "properties": {
+      "output_id": {
+        "type": "keyword",
+        "index": false
+      },
+      "name": {
+        "type": "keyword"
+      },
+      "type": {
+        "type": "keyword"
+      },
+      "is_default": {
+        "type": "boolean"
+      },
+      "is_default_monitoring": {
+        "type": "boolean"
+      },
+      "hosts": {
+        "type": "keyword"
+      },
+      "ca_sha256": {
+        "type": "keyword",
+        "index": false
+      },
+      "ca_trusted_fingerprint": {
+        "type": "keyword",
+        "index": false
+      },
+      "config": {
+        "type": "flattened"
+      },
+      "config_yaml": {
+        "type": "text"
+      },
+      "is_preconfigured": {
+        "type": "boolean",
+        "index": false
+      },
+      "ssl": {
+        "type": "binary"
+      },
+      "proxy_id": {
+        "type": "keyword"
+      },
+      "shipper": {
+        "dynamic": false,
+        "properties": {}
+      }
+    }
+  },
+  "ingest-package-policies": {
+    "properties": {
+      "name": {
+        "type": "keyword"
+      },
+      "description": {
+        "type": "text"
+      },
+      "namespace": {
+        "type": "keyword"
+      },
+      "enabled": {
+        "type": "boolean"
+      },
+      "is_managed": {
+        "type": "boolean"
+      },
+      "policy_id": {
+        "type": "keyword"
+      },
+      "package": {
+        "properties": {
+          "name": {
+            "type": "keyword"
+          },
+          "title": {
+            "type": "keyword"
+          },
+          "version": {
+            "type": "keyword"
+          }
+        }
+      },
+      "elasticsearch": {
+        "dynamic": false,
+        "properties": {}
+      },
+      "vars": {
+        "type": "flattened"
+      },
+      "inputs": {
+        "dynamic": false,
+        "properties": {}
+      },
+      "revision": {
+        "type": "integer"
+      },
+      "updated_at": {
+        "type": "date"
+      },
+      "updated_by": {
+        "type": "keyword"
+      },
+      "created_at": {
+        "type": "date"
+      },
+      "created_by": {
+        "type": "keyword"
+      }
+    }
+  },
+  "epm-packages": {
+    "properties": {
+      "name": {
+        "type": "keyword"
+      },
+      "version": {
+        "type": "keyword"
+      },
+      "internal": {
+        "type": "boolean"
+      },
+      "keep_policies_up_to_date": {
+        "type": "boolean",
+        "index": false
+      },
+      "es_index_patterns": {
+        "dynamic": false,
+        "properties": {}
+      },
+      "verification_status": {
+        "type": "keyword"
+      },
+      "verification_key_id": {
+        "type": "keyword"
+      },
+      "installed_es": {
+        "type": "nested",
+        "properties": {
+          "id": {
+            "type": "keyword"
+          },
+          "type": {
+            "type": "keyword"
+          },
+          "version": {
+            "type": "keyword"
+          },
+          "deferred": {
+            "type": "boolean"
+          }
+        }
+      },
+      "installed_kibana": {
+        "dynamic": false,
+        "properties": {}
+      },
+      "installed_kibana_space_id": {
+        "type": "keyword"
+      },
+      "package_assets": {
+        "dynamic": false,
+        "properties": {}
+      },
+      "install_started_at": {
+        "type": "date"
+      },
+      "install_version": {
+        "type": "keyword"
+      },
+      "install_status": {
+        "type": "keyword"
+      },
+      "install_source": {
+        "type": "keyword"
+      },
+      "install_format_schema_version": {
+        "type": "version"
+      },
+      "experimental_data_stream_features": {
+        "type": "nested",
+        "properties": {
+          "data_stream": {
+            "type": "keyword"
+          },
+          "features": {
+            "type": "nested",
+            "dynamic": false,
+            "properties": {
+              "synthetic_source": {
+                "type": "boolean"
+              },
+              "tsdb": {
+                "type": "boolean"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "epm-packages-assets": {
+    "properties": {
+      "package_name": {
+        "type": "keyword"
+      },
+      "package_version": {
+        "type": "keyword"
+      },
+      "install_source": {
+        "type": "keyword"
+      },
+      "asset_path": {
+        "type": "keyword"
+      },
+      "media_type": {
+        "type": "keyword"
+      },
+      "data_utf8": {
+        "type": "text",
+        "index": false
+      },
+      "data_base64": {
+        "type": "binary"
+      }
+    }
+  },
+  "fleet-preconfiguration-deletion-record": {
+    "properties": {
+      "id": {
+        "type": "keyword"
+      }
+    }
+  },
+  "ingest-download-sources": {
+    "properties": {
+      "source_id": {
+        "type": "keyword",
+        "index": false
+      },
+      "name": {
+        "type": "keyword"
+      },
+      "is_default": {
+        "type": "boolean"
+      },
+      "host": {
+        "type": "keyword"
+      }
+    }
+  },
+  "fleet-fleet-server-host": {
+    "properties": {
+      "name": {
+        "type": "keyword"
+      },
+      "is_default": {
+        "type": "boolean"
+      },
+      "host_urls": {
+        "type": "keyword",
+        "index": false
+      },
+      "is_preconfigured": {
+        "type": "boolean"
+      },
+      "proxy_id": {
+        "type": "keyword"
+      }
+    }
+  },
+  "fleet-proxy": {
+    "properties": {
+      "name": {
+        "type": "keyword"
+      },
+      "url": {
+        "type": "keyword",
+        "index": false
+      },
+      "proxy_headers": {
+        "type": "text",
+        "index": false
+      },
+      "certificate_authorities": {
+        "type": "keyword",
+        "index": false
+      },
+      "certificate": {
+        "type": "keyword",
+        "index": false
+      },
+      "certificate_key": {
+        "type": "keyword",
+        "index": false
+      },
+      "is_preconfigured": {
+        "type": "boolean"
+      }
+    }
+  },
+  "fleet-message-signing-keys": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "osquery-manager-usage-metric": {
+    "properties": {
+      "count": {
+        "type": "long"
+      },
+      "errors": {
+        "type": "long"
+      }
+    }
+  },
+  "osquery-saved-query": {
+    "dynamic": false,
+    "properties": {
+      "description": {
+        "type": "text"
+      },
+      "id": {
+        "type": "keyword"
+      },
+      "query": {
+        "type": "text"
+      },
+      "created_at": {
+        "type": "date"
+      },
+      "created_by": {
+        "type": "text"
+      },
+      "platform": {
+        "type": "keyword"
+      },
+      "version": {
+        "type": "keyword"
+      },
+      "updated_at": {
+        "type": "date"
+      },
+      "updated_by": {
+        "type": "text"
+      },
+      "interval": {
+        "type": "keyword"
+      },
+      "ecs_mapping": {
+        "dynamic": false,
+        "properties": {}
+      }
+    }
+  },
+  "osquery-pack": {
+    "properties": {
+      "description": {
+        "type": "text"
+      },
+      "name": {
+        "type": "text"
+      },
+      "created_at": {
+        "type": "date"
+      },
+      "created_by": {
+        "type": "keyword"
+      },
+      "updated_at": {
+        "type": "date"
+      },
+      "updated_by": {
+        "type": "keyword"
+      },
+      "enabled": {
+        "type": "boolean"
+      },
+      "shards": {
+        "dynamic": false,
+        "properties": {}
+      },
+      "version": {
+        "type": "long"
+      },
+      "queries": {
+        "dynamic": false,
+        "properties": {
+          "id": {
+            "type": "keyword"
+          },
+          "query": {
+            "type": "text"
+          },
+          "interval": {
+            "type": "text"
+          },
+          "platform": {
+            "type": "keyword"
+          },
+          "version": {
+            "type": "keyword"
+          },
+          "ecs_mapping": {
+            "dynamic": false,
+            "properties": {}
+          }
+        }
+      }
+    }
+  },
+  "osquery-pack-asset": {
+    "dynamic": false,
+    "properties": {
+      "description": {
+        "type": "text"
+      },
+      "name": {
+        "type": "text"
+      },
+      "version": {
+        "type": "long"
+      },
+      "shards": {
+        "dynamic": false,
+        "properties": {}
+      },
+      "queries": {
+        "dynamic": false,
+        "properties": {
+          "id": {
+            "type": "keyword"
+          },
+          "query": {
+            "type": "text"
+          },
+          "interval": {
+            "type": "text"
+          },
+          "platform": {
+            "type": "keyword"
+          },
+          "version": {
+            "type": "keyword"
+          },
+          "ecs_mapping": {
+            "dynamic": false,
+            "properties": {}
+          }
+        }
+      }
+    }
+  },
+  "csp-rule-template": {
+    "dynamic": false,
+    "properties": {
+      "metadata": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "keyword",
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
+          },
+          "benchmark": {
+            "type": "object",
+            "properties": {
+              "id": {
+                "type": "keyword"
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "slo": {
+    "dynamic": false,
+    "properties": {
+      "id": {
+        "type": "keyword"
+      },
+      "name": {
+        "type": "text"
+      },
+      "description": {
+        "type": "text"
+      },
+      "indicator": {
+        "properties": {
+          "type": {
+            "type": "keyword"
+          },
+          "params": {
+            "type": "flattened"
+          }
+        }
+      },
+      "budgetingMethod": {
+        "type": "keyword"
+      },
+      "enabled": {
+        "type": "boolean"
+      },
+      "tags": {
+        "type": "keyword"
+      }
+    }
+  },
+  "ml-job": {
+    "properties": {
+      "job_id": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "datafeed_id": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "type": {
+        "type": "keyword"
+      }
+    }
+  },
+  "ml-trained-model": {
+    "properties": {
+      "model_id": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "job": {
+        "properties": {
+          "job_id": {
+            "type": "text",
+            "fields": {
+              "keyword": {
+                "type": "keyword"
+              }
+            }
+          },
+          "create_time": {
+            "type": "date"
+          }
+        }
+      }
+    }
+  },
+  "ml-module": {
+    "dynamic": false,
+    "properties": {
+      "id": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "title": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "description": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "type": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "logo": {
+        "type": "object"
+      },
+      "defaultIndexPattern": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword"
+          }
+        }
+      },
+      "query": {
+        "type": "object"
+      },
+      "jobs": {
+        "type": "object"
+      },
+      "datafeeds": {
+        "type": "object"
+      }
+    }
+  },
+  "uptime-dynamic-settings": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "synthetics-privates-locations": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "synthetics-monitor": {
+    "dynamic": false,
+    "properties": {
+      "name": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256,
+            "normalizer": "lowercase"
+          }
+        }
+      },
+      "type": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "urls": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "hosts": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      },
+      "journey_id": {
+        "type": "keyword"
+      },
+      "project_id": {
+        "type": "keyword",
+        "fields": {
+          "text": {
+            "type": "text"
+          }
+        }
+      },
+      "origin": {
+        "type": "keyword"
+      },
+      "hash": {
+        "type": "keyword"
+      },
+      "locations": {
+        "properties": {
+          "id": {
+            "type": "keyword",
+            "ignore_above": 256,
+            "fields": {
+              "text": {
+                "type": "text"
+              }
+            }
+          },
+          "label": {
+            "type": "text"
+          }
+        }
+      },
+      "custom_heartbeat_id": {
+        "type": "keyword"
+      },
+      "id": {
+        "type": "keyword"
+      },
+      "tags": {
+        "type": "keyword",
+        "fields": {
+          "text": {
+            "type": "text"
+          }
+        }
+      },
+      "schedule": {
+        "properties": {
+          "number": {
+            "type": "integer"
+          }
+        }
+      },
+      "enabled": {
+        "type": "boolean"
+      },
+      "alert": {
+        "properties": {
+          "status": {
+            "properties": {
+              "enabled": {
+                "type": "boolean"
+              }
+            }
+          }
+        }
+      },
+      "throttling": {
+        "properties": {
+          "label": {
+            "type": "keyword"
+          }
+        }
+      }
+    }
+  },
+  "uptime-synthetics-api-key": {
+    "dynamic": false,
+    "properties": {
+      "apiKey": {
+        "type": "binary"
+      }
+    }
+  },
+  "synthetics-param": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "siem-ui-timeline-note": {
+    "properties": {
+      "eventId": {
+        "type": "keyword"
+      },
+      "note": {
+        "type": "text"
+      },
+      "created": {
+        "type": "date"
+      },
+      "createdBy": {
+        "type": "text"
+      },
+      "updated": {
+        "type": "date"
+      },
+      "updatedBy": {
+        "type": "text"
+      }
+    }
+  },
+  "siem-ui-timeline-pinned-event": {
+    "properties": {
+      "eventId": {
+        "type": "keyword"
+      },
+      "created": {
+        "type": "date"
+      },
+      "createdBy": {
+        "type": "text"
+      },
+      "updated": {
+        "type": "date"
+      },
+      "updatedBy": {
+        "type": "text"
+      }
+    }
+  },
+  "siem-detection-engine-rule-actions": {
+    "properties": {
+      "alertThrottle": {
+        "type": "keyword"
+      },
+      "ruleAlertId": {
+        "type": "keyword"
+      },
+      "ruleThrottle": {
+        "type": "keyword"
+      },
+      "actions": {
+        "properties": {
+          "actionRef": {
+            "type": "keyword"
+          },
+          "group": {
+            "type": "keyword"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "action_type_id": {
+            "type": "keyword"
+          },
+          "params": {
+            "dynamic": false,
+            "properties": {}
+          }
+        }
+      }
+    }
+  },
+  "security-rule": {
+    "dynamic": false,
+    "properties": {
+      "rule_id": {
+        "type": "keyword"
+      },
+      "version": {
+        "type": "long"
+      }
+    }
+  },
+  "siem-ui-timeline": {
+    "properties": {
+      "columns": {
+        "properties": {
+          "aggregatable": {
+            "type": "boolean"
+          },
+          "category": {
+            "type": "keyword"
+          },
+          "columnHeaderType": {
+            "type": "keyword"
+          },
+          "description": {
+            "type": "text"
+          },
+          "example": {
+            "type": "text"
+          },
+          "indexes": {
+            "type": "keyword"
+          },
+          "id": {
+            "type": "keyword"
+          },
+          "name": {
+            "type": "text"
+          },
+          "placeholder": {
+            "type": "text"
+          },
+          "searchable": {
+            "type": "boolean"
+          },
+          "type": {
+            "type": "keyword"
+          }
+        }
+      },
+      "dataProviders": {
+        "properties": {
+          "id": {
+            "type": "keyword"
+          },
+          "name": {
+            "type": "text"
+          },
+          "enabled": {
+            "type": "boolean"
+          },
+          "excluded": {
+            "type": "boolean"
+          },
+          "kqlQuery": {
+            "type": "text"
+          },
+          "type": {
+            "type": "text"
+          },
+          "queryMatch": {
+            "properties": {
+              "field": {
+                "type": "text"
+              },
+              "displayField": {
+                "type": "text"
+              },
+              "value": {
+                "type": "text"
+              },
+              "displayValue": {
+                "type": "text"
+              },
+              "operator": {
+                "type": "text"
+              }
+            }
+          },
+          "and": {
+            "properties": {
+              "id": {
+                "type": "keyword"
+              },
+              "name": {
+                "type": "text"
+              },
+              "enabled": {
+                "type": "boolean"
+              },
+              "excluded": {
+                "type": "boolean"
+              },
+              "kqlQuery": {
+                "type": "text"
+              },
+              "type": {
+                "type": "text"
+              },
+              "queryMatch": {
+                "properties": {
+                  "field": {
+                    "type": "text"
+                  },
+                  "displayField": {
+                    "type": "text"
+                  },
+                  "value": {
+                    "type": "text"
+                  },
+                  "displayValue": {
+                    "type": "text"
+                  },
+                  "operator": {
+                    "type": "text"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "description": {
+        "type": "text"
+      },
+      "eqlOptions": {
+        "properties": {
+          "eventCategoryField": {
+            "type": "text"
+          },
+          "tiebreakerField": {
+            "type": "text"
+          },
+          "timestampField": {
+            "type": "text"
+          },
+          "query": {
+            "type": "text"
+          },
+          "size": {
+            "type": "text"
+          }
+        }
+      },
+      "eventType": {
+        "type": "keyword"
+      },
+      "excludedRowRendererIds": {
+        "type": "text"
+      },
+      "favorite": {
+        "properties": {
+          "keySearch": {
+            "type": "text"
+          },
+          "fullName": {
+            "type": "text"
+          },
+          "userName": {
+            "type": "text"
+          },
+          "favoriteDate": {
+            "type": "date"
+          }
+        }
+      },
+      "filters": {
+        "properties": {
+          "meta": {
+            "properties": {
+              "alias": {
+                "type": "text"
+              },
+              "controlledBy": {
+                "type": "text"
+              },
+              "disabled": {
+                "type": "boolean"
+              },
+              "field": {
+                "type": "text"
+              },
+              "formattedValue": {
+                "type": "text"
+              },
+              "index": {
+                "type": "keyword"
+              },
+              "key": {
+                "type": "keyword"
+              },
+              "negate": {
+                "type": "boolean"
+              },
+              "params": {
+                "type": "text"
+              },
+              "type": {
+                "type": "keyword"
+              },
+              "value": {
+                "type": "text"
+              }
+            }
+          },
+          "exists": {
+            "type": "text"
+          },
+          "match_all": {
+            "type": "text"
+          },
+          "missing": {
+            "type": "text"
+          },
+          "query": {
+            "type": "text"
+          },
+          "range": {
+            "type": "text"
+          },
+          "script": {
+            "type": "text"
+          }
+        }
+      },
+      "indexNames": {
+        "type": "text"
+      },
+      "kqlMode": {
+        "type": "keyword"
+      },
+      "kqlQuery": {
+        "properties": {
+          "filterQuery": {
+            "properties": {
+              "kuery": {
+                "properties": {
+                  "kind": {
+                    "type": "keyword"
+                  },
+                  "expression": {
+                    "type": "text"
+                  }
+                }
+              },
+              "serializedQuery": {
+                "type": "text"
+              }
+            }
+          }
+        }
+      },
+      "title": {
+        "type": "text"
+      },
+      "templateTimelineId": {
+        "type": "text"
+      },
+      "templateTimelineVersion": {
+        "type": "integer"
+      },
+      "timelineType": {
+        "type": "keyword"
+      },
+      "dateRange": {
+        "properties": {
+          "start": {
+            "type": "date"
+          },
+          "end": {
+            "type": "date"
+          }
+        }
+      },
+      "sort": {
+        "dynamic": false,
+        "properties": {
+          "columnId": {
+            "type": "keyword"
+          },
+          "columnType": {
+            "type": "keyword"
+          },
+          "sortDirection": {
+            "type": "keyword"
+          }
+        }
+      },
+      "status": {
+        "type": "keyword"
+      },
+      "created": {
+        "type": "date"
+      },
+      "createdBy": {
+        "type": "text"
+      },
+      "updated": {
+        "type": "date"
+      },
+      "updatedBy": {
+        "type": "text"
+      }
+    }
+  },
+  "endpoint:user-artifact-manifest": {
+    "dynamic": false,
+    "properties": {
+      "schemaVersion": {
+        "type": "keyword"
+      },
+      "artifacts": {
+        "type": "nested"
+      }
+    }
+  },
+  "security-solution-signals-migration": {
+    "dynamic": false,
+    "properties": {
+      "sourceIndex": {
+        "type": "keyword"
+      },
+      "updated": {
+        "type": "date"
+      },
+      "version": {
+        "type": "long"
+      }
+    }
+  },
+  "infrastructure-ui-source": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "inventory-view": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "infrastructure-monitoring-log-view": {
+    "dynamic": false,
+    "properties": {
+      "name": {
+        "type": "text"
+      }
+    }
+  },
+  "metrics-explorer-view": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "upgrade-assistant-reindex-operation": {
+    "dynamic": false,
+    "properties": {
+      "indexName": {
+        "type": "keyword"
+      },
+      "status": {
+        "type": "integer"
+      }
+    }
+  },
+  "upgrade-assistant-ml-upgrade-operation": {
+    "dynamic": false,
+    "properties": {
+      "snapshotId": {
+        "type": "text",
+        "fields": {
+          "keyword": {
+            "type": "keyword",
+            "ignore_above": 256
+          }
+        }
+      }
+    }
+  },
+  "monitoring-telemetry": {
+    "properties": {
+      "reportedClusterUuids": {
+        "type": "keyword"
+      }
+    }
+  },
+  "enterprise_search_telemetry": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "app_search_telemetry": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "workplace_search_telemetry": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "apm-indices": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "apm-telemetry": {
+    "dynamic": false,
+    "properties": {}
+  },
+  "apm-server-schema": {
+    "properties": {
+      "schemaJson": {
+        "type": "text",
+        "index": false
+      }
+    }
+  },
+  "apm-service-group": {
+    "properties": {
+      "groupName": {
+        "type": "keyword"
+      },
+      "kuery": {
+        "type": "text"
+      },
+      "description": {
+        "type": "text"
+      },
+      "color": {
+        "type": "text"
+      }
+    }
+  }
+}
diff --git a/packages/kbn-check-mappings-update-cli/jest.config.js b/packages/kbn-check-mappings-update-cli/jest.config.js
new file mode 100644
index 00000000000000..0dd3ec8937db90
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/jest.config.js
@@ -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 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.
+ */
+
+module.exports = {
+  preset: '@kbn/test/jest_node',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-check-mappings-update-cli'],
+};
diff --git a/packages/kbn-check-mappings-update-cli/kibana.jsonc b/packages/kbn-check-mappings-update-cli/kibana.jsonc
new file mode 100644
index 00000000000000..34a77c75c21f10
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/kibana.jsonc
@@ -0,0 +1,6 @@
+{
+  "type": "shared-common",
+  "id": "@kbn/check-mappings-update-cli",
+  "owner": "@elastic/kibana-core",
+  "devOnly": true
+}
diff --git a/packages/kbn-check-mappings-update-cli/package.json b/packages/kbn-check-mappings-update-cli/package.json
new file mode 100644
index 00000000000000..3325f323f01885
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "@kbn/check-mappings-update-cli",
+  "private": true,
+  "version": "1.0.0",
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "main": "./src/run_check_mappings_update_cli"
+}
\ No newline at end of file
diff --git a/packages/kbn-check-mappings-update-cli/src/check_additive_only_change.ts b/packages/kbn-check-mappings-update-cli/src/check_additive_only_change.ts
new file mode 100644
index 00000000000000..7fb42f71152331
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/src/check_additive_only_change.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { get } from 'lodash';
+import { SomeDevLog } from '@kbn/some-dev-log';
+import { createFailError } from '@kbn/dev-cli-errors';
+import type { SavedObjectsTypeMappingDefinitions } from '@kbn/core-saved-objects-base-server-internal';
+
+function isObject(v: unknown): v is object {
+  return Object.prototype.toString.call(v) === '[object Object]';
+}
+
+/**
+ * 1. Walk the current mappings
+ * 2. For each mapped field (i.e., for each field under a "properties" object)
+ *    in current, check that the same field exists in next
+ * 3. If we see any missing fields in next, throw an appropriate error
+ */
+export function checkAdditiveOnlyChange(
+  log: SomeDevLog,
+  current: SavedObjectsTypeMappingDefinitions,
+  next: SavedObjectsTypeMappingDefinitions
+) {
+  let checkedCount = 0;
+  const Os: Array<[path: string[], value: unknown]> = [[[], current]];
+  const missingProps: string[] = [];
+
+  while (Os.length) {
+    const [path, value] = Os.shift()!;
+    // "Recurse" into the value if it's an object
+    if (isObject(value)) {
+      Object.entries(value).forEach(([k, v]) => Os.push([[...path, k], v]));
+    }
+    // If we're at a "properties" object, check that the next mappings have the same field
+    if (path.length > 1 && path[path.length - 2] === 'properties') {
+      const prop = path.join('.');
+      if (!get(next, prop)) missingProps.push(prop);
+      checkedCount++;
+    }
+  }
+
+  if (missingProps.length > 0) {
+    const props = JSON.stringify(missingProps, null, 2);
+    throw createFailError(
+      `Removing mapped properties is disallowed. Properties found in current mappings but not in next mappings:\n${props}`
+    );
+  }
+
+  log.success(`Checked ${checkedCount} existing properties. All present in extracted mappings.`);
+}
diff --git a/packages/kbn-check-mappings-update-cli/src/check_additve_only_change.test.ts b/packages/kbn-check-mappings-update-cli/src/check_additve_only_change.test.ts
new file mode 100644
index 00000000000000..11f9394b9dd5e4
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/src/check_additve_only_change.test.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { cloneDeep } from 'lodash';
+import type { SomeDevLog } from '@kbn/some-dev-log';
+import type { SavedObjectsTypeMappingDefinitions } from '@kbn/core-saved-objects-base-server-internal';
+import { checkAdditiveOnlyChange } from './check_additive_only_change';
+import { createSomeDevLogMock } from './mocks';
+
+describe('#checkAdditiveOnlyChange', () => {
+  let log: SomeDevLog;
+  beforeEach(() => {
+    log = createSomeDevLogMock();
+  });
+  test('detect removed mapping', () => {
+    const current: SavedObjectsTypeMappingDefinitions = {
+      foo: {
+        properties: {
+          text: { type: 'text' },
+          number: { type: 'long' },
+          object: { type: 'object', properties: { nestedText: { type: 'text' } } },
+        },
+      },
+      bar: {
+        properties: {
+          text: { type: 'text' },
+          number: { type: 'long' },
+        },
+      },
+    };
+
+    const next = cloneDeep(current);
+    delete next.foo.properties.text;
+    delete next.foo.properties.object.properties!.nestedText;
+    delete next.bar.properties.number;
+
+    expect(() => checkAdditiveOnlyChange(log, current, next)).toThrowErrorMatchingInlineSnapshot(`
+      "Removing mapped properties is disallowed. Properties found in current mappings but not in next mappings:
+      [
+        \\"foo.properties.text\\",
+        \\"bar.properties.number\\",
+        \\"foo.properties.object.properties.nestedText\\"
+      ]"
+    `);
+  });
+
+  test('detects when no mappings are removed', () => {
+    const current: SavedObjectsTypeMappingDefinitions = {
+      foo: {
+        properties: {
+          text: { type: 'text' },
+          number: { type: 'long' },
+          object: { type: 'object', properties: { nestedText: { type: 'text' } } },
+        },
+      },
+      bar: {
+        properties: {
+          text: { type: 'text' },
+          number: { type: 'long' },
+        },
+      },
+    };
+
+    expect(() => checkAdditiveOnlyChange(log, current, cloneDeep(current))).not.toThrow();
+    expect(log.success).toHaveBeenCalledTimes(1);
+    expect(log.success).toHaveBeenCalledWith(
+      'Checked 6 existing properties. All present in extracted mappings.'
+    );
+  });
+
+  test('ignores new field', () => {
+    const current: SavedObjectsTypeMappingDefinitions = {
+      foo: {
+        properties: {
+          text: { type: 'text' },
+          number: { type: 'long' },
+          object: { type: 'object', properties: { nestedText: { type: 'text' } } },
+        },
+      },
+      bar: {
+        properties: {
+          text: { type: 'text' },
+          number: { type: 'long' },
+        },
+      },
+    };
+
+    const next = cloneDeep(current);
+    next.foo.properties.newField = { type: 'text' };
+
+    expect(() => checkAdditiveOnlyChange(log, current, next)).not.toThrow();
+    expect(log.success).toHaveBeenCalledTimes(1);
+    expect(log.success).toHaveBeenCalledWith(
+      'Checked 6 existing properties. All present in extracted mappings.'
+    );
+  });
+
+  test('handles empty current', () => {
+    const current: SavedObjectsTypeMappingDefinitions = {};
+    const next: SavedObjectsTypeMappingDefinitions = {
+      foo: { properties: { text: { type: 'text' } } },
+    };
+
+    expect(() => checkAdditiveOnlyChange(log, current, next)).not.toThrow();
+    expect(log.success).toHaveBeenCalledTimes(1);
+    expect(log.success).toHaveBeenCalledWith(
+      'Checked 0 existing properties. All present in extracted mappings.'
+    );
+  });
+});
diff --git a/packages/kbn-check-mappings-update-cli/src/check_incompatible_mappings.test.ts b/packages/kbn-check-mappings-update-cli/src/check_incompatible_mappings.test.ts
new file mode 100644
index 00000000000000..adba4672b0fd2e
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/src/check_incompatible_mappings.test.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { Client } from '@elastic/elasticsearch';
+import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
+import type { SomeDevLog } from '@kbn/some-dev-log';
+import { checkIncompatibleMappings } from './check_incompatible_mappings';
+import { createSomeDevLogMock } from './mocks';
+
+describe('#checkIncompatibleMappings', () => {
+  let log: SomeDevLog;
+  let esClient: Client;
+  beforeEach(() => {
+    log = createSomeDevLogMock();
+    esClient = elasticsearchClientMock.createClusterClient().asInternalUser as unknown as Client;
+  });
+
+  test('calls ES with the expected inputs', async () => {
+    await checkIncompatibleMappings({ log, esClient, currentMappings: {}, nextMappings: {} });
+    expect(esClient.indices.create).toHaveBeenCalledTimes(1);
+    expect(esClient.indices.create).toHaveBeenCalledWith({
+      index: '.kibana_mappings_check',
+      mappings: {
+        dynamic: false,
+        properties: {},
+      },
+      settings: {
+        mapping: {
+          total_fields: {
+            limit: 1500,
+          },
+        },
+      },
+    });
+    expect(esClient.indices.putMapping).toHaveBeenCalledTimes(1);
+    expect(esClient.indices.putMapping).toHaveBeenCalledWith({
+      index: '.kibana_mappings_check',
+      properties: {},
+    });
+  });
+
+  test('throws expected error when cannot put mappings', async () => {
+    (esClient.indices.putMapping as jest.Mock).mockRejectedValueOnce(new Error('foo'));
+    expect(() =>
+      checkIncompatibleMappings({ log, esClient, currentMappings: {}, nextMappings: {} })
+    ).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"Only mappings changes that are compatible with current mappings are allowed. Consider reaching out to the Kibana core team if you are stuck."`
+    );
+  });
+});
diff --git a/packages/kbn-check-mappings-update-cli/src/check_incompatible_mappings.ts b/packages/kbn-check-mappings-update-cli/src/check_incompatible_mappings.ts
new file mode 100644
index 00000000000000..5387e5276a4745
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/src/check_incompatible_mappings.ts
@@ -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 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 { SomeDevLog } from '@kbn/some-dev-log';
+import { Client } from '@elastic/elasticsearch';
+import { createFailError } from '@kbn/dev-cli-errors';
+import type { SavedObjectsTypeMappingDefinitions } from '@kbn/core-saved-objects-base-server-internal';
+
+const TEST_INDEX_NAME = '.kibana_mappings_check';
+
+export async function checkIncompatibleMappings({
+  log,
+  esClient,
+  currentMappings,
+  nextMappings,
+}: {
+  log: SomeDevLog;
+  esClient: Client;
+  currentMappings: SavedObjectsTypeMappingDefinitions;
+  nextMappings: SavedObjectsTypeMappingDefinitions;
+}) {
+  try {
+    log.debug('creating index using current mappings...');
+    await esClient.indices.create({
+      index: TEST_INDEX_NAME,
+      mappings: {
+        dynamic: false,
+        properties: currentMappings,
+      },
+      settings: {
+        mapping: {
+          total_fields: { limit: 1500 },
+        },
+      },
+    });
+
+    log.debug('attempting to update to new mappings...');
+    const resp = await esClient.indices.putMapping({
+      index: TEST_INDEX_NAME,
+      properties: nextMappings,
+    });
+
+    log.success('Extracted mappings are compatible with existing mappings.');
+    log.debug(`Got response:`, resp);
+  } catch (error) {
+    log.error('There was an issue trying to apply the extracted mappings to the existing index.');
+    log.error(error);
+    throw createFailError(
+      `Only mappings changes that are compatible with current mappings are allowed. Consider reaching out to the Kibana core team if you are stuck.`
+    );
+  }
+}
diff --git a/packages/kbn-check-mappings-update-cli/src/current_mappings.ts b/packages/kbn-check-mappings-update-cli/src/current_mappings.ts
new file mode 100644
index 00000000000000..c7e7dac4763a6d
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/src/current_mappings.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 Fsp from 'fs/promises';
+import Path from 'path';
+
+import type { SavedObjectsTypeMappingDefinitions } from '@kbn/core-saved-objects-base-server-internal';
+
+export const CURRENT_MAPPINGS_FILE = Path.resolve(__dirname, '../current_mappings.json');
+
+export async function readCurrentMappings(): Promise<SavedObjectsTypeMappingDefinitions> {
+  let currentMappingsJson;
+  try {
+    currentMappingsJson = await Fsp.readFile(CURRENT_MAPPINGS_FILE, 'utf8');
+  } catch (error) {
+    if (error.code === 'ENOENT') {
+      return {};
+    }
+
+    throw error;
+  }
+
+  return JSON.parse(currentMappingsJson);
+}
+
+export async function updateCurrentMappings(newMappings: SavedObjectsTypeMappingDefinitions) {
+  await Fsp.writeFile(CURRENT_MAPPINGS_FILE, JSON.stringify(newMappings, null, 2) + '\n', 'utf8');
+}
diff --git a/packages/kbn-check-mappings-update-cli/src/extract_mappings_from_plugins.ts b/packages/kbn-check-mappings-update-cli/src/extract_mappings_from_plugins.ts
new file mode 100644
index 00000000000000..2c2884b4463383
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/src/extract_mappings_from_plugins.ts
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 ChildProcess from 'child_process';
+import { Readable } from 'stream';
+
+import * as Rx from 'rxjs';
+
+import { REPO_ROOT } from '@kbn/repo-info';
+import { SomeDevLog } from '@kbn/some-dev-log';
+import { observeLines } from '@kbn/stdio-dev-helpers';
+import type { SavedObjectsTypeMappingDefinitions } from '@kbn/core-saved-objects-base-server-internal';
+
+import type { Result } from './extract_mappings_from_plugins_worker';
+
+function routeToLog(readable: Readable, log: SomeDevLog, level: 'debug' | 'error') {
+  return observeLines(readable).pipe(
+    Rx.tap((line) => {
+      log[level](line);
+    }),
+    Rx.ignoreElements()
+  );
+}
+
+/**
+ * Run a worker process that starts the core with all plugins enabled and sends back the
+ * saved object mappings for all plugins. We run this in a child process so that we can
+ * harvest logs and feed them into the logger when debugging.
+ */
+export async function extractMappingsFromPlugins(
+  log: SomeDevLog
+): Promise<SavedObjectsTypeMappingDefinitions> {
+  log.info('Loading core with all plugins enabled so that we can get all savedObject mappings...');
+
+  const fork = ChildProcess.fork(require.resolve('./extract_mappings_from_plugins_worker.ts'), {
+    execArgv: ['--require=@kbn/babel-register/install'],
+    cwd: REPO_ROOT,
+    stdio: ['ignore', 'pipe', 'pipe', 'ipc'],
+  });
+
+  const mappings = await Rx.firstValueFrom(
+    Rx.merge(
+      // the actual value we are interested in
+      Rx.fromEvent(fork, 'message'),
+
+      // worker logs are written to the logger, but dropped from the stream
+      routeToLog(fork.stdout!, log, 'debug'),
+      routeToLog(fork.stderr!, log, 'error'),
+
+      // if an error occurs running the worker throw it into the stream
+      Rx.fromEvent(fork, 'error').pipe(
+        Rx.map((err) => {
+          throw err;
+        })
+      )
+    ).pipe(
+      Rx.takeUntil(Rx.fromEvent(fork, 'exit')),
+      Rx.map((results) => {
+        const [result] = results as [Result];
+        log.debug('message received from worker', result);
+        fork.kill('SIGILL');
+        return result.mappings;
+      }),
+      Rx.defaultIfEmpty(undefined)
+    )
+  );
+
+  if (!mappings) {
+    throw new Error('worker exitted without sending mappings');
+  }
+
+  log.info(`Got mappings for ${Object.keys(mappings).length} types from plugins.`);
+
+  return mappings;
+}
diff --git a/packages/kbn-check-mappings-update-cli/src/extract_mappings_from_plugins_worker.ts b/packages/kbn-check-mappings-update-cli/src/extract_mappings_from_plugins_worker.ts
new file mode 100644
index 00000000000000..684370e782b02e
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/src/extract_mappings_from_plugins_worker.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 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 { createRootWithCorePlugins } from '@kbn/core-test-helpers-kbn-server';
+import { set } from '@kbn/safer-lodash-set';
+import { buildTypesMappings } from '@kbn/core-saved-objects-migration-server-internal';
+import type { SavedObjectsTypeMappingDefinitions } from '@kbn/core-saved-objects-base-server-internal';
+import { PLUGIN_SYSTEM_ENABLE_ALL_PLUGINS_CONFIG_PATH } from '@kbn/core-plugins-server-internal/src/constants';
+
+export interface Result {
+  mappings: SavedObjectsTypeMappingDefinitions;
+}
+
+(async () => {
+  if (!process.send) {
+    throw new Error('worker must be run in a node.js fork');
+  }
+
+  const settings = {
+    logging: {
+      loggers: [{ name: 'root', level: 'info', appenders: ['console'] }],
+    },
+  };
+
+  set(settings, PLUGIN_SYSTEM_ENABLE_ALL_PLUGINS_CONFIG_PATH, true);
+
+  const root = createRootWithCorePlugins(settings, {
+    basePath: false,
+    cache: false,
+    dev: true,
+    disableOptimizer: true,
+    silent: false,
+    dist: false,
+    oss: false,
+    runExamples: false,
+    watch: false,
+  });
+
+  await root.preboot();
+  const { savedObjects } = await root.setup();
+  const result: Result = {
+    mappings: buildTypesMappings(savedObjects.getTypeRegistry().getAllTypes()),
+  };
+  process.send(result);
+})().catch((error) => {
+  process.stderr.write(`UNHANDLED ERROR: ${error.stack}`);
+  process.exit(1);
+});
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/types.ts b/packages/kbn-check-mappings-update-cli/src/mocks.ts
similarity index 51%
rename from src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/types.ts
rename to packages/kbn-check-mappings-update-cli/src/mocks.ts
index ba308d8e14bf02..7a0e0264fc773c 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/types.ts
+++ b/packages/kbn-check-mappings-update-cli/src/mocks.ts
@@ -6,22 +6,15 @@
  * Side Public License, v 1.
  */
 
-export interface ValidFieldDetails {
-  exists: number;
-  total: number;
-  missing: number;
-  buckets: Bucket[];
-}
-
-export interface ErrorFieldDetails {
-  error: string;
-}
-
-export type FieldDetails = ValidFieldDetails | ErrorFieldDetails;
+import { SomeDevLog } from '@kbn/some-dev-log';
 
-export interface Bucket {
-  display: string;
-  value: string;
-  percent: number;
-  count: number;
+export function createSomeDevLogMock(): SomeDevLog {
+  return {
+    debug: jest.fn(),
+    error: jest.fn(),
+    info: jest.fn(),
+    success: jest.fn(),
+    verbose: jest.fn(),
+    warning: jest.fn(),
+  };
 }
diff --git a/packages/kbn-check-mappings-update-cli/src/run_check_mappings_update_cli.ts b/packages/kbn-check-mappings-update-cli/src/run_check_mappings_update_cli.ts
new file mode 100644
index 00000000000000..b1674211d61fb9
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/src/run_check_mappings_update_cli.ts
@@ -0,0 +1,101 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 deepEqual from 'fast-deep-equal';
+import { run } from '@kbn/dev-cli-runner';
+import { createTestEsCluster } from '@kbn/test';
+
+import { extractMappingsFromPlugins } from './extract_mappings_from_plugins';
+
+import { checkAdditiveOnlyChange } from './check_additive_only_change';
+import { checkIncompatibleMappings } from './check_incompatible_mappings';
+import { readCurrentMappings, updateCurrentMappings } from './current_mappings';
+
+run(
+  async ({ log, flagsReader, addCleanupTask }) => {
+    const fix = flagsReader.boolean('fix');
+    const verify = flagsReader.boolean('verify');
+
+    /**
+     * Algorithm for checking compatible mappings. Should work in CI or local
+     * dev environment.
+     * 1. Extract mappings from code as JSON object
+     * 2. Check if extracted mappings is different from current_mappings.json, current_mappings.json stores
+     *    the mappings from upstream and is commited to each branch
+     * 3. Start a fresh ES node
+     * 4. Upload current_mappings.json to ES node
+     * 5. Upload extracted mappings.json to ES node
+     * 6. Check result of response to step 5, if bad response the mappings are incompatible
+     * 7. If good response, write extracted mappings to current_mappings.json
+     */
+
+    log.info('Extracting mappings from plugins');
+    const extractedMappings = await log.indent(4, async () => {
+      return await extractMappingsFromPlugins(log);
+    });
+
+    const currentMappings = await readCurrentMappings();
+    const isMappingChanged = !deepEqual(currentMappings, extractedMappings);
+
+    if (!isMappingChanged) {
+      log.success('Mappings are unchanged.');
+      return;
+    }
+
+    if (verify) {
+      log.info('Checking if any mappings have been removed');
+      await log.indent(4, async () => {
+        return checkAdditiveOnlyChange(log, currentMappings, extractedMappings);
+      });
+
+      log.info('Starting es...');
+      const esClient = await log.indent(4, async () => {
+        const cluster = createTestEsCluster({ log });
+        await cluster.start();
+        addCleanupTask(() => cluster.cleanup());
+        return cluster.getClient();
+      });
+
+      log.info(`Checking if mappings are compatible`);
+      await log.indent(4, async () => {
+        await checkIncompatibleMappings({
+          log,
+          esClient,
+          currentMappings,
+          nextMappings: extractedMappings,
+        });
+      });
+    }
+
+    if (fix) {
+      await updateCurrentMappings(extractedMappings);
+      log.warning(
+        `Updated extracted mappings in current_mappings.json file, please commit the changes if desired.`
+      );
+    } else {
+      log.warning(
+        `The extracted mappings do not match the current_mappings.json file, run with --fix to update.`
+      );
+    }
+  },
+  {
+    description: `
+      Determine if the current SavedObject mappings in the source code can be applied to the current mappings from upstream.
+    `,
+    flags: {
+      boolean: ['fix', 'verify'],
+      default: {
+        verify: true,
+      },
+      help: `
+        --fix              If the current mappings differ from the mappings in the file, update the current_mappings.json file
+        --no-verify        Don't run any validation, just update the current_mappings.json file.
+      `,
+    },
+  }
+);
diff --git a/packages/kbn-check-mappings-update-cli/tsconfig.json b/packages/kbn-check-mappings-update-cli/tsconfig.json
new file mode 100644
index 00000000000000..1439669b1e1dd4
--- /dev/null
+++ b/packages/kbn-check-mappings-update-cli/tsconfig.json
@@ -0,0 +1,30 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types",
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "**/*.ts",
+  ],
+  "exclude": [
+    "target/**/*"
+  ],
+  "kbn_references": [
+    "@kbn/some-dev-log",
+    "@kbn/dev-cli-errors",
+    "@kbn/core-saved-objects-base-server-internal",
+    "@kbn/repo-info",
+    "@kbn/stdio-dev-helpers",
+    "@kbn/core-test-helpers-kbn-server",
+    "@kbn/core-plugins-server-internal",
+    "@kbn/core-saved-objects-migration-server-internal",
+    "@kbn/dev-cli-runner",
+    "@kbn/test",
+    "@kbn/core-elasticsearch-client-server-mocks",
+    "@kbn/safer-lodash-set",
+  ]
+}
diff --git a/packages/kbn-content-management-utils/index.ts b/packages/kbn-content-management-utils/index.ts
index 12594660136d8f..8e4751ba223ea8 100644
--- a/packages/kbn-content-management-utils/index.ts
+++ b/packages/kbn-content-management-utils/index.ts
@@ -6,4 +6,5 @@
  * Side Public License, v 1.
  */
 
-export * from './types';
+export * from './src/types';
+export * from './src/schema';
diff --git a/packages/kbn-content-management-utils/src/schema.ts b/packages/kbn-content-management-utils/src/schema.ts
new file mode 100644
index 00000000000000..2e95624c36a22a
--- /dev/null
+++ b/packages/kbn-content-management-utils/src/schema.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { schema, ObjectType } from '@kbn/config-schema';
+
+export const apiError = schema.object({
+  error: schema.string(),
+  message: schema.string(),
+  statusCode: schema.number(),
+  metadata: schema.object({}, { unknowns: 'allow' }),
+});
+
+export const referenceSchema = schema.object(
+  {
+    name: schema.maybe(schema.string()),
+    type: schema.string(),
+    id: schema.string(),
+  },
+  { unknowns: 'forbid' }
+);
+
+export const referencesSchema = schema.arrayOf(referenceSchema);
+
+export const savedObjectSchema = (attributesSchema: ObjectType<any>) =>
+  schema.object(
+    {
+      id: schema.string(),
+      type: schema.string(),
+      version: schema.maybe(schema.string()),
+      createdAt: schema.maybe(schema.string()),
+      updatedAt: schema.maybe(schema.string()),
+      error: schema.maybe(apiError),
+      attributes: attributesSchema,
+      references: referencesSchema,
+      namespaces: schema.maybe(schema.arrayOf(schema.string())),
+      originId: schema.maybe(schema.string()),
+    },
+    { unknowns: 'allow' }
+  );
+
+export const objectTypeToGetResultSchema = (soSchema: ObjectType<any>) =>
+  schema.object(
+    {
+      item: soSchema,
+      meta: schema.object(
+        {
+          outcome: schema.oneOf([
+            schema.literal('exactMatch'),
+            schema.literal('aliasMatch'),
+            schema.literal('conflict'),
+          ]),
+          aliasTargetId: schema.maybe(schema.string()),
+          aliasPurpose: schema.maybe(
+            schema.oneOf([
+              schema.literal('savedObjectConversion'),
+              schema.literal('savedObjectImport'),
+            ])
+          ),
+        },
+        { unknowns: 'forbid' }
+      ),
+    },
+    { unknowns: 'forbid' }
+  );
+
+// its recommended to create a subset of this schema for stricter validation
+export const createOptionsSchemas = {
+  id: schema.maybe(schema.string()),
+  references: schema.maybe(referencesSchema),
+  overwrite: schema.maybe(schema.boolean()),
+  version: schema.maybe(schema.string()),
+  refresh: schema.maybe(schema.boolean()),
+  initialNamespaces: schema.maybe(schema.arrayOf(schema.string())),
+};
+
+export const schemaAndOr = schema.oneOf([schema.literal('AND'), schema.literal('OR')]);
+
+// its recommended to create a subset of this schema for stricter validation
+export const searchOptionsSchemas = {
+  page: schema.maybe(schema.number()),
+  perPage: schema.maybe(schema.number()),
+  sortField: schema.maybe(schema.string()),
+  sortOrder: schema.maybe(schema.oneOf([schema.literal('asc'), schema.literal('desc')])),
+  fields: schema.maybe(schema.arrayOf(schema.string())),
+  search: schema.maybe(schema.string()),
+  searchFields: schema.maybe(schema.oneOf([schema.string(), schema.arrayOf(schema.string())])),
+  rootSearchFields: schema.maybe(schema.arrayOf(schema.string())),
+
+  hasReference: schema.maybe(schema.oneOf([referenceSchema, schema.arrayOf(referenceSchema)])),
+  hasReferenceOperator: schema.maybe(schemaAndOr),
+  hasNoReference: schema.maybe(schema.oneOf([referenceSchema, schema.arrayOf(referenceSchema)])),
+  hasNoReferenceOperator: schema.maybe(schemaAndOr),
+  defaultSearchOperator: schema.maybe(schemaAndOr),
+  namespaces: schema.maybe(schema.arrayOf(schema.string())),
+  type: schema.maybe(schema.string()),
+
+  filter: schema.maybe(schema.string()),
+  pit: schema.maybe(
+    schema.object({ id: schema.string(), keepAlive: schema.maybe(schema.string()) })
+  ),
+};
+
+// its recommended to create a subset of this schema for stricter validation
+export const updateOptionsSchema = {
+  references: schema.maybe(referencesSchema),
+  version: schema.maybe(schema.string()),
+  refresh: schema.maybe(schema.oneOf([schema.boolean(), schema.literal('wait_for')])),
+  upsert: (attributesSchema: ObjectType<any>) => schema.maybe(savedObjectSchema(attributesSchema)),
+  retryOnConflict: schema.maybe(schema.number()),
+};
+
+export const createResultSchema = (soSchema: ObjectType<any>) =>
+  schema.object(
+    {
+      item: soSchema,
+    },
+    { unknowns: 'forbid' }
+  );
diff --git a/packages/kbn-content-management-utils/types.ts b/packages/kbn-content-management-utils/src/types.ts
similarity index 100%
rename from packages/kbn-content-management-utils/types.ts
rename to packages/kbn-content-management-utils/src/types.ts
diff --git a/packages/kbn-content-management-utils/tsconfig.json b/packages/kbn-content-management-utils/tsconfig.json
index 7de04c3c13451d..89a1d2520f3223 100644
--- a/packages/kbn-content-management-utils/tsconfig.json
+++ b/packages/kbn-content-management-utils/tsconfig.json
@@ -17,6 +17,7 @@
   ],
   "kbn_references": [
     "@kbn/content-management-plugin",
+    "@kbn/config-schema",
     "@kbn/core-saved-objects-api-server",
   ]
 }
diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
index 29ac5472e37ddd..89b3610e622b9c 100644
--- a/packages/kbn-doc-links/src/get_doc_links.ts
+++ b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -126,6 +126,7 @@ export const getDocLinks = ({ kibanaBranch }: GetDocLinkOptions): DocLinks => {
       apiKeys: `${KIBANA_DOCS}api-keys.html`,
       behavioralAnalytics: `${ENTERPRISE_SEARCH_DOCS}analytics-overview.html`,
       behavioralAnalyticsEvents: `${ENTERPRISE_SEARCH_DOCS}analytics-events.html`,
+      buildConnector: `{$ENTERPRISE_SEARCH_DOCS}build-connector.html`,
       bulkApi: `${ELASTICSEARCH_DOCS}docs-bulk.html`,
       configuration: `${ENTERPRISE_SEARCH_DOCS}configuration.html`,
       connectors: `${ENTERPRISE_SEARCH_DOCS}connectors.html`,
diff --git a/packages/kbn-doc-links/src/types.ts b/packages/kbn-doc-links/src/types.ts
index efe5e95f238d00..5e2e8e7bf13040 100644
--- a/packages/kbn-doc-links/src/types.ts
+++ b/packages/kbn-doc-links/src/types.ts
@@ -111,6 +111,7 @@ export interface DocLinks {
     readonly apiKeys: string;
     readonly behavioralAnalytics: string;
     readonly behavioralAnalyticsEvents: string;
+    readonly buildConnector: string;
     readonly bulkApi: string;
     readonly configuration: string;
     readonly connectors: string;
diff --git a/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts b/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
index 46e21245bf333a..d414788afec1e4 100644
--- a/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
+++ b/packages/kbn-es-query/src/kuery/node_types/node_builder.test.ts
@@ -55,6 +55,25 @@ describe('nodeBuilder', () => {
   });
 
   describe('and method', () => {
+    test('no clauses', () => {
+      const node = nodeBuilder.and([]);
+      const query = toElasticsearchQuery(node);
+      expect(node).toMatchInlineSnapshot(`
+        Object {
+          "arguments": Array [],
+          "function": "and",
+          "type": "function",
+        }
+      `);
+      expect(query).toMatchInlineSnapshot(`
+        Object {
+          "bool": Object {
+            "filter": Array [],
+          },
+        }
+      `);
+    });
+
     test('single clause', () => {
       const nodes = [nodeBuilder.is('foo', 'bar')];
       const query = toElasticsearchQuery(nodeBuilder.and(nodes));
@@ -166,6 +185,26 @@ describe('nodeBuilder', () => {
   });
 
   describe('or method', () => {
+    test('no clauses', () => {
+      const node = nodeBuilder.or([]);
+      const query = toElasticsearchQuery(node);
+      expect(node).toMatchInlineSnapshot(`
+        Object {
+          "arguments": Array [],
+          "function": "or",
+          "type": "function",
+        }
+      `);
+      expect(query).toMatchInlineSnapshot(`
+        Object {
+          "bool": Object {
+            "minimum_should_match": 1,
+            "should": Array [],
+          },
+        }
+      `);
+    });
+
     test('single clause', () => {
       const nodes = [nodeBuilder.is('foo', 'bar')];
       const query = toElasticsearchQuery(nodeBuilder.or(nodes));
diff --git a/packages/kbn-es-query/src/kuery/node_types/node_builder.ts b/packages/kbn-es-query/src/kuery/node_types/node_builder.ts
index 948985c9653789..80fcd9607c7abe 100644
--- a/packages/kbn-es-query/src/kuery/node_types/node_builder.ts
+++ b/packages/kbn-es-query/src/kuery/node_types/node_builder.ts
@@ -10,23 +10,23 @@ import type { RangeFilterParams } from '../../filters';
 import { KueryNode, nodeTypes } from '../types';
 
 export const nodeBuilder = {
-  is: (fieldName: string, value: string | KueryNode) => {
+  is: (fieldName: string, value: string | KueryNode): KueryNode => {
     return nodeTypes.function.buildNodeWithArgumentNodes('is', [
       nodeTypes.literal.buildNode(fieldName),
       typeof value === 'string' ? nodeTypes.literal.buildNode(value) : value,
     ]);
   },
   or: (nodes: KueryNode[]): KueryNode => {
-    return nodes.length > 1 ? nodeTypes.function.buildNode('or', nodes) : nodes[0];
+    return nodes.length === 1 ? nodes[0] : nodeTypes.function.buildNode('or', nodes);
   },
   and: (nodes: KueryNode[]): KueryNode => {
-    return nodes.length > 1 ? nodeTypes.function.buildNode('and', nodes) : nodes[0];
+    return nodes.length === 1 ? nodes[0] : nodeTypes.function.buildNode('and', nodes);
   },
   range: (
     fieldName: string,
     operator: keyof Pick<RangeFilterParams, 'gt' | 'gte' | 'lt' | 'lte'>,
     value: number | string
-  ) => {
+  ): KueryNode => {
     return nodeTypes.function.buildNodeWithArgumentNodes('range', [
       nodeTypes.literal.buildNode(fieldName),
       operator,
diff --git a/packages/kbn-generate-csv/src/get_export_settings.ts b/packages/kbn-generate-csv/src/get_export_settings.ts
index d2e62f9281418b..46d31afaf9e4f4 100644
--- a/packages/kbn-generate-csv/src/get_export_settings.ts
+++ b/packages/kbn-generate-csv/src/get_export_settings.ts
@@ -64,7 +64,11 @@ export const getExportSettings = async (
   ]);
 
   const escapeFormulaValues = config.escapeFormulaValues;
-  const escapeValue = createEscapeValue(quoteValues, escapeFormulaValues);
+  const escapeValue = createEscapeValue({
+    separator,
+    quoteValues,
+    escapeFormulaValues,
+  });
   const bom = config.useByteOrderMarkEncoding ? CSV_BOM_CHARS : '';
 
   return {
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index af6396c11e063e..13cf535a36873d 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -116,6 +116,9 @@ pageLoadAssetSize:
   security: 65433
   securitySolution: 66738
   serverless: 16573
+  serverlessObservability: 16582
+  serverlessSearch: 17548
+  serverlessSecurity: 41807
   sessionView: 77750
   share: 71239
   snapshotRestore: 79032
@@ -153,4 +156,5 @@ pageLoadAssetSize:
   visTypeVislib: 242838
   visTypeXy: 46868
   visualizations: 90000
+  visualizationUiComponents: 76424
   watcher: 43598
diff --git a/packages/kbn-securitysolution-grouping/src/components/accordion_panel/helpers.ts b/packages/kbn-securitysolution-grouping/src/components/accordion_panel/helpers.ts
index 5529d5bf521c02..14d7c44daf1f1e 100644
--- a/packages/kbn-securitysolution-grouping/src/components/accordion_panel/helpers.ts
+++ b/packages/kbn-securitysolution-grouping/src/components/accordion_panel/helpers.ts
@@ -30,3 +30,22 @@ export const createGroupFilter = (selectedGroup: string, query?: string) =>
         },
       ]
     : [];
+
+export const getNullGroupFilter = (selectedGroup: string) => [
+  {
+    meta: {
+      disabled: false,
+      negate: true,
+      alias: null,
+      key: selectedGroup,
+      field: selectedGroup,
+      value: 'exists',
+      type: 'exists',
+    },
+    query: {
+      exists: {
+        field: selectedGroup,
+      },
+    },
+  },
+];
diff --git a/packages/kbn-securitysolution-grouping/src/components/accordion_panel/index.tsx b/packages/kbn-securitysolution-grouping/src/components/accordion_panel/index.tsx
index c1d55495cf785c..f40fc79eb8c807 100644
--- a/packages/kbn-securitysolution-grouping/src/components/accordion_panel/index.tsx
+++ b/packages/kbn-securitysolution-grouping/src/components/accordion_panel/index.tsx
@@ -6,12 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { EuiAccordion, EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
+import { EuiAccordion, EuiFlexGroup, EuiFlexItem, EuiTitle, EuiIconTip } from '@elastic/eui';
 import type { Filter } from '@kbn/es-query';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { firstNonNullValue } from '../../helpers';
 import type { RawBucket } from '../types';
-import { createGroupFilter } from './helpers';
+import { createGroupFilter, getNullGroupFilter } from './helpers';
 
 interface GroupPanelProps<T> {
   customAccordionButtonClassName?: string;
@@ -22,20 +22,35 @@ interface GroupPanelProps<T> {
   groupPanelRenderer?: JSX.Element;
   groupingLevel?: number;
   isLoading: boolean;
+  isNullGroup?: boolean;
+  nullGroupMessage?: string;
   onGroupClose: () => void;
   onToggleGroup?: (isOpen: boolean, groupBucket: RawBucket<T>) => void;
   renderChildComponent: (groupFilter: Filter[]) => React.ReactElement;
   selectedGroup: string;
 }
 
-const DefaultGroupPanelRenderer = ({ title }: { title: string }) => (
+const DefaultGroupPanelRenderer = ({
+  isNullGroup,
+  title,
+  nullGroupMessage,
+}: {
+  isNullGroup: boolean;
+  title: string;
+  nullGroupMessage?: string;
+}) => (
   <div>
     <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
-      <EuiFlexItem>
+      <EuiFlexItem grow={false}>
         <EuiTitle size="xs" className="euiAccordionForm__title">
           <h4 className="eui-textTruncate">{title}</h4>
         </EuiTitle>
       </EuiFlexItem>
+      {isNullGroup && nullGroupMessage && (
+        <EuiFlexItem grow={false} data-test-subj="null-group-icon">
+          <EuiIconTip content={nullGroupMessage} position="right" />
+        </EuiFlexItem>
+      )}
     </EuiFlexGroup>
   </div>
 );
@@ -49,10 +64,12 @@ const GroupPanelComponent = <T,>({
   groupPanelRenderer,
   groupingLevel = 0,
   isLoading,
+  isNullGroup = false,
   onGroupClose,
   onToggleGroup,
   renderChildComponent,
   selectedGroup,
+  nullGroupMessage,
 }: GroupPanelProps<T>) => {
   const lastForceState = useRef(forceState);
   useEffect(() => {
@@ -68,8 +85,11 @@ const GroupPanelComponent = <T,>({
   const groupFieldValue = useMemo(() => firstNonNullValue(groupBucket.key), [groupBucket.key]);
 
   const groupFilters = useMemo(
-    () => createGroupFilter(selectedGroup, groupFieldValue),
-    [groupFieldValue, selectedGroup]
+    () =>
+      isNullGroup
+        ? getNullGroupFilter(selectedGroup)
+        : createGroupFilter(selectedGroup, groupFieldValue),
+    [groupFieldValue, isNullGroup, selectedGroup]
   );
 
   const onToggle = useCallback(
@@ -86,7 +106,13 @@ const GroupPanelComponent = <T,>({
       buttonClassName={customAccordionButtonClassName}
       buttonContent={
         <div data-test-subj="group-panel-toggle" className="groupingPanelRenderer">
-          {groupPanelRenderer ?? <DefaultGroupPanelRenderer title={groupFieldValue} />}
+          {groupPanelRenderer ?? (
+            <DefaultGroupPanelRenderer
+              title={groupFieldValue}
+              isNullGroup={isNullGroup}
+              nullGroupMessage={nullGroupMessage}
+            />
+          )}
         </div>
       }
       buttonElement="div"
diff --git a/packages/kbn-securitysolution-grouping/src/components/grouping.mock.tsx b/packages/kbn-securitysolution-grouping/src/components/grouping.mock.tsx
index 0647c14485fada..8f06c877d3f95f 100644
--- a/packages/kbn-securitysolution-grouping/src/components/grouping.mock.tsx
+++ b/packages/kbn-securitysolution-grouping/src/components/grouping.mock.tsx
@@ -8,29 +8,27 @@
 
 import React from 'react';
 import { EuiContextMenuItem } from '@elastic/eui';
-export const rule1Name = 'Rule 1 name';
-const rule1Desc = 'Rule 1 description';
-export const rule2Name = 'Rule 2 name';
-const rule2Desc = 'Rule 2 description';
+export const host1Name = 'nice-host';
+export const host2Name = 'cool-host';
 
 export const mockGroupingProps = {
   activePage: 0,
   data: {
     groupsCount: {
-      value: 2,
+      value: 3,
     },
     groupByFields: {
       doc_count_error_upper_bound: 0,
       sum_other_doc_count: 0,
       buckets: [
         {
-          key: [rule1Name, rule1Desc],
-          key_as_string: `${rule1Name}|${rule1Desc}`,
+          key: [host1Name],
+          key_as_string: `${host1Name}`,
           doc_count: 1,
           hostsCountAggregation: {
             value: 1,
           },
-          ruleTags: {
+          hostTags: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [],
@@ -56,13 +54,13 @@ export const mockGroupingProps = {
           },
         },
         {
-          key: [rule2Name, rule2Desc],
-          key_as_string: `${rule2Name}|${rule2Desc}`,
+          key: [host2Name],
+          key_as_string: `${host2Name}`,
           doc_count: 1,
           hostsCountAggregation: {
             value: 1,
           },
-          ruleTags: {
+          hostTags: {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
             buckets: [],
@@ -87,10 +85,46 @@ export const mockGroupingProps = {
             value: 1,
           },
         },
+        {
+          key: ['-'],
+          key_as_string: `-`,
+          isNullGroup: true,
+          doc_count: 11,
+          hostsCountAggregation: {
+            value: 11,
+          },
+          hostTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [],
+          },
+          alertsCount: {
+            value: 11,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 11,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 11,
+          },
+          usersCountAggregation: {
+            value: 11,
+          },
+        },
       ],
     },
     unitsCount: {
-      value: 2,
+      value: 14,
+    },
+    unitsCountWithoutNull: {
+      value: 14,
     },
   },
   groupingId: 'test-grouping-id',
@@ -98,7 +132,7 @@ export const mockGroupingProps = {
   itemsPerPage: 25,
   renderChildComponent: () => <p>{'child component'}</p>,
   onGroupClose: () => {},
-  selectedGroup: 'kibana.alert.rule.name',
+  selectedGroup: 'host.name',
   takeActionItems: () => [
     <EuiContextMenuItem key="acknowledged" onClick={() => {}}>
       {'Mark as acknowledged'}
diff --git a/packages/kbn-securitysolution-grouping/src/components/grouping.stories.tsx b/packages/kbn-securitysolution-grouping/src/components/grouping.stories.tsx
index b961402ee3a7cb..ed08d8541d0e86 100644
--- a/packages/kbn-securitysolution-grouping/src/components/grouping.stories.tsx
+++ b/packages/kbn-securitysolution-grouping/src/components/grouping.stories.tsx
@@ -23,6 +23,6 @@ export default {
   },
 };
 
-export const Emtpy: Story<void> = () => {
+export const Empty: Story<void> = () => {
   return <Grouping {...mockGroupingProps} />;
 };
diff --git a/packages/kbn-securitysolution-grouping/src/components/grouping.test.tsx b/packages/kbn-securitysolution-grouping/src/components/grouping.test.tsx
index 2376614ab444c5..151b83e45cfd54 100644
--- a/packages/kbn-securitysolution-grouping/src/components/grouping.test.tsx
+++ b/packages/kbn-securitysolution-grouping/src/components/grouping.test.tsx
@@ -10,11 +10,11 @@ import { fireEvent, render, within } from '@testing-library/react';
 import React from 'react';
 import { I18nProvider } from '@kbn/i18n-react';
 import { Grouping } from './grouping';
-import { createGroupFilter } from './accordion_panel/helpers';
+import { createGroupFilter, getNullGroupFilter } from './accordion_panel/helpers';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { getTelemetryEvent } from '../telemetry/const';
 
-import { mockGroupingProps, rule1Name, rule2Name } from './grouping.mock';
+import { mockGroupingProps, host1Name, host2Name } from './grouping.mock';
 
 const renderChildComponent = jest.fn();
 const takeActionItems = jest.fn();
@@ -37,9 +37,9 @@ describe('grouping container', () => {
         <Grouping {...testProps} />
       </I18nProvider>
     );
-    expect(getByTestId('unit-count').textContent).toBe('2 events');
-    expect(getByTestId('group-count').textContent).toBe('2 groups');
-    expect(getAllByTestId('grouping-accordion').length).toBe(2);
+    expect(getByTestId('unit-count').textContent).toBe('14 events');
+    expect(getByTestId('group-count').textContent).toBe('3 groups');
+    expect(getAllByTestId('grouping-accordion').length).toBe(3);
     expect(queryByTestId('empty-results-panel')).not.toBeInTheDocument();
   });
 
@@ -79,12 +79,12 @@ describe('grouping container', () => {
     fireEvent.click(group1);
     expect(renderChildComponent).toHaveBeenNthCalledWith(
       1,
-      createGroupFilter(testProps.selectedGroup, rule1Name)
+      createGroupFilter(testProps.selectedGroup, host1Name)
     );
     fireEvent.click(group2);
     expect(renderChildComponent).toHaveBeenNthCalledWith(
       2,
-      createGroupFilter(testProps.selectedGroup, rule2Name)
+      createGroupFilter(testProps.selectedGroup, host2Name)
     );
   });
 
@@ -116,4 +116,24 @@ describe('grouping container', () => {
       })
     );
   });
+
+  it('Renders a null group and passes the correct filter to take actions and child component', () => {
+    takeActionItems.mockReturnValue([]);
+    const { getAllByTestId, getByTestId } = render(
+      <I18nProvider>
+        <Grouping {...testProps} />
+      </I18nProvider>
+    );
+    expect(getByTestId('null-group-icon')).toBeInTheDocument();
+
+    let lastGroup = getAllByTestId('grouping-accordion').at(-1);
+    fireEvent.click(within(lastGroup!).getByTestId('take-action-button'));
+
+    expect(takeActionItems).toHaveBeenCalledWith(getNullGroupFilter('host.name'), 2);
+
+    lastGroup = getAllByTestId('grouping-accordion').at(-1);
+    fireEvent.click(within(lastGroup!).getByTestId('group-panel-toggle'));
+
+    expect(renderChildComponent).toHaveBeenCalledWith(getNullGroupFilter('host.name'));
+  });
 });
diff --git a/packages/kbn-securitysolution-grouping/src/components/grouping.tsx b/packages/kbn-securitysolution-grouping/src/components/grouping.tsx
index 625beda320d049..74cc899121b91d 100644
--- a/packages/kbn-securitysolution-grouping/src/components/grouping.tsx
+++ b/packages/kbn-securitysolution-grouping/src/components/grouping.tsx
@@ -17,12 +17,12 @@ import type { Filter } from '@kbn/es-query';
 import React, { useMemo, useState } from 'react';
 import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
 import { defaultUnit, firstNonNullValue } from '../helpers';
-import { createGroupFilter } from './accordion_panel/helpers';
+import { createGroupFilter, getNullGroupFilter } from './accordion_panel/helpers';
 import { GroupPanel } from './accordion_panel';
 import { GroupStats } from './accordion_panel/group_stats';
 import { EmptyGroupingComponent } from './empty_results_panel';
 import { countCss, groupingContainerCss, groupingContainerCssLevel } from './styles';
-import { GROUPS_UNIT } from './translations';
+import { GROUPS_UNIT, NULL_GROUP } from './translations';
 import type { GroupingAggregation, GroupPanelRenderer } from './types';
 import { GroupStatsRenderer, OnGroupToggle } from './types';
 import { getTelemetryEvent } from '../telemetry/const';
@@ -79,12 +79,12 @@ const GroupingComponent = <T,>({
     {}
   );
 
-  const unitCount = data?.unitsCount?.value ?? 0;
+  const unitCount = useMemo(() => data?.unitsCount?.value ?? 0, [data?.unitsCount?.value]);
   const unitCountText = useMemo(() => {
     return `${unitCount.toLocaleString()} ${unit && unit(unitCount)}`;
   }, [unitCount, unit]);
 
-  const groupCount = data?.groupsCount?.value ?? 0;
+  const groupCount = useMemo(() => data?.groupsCount?.value ?? 0, [data?.groupsCount?.value]);
   const groupCountText = useMemo(
     () => `${groupCount.toLocaleString()} ${GROUPS_UNIT(groupCount)}`,
     [groupCount]
@@ -95,15 +95,25 @@ const GroupingComponent = <T,>({
       data?.groupByFields?.buckets?.map((groupBucket, groupNumber) => {
         const group = firstNonNullValue(groupBucket.key);
         const groupKey = `group-${groupNumber}-${group}`;
+        const isNullGroup = groupBucket.isNullGroup ?? false;
+        const nullGroupMessage = isNullGroup
+          ? NULL_GROUP(selectedGroup, unit(groupBucket.doc_count))
+          : undefined;
 
         return (
           <span key={groupKey}>
             <GroupPanel
+              isNullGroup={isNullGroup}
+              nullGroupMessage={nullGroupMessage}
               onGroupClose={onGroupClose}
               extraAction={
                 <GroupStats
                   bucketKey={groupKey}
-                  groupFilter={createGroupFilter(selectedGroup, group)}
+                  groupFilter={
+                    isNullGroup
+                      ? getNullGroupFilter(selectedGroup)
+                      : createGroupFilter(selectedGroup, group)
+                  }
                   groupNumber={groupNumber}
                   statRenderers={
                     groupStatsRenderer && groupStatsRenderer(selectedGroup, groupBucket)
@@ -114,7 +124,8 @@ const GroupingComponent = <T,>({
               forceState={(trigger[groupKey] && trigger[groupKey].state) ?? 'closed'}
               groupBucket={groupBucket}
               groupPanelRenderer={
-                groupPanelRenderer && groupPanelRenderer(selectedGroup, groupBucket)
+                groupPanelRenderer &&
+                groupPanelRenderer(selectedGroup, groupBucket, nullGroupMessage)
               }
               isLoading={isLoading}
               onToggleGroup={(isOpen) => {
@@ -157,8 +168,10 @@ const GroupingComponent = <T,>({
       takeActionItems,
       tracker,
       trigger,
+      unit,
     ]
   );
+
   const pageCount = useMemo(
     () => (groupCount ? Math.ceil(groupCount / itemsPerPage) : 1),
     [groupCount, itemsPerPage]
diff --git a/packages/kbn-securitysolution-grouping/src/components/translations.ts b/packages/kbn-securitysolution-grouping/src/components/translations.ts
index f2cb8a172dbdc6..2209d61d1b34f2 100644
--- a/packages/kbn-securitysolution-grouping/src/components/translations.ts
+++ b/packages/kbn-securitysolution-grouping/src/components/translations.ts
@@ -54,3 +54,10 @@ export const DEFAULT_UNIT = (totalCount: number) =>
     values: { totalCount },
     defaultMessage: `{totalCount, plural, =1 {event} other {events}}`,
   });
+
+export const NULL_GROUP = (selectedGroup: string, unit: string) =>
+  i18n.translate('grouping.nullGroup.title', {
+    values: { selectedGroup, unit },
+    defaultMessage:
+      'The selected group by field, {selectedGroup}, is missing a value for this group of {unit}.',
+  });
diff --git a/packages/kbn-securitysolution-grouping/src/components/types.ts b/packages/kbn-securitysolution-grouping/src/components/types.ts
index cf5f55f5c27f3e..955a55d51ef6f5 100644
--- a/packages/kbn-securitysolution-grouping/src/components/types.ts
+++ b/packages/kbn-securitysolution-grouping/src/components/types.ts
@@ -12,16 +12,19 @@ export interface GenericBuckets {
   key_as_string?: string; // contains, for example, formatted dates
   doc_count: number;
 }
-
 export const NONE_GROUP_KEY = 'none';
 
 export type RawBucket<T> = GenericBuckets & T;
 
+export interface GroupingBucket {
+  isNullGroup?: boolean;
+}
+
 /** Defines the shape of the aggregation returned by Elasticsearch */
 // TODO: write developer docs for these fields
 export interface RootAggregation<T> {
   groupByFields?: {
-    buckets?: Array<RawBucket<T>>;
+    buckets?: Array<RawBucket<T> & GroupingBucket>;
   };
   groupsCount?: {
     value?: number | null;
@@ -29,6 +32,9 @@ export interface RootAggregation<T> {
   unitsCount?: {
     value?: number | null;
   };
+  unitsCountWithoutNull?: {
+    value?: number | null;
+  };
 }
 
 export type GroupingFieldTotalAggregation<T> = Record<
@@ -60,7 +66,8 @@ export type GroupStatsRenderer<T> = (
 
 export type GroupPanelRenderer<T> = (
   selectedGroup: string,
-  fieldBucket: RawBucket<T>
+  fieldBucket: RawBucket<T>,
+  nullGroupMessage?: string
 ) => JSX.Element | undefined;
 
 export type OnGroupToggle = (params: {
diff --git a/packages/kbn-securitysolution-grouping/src/containers/query/helpers.ts b/packages/kbn-securitysolution-grouping/src/containers/query/helpers.ts
new file mode 100644
index 00000000000000..0de0e66fe3df09
--- /dev/null
+++ b/packages/kbn-securitysolution-grouping/src/containers/query/helpers.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 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 { ES_FIELD_TYPES } from '@kbn/field-types';
+/**
+ * Returns a tuple of values according to the `esType` param, these values are meant to be applied in the _missing_
+ * property of the query aggregation of the grouping, to look up for missing values in the response buckets.
+ * These values do not need to be anything in particular, the only requirement is they have to be 2 different values that validate against the field type.
+ */
+export function getFieldTypeMissingValues(esType: string[]): [number, number] | [string, string] {
+  const knownType: ES_FIELD_TYPES = esType[0] as ES_FIELD_TYPES;
+  switch (knownType) {
+    case ES_FIELD_TYPES.BYTE:
+    case ES_FIELD_TYPES.DOUBLE:
+    case ES_FIELD_TYPES.INTEGER:
+    case ES_FIELD_TYPES.LONG:
+    case ES_FIELD_TYPES.FLOAT:
+    case ES_FIELD_TYPES.HALF_FLOAT:
+    case ES_FIELD_TYPES.SCALED_FLOAT:
+    case ES_FIELD_TYPES.SHORT:
+    case ES_FIELD_TYPES.UNSIGNED_LONG:
+    case ES_FIELD_TYPES.DATE:
+    case ES_FIELD_TYPES.DATE_NANOS:
+      return [0, 1];
+    case ES_FIELD_TYPES.IP:
+      return ['0.0.0.0', '::'];
+    default:
+      return ['-', '--'];
+  }
+}
+
+export const getEmptyValue = () => '—';
diff --git a/packages/kbn-securitysolution-grouping/src/containers/query/index.test.ts b/packages/kbn-securitysolution-grouping/src/containers/query/index.test.ts
index c3f81c4071c582..b04c21c49d50ce 100644
--- a/packages/kbn-securitysolution-grouping/src/containers/query/index.test.ts
+++ b/packages/kbn-securitysolution-grouping/src/containers/query/index.test.ts
@@ -7,12 +7,14 @@
  */
 
 import type { GroupingQueryArgs } from './types';
-import { getGroupingQuery, MAX_QUERY_SIZE } from '.';
+import { getGroupingQuery, parseGroupingQuery } from '.';
+import { getEmptyValue } from './helpers';
+import { GroupingAggregation } from '../../..';
 
 const testProps: GroupingQueryArgs = {
   additionalFilters: [],
   from: '2022-12-28T15:35:32.871Z',
-  groupByFields: ['host.name'],
+  groupByField: 'host.name',
   statsAggregations: [
     {
       alertsCount: {
@@ -53,6 +55,7 @@ const testProps: GroupingQueryArgs = {
   pageNumber: 0,
   rootAggregations: [],
   runtimeMappings: {},
+  selectedGroupEsTypes: ['keyword'],
   size: 25,
   to: '2023-02-23T06:59:59.999Z',
 };
@@ -60,12 +63,13 @@ describe('group selector', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
-  it('Sets terms query when single stackBy field requested', () => {
+  it('Sets multi terms query with missing argument for 2 default values', () => {
     const result = getGroupingQuery(testProps);
-    expect(result.aggs.groupByFields.multi_terms).toBeUndefined();
-    expect(result.aggs.groupByFields.terms).toEqual({
-      field: 'host.name',
-      size: MAX_QUERY_SIZE,
+    result.aggs.groupByFields?.multi_terms?.terms.forEach((term, i) => {
+      expect(term).toEqual({
+        field: 'host.name',
+        missing: i === 0 ? '-' : '--',
+      });
     });
     expect(result.aggs.groupByFields.aggs).toEqual({
       bucket_truncate: { bucket_sort: { from: 0, size: 25 } },
@@ -79,7 +83,7 @@ describe('group selector', () => {
     expect(result.aggs.groupsNumber).toBeUndefined();
     expect(result.query.bool.filter.length).toEqual(1);
   });
-  it('Sets terms query when single stackBy field requested additionalAggregationsRoot', () => {
+  it('Sets additional rootAggregations', () => {
     const result = getGroupingQuery({
       ...testProps,
       rootAggregations: [
@@ -105,17 +109,6 @@ describe('group selector', () => {
     });
     expect(result.aggs.groupsNumber).toEqual({ cardinality: { field: 'host.name' } });
   });
-  it('Sets terms query when multiple stackBy fields requested', () => {
-    const result = getGroupingQuery({
-      ...testProps,
-      groupByFields: ['kibana.alert.rule.name', 'kibana.alert.rule.description'],
-    });
-    expect(result.aggs.groupByFields.terms).toBeUndefined();
-    expect(result.aggs.groupByFields.multi_terms).toEqual({
-      terms: [{ field: 'kibana.alert.rule.name' }, { field: 'kibana.alert.rule.description' }],
-      size: MAX_QUERY_SIZE,
-    });
-  });
   it('Additional filters get added to the query', () => {
     const result = getGroupingQuery({
       ...testProps,
@@ -144,4 +137,94 @@ describe('group selector', () => {
     });
     expect(result.query.bool.filter.length).toEqual(2);
   });
+  it('Uses 0/1 for number fields', () => {
+    const result = getGroupingQuery({ ...testProps, selectedGroupEsTypes: ['long'] });
+    result.aggs.groupByFields?.multi_terms?.terms.forEach((term, i) => {
+      expect(term).toEqual({
+        field: 'host.name',
+        missing: i === 0 ? 0 : 1,
+      });
+    });
+  });
+  it('Uses 0.0.0.0/:: for ip fields', () => {
+    const result = getGroupingQuery({ ...testProps, selectedGroupEsTypes: ['ip'] });
+    result.aggs.groupByFields?.multi_terms?.terms.forEach((term, i) => {
+      expect(term).toEqual({
+        field: 'host.name',
+        missing: i === 0 ? '0.0.0.0' : '::',
+      });
+    });
+  });
+  const groupingAggs = {
+    groupByFields: {
+      buckets: [
+        {
+          key: ['20.80.64.28', '20.80.64.28'],
+          key_as_string: '20.80.64.28|20.80.64.28',
+          doc_count: 75,
+        },
+        {
+          key: ['0.0.0.0', '0.0.0.0'],
+          key_as_string: '0.0.0.0|0.0.0.0',
+          doc_count: 75,
+        },
+        {
+          key: ['0.0.0.0', '::'],
+          key_as_string: '0.0.0.0|::',
+          doc_count: 75,
+        },
+      ],
+    },
+    unitsCount: {
+      value: 100,
+    },
+    unitsCountWithoutNull: {
+      value: 100,
+    },
+    groupsCount: {
+      value: 20,
+    },
+  };
+  it('parseGroupingQuery finds and flags the null group', () => {
+    const result = parseGroupingQuery(groupingAggs);
+    expect(result).toEqual({
+      groupByFields: {
+        buckets: [
+          {
+            key: ['20.80.64.28'],
+            key_as_string: '20.80.64.28',
+            doc_count: 75,
+          },
+          {
+            key: ['0.0.0.0'],
+            key_as_string: '0.0.0.0',
+            doc_count: 75,
+          },
+          {
+            key: [getEmptyValue()],
+            key_as_string: getEmptyValue(),
+            isNullGroup: true,
+            doc_count: 75,
+          },
+        ],
+      },
+      unitsCount: {
+        value: 100,
+      },
+      unitsCountWithoutNull: {
+        value: 100,
+      },
+      groupsCount: {
+        value: 20,
+      },
+    });
+  });
+  it('parseGroupingQuery adjust group count when null field group is present', () => {
+    const result: GroupingAggregation<{}> = parseGroupingQuery({
+      ...groupingAggs,
+      unitsCountWithoutNull: { value: 99 },
+    });
+
+    expect(result.groupsCount?.value).toEqual(21);
+  });
 });
diff --git a/packages/kbn-securitysolution-grouping/src/containers/query/index.ts b/packages/kbn-securitysolution-grouping/src/containers/query/index.ts
index 23699c1ccf94a9..8e29c95be2aa08 100644
--- a/packages/kbn-securitysolution-grouping/src/containers/query/index.ts
+++ b/packages/kbn-securitysolution-grouping/src/containers/query/index.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { getEmptyValue, getFieldTypeMissingValues } from './helpers';
+import { GroupingAggregation } from '../..';
 import type { GroupingQueryArgs, GroupingQuery } from './types';
 /** The maximum number of groups to render */
 export const DEFAULT_GROUP_BY_FIELD_SIZE = 10;
@@ -24,6 +26,7 @@ export const MAX_QUERY_SIZE = 10000;
  * @param rootAggregations Top level aggregations to get the groups number or overall groups metrics.
  * Array of {@link NamedAggregation}
  * @param runtimeMappings mappings of runtime fields [see runtimeMappings]{@link GroupingQueryArgs.runtimeMappings}
+ * @param selectedGroupEsTypes array of selected group types
  * @param size number of grouping results per page
  * @param sort add one or more sorts on specific fields
  * @param statsAggregations group level aggregations which correspond to {@link GroupStatsRenderer} configuration
@@ -31,14 +34,16 @@ export const MAX_QUERY_SIZE = 10000;
  *
  * @returns query dsl {@link GroupingQuery}
  */
+
 export const getGroupingQuery = ({
   additionalFilters = [],
   from,
-  groupByFields,
+  groupByField,
+  pageNumber,
   rootAggregations,
   runtimeMappings,
+  selectedGroupEsTypes,
   size = DEFAULT_GROUP_BY_FIELD_SIZE,
-  pageNumber,
   sort,
   statsAggregations,
   to,
@@ -46,21 +51,25 @@ export const getGroupingQuery = ({
   size: 0,
   aggs: {
     groupByFields: {
-      ...(groupByFields.length > 1
-        ? {
-            multi_terms: {
-              terms: groupByFields.map((groupByField) => ({
-                field: groupByField,
-              })),
-              size: MAX_QUERY_SIZE,
-            },
-          }
-        : {
-            terms: {
-              field: groupByFields[0],
-              size: MAX_QUERY_SIZE,
-            },
-          }),
+      multi_terms: {
+        terms: [
+          // by looking up multiple missing values, we can ensure we're not overwriting an existing group with the default value
+          {
+            field: groupByField,
+            // the AggregationsMultiTermLookup type is wrong in the elasticsearch node package
+            // when this issues is resolved, we can remove these ts expect errors
+            // https://github.com/elastic/elasticsearch/issues/95628
+            // @ts-expect-error
+            missing: getFieldTypeMissingValues(selectedGroupEsTypes)[0],
+          },
+          {
+            field: groupByField,
+            // @ts-expect-error
+            missing: getFieldTypeMissingValues(selectedGroupEsTypes)[1],
+          },
+        ],
+        size: MAX_QUERY_SIZE,
+      },
       aggs: {
         bucket_truncate: {
           bucket_sort: {
@@ -74,6 +83,16 @@ export const getGroupingQuery = ({
           : {}),
       },
     },
+
+    unitsCountWithoutNull: { value_count: { field: groupByField } },
+    unitsCount: {
+      value_count: {
+        field: groupByField,
+        missing: getFieldTypeMissingValues(selectedGroupEsTypes)[0],
+      },
+    },
+    groupsCount: { cardinality: { field: groupByField } },
+
     ...(rootAggregations
       ? rootAggregations.reduce((aggObj, subAgg) => Object.assign(aggObj, subAgg), {})
       : {}),
@@ -96,3 +115,47 @@ export const getGroupingQuery = ({
   runtime_mappings: runtimeMappings,
   _source: false,
 });
+
+/**
+ * Parses the grouping query response to add the isNullGroup
+ * flag to the buckets and to format the bucket keys
+ * @param buckets buckets returned from the grouping query
+ */
+export const parseGroupingQuery = <T>(
+  aggs?: GroupingAggregation<T>
+): GroupingAggregation<T> | {} => {
+  if (!aggs) {
+    return {};
+  }
+  const groupByFields = aggs?.groupByFields?.buckets?.map((group) => {
+    if (!Array.isArray(group.key)) {
+      return group;
+    }
+    const emptyValue = getEmptyValue();
+    // If the keys are different means that the `missing` values of the multi_terms aggregation have been applied, we use the default empty string.
+    // If the keys are equal means the `missing` values have not been applied, they are stored values.
+    return group.key[0] === group.key[1]
+      ? {
+          ...group,
+          key: [group.key[0]],
+          key_as_string: group.key[0],
+        }
+      : {
+          ...group,
+          key: [emptyValue],
+          key_as_string: emptyValue,
+          isNullGroup: true,
+        };
+  });
+
+  return {
+    ...aggs,
+    groupByFields: { buckets: groupByFields },
+    groupsCount: {
+      value:
+        (aggs.unitsCount?.value !== aggs.unitsCountWithoutNull?.value
+          ? (aggs.groupsCount?.value ?? 0) + 1
+          : aggs.groupsCount?.value) ?? 0,
+    },
+  };
+};
diff --git a/packages/kbn-securitysolution-grouping/src/containers/query/types.ts b/packages/kbn-securitysolution-grouping/src/containers/query/types.ts
index 5a8b2f822fb5c8..4a370094d0d5c4 100644
--- a/packages/kbn-securitysolution-grouping/src/containers/query/types.ts
+++ b/packages/kbn-securitysolution-grouping/src/containers/query/types.ts
@@ -23,11 +23,12 @@ export type NamedAggregation = Record<string, estypes.AggregationsAggregationCon
 export interface GroupingQueryArgs {
   additionalFilters: BoolAgg[];
   from: string;
-  groupByFields: string[];
+  groupByField: string;
   rootAggregations?: NamedAggregation[];
   runtimeMappings?: MappingRuntimeFields;
   additionalAggregationsRoot?: NamedAggregation[];
   pageNumber?: number;
+  selectedGroupEsTypes: string[];
   size?: number;
   sort?: Array<{ [category: string]: { order: 'asc' | 'desc' } }>;
   statsAggregations?: NamedAggregation[];
@@ -37,8 +38,7 @@ export interface GroupingQueryArgs {
 export interface MainAggregation extends NamedAggregation {
   groupByFields: {
     aggs: NamedAggregation;
-    multi_terms?: estypes.AggregationsAggregationContainer['multi_terms'];
-    terms?: estypes.AggregationsAggregationContainer['terms'];
+    multi_terms: estypes.AggregationsAggregationContainer['multi_terms'];
   };
 }
 
diff --git a/packages/kbn-securitysolution-grouping/tsconfig.json b/packages/kbn-securitysolution-grouping/tsconfig.json
index 621ba68957cf1f..efecb457f96de6 100644
--- a/packages/kbn-securitysolution-grouping/tsconfig.json
+++ b/packages/kbn-securitysolution-grouping/tsconfig.json
@@ -25,6 +25,7 @@
     "@kbn/kibana-react-plugin",
     "@kbn/shared-svg",
     "@kbn/ui-theme",
-    "@kbn/analytics"
+    "@kbn/analytics",
+    "@kbn/field-types"
   ]
 }
diff --git a/packages/shared-ux/chrome/navigation/README.mdx b/packages/shared-ux/chrome/navigation/README.mdx
new file mode 100644
index 00000000000000..c2e04ebbeb98f5
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/README.mdx
@@ -0,0 +1,26 @@
+---
+id: sharedUX/Chrome/Navigation
+slug: /shared-ux/chrome/navigation
+title: Kibana Chrome Navigation
+description: Navigation container to render items for cross-app linking
+tags: ['shared-ux', 'component', 'chrome', 'navigation']
+date: 2023-02-28
+---
+
+## Description
+
+Empty package generated by @kbn/generate
+@kbn/shared-ux-chrome-navigation
+Navigation container to render items for cross-app linking
+
+## API
+
+| Export | Description |
+|---|---|
+| `NavigationProvider` | Provides contextual services to `Navigation`. |
+| `NavigationKibanaProvider` | Maps Kibana dependencies to provide contextual services to `Navigation`. |
+| `Navigation` | Uses a `Provider` to access contextual services and render the component. |
+
+## EUI Promotion Status
+
+This component is not currently considered for promotion to EUI.
diff --git a/packages/shared-ux/chrome/navigation/index.ts b/packages/shared-ux/chrome/navigation/index.ts
new file mode 100644
index 00000000000000..f6070a30a5836d
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright 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 { NavigationKibanaProvider, NavigationProvider } from './src/services';
+export { Navigation } from './src/ui/navigation';
+export type { NavigationProps, NavigationServices, NavItemProps } from './types';
diff --git a/packages/shared-ux/chrome/navigation/jest.config.js b/packages/shared-ux/chrome/navigation/jest.config.js
new file mode 100644
index 00000000000000..808dc82a089c2f
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/jest.config.js
@@ -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 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.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../..',
+  roots: ['<rootDir>/packages/shared-ux/chrome/navigation'],
+};
diff --git a/packages/shared-ux/chrome/navigation/kibana.jsonc b/packages/shared-ux/chrome/navigation/kibana.jsonc
new file mode 100644
index 00000000000000..74cd1ccea32528
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/kibana.jsonc
@@ -0,0 +1,5 @@
+{
+  "type": "shared-common",
+  "id": "@kbn/shared-ux-chrome-navigation",
+  "owner": "@elastic/appex-sharedux"
+}
diff --git a/packages/shared-ux/chrome/navigation/mocks/index.ts b/packages/shared-ux/chrome/navigation/mocks/index.ts
new file mode 100644
index 00000000000000..a72e07ce52132b
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/mocks/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 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 {
+  getServicesMock as getNavigationServicesMock,
+  getSolutionPropertiesMock,
+} from './src/jest';
+export { StorybookMock as NavigationStorybookMock } from './src/storybook';
+export type { Params as NavigationStorybookParams } from './src/storybook';
diff --git a/packages/shared-ux/chrome/navigation/mocks/src/jest.ts b/packages/shared-ux/chrome/navigation/mocks/src/jest.ts
new file mode 100644
index 00000000000000..166dc73b6290c8
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/mocks/src/jest.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { NavigationServices, SolutionProperties } from '../../types';
+
+export const getServicesMock = (): NavigationServices => {
+  const navigateToUrl = jest.fn().mockResolvedValue(undefined);
+  const basePath = { prepend: jest.fn((path: string) => `/base${path}`) };
+  const loadingCount = 0;
+
+  return {
+    basePath,
+    loadingCount,
+    navIsOpen: true,
+    navigateToUrl,
+  };
+};
+
+export const getSolutionPropertiesMock = (): SolutionProperties => ({
+  id: 'example_project',
+  icon: 'logoObservability',
+  name: 'Example project',
+  items: [
+    {
+      id: 'root',
+      name: '',
+      items: [
+        {
+          id: 'get_started',
+          name: 'Get started',
+          href: '/app/example_project/get_started',
+        },
+        {
+          id: 'alerts',
+          name: 'Alerts',
+          href: '/app/example_project/alerts',
+        },
+        {
+          id: 'cases',
+          name: 'Cases',
+          href: '/app/example_project/cases',
+        },
+      ],
+    },
+    {
+      id: 'example_settings',
+      name: 'Settings',
+      items: [
+        {
+          id: 'logs',
+          name: 'Logs',
+          href: '/app/management/logs',
+        },
+        {
+          id: 'signals',
+          name: 'Signals',
+          href: '/app/management/signals',
+        },
+        {
+          id: 'tracing',
+          name: 'Tracing',
+          href: '/app/management/tracing',
+        },
+      ],
+    },
+  ],
+});
diff --git a/packages/shared-ux/chrome/navigation/mocks/src/storybook.ts b/packages/shared-ux/chrome/navigation/mocks/src/storybook.ts
new file mode 100644
index 00000000000000..27e27393dc5bba
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/mocks/src/storybook.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 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 { AbstractStorybookMock } from '@kbn/shared-ux-storybook-mock';
+import { action } from '@storybook/addon-actions';
+import { NavigationProps, NavigationServices } from '../../types';
+
+type Arguments = NavigationProps & NavigationServices;
+export type Params = Pick<
+  Arguments,
+  'activeNavItemId' | 'loadingCount' | 'navIsOpen' | 'platformConfig' | 'solutions'
+>;
+
+export class StorybookMock extends AbstractStorybookMock<NavigationProps, NavigationServices> {
+  propArguments = {};
+
+  serviceArguments = {
+    navIsOpen: {
+      control: 'boolean',
+      defaultValue: true,
+    },
+    loadingCount: {
+      control: 'number',
+      defaultValue: 0,
+    },
+  };
+
+  dependencies = [];
+
+  getServices(params: Params): NavigationServices {
+    const { navIsOpen } = params;
+
+    const navAction = action('Navigate to');
+    const navigateToUrl = (url: string) => {
+      navAction(url);
+      return Promise.resolve();
+    };
+
+    return {
+      ...params,
+      basePath: { prepend: (suffix: string) => `/basepath${suffix}` },
+      navigateToUrl,
+      navIsOpen,
+    };
+  }
+
+  getProps(params: Params): NavigationProps {
+    return {
+      ...params,
+      homeHref: '#',
+      linkToCloud: 'projects',
+    };
+  }
+}
diff --git a/packages/shared-ux/chrome/navigation/package.json b/packages/shared-ux/chrome/navigation/package.json
new file mode 100644
index 00000000000000..312c11c6f7c1e2
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@kbn/shared-ux-chrome-navigation",
+  "private": true,
+  "version": "1.0.0",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}
\ No newline at end of file
diff --git a/packages/shared-ux/chrome/navigation/src/model/create_side_nav.ts b/packages/shared-ux/chrome/navigation/src/model/create_side_nav.ts
new file mode 100644
index 00000000000000..aac2fdf346ffcc
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/model/create_side_nav.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { EuiSideNavItemType } from '@elastic/eui';
+import type { NavigationModelDeps } from '.';
+import type { NavItemProps, PlatformSectionConfig } from '../../types';
+
+type MyEuiSideNavItem = EuiSideNavItemType<unknown>;
+type OnClickFn = MyEuiSideNavItem['onClick'];
+
+/**
+ * Factory function to return a function that processes modeled nav items into EuiSideNavItemType
+ * The factory puts memoized function arguments in scope for iterations of the recursive item processing.
+ */
+export const createSideNavDataFactory = (
+  deps: NavigationModelDeps,
+  activeNavItemId: string | undefined
+) => {
+  const { basePath, navigateToUrl } = deps;
+  const createSideNavData = (
+    parentIds: string | number = '',
+    navItems: NavItemProps[],
+    platformSectionConfig?: PlatformSectionConfig
+  ): Array<EuiSideNavItemType<unknown>> =>
+    navItems.reduce<MyEuiSideNavItem[]>((accum, item) => {
+      const { id, name, items: subNav, href } = item;
+      const config = platformSectionConfig?.properties?.[id];
+      if (config?.enabled === false) {
+        // return accumulated set without the item that is not enabled
+        return accum;
+      }
+
+      let onClick: OnClickFn | undefined;
+
+      const fullId = [parentIds, id].filter(Boolean).join('.');
+
+      if (href) {
+        onClick = (event: React.MouseEvent) => {
+          event.preventDefault();
+          navigateToUrl(basePath.prepend(href));
+        };
+      }
+
+      let filteredSubNav: MyEuiSideNavItem[] | undefined;
+      if (subNav) {
+        // recursion
+        const nextConfig = platformSectionConfig?.properties?.[id];
+        filteredSubNav = createSideNavData(fullId, subNav, nextConfig);
+      }
+
+      let isSelected: boolean = false;
+      let subjId = fullId;
+      if (!subNav && fullId === activeNavItemId) {
+        // if there are no subnav items and ID is current, mark the item as selected
+        isSelected = true;
+        subjId += '-selected';
+      }
+
+      const next: MyEuiSideNavItem = {
+        id: fullId,
+        name,
+        isSelected,
+        onClick,
+        href,
+        items: filteredSubNav,
+        ['data-test-subj']: `nav-item-${subjId}`,
+      };
+      return [...accum, next];
+    }, []);
+
+  return createSideNavData;
+};
diff --git a/packages/shared-ux/chrome/navigation/src/model/index.ts b/packages/shared-ux/chrome/navigation/src/model/index.ts
new file mode 100644
index 00000000000000..8e8d94e9950194
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/model/index.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 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 { BasePathService, NavigateToUrlFn } from '../../types/internal';
+import { analyticsItemSet } from './platform_nav/analytics';
+import { devtoolsItemSet } from './platform_nav/devtools';
+import { mlItemSet } from './platform_nav/machine_learning';
+import { managementItemSet } from './platform_nav/management';
+
+export interface NavigationModelDeps {
+  basePath: BasePathService;
+  navigateToUrl: NavigateToUrlFn;
+}
+
+/**
+ * @public
+ */
+export enum Platform {
+  Recents = 'recents',
+  Analytics = 'analytics',
+  MachineLearning = 'ml',
+  DevTools = 'devTools',
+  Management = 'management',
+}
+
+/**
+ * @public
+ */
+export const navItemSet = {
+  [Platform.Analytics]: analyticsItemSet,
+  [Platform.MachineLearning]: mlItemSet,
+  [Platform.DevTools]: devtoolsItemSet,
+  [Platform.Management]: managementItemSet,
+};
+
+export { NavigationModel } from './model';
diff --git a/packages/shared-ux/chrome/navigation/src/model/model.ts b/packages/shared-ux/chrome/navigation/src/model/model.ts
new file mode 100644
index 00000000000000..0d3e3266be7809
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/model/model.ts
@@ -0,0 +1,107 @@
+/*
+ * Copyright 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 { EuiSideNavItemType } from '@elastic/eui';
+import type { NavigationModelDeps } from '.';
+import { navItemSet, Platform } from '.';
+import type {
+  NavigationBucketProps,
+  NavigationProps,
+  NavItemProps,
+  PlatformId,
+  PlatformSectionConfig,
+  SolutionProperties,
+} from '../../types';
+import { createSideNavDataFactory } from './create_side_nav';
+
+/**
+ * @internal
+ */
+export class NavigationModel {
+  private createSideNavData: (
+    parentIds: string | number | undefined,
+    navItems: Array<NavItemProps<unknown>>,
+    config?: PlatformSectionConfig | undefined
+  ) => Array<EuiSideNavItemType<unknown>>;
+
+  constructor(
+    deps: NavigationModelDeps,
+    private platformConfig: NavigationProps['platformConfig'] | undefined,
+    private solutions: SolutionProperties[],
+    activeNavItemId: string | undefined
+  ) {
+    this.createSideNavData = createSideNavDataFactory(deps, activeNavItemId);
+  }
+
+  private convertToSideNavItems(
+    id: string,
+    items: NavItemProps[] | undefined,
+    platformConfig?: PlatformSectionConfig
+  ) {
+    return items ? this.createSideNavData(id, items, platformConfig) : undefined;
+  }
+
+  public getPlatform(): Record<PlatformId, NavigationBucketProps> {
+    return {
+      [Platform.Analytics]: {
+        id: Platform.Analytics,
+        icon: 'stats',
+        name: 'Data exploration',
+        items: this.convertToSideNavItems(
+          Platform.Analytics,
+          navItemSet[Platform.Analytics],
+          this.platformConfig?.[Platform.Analytics]
+        ),
+      },
+      [Platform.MachineLearning]: {
+        id: Platform.MachineLearning,
+        icon: 'indexMapping',
+        name: 'Machine learning',
+        items: this.convertToSideNavItems(
+          Platform.MachineLearning,
+          navItemSet[Platform.MachineLearning],
+          this.platformConfig?.[Platform.MachineLearning]
+        ),
+      },
+      [Platform.DevTools]: {
+        id: Platform.DevTools,
+        icon: 'editorCodeBlock',
+        name: 'Developer tools',
+        items: this.convertToSideNavItems(
+          Platform.DevTools,
+          navItemSet[Platform.DevTools],
+          this.platformConfig?.[Platform.DevTools]
+        ),
+      },
+      [Platform.Management]: {
+        id: Platform.Management,
+        icon: 'gear',
+        name: 'Management',
+        items: this.convertToSideNavItems(
+          Platform.Management,
+          navItemSet[Platform.Management],
+          this.platformConfig?.[Platform.Management]
+        ),
+      },
+    };
+  }
+
+  public getSolutions(): NavigationBucketProps[] {
+    // Allow multiple solutions' collapsible nav buckets side-by-side
+    return this.solutions.map((s) => ({
+      id: s.id,
+      name: s.name,
+      icon: s.icon,
+      items: this.convertToSideNavItems(s.id, s.items),
+    }));
+  }
+
+  public isEnabled(sectionId: PlatformId) {
+    return this.platformConfig?.[sectionId]?.enabled !== false;
+  }
+}
diff --git a/packages/shared-ux/chrome/navigation/src/model/platform_nav/analytics.ts b/packages/shared-ux/chrome/navigation/src/model/platform_nav/analytics.ts
new file mode 100644
index 00000000000000..4e52e8c161bbd7
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/model/platform_nav/analytics.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { NavItemProps } from '../../../types';
+
+export const analyticsItemSet: NavItemProps[] = [
+  {
+    name: '',
+    id: 'root',
+    items: [
+      {
+        name: 'Discover',
+        id: 'discover',
+        href: '/app/discover',
+      },
+      {
+        name: 'Dashboard',
+        id: 'dashboard',
+        href: '/app/dashboards',
+      },
+      {
+        name: 'Visualize Library',
+        id: 'visualize_library',
+        href: '/app/visualize',
+      },
+    ],
+  },
+];
diff --git a/packages/shared-ux/chrome/navigation/src/model/platform_nav/devtools.ts b/packages/shared-ux/chrome/navigation/src/model/platform_nav/devtools.ts
new file mode 100644
index 00000000000000..049a537c96cc60
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/model/platform_nav/devtools.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { NavItemProps } from '../../../types';
+
+export const devtoolsItemSet: NavItemProps[] = [
+  {
+    name: '',
+    id: 'root',
+    items: [
+      {
+        name: 'Console',
+        id: 'console',
+        href: '/app/dev_tools#/console',
+      },
+      {
+        name: 'Search profiler',
+        id: 'search_profiler',
+        href: '/app/dev_tools#/searchprofiler',
+      },
+      {
+        name: 'Grok debugger',
+        id: 'grok_debugger',
+        href: '/app/dev_tools#/grokdebugger',
+      },
+      {
+        name: 'Painless lab',
+        id: 'painless_lab',
+        href: '/app/dev_tools#/painless_lab',
+      },
+    ],
+  },
+];
diff --git a/packages/shared-ux/chrome/navigation/src/model/platform_nav/machine_learning.ts b/packages/shared-ux/chrome/navigation/src/model/platform_nav/machine_learning.ts
new file mode 100644
index 00000000000000..692bb704dca174
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/model/platform_nav/machine_learning.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright 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 { NavItemProps } from '../../../types';
+
+export const mlItemSet: NavItemProps[] = [
+  {
+    name: '',
+    id: 'root',
+    items: [
+      {
+        name: 'Overview',
+        id: 'overview',
+        href: '/app/ml/overview',
+      },
+      {
+        name: 'Notifications',
+        id: 'notifications',
+        href: '/app/ml/notifications',
+      },
+    ],
+  },
+  {
+    name: 'Anomaly detection',
+    id: 'anomaly_detection',
+    items: [
+      {
+        name: 'Jobs',
+        id: 'jobs',
+        href: '/app/ml/jobs',
+      },
+      {
+        name: 'Anomaly explorer',
+        id: 'explorer',
+        href: '/app/ml/explorer',
+      },
+      {
+        name: 'Single metric viewer',
+        id: 'single_metric_viewer',
+        href: '/app/ml/timeseriesexplorer',
+      },
+      {
+        name: 'Settings',
+        id: 'settings',
+        href: '/app/ml/settings',
+      },
+    ],
+  },
+  {
+    name: 'Data frame analytics',
+    id: 'data_frame_analytics',
+    items: [
+      {
+        name: 'Jobs',
+        id: 'jobs',
+        href: '/app/ml/data_frame_analytics',
+      },
+      {
+        name: 'Results explorer',
+        id: 'results_explorer',
+        href: '/app/ml/data_frame_analytics/exploration',
+      },
+      {
+        name: 'Analytics map',
+        id: 'analytics_map',
+        href: '/app/ml/data_frame_analytics/map',
+      },
+    ],
+  },
+  {
+    name: 'Model management',
+    id: 'model_management',
+    items: [
+      {
+        name: 'Trained models',
+        id: 'trained_models',
+        href: '/app/ml/trained_models',
+      },
+      {
+        name: 'Nodes',
+        id: 'nodes',
+        href: '/app/ml/nodes',
+      },
+    ],
+  },
+  {
+    name: 'Data visualizer',
+    id: 'data_visualizer',
+    items: [
+      {
+        name: 'File',
+        id: 'file',
+        href: '/app/ml/filedatavisualizer',
+      },
+      {
+        name: 'Data view',
+        id: 'data_view',
+        href: '/app/ml/datavisualizer_index_select',
+      },
+    ],
+  },
+  {
+    name: 'AIOps labs',
+    id: 'aiops_labs',
+    items: [
+      {
+        name: 'Explain log rate spikes',
+        id: 'explain_log_rate_spikes',
+        href: '/app/ml/aiops/explain_log_rate_spikes_index_select',
+      },
+      {
+        name: 'Log pattern analysis',
+        id: 'log_pattern_analysis',
+        href: '/app/ml/aiops/log_categorization_index_select',
+      },
+    ],
+  },
+];
diff --git a/packages/shared-ux/chrome/navigation/src/model/platform_nav/management.ts b/packages/shared-ux/chrome/navigation/src/model/platform_nav/management.ts
new file mode 100644
index 00000000000000..c1b09258d1c3b9
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/model/platform_nav/management.ts
@@ -0,0 +1,210 @@
+/*
+ * Copyright 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 { NavItemProps } from '../../../types';
+
+export const managementItemSet: NavItemProps[] = [
+  {
+    name: '',
+    id: 'root',
+    items: [
+      {
+        name: 'Stack monitoring',
+        id: 'stack_monitoring',
+        href: '/app/monitoring',
+      },
+    ],
+  },
+  {
+    name: 'Integration management',
+    id: 'integration_management',
+    items: [
+      {
+        name: 'Integrations',
+        id: 'integrations',
+        href: '/app/integrations',
+      },
+      {
+        name: 'Fleet',
+        id: 'fleet',
+        href: '/app/fleet',
+      },
+      {
+        name: 'Osquery',
+        id: 'osquery',
+        href: '/app/osquery',
+      },
+    ],
+  },
+  {
+    name: 'Stack management',
+    id: 'stack_management',
+    items: [
+      {
+        name: 'Ingest',
+        id: 'ingest',
+        items: [
+          {
+            name: 'Ingest pipelines',
+            id: 'ingest_pipelines',
+            href: '/app/management/ingest/ingest_pipelines',
+          },
+          {
+            name: 'Logstash pipelines',
+            id: 'logstash_pipelines',
+            href: '/app/management/ingest/pipelines',
+          },
+        ],
+      },
+      {
+        name: 'Data',
+        id: 'data',
+        items: [
+          {
+            name: 'Index management',
+            id: 'index_management',
+            href: '/app/management/data/index_management',
+          },
+          {
+            name: 'Index lifecycle policies',
+            id: 'index_lifecycle_policies',
+            href: '/app/management/data/index_lifecycle_management',
+          },
+          {
+            name: 'Snapshot and restore',
+            id: 'snapshot_and_restore',
+            href: 'app/management/data/snapshot_restore',
+          },
+          {
+            name: 'Rollup jobs',
+            id: 'rollup_jobs',
+            href: '/app/management/data/rollup_jobs',
+          },
+          {
+            name: 'Transforms',
+            id: 'transforms',
+            href: '/app/management/data/transform',
+          },
+          {
+            name: 'Cross-cluster replication',
+            id: 'cross_cluster_replication',
+            href: '/app/management/data/cross_cluster_replication',
+          },
+          {
+            name: 'Remote clusters',
+            id: 'remote_clusters',
+            href: '/app/management/data/remote_clusters',
+          },
+        ],
+      },
+      {
+        name: 'Alerts and insights',
+        id: 'alerts_and_insights',
+        items: [
+          {
+            name: 'Rules',
+            id: 'rules',
+            href: '/app/management/insightsAndAlerting/triggersActions/rules',
+          },
+          {
+            name: 'Cases',
+            id: 'cases',
+            href: '/app/management/insightsAndAlerting/cases',
+          },
+          {
+            name: 'Connectors',
+            id: 'connectors',
+            href: '/app/management/insightsAndAlerting/triggersActionsConnectors/connectors',
+          },
+          {
+            name: 'Reporting',
+            id: 'reporting',
+            href: '/app/management/insightsAndAlerting/reporting',
+          },
+          {
+            name: 'Machine learning',
+            id: 'machine_learning',
+            href: '/app/management/insightsAndAlerting/jobsListLink',
+          },
+          {
+            name: 'Watcher',
+            id: 'watcher',
+            href: '/app/management/insightsAndAlerting/watcher',
+          },
+        ],
+      },
+      {
+        name: 'Security',
+        id: 'security',
+        items: [
+          {
+            name: 'Users',
+            id: 'users',
+            href: '/app/management/security/users',
+          },
+          {
+            name: 'Roles',
+            id: 'roles',
+            href: '/app/management/security/roles',
+          },
+          {
+            name: 'Role mappings',
+            id: 'role_mappings',
+            href: '/app/management/security/role_mappings',
+          },
+          {
+            name: 'API keys',
+            id: 'api_keys',
+            href: '/app/management/security/api_keys',
+          },
+        ],
+      },
+      {
+        name: 'Kibana',
+        id: 'kibana',
+        items: [
+          {
+            name: 'Data view',
+            id: 'data_views',
+            href: '/app/management/kibana/dataViews',
+          },
+          {
+            name: 'Saved objects',
+            id: 'saved_objects',
+            href: '/app/management/kibana/objects',
+          },
+          {
+            name: 'Tags',
+            id: 'tags',
+            href: '/app/management/kibana/tags',
+          },
+          {
+            name: 'Search sessions',
+            id: 'search_sessions',
+            href: '/app/management/kibana/search_sessions',
+          },
+          {
+            name: 'Spaces',
+            id: 'spaces',
+            href: '/app/management/kibana/spaces',
+          },
+          {
+            name: 'Advanced settings',
+            id: 'advanced_settings',
+            href: '/app/management/kibana/settings',
+          },
+        ],
+      },
+      {
+        name: 'Upgrade assistant',
+        id: 'upgrade_assistant',
+        href: '/app/management/stack/upgrade_assistant',
+      },
+    ],
+  },
+];
diff --git a/packages/shared-ux/chrome/navigation/src/services.tsx b/packages/shared-ux/chrome/navigation/src/services.tsx
new file mode 100644
index 00000000000000..8235963c186814
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/services.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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, { FC, useContext } from 'react';
+import useObservable from 'react-use/lib/useObservable';
+import { NavigationKibanaDependencies, NavigationServices } from '../types';
+
+const Context = React.createContext<NavigationServices | null>(null);
+
+/**
+ * A Context Provider that provides services to the component and its dependencies.
+ */
+export const NavigationProvider: FC<NavigationServices> = ({ children, ...services }) => {
+  return <Context.Provider value={services}>{children}</Context.Provider>;
+};
+
+/**
+ * Kibana-specific Provider that maps dependencies to services.
+ */
+export const NavigationKibanaProvider: FC<NavigationKibanaDependencies> = ({
+  children,
+  ...dependencies
+}) => {
+  const { core } = dependencies;
+  const { http } = core;
+  const { basePath } = http;
+  const { navigateToUrl } = core.application;
+
+  const loadingCount = useObservable(http.getLoadingCount$(), 0);
+
+  const value: NavigationServices = {
+    basePath,
+    loadingCount,
+    navigateToUrl,
+    navIsOpen: true,
+  };
+
+  return (
+    <Context.Provider {...{ value }} {...dependencies}>
+      {children}
+    </Context.Provider>
+  );
+};
+
+/**
+ * React hook for accessing pre-wired services.
+ */
+export function useNavigation() {
+  const context = useContext(Context);
+
+  if (!context) {
+    throw new Error(
+      'Navigation Context is missing. Ensure your component or React root is wrapped with NavigationContext.'
+    );
+  }
+
+  return context;
+}
diff --git a/packages/shared-ux/chrome/navigation/src/styles.ts b/packages/shared-ux/chrome/navigation/src/styles.ts
new file mode 100644
index 00000000000000..72db66e12f7bf1
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/styles.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { css } from '@emotion/react';
+
+export const navigationStyles = {
+  euiSideNavItems: css`
+    padding-left: 45px;
+  `,
+};
diff --git a/packages/shared-ux/chrome/navigation/src/ui/elastic_mark.tsx b/packages/shared-ux/chrome/navigation/src/ui/elastic_mark.tsx
new file mode 100644
index 00000000000000..b538eb5d1756c0
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/ui/elastic_mark.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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, { HTMLAttributes } from 'react';
+
+export const ElasticMark = ({ ...props }: HTMLAttributes<SVGElement>) => (
+  <svg
+    width="64"
+    height="19"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    aria-labelledby="elasticMark"
+    {...props}
+  >
+    <title id="elasticMark">Elastic</title>
+    <path d="M9.74 16.882l.711-.076.046 1.455c-1.879.257-3.485.393-4.818.393-1.773 0-3.03-.515-3.773-1.545C1.164 16.08.8 14.473.8 12.306c0-4.333 1.727-6.5 5.167-6.5 1.666 0 2.909.47 3.727 1.394.818.924 1.227 2.394 1.227 4.379l-.106 1.409H2.664c0 1.364.242 2.379.742 3.03.5.652 1.349.985 2.576.985 1.242.03 2.485-.015 3.757-.121zm-.667-5.349c0-1.515-.243-2.59-.728-3.212-.484-.621-1.272-.94-2.363-.94s-1.924.334-2.47.986c-.545.651-.833 1.712-.848 3.166h6.409zM13.497 18.427V.7h1.848v17.727h-1.848zM27.027 9.806v6.076c0 .621 1.53.742 1.53.742l-.09 1.637c-1.303 0-2.38.106-3.03-.515a10.861 10.861 0 01-4.44.924c-1.136 0-2-.319-2.59-.97-.592-.636-.895-1.56-.895-2.773 0-1.197.303-2.09.91-2.651.605-.56 1.56-.925 2.863-1.046l3.879-.363v-1.06c0-.834-.182-1.44-.546-1.804-.363-.364-.863-.545-1.485-.545H18.27V5.82h4.742c1.394 0 2.41.318 3.046.97.651.636.97 1.651.97 3.015zm-7.606 5.03c0 1.516.621 2.273 1.879 2.273a9.89 9.89 0 003.303-.56l.56-.197v-4.076l-3.65.348c-.743.06-1.274.273-1.607.637-.333.363-.485.894-.485 1.575zM34.255 7.473c-1.788 0-2.697.62-2.697 1.879 0 .575.212.984.62 1.227.41.242 1.35.485 2.819.742 1.47.258 2.5.606 3.106 1.076.606.454.91 1.318.91 2.59 0 1.274-.41 2.198-1.228 2.789-.818.59-2 .894-3.576.894-1.015 0-4.424-.38-4.424-.38l.106-1.605c1.954.182 3.379.333 4.333.333.955 0 1.682-.151 2.182-.454.5-.303.758-.819.758-1.53 0-.713-.212-1.198-.637-1.455-.424-.258-1.363-.5-2.818-.728-1.455-.227-2.485-.56-3.09-1.015-.607-.439-.91-1.272-.91-2.47 0-1.196.424-2.09 1.273-2.666.848-.576 1.909-.864 3.166-.864 1 0 4.485.258 4.485.258v1.621c-1.833-.106-3.333-.242-4.379-.242zM47.952 7.685h-3.925v5.909c0 1.409.106 2.348.303 2.788.212.44.697.666 1.47.666l2.197-.151.121 1.53c-1.106.182-1.94.273-2.515.273-1.288 0-2.167-.318-2.667-.94-.5-.62-.742-1.818-.742-3.575v-6.5h-1.758V6.079h1.758V2.29h1.833v3.773h3.925v1.62zM50.527 3.276V1.139h1.849v2.152l-1.849-.015zm0 15.151V6.08h1.849v12.348h-1.849zM60.406 5.821c.546 0 1.47.106 2.773.303l.59.076-.075 1.5c-1.318-.152-2.288-.227-2.91-.227-1.393 0-2.348.333-2.848 1-.5.666-.757 1.909-.757 3.712 0 1.803.227 3.06.697 3.773.47.712 1.44 1.06 2.924 1.06l2.91-.227.075 1.53c-1.53.227-2.682.349-3.44.349-1.924 0-3.257-.5-3.984-1.485-.728-.985-1.106-2.652-1.106-5 0-2.349.393-4 1.181-4.94.803-.939 2.122-1.424 3.97-1.424z" />
+  </svg>
+);
diff --git a/packages/shared-ux/chrome/navigation/src/ui/header_logo.scss b/packages/shared-ux/chrome/navigation/src/ui/header_logo.scss
new file mode 100644
index 00000000000000..f75fd9cfa2466e
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/ui/header_logo.scss
@@ -0,0 +1,4 @@
+.chrHeaderLogo__mark {
+  margin-left: $euiSizeS;
+  fill: $euiColorGhost;
+}
diff --git a/packages/shared-ux/chrome/navigation/src/ui/i18n_strings.ts b/packages/shared-ux/chrome/navigation/src/ui/i18n_strings.ts
new file mode 100644
index 00000000000000..9f6f3fbadca306
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/ui/i18n_strings.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { i18n } from '@kbn/i18n';
+
+export const getI18nStrings = () => ({
+  headerLogoAriaLabel: i18n.translate(
+    'sharedUXPackages.chrome.sideNavigation.headerLogo.ariaLabel',
+    {
+      defaultMessage: 'Go to home page',
+    }
+  ),
+  linkToCloudProjects: i18n.translate(
+    'sharedUXPackages.chrome.sideNavigation.linkToCloud.projects',
+    {
+      defaultMessage: 'My projects',
+    }
+  ),
+  linkToCloudDeployments: i18n.translate(
+    'sharedUXPackages.chrome.sideNavigation.linkToCloud.deployments',
+    {
+      defaultMessage: 'My deployments',
+    }
+  ),
+});
diff --git a/packages/shared-ux/chrome/navigation/src/ui/navigation.stories.tsx b/packages/shared-ux/chrome/navigation/src/ui/navigation.stories.tsx
new file mode 100644
index 00000000000000..20c0c2201acfbb
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/ui/navigation.stories.tsx
@@ -0,0 +1,167 @@
+/*
+ * Copyright 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 {
+  EuiButtonEmpty,
+  EuiButtonIcon,
+  EuiCollapsibleNav,
+  EuiPopover,
+  EuiThemeProvider,
+} from '@elastic/eui';
+import { ComponentMeta, ComponentStory } from '@storybook/react';
+import React, { useCallback, useState } from 'react';
+import { css } from '@emotion/react';
+import { getSolutionPropertiesMock, NavigationStorybookMock } from '../../mocks';
+import mdx from '../../README.mdx';
+import { NavigationProps, NavigationServices } from '../../types';
+import { Platform } from '../model';
+import { NavigationProvider } from '../services';
+import { Navigation as Component } from './navigation';
+
+const storybookMock = new NavigationStorybookMock();
+
+const SIZE_OPEN = 248;
+const SIZE_CLOSED = 40;
+
+const Template = (args: NavigationProps & NavigationServices) => {
+  const services = storybookMock.getServices(args);
+  const props = storybookMock.getProps(args);
+
+  const [isOpen, setIsOpen] = useState(true);
+
+  const toggleOpen = useCallback(() => {
+    setIsOpen(!isOpen);
+  }, [isOpen, setIsOpen]);
+
+  const collabsibleNavCSS = css`
+    border-inline-end-width: 1,
+    display: flex,
+    flex-direction: row,
+  `;
+
+  const CollapseButton = () => {
+    const buttonCSS = css`
+      margin-left: -32px;
+      position: fixed;
+      z-index: 1000;
+    `;
+    return (
+      <span css={buttonCSS}>
+        <EuiButtonIcon
+          iconType={isOpen ? 'menuLeft' : 'menuRight'}
+          color={isOpen ? 'ghost' : 'text'}
+          onClick={toggleOpen}
+        />
+      </span>
+    );
+  };
+
+  return (
+    <EuiThemeProvider>
+      <EuiCollapsibleNav
+        css={collabsibleNavCSS}
+        isOpen={true}
+        showButtonIfDocked={true}
+        onClose={toggleOpen}
+        isDocked={true}
+        size={isOpen ? SIZE_OPEN : SIZE_CLOSED}
+        hideCloseButton={false}
+        button={<CollapseButton />}
+      >
+        {isOpen && (
+          <NavigationProvider {...services}>
+            <Component {...props} />
+          </NavigationProvider>
+        )}
+      </EuiCollapsibleNav>
+    </EuiThemeProvider>
+  );
+};
+
+export default {
+  title: 'Chrome/Navigation',
+  description: 'Navigation container to render items for cross-app linking',
+  parameters: {
+    docs: {
+      page: mdx,
+    },
+  },
+  component: Template,
+} as ComponentMeta<typeof Template>;
+
+export const SingleExpanded: ComponentStory<typeof Template> = Template.bind({});
+SingleExpanded.args = {
+  activeNavItemId: 'example_project.root.get_started',
+  solutions: [getSolutionPropertiesMock()],
+};
+SingleExpanded.argTypes = storybookMock.getArgumentTypes();
+
+export const ReducedPlatformLinks: ComponentStory<typeof Template> = Template.bind({});
+ReducedPlatformLinks.args = {
+  activeNavItemId: 'example_project.root.get_started',
+  platformConfig: {
+    [Platform.Analytics]: { enabled: false },
+    [Platform.MachineLearning]: { enabled: false },
+    [Platform.DevTools]: { enabled: false },
+    [Platform.Management]: {
+      properties: {
+        root: {
+          enabled: false, // disables the un-named section that contains only "Stack Monitoring"
+        },
+        integration_management: {
+          properties: {
+            integrations: { enabled: false }, // enable only osquery
+            fleet: { enabled: false }, // enable only osquery
+          },
+        },
+        stack_management: {
+          enabled: false, // disables the stack management section
+        },
+      },
+    },
+  },
+  solutions: [getSolutionPropertiesMock()],
+};
+ReducedPlatformLinks.argTypes = storybookMock.getArgumentTypes();
+
+export const WithRequestsLoading: ComponentStory<typeof Template> = Template.bind({});
+WithRequestsLoading.args = {
+  activeNavItemId: 'example_project.root.get_started',
+  loadingCount: 1,
+  solutions: [getSolutionPropertiesMock()],
+};
+WithRequestsLoading.argTypes = storybookMock.getArgumentTypes();
+
+export const CustomElements: ComponentStory<typeof Template> = Template.bind({});
+CustomElements.args = {
+  activeNavItemId: 'example_project.custom',
+  solutions: [
+    {
+      ...getSolutionPropertiesMock(),
+      items: [
+        {
+          name: (
+            <EuiPopover
+              button={
+                <EuiButtonEmpty iconType="spaces" iconSide="right">
+                  Custom element
+                </EuiButtonEmpty>
+              }
+              isOpen={true}
+              anchorPosition="rightCenter"
+            >
+              Cool popover content
+            </EuiPopover>
+          ),
+          id: 'custom',
+        },
+      ],
+    },
+  ],
+};
+CustomElements.argTypes = storybookMock.getArgumentTypes();
diff --git a/packages/shared-ux/chrome/navigation/src/ui/navigation.test.tsx b/packages/shared-ux/chrome/navigation/src/ui/navigation.test.tsx
new file mode 100644
index 00000000000000..075925f05de6a3
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/ui/navigation.test.tsx
@@ -0,0 +1,127 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { render } from '@testing-library/react';
+import React from 'react';
+import { getServicesMock } from '../../mocks/src/jest';
+import { PlatformConfigSet, SolutionProperties } from '../../types';
+import { Platform } from '../model';
+import { NavigationProvider } from '../services';
+import { Navigation } from './navigation';
+
+describe('<Navigation />', () => {
+  const services = getServicesMock();
+
+  const homeHref = '#';
+  let platformSections: PlatformConfigSet | undefined;
+  let solutions: SolutionProperties[];
+
+  beforeEach(() => {
+    platformSections = { analytics: {}, ml: {}, devTools: {}, management: {} };
+    solutions = [{ id: 'navigation_testing', name: 'Navigation testing', icon: 'gear' }];
+  });
+
+  test('renders the header logo and top-level navigation buckets', async () => {
+    const { findByTestId, findByText } = render(
+      <NavigationProvider {...services} navIsOpen={true}>
+        <Navigation platformConfig={platformSections} solutions={solutions} homeHref={homeHref} />
+      </NavigationProvider>
+    );
+
+    expect(await findByText('Navigation testing')).toBeVisible();
+
+    expect(await findByTestId('nav-header-logo')).toBeVisible();
+    expect(await findByTestId('nav-bucket-navigation_testing')).toBeVisible();
+    expect(await findByTestId('nav-bucket-analytics')).toBeVisible();
+    expect(await findByTestId('nav-bucket-ml')).toBeVisible();
+    expect(await findByTestId('nav-bucket-devTools')).toBeVisible();
+    expect(await findByTestId('nav-bucket-management')).toBeVisible();
+  });
+
+  test('includes link to deployments', async () => {
+    const { findByText } = render(
+      <NavigationProvider {...services} navIsOpen={true}>
+        <Navigation
+          platformConfig={platformSections}
+          solutions={solutions}
+          homeHref={homeHref}
+          linkToCloud="deployments"
+        />
+      </NavigationProvider>
+    );
+
+    expect(await findByText('My deployments')).toBeVisible();
+  });
+
+  test('platform links can be disabled', async () => {
+    platformSections = {
+      [Platform.Analytics]: { enabled: false },
+      [Platform.MachineLearning]: { enabled: false },
+      [Platform.DevTools]: { enabled: false },
+      [Platform.Management]: { enabled: false },
+    };
+
+    const { findByTestId, queryByTestId } = render(
+      <NavigationProvider {...services} navIsOpen={true}>
+        <Navigation platformConfig={platformSections} solutions={solutions} homeHref={homeHref} />
+      </NavigationProvider>
+    );
+
+    expect(await findByTestId('nav-header-logo')).toBeVisible();
+    expect(queryByTestId('nav-bucket-analytics')).not.toBeInTheDocument();
+    expect(queryByTestId('nav-bucket-ml')).not.toBeInTheDocument();
+    expect(queryByTestId('nav-bucket-devTools')).not.toBeInTheDocument();
+    expect(queryByTestId('nav-bucket-management')).not.toBeInTheDocument();
+  });
+
+  test('sets the specified nav item to active', async () => {
+    solutions[0].items = [
+      {
+        id: 'root',
+        name: '',
+        items: [
+          {
+            id: 'city',
+            name: 'City',
+          },
+          {
+            id: 'town',
+            name: 'Town',
+          },
+        ],
+      },
+    ];
+
+    const { findByTestId } = render(
+      <NavigationProvider {...services} navIsOpen={true}>
+        <Navigation
+          platformConfig={platformSections}
+          solutions={solutions}
+          homeHref={homeHref}
+          activeNavItemId="navigation_testing.root.city"
+        />
+      </NavigationProvider>
+    );
+
+    const label = await findByTestId('nav-item-navigation_testing.root.city-selected');
+    expect(label).toHaveTextContent('City');
+    expect(label).toBeVisible();
+  });
+
+  test('shows loading state', async () => {
+    services.loadingCount = 5;
+
+    const { findByTestId } = render(
+      <NavigationProvider {...services} navIsOpen={true}>
+        <Navigation platformConfig={platformSections} solutions={solutions} homeHref={homeHref} />
+      </NavigationProvider>
+    );
+
+    expect(await findByTestId('nav-header-loading-spinner')).toBeVisible();
+  });
+});
diff --git a/packages/shared-ux/chrome/navigation/src/ui/navigation.tsx b/packages/shared-ux/chrome/navigation/src/ui/navigation.tsx
new file mode 100644
index 00000000000000..60f3af10a6b541
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/ui/navigation.tsx
@@ -0,0 +1,135 @@
+/*
+ * Copyright 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 {
+  EuiCollapsibleNavGroup,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHeaderLogo,
+  EuiLink,
+  EuiLoadingSpinner,
+  EuiSpacer,
+  useEuiTheme,
+} from '@elastic/eui';
+import React from 'react';
+import { getI18nStrings } from './i18n_strings';
+import { NavigationBucketProps, NavigationProps } from '../../types';
+import { NavigationModel } from '../model';
+import { useNavigation } from '../services';
+import { ElasticMark } from './elastic_mark';
+import './header_logo.scss';
+import { NavigationBucket } from './navigation_bucket';
+
+export const Navigation = (props: NavigationProps) => {
+  const { loadingCount, activeNavItemId, ...services } = useNavigation();
+  const { euiTheme } = useEuiTheme();
+
+  const activeNav = activeNavItemId ?? props.activeNavItemId;
+
+  const nav = new NavigationModel(services, props.platformConfig, props.solutions, activeNav);
+
+  const solutions = nav.getSolutions();
+  const { analytics, ml, devTools, management } = nav.getPlatform();
+
+  const strings = getI18nStrings();
+
+  const NavHeader = () => {
+    const homeUrl = services.basePath.prepend(props.homeHref);
+    const navigateHome = (event: React.MouseEvent) => {
+      event.preventDefault();
+      services.navigateToUrl(homeUrl);
+    };
+    const logo =
+      loadingCount === 0 ? (
+        <EuiHeaderLogo
+          iconType="logoElastic"
+          aria-label={strings.headerLogoAriaLabel}
+          onClick={navigateHome}
+          data-test-subj="nav-header-logo"
+        />
+      ) : (
+        <a href={homeUrl} onClick={navigateHome}>
+          <EuiLoadingSpinner
+            size="l"
+            aria-hidden={false}
+            onClick={navigateHome}
+            data-test-subj="nav-header-loading-spinner"
+          />
+        </a>
+      );
+
+    return (
+      <>
+        {logo}
+        {services.navIsOpen ? (
+          <ElasticMark className="chrHeaderLogo__mark" aria-hidden={true} />
+        ) : null}
+      </>
+    );
+  };
+
+  const LinkToCloud = () => {
+    switch (props.linkToCloud) {
+      case 'projects':
+        return (
+          <EuiLink
+            href="https://cloud.elastic.co/projects"
+            color="text"
+            data-test-subj="nav-header-link-to-projects"
+          >
+            <EuiCollapsibleNavGroup iconType="spaces" title={strings.linkToCloudProjects} />
+          </EuiLink>
+        );
+      case 'deployments':
+        return (
+          <EuiLink
+            href="https://cloud.elastic.co/deployments"
+            color="text"
+            data-test-subj="nav-header-link-to-deployments"
+          >
+            <EuiCollapsibleNavGroup iconType="spaces" title={strings.linkToCloudDeployments} />
+          </EuiLink>
+        );
+      default:
+        return null;
+    }
+  };
+
+  // higher-order-component to keep the common props DRY
+  const NavigationBucketHoc = (outerProps: Omit<NavigationBucketProps, 'activeNavItemId'>) => (
+    <NavigationBucket {...outerProps} activeNavItemId={activeNav} />
+  );
+
+  return (
+    <EuiFlexGroup direction="column" gutterSize="none" style={{ overflowY: 'auto' }}>
+      <EuiFlexItem grow={false}>
+        <EuiCollapsibleNavGroup css={{ background: euiTheme.colors.darkestShade, height: '50px' }}>
+          <NavHeader />
+        </EuiCollapsibleNavGroup>
+
+        <LinkToCloud />
+
+        {solutions.map((solutionBucket, idx) => {
+          return <NavigationBucketHoc {...solutionBucket} key={`solution${idx}`} />;
+        })}
+
+        {nav.isEnabled('analytics') ? <NavigationBucketHoc {...analytics} /> : null}
+        {nav.isEnabled('ml') ? <NavigationBucketHoc {...ml} /> : null}
+      </EuiFlexItem>
+
+      <EuiFlexItem grow={true}>
+        <EuiSpacer />
+      </EuiFlexItem>
+
+      <EuiFlexItem grow={false}>
+        {nav.isEnabled('devTools') ? <NavigationBucketHoc {...devTools} /> : null}
+        {nav.isEnabled('management') ? <NavigationBucketHoc {...management} /> : null}
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/packages/shared-ux/chrome/navigation/src/ui/navigation_bucket.tsx b/packages/shared-ux/chrome/navigation/src/ui/navigation_bucket.tsx
new file mode 100644
index 00000000000000..0b0d6b5b223ab2
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/src/ui/navigation_bucket.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { EuiCollapsibleNavGroup, EuiIcon, EuiSideNav, EuiText } from '@elastic/eui';
+import React from 'react';
+import { NavigationBucketProps } from '../../types';
+import { useNavigation } from '../services';
+import { navigationStyles as styles } from '../styles';
+
+export const NavigationBucket = (opts: NavigationBucketProps) => {
+  const { id, items, activeNavItemId, ...props } = opts;
+  const { navIsOpen } = useNavigation();
+
+  if (navIsOpen) {
+    return (
+      <EuiCollapsibleNavGroup
+        id={id}
+        title={props.name}
+        iconType={props.icon}
+        isCollapsible={true}
+        initialIsOpen={activeNavItemId?.startsWith(id + '.')}
+        data-test-subj={`nav-bucket-${id}`}
+      >
+        <EuiText color="default">
+          <EuiSideNav items={items} css={styles.euiSideNavItems} />
+        </EuiText>
+      </EuiCollapsibleNavGroup>
+    );
+  }
+
+  return (
+    <div>
+      <EuiIcon type={props.icon ?? 'empty'} size="l" />
+      <hr />
+    </div>
+  );
+};
diff --git a/packages/shared-ux/chrome/navigation/tsconfig.json b/packages/shared-ux/chrome/navigation/tsconfig.json
new file mode 100644
index 00000000000000..05fd9d0346421a
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types",
+    "types": [
+      "jest",
+      "node",
+      "react",
+      "@emotion/react/types/css-prop",
+      "@testing-library/jest-dom",
+      "@testing-library/react",
+      "@kbn/ambient-ui-types"
+    ]
+  },
+  "include": [
+    "**/*.ts",
+    "**/*.tsx"
+  ],
+  "kbn_references": [
+    "@kbn/core-application-browser",
+    "@kbn/core-http-browser",
+    "@kbn/shared-ux-storybook-mock",
+    "@kbn/i18n"
+  ],
+  "exclude": [
+    "target/**/*"
+  ]
+}
diff --git a/packages/shared-ux/chrome/navigation/types/index.ts b/packages/shared-ux/chrome/navigation/types/index.ts
new file mode 100644
index 00000000000000..bd7aaddcb67c6f
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/types/index.ts
@@ -0,0 +1,132 @@
+/*
+ * Copyright 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 { EuiSideNavItemType, IconType } from '@elastic/eui';
+import { Observable } from 'rxjs';
+import { BasePathService, NavigateToUrlFn, RecentItem } from './internal';
+
+/**
+ * A list of services that are consumed by this component.
+ * @public
+ */
+export interface NavigationServices {
+  activeNavItemId?: string;
+  basePath: BasePathService;
+  loadingCount: number;
+  navIsOpen: boolean;
+  navigateToUrl: NavigateToUrlFn;
+}
+
+/**
+ * An interface containing a collection of Kibana dependencies required to
+ * render this component
+ * @public
+ */
+export interface NavigationKibanaDependencies {
+  core: {
+    application: { navigateToUrl: NavigateToUrlFn };
+    chrome: {
+      recentlyAccessed: { get$: () => Observable<RecentItem[]> };
+    };
+    http: {
+      basePath: BasePathService;
+      getLoadingCount$(): Observable<number>;
+    };
+  };
+}
+
+/**
+ * Props for the `NavItem` component representing the content of a navigational item with optional children.
+ * @public
+ */
+export type NavItemProps<T = unknown> = Pick<EuiSideNavItemType<T>, 'id' | 'name'> & {
+  /**
+   * Nav Items
+   */
+  items?: Array<NavItemProps<T>>;
+  /**
+   * Href for a link destination
+   * Example: /app/fleet
+   */
+  href?: string;
+};
+
+/**
+ * @public
+ */
+export interface PlatformSectionConfig {
+  enabled?: boolean;
+  properties?: Record<string, PlatformSectionConfig>;
+}
+
+/**
+ * @public
+ */
+export interface SolutionProperties {
+  /**
+   * Solutions' navigation items
+   */
+  items?: NavItemProps[];
+  /**
+   * Solutions' navigation collapsible nav ID
+   */
+  id: string;
+  /**
+   * Name to show as title for Solutions' collapsible nav "bucket"
+   */
+  name: React.ReactNode;
+  /**
+   * Solution logo, i.e. "logoObservability"
+   */
+  icon: IconType;
+}
+
+/**
+ * @public
+ */
+export type PlatformId = 'analytics' | 'ml' | 'devTools' | 'management';
+
+/**
+ * Object that will allow parts of the platform-controlled nav to be hidden
+ * @public
+ */
+export type PlatformConfigSet = Record<PlatformId, PlatformSectionConfig>;
+
+/**
+ * Props for the `Navigation` component.
+ * @public
+ */
+export interface NavigationProps {
+  /**
+   * ID of sections to initially open
+   * Path to the nav item is given with hierarchy expressed in dotted notation.
+   * Example: `my_project.settings.index_management`
+   */
+  activeNavItemId?: string;
+  /**
+   * Configuration for Solutions' section(s)
+   */
+  solutions: SolutionProperties[];
+  /**
+   * Controls over how Platform nav sections appear
+   */
+  platformConfig?: Partial<PlatformConfigSet>;
+  /**
+   * Target for the logo icon
+   */
+  homeHref: string;
+  /**
+   * Control of the link that takes the user to their projects or deployments
+   */
+  linkToCloud?: 'projects' | 'deployments';
+}
+
+export type NavigationBucketProps = (SolutionProperties &
+  Pick<NavigationProps, 'activeNavItemId'>) & {
+  platformConfig?: PlatformSectionConfig;
+};
diff --git a/packages/shared-ux/chrome/navigation/types/internal.ts b/packages/shared-ux/chrome/navigation/types/internal.ts
new file mode 100644
index 00000000000000..6808c391073a9b
--- /dev/null
+++ b/packages/shared-ux/chrome/navigation/types/internal.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright 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 { ApplicationStart } from '@kbn/core-application-browser';
+import type { IBasePath } from '@kbn/core-http-browser';
+
+/**
+ * @internal
+ */
+export type SetActiveNavItemIdFn = (activeNavItemId: string) => void;
+
+/**
+ * @internal
+ */
+export interface RecentItem {
+  link: string;
+  label: string;
+  id: string;
+}
+
+export type NavigateToUrlFn = ApplicationStart['navigateToUrl'];
+
+export type BasePathService = Pick<IBasePath, 'prepend'>;
diff --git a/packages/shared-ux/file/types/index.ts b/packages/shared-ux/file/types/index.ts
index 86b9e47fdab43e..32dda0bd933a7c 100644
--- a/packages/shared-ux/file/types/index.ts
+++ b/packages/shared-ux/file/types/index.ts
@@ -226,6 +226,10 @@ export interface FileJSON<Meta = unknown> {
    * User data associated with this file
    */
   user?: FileMetadata['user'];
+  /**
+   * File hash information
+   */
+  hash?: BaseFileMetadata['hash'];
 }
 
 export interface FileKindBase {
diff --git a/scripts/check_mappings_update.js b/scripts/check_mappings_update.js
new file mode 100644
index 00000000000000..52e8b3c9e1c970
--- /dev/null
+++ b/scripts/check_mappings_update.js
@@ -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 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.
+ */
+
+require('../src/setup_node_env');
+require('@kbn/check-mappings-update-cli');
diff --git a/src/cli/serve/integration_tests/serverless_config_flag.test.ts b/src/cli/serve/integration_tests/serverless_config_flag.test.ts
index 6c67ba6261eb40..d603eff2eaec4d 100644
--- a/src/cli/serve/integration_tests/serverless_config_flag.test.ts
+++ b/src/cli/serve/integration_tests/serverless_config_flag.test.ts
@@ -6,15 +6,38 @@
  * Side Public License, v 1.
  */
 
-import { spawn, spawnSync } from 'child_process';
+import { spawn, spawnSync, ChildProcessWithoutNullStreams } from 'child_process';
+import type { Readable } from 'stream';
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
-import { filter, firstValueFrom, from, take, concatMap } from 'rxjs';
+import { filter, firstValueFrom, from, concatMap } from 'rxjs';
 
 import { REPO_ROOT } from '@kbn/repo-info';
 import { getConfigDirectory } from '@kbn/utils';
 
 describe('cli serverless project type', () => {
+  let child: ChildProcessWithoutNullStreams | undefined;
+
+  afterEach(() => {
+    child?.kill('SIGKILL');
+    child = undefined;
+  });
+
+  async function waitForMessage(stream: Readable, expectedMsg: string) {
+    let leftover = '';
+    return await firstValueFrom(
+      from(stream).pipe(
+        concatMap((chunk: Buffer) => {
+          const data = leftover + chunk.toString('utf-8');
+          const msgs = data.split('\n');
+          leftover = msgs.pop() ?? '';
+          return msgs;
+        }),
+        filter((msg) => msg.includes(expectedMsg) || msg.includes('FATAL'))
+      )
+    );
+  }
+
   it(
     'exits with statusCode 1 and logs an error when serverless project type is invalid',
     () => {
@@ -36,52 +59,36 @@ describe('cli serverless project type', () => {
     20 * 1000
   );
 
-  // Skipping this one because on CI it fails to read the config file
-  it.skip.each(['es', 'oblt', 'security'])(
+  it.each(['es', 'oblt', 'security'])(
     'writes the serverless project type %s in config/serverless.recent.yml',
     async (mode) => {
       // Making sure `--serverless` translates into the `serverless` config entry, and validates against the accepted values
-      const child = spawn(process.execPath, ['scripts/kibana', `--serverless=${mode}`], {
+      child = spawn(process.execPath, ['scripts/kibana', `--serverless=${mode}`], {
         cwd: REPO_ROOT,
       });
 
-      // Wait for 5 lines in the logs
-      await firstValueFrom(from(child.stdout).pipe(take(5)));
+      // Wait until Kibana starts bootstrapping (at that point the file should be present)
+      const found = await waitForMessage(child.stdout, 'Kibana process configured with roles');
+      expect(found).not.toContain('FATAL');
 
       expect(
         readFileSync(resolve(getConfigDirectory(), 'serverless.recent.yml'), 'utf-8')
       ).toContain(`serverless: ${mode}\n`);
-
-      child.kill('SIGKILL');
     }
   );
 
   it.each(['es', 'oblt', 'security'])(
     'Kibana does not crash when running project type %s',
     async (mode) => {
-      const child = spawn(process.execPath, ['scripts/kibana', `--serverless=${mode}`], {
+      child = spawn(process.execPath, ['scripts/kibana', `--serverless=${mode}`], {
         cwd: REPO_ROOT,
       });
 
       // Wait until Kibana starts listening to the port
-      let leftover = '';
-      const found = await firstValueFrom(
-        from(child.stdout).pipe(
-          concatMap((chunk: Buffer) => {
-            const data = leftover + chunk.toString('utf-8');
-            const msgs = data.split('\n');
-            leftover = msgs.pop() ?? '';
-            return msgs;
-          }),
-          filter(
-            (msg) =>
-              msg.includes('http server running at http://localhost:5601') || msg.includes('FATAL')
-          )
-        )
+      const found = await waitForMessage(
+        child.stdout,
+        'http server running at http://localhost:5601'
       );
-
-      child.kill('SIGKILL');
-
       expect(found).not.toContain('FATAL');
     }
   );
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index c1b9f04fd8d814..45c9e04c7e5587 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -125,11 +125,9 @@ function maybeSetRecentConfig(file, projectType, isDevMode, configs, method) {
   }
 
   try {
-    if (projectType === true) {
-      if (!existsSync(path)) {
-        writeMode('es');
-      }
-    } else {
+    if (!existsSync(path)) {
+      writeMode(projectType === true ? 'es' : projectType);
+    } else if (typeof projectType === 'string') {
       const data = readFileSync(path, 'utf-8');
       const match = data.match(/serverless: (\w+)\n/);
       if (!match || match[1] !== projectType) {
@@ -139,10 +137,6 @@ function maybeSetRecentConfig(file, projectType, isDevMode, configs, method) {
 
     configs[method](path);
   } catch (err) {
-    if (err.code === 'ENOENT') {
-      return;
-    }
-
     throw err;
   }
 }
diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss
index 1e8e6c7411e4d8..de138cdf402e6e 100644
--- a/src/core/public/styles/_base.scss
+++ b/src/core/public/styles/_base.scss
@@ -34,12 +34,3 @@
 .euiPageHeader--bottomBorder:not(.euiPageHeader--tabsAtBottom):not([class*='euiPageHeader--padding']) {
   padding-bottom: $euiSizeL;
 }
-
-// Kibana's body ignores the `margin-right !important` set by react-remove-scroll-bar
-// (used by EUI's focus trap component & prevents page width jumps on full-screen overlays)
-// due to the 100% width/min-width CSS set by Kibana in other places. To work around this, we
-// grab the `--removed-body-scroll-bar-size` var added by the library & manually set `padding`
-// TODO: Use `gapMode` instead once https://github.com/theKashey/react-focus-on/issues/65 is fixed
-.kbnBody {
-  padding-right: var(--removed-body-scroll-bar-size, 0);
-}
diff --git a/src/core/server/integration_tests/saved_objects/jest.integration.config.js b/src/core/server/integration_tests/saved_objects/jest.integration.config.js
index e0713af701ea3f..abafabc152d173 100644
--- a/src/core/server/integration_tests/saved_objects/jest.integration.config.js
+++ b/src/core/server/integration_tests/saved_objects/jest.integration.config.js
@@ -7,6 +7,7 @@
  */
 
 module.exports = {
+  bail: true, // only report 1 issue
   // TODO replace the line below with
   // preset: '@kbn/test/jest_integration_node
   // to do so, we must fix all integration tests first
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/base.fixtures.ts b/src/core/server/integration_tests/saved_objects/migrations/fixtures/zdt_base.fixtures.ts
similarity index 87%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/base.fixtures.ts
rename to src/core/server/integration_tests/saved_objects/migrations/fixtures/zdt_base.fixtures.ts
index 3cf5e499eaa6ee..53c7c1d11613d4 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/base.fixtures.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/fixtures/zdt_base.fixtures.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsModelVersion } from '@kbn/core-saved-objects-server';
+import { SavedObjectsModelVersion, SavedObjectMigrationFn } from '@kbn/core-saved-objects-server';
 import { createType } from '../test_utils';
 import { type KibanaMigratorTestKitParams } from '../kibana_migrator_test_kit';
 
@@ -29,6 +29,8 @@ export const dummyModelVersion: SavedObjectsModelVersion = {
   },
 };
 
+export const noopMigration: SavedObjectMigrationFn = (doc) => doc;
+
 export const getFooType = () => {
   return createType({
     name: 'foo',
@@ -130,3 +132,18 @@ export const getExcludedType = () => {
     },
   });
 };
+
+export const getLegacyType = () => {
+  return createType({
+    name: 'legacy',
+    mappings: {
+      properties: {
+        someField: { type: 'text' },
+      },
+    },
+    migrations: {
+      '7.0.0': noopMigration,
+      '7.5.0': noopMigration,
+    },
+  });
+};
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
index e98f7e319d5ac8..93b3b73393a85c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/check_registered_types.test.ts
@@ -88,7 +88,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "event_loop_delays_daily": "ef49e7f15649b551b458c7ea170f3ed17f89abd0",
         "exception-list": "38181294f64fc406c15f20d85ca306c8a4feb3c0",
         "exception-list-agnostic": "d527ce9d12b134cb163150057b87529043a8ec77",
-        "file": "d12998f49bc82da596a9e6c8397999930187ec6a",
+        "file": "487a562dd895407307980cc4404ca08e87e8999d",
         "file-upload-usage-collection-telemetry": "c6fcb9a7efcf19b2bb66ca6e005bfee8961f6073",
         "fileShare": "f07d346acbb724eacf139a0fb781c38dc5280115",
         "fleet-fleet-server-host": "67180a54a689111fb46403c3603c9b3a329c698d",
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/basic_document_migration.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_document_migration.test.ts
similarity index 97%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/basic_document_migration.test.ts
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_document_migration.test.ts
index 418adb0a7894ed..9122cb1bd6c102 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/basic_document_migration.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_document_migration.test.ts
@@ -14,7 +14,11 @@ import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server
 import '../jest_matchers';
 import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
 import { delay, parseLogFile } from '../test_utils';
-import { getBaseMigratorParams, getSampleAType, getSampleBType } from './base.fixtures';
+import {
+  getBaseMigratorParams,
+  getSampleAType,
+  getSampleBType,
+} from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'basic_document_migration.test.log');
 
@@ -179,8 +183,8 @@ describe('ZDT upgrades - basic document migration', () => {
     );
 
     expect(mappingMeta.docVersions).toEqual({
-      sample_a: 2,
-      sample_b: 3,
+      sample_a: '10.2.0',
+      sample_b: '10.3.0',
     });
 
     const { saved_objects: sampleADocs } = await savedObjectsRepository.find({ type: 'sample_a' });
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/conversion_failures.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
similarity index 98%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/conversion_failures.test.ts
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
index 4f1b0a4bfe468b..750753d52c66b2 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/conversion_failures.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
@@ -14,7 +14,11 @@ import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server
 import '../jest_matchers';
 import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
 import { delay, parseLogFile } from '../test_utils';
-import { getBaseMigratorParams, getSampleAType, getSampleBType } from './base.fixtures';
+import {
+  getBaseMigratorParams,
+  getSampleAType,
+  getSampleBType,
+} from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'conversion_failures.test.log');
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/create_index.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
similarity index 96%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/create_index.test.ts
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
index 760b0f113a8ff1..18b9aecc39cad4 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/create_index.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
@@ -12,7 +12,7 @@ import '../jest_matchers';
 import { createTestServers, type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
 import { delay, parseLogFile } from '../test_utils';
-import { getBaseMigratorParams, getFooType, getBarType } from './base.fixtures';
+import { getBaseMigratorParams, getFooType, getBarType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'create_index.test.log');
 
@@ -81,12 +81,12 @@ describe('ZDT upgrades - running on a fresh cluster', () => {
 
     expect(mappingMeta).toEqual({
       docVersions: {
-        foo: 2,
-        bar: 1,
+        foo: '10.2.0',
+        bar: '10.1.0',
       },
       mappingVersions: {
-        foo: 2,
-        bar: 1,
+        foo: '10.2.0',
+        bar: '10.1.0',
       },
       migrationState: expect.objectContaining({
         convertingDocuments: false,
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/document_cleanup.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
similarity index 98%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/document_cleanup.test.ts
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
index b321a400684b73..98e85b3029f18f 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/document_cleanup.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
@@ -21,7 +21,7 @@ import {
   getFooType,
   getBarType,
   dummyModelVersion,
-} from './base.fixtures';
+} from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'document_cleanup.test.log');
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/jest.integration.config.js b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/jest.integration.config.js
similarity index 96%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/jest.integration.config.js
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/jest.integration.config.js
index 4772e43faa148d..04b7ddfc4377a8 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/jest.integration.config.js
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/jest.integration.config.js
@@ -13,7 +13,7 @@ module.exports = {
   // see https://github.com/elastic/kibana/pull/130255/
   preset: '@kbn/test/jest_integration',
   rootDir: '../../../../../../..',
-  roots: ['<rootDir>/src/core/server/integration_tests/saved_objects/migrations/zero_downtime'],
+  roots: ['<rootDir>/src/core/server/integration_tests/saved_objects/migrations/zdt_1'],
   // must override to match all test given there is no `integration_tests` subfolder
   testMatch: ['**/*.test.{js,mjs,ts,tsx}'],
 };
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/mapping_version_conflict.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
similarity index 95%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/mapping_version_conflict.test.ts
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
index 1674bf747f7b1a..50edd85babe8e9 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/mapping_version_conflict.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
@@ -12,7 +12,12 @@ import { createTestServers, type TestElasticsearchUtils } from '@kbn/core-test-h
 import '../jest_matchers';
 import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
 import { delay, parseLogFile } from '../test_utils';
-import { getBaseMigratorParams, getFooType, getBarType, dummyModelVersion } from './base.fixtures';
+import {
+  getBaseMigratorParams,
+  getFooType,
+  getBarType,
+  dummyModelVersion,
+} from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'mapping_version_conflict.test.log');
 
@@ -106,8 +111,8 @@ describe('ZDT upgrades - mapping model version conflict', () => {
     expect(aliases).toEqual(['.kibana', '.kibana_8.8.0']);
 
     expect(mappingMeta.mappingVersions).toEqual({
-      foo: 2,
-      bar: 2,
+      foo: '10.2.0',
+      bar: '10.2.0',
     });
 
     const records = await parseLogFile(logFilePath);
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/rerun_same_version.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
similarity index 98%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/rerun_same_version.test.ts
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
index 2be7c939656930..42ac41a84c92cc 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/rerun_same_version.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
@@ -12,7 +12,7 @@ import { createTestServers, type TestElasticsearchUtils } from '@kbn/core-test-h
 import '../jest_matchers';
 import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
 import { delay, parseLogFile } from '../test_utils';
-import { getBaseMigratorParams, getFooType, getBarType } from './base.fixtures';
+import { getBaseMigratorParams, getFooType, getBarType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'rerun_same_version.test.log');
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/standard_workflow.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/standard_workflow.test.ts
similarity index 99%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/standard_workflow.test.ts
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/standard_workflow.test.ts
index 2fbbe7e090267b..2e08df454f1111 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/standard_workflow.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/standard_workflow.test.ts
@@ -19,7 +19,7 @@ import {
   getSampleAType,
   getSampleBType,
   dummyModelVersion,
-} from './base.fixtures';
+} from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'standard_workflow.test.log');
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/update_mappings.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
similarity index 95%
rename from src/core/server/integration_tests/saved_objects/migrations/zero_downtime/update_mappings.test.ts
rename to src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
index 9829da66a965e7..f8f49147ef7535 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zero_downtime/update_mappings.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
@@ -12,7 +12,12 @@ import { createTestServers, type TestElasticsearchUtils } from '@kbn/core-test-h
 import '../jest_matchers';
 import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
 import { delay, parseLogFile } from '../test_utils';
-import { getBaseMigratorParams, getFooType, getBarType, dummyModelVersion } from './base.fixtures';
+import {
+  getBaseMigratorParams,
+  getFooType,
+  getBarType,
+  dummyModelVersion,
+} from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'update_mappings.test.log');
 
@@ -111,8 +116,8 @@ describe('ZDT upgrades - basic mapping update', () => {
     );
 
     expect(mappingMeta.mappingVersions).toEqual({
-      foo: 3,
-      bar: 2,
+      foo: '10.3.0',
+      bar: '10.2.0',
     });
 
     const records = await parseLogFile(logFilePath);
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts
new file mode 100644
index 00000000000000..14d707e51a7ec9
--- /dev/null
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts
@@ -0,0 +1,243 @@
+/*
+ * Copyright 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 Path from 'path';
+import fs from 'fs/promises';
+import { range, sortBy } from 'lodash';
+import { createTestServers, type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
+import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
+import '../jest_matchers';
+import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
+import { delay, parseLogFile } from '../test_utils';
+import {
+  getBaseMigratorParams,
+  getSampleAType,
+  getLegacyType,
+} from '../fixtures/zdt_base.fixtures';
+
+const logFilePath = Path.join(__dirname, 'basic_document_migration.test.log');
+
+describe('ZDT with v2 compat - basic document migration', () => {
+  let esServer: TestElasticsearchUtils['es'];
+
+  const startElasticsearch = async () => {
+    const { startES } = createTestServers({
+      adjustTimeout: (t: number) => jest.setTimeout(t),
+      settings: {
+        es: {
+          license: 'basic',
+        },
+      },
+    });
+    return await startES();
+  };
+
+  beforeAll(async () => {
+    await fs.unlink(logFilePath).catch(() => {});
+    esServer = await startElasticsearch();
+  });
+
+  afterAll(async () => {
+    await esServer?.stop();
+    await delay(10);
+  });
+
+  const createBaseline = async () => {
+    const { runMigrations, savedObjectsRepository } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      types: [getSampleAType(), getLegacyType()],
+    });
+    await runMigrations();
+
+    const sampleAObjs = range(5).map<SavedObjectsBulkCreateObject>((number) => ({
+      id: `a-${number}`,
+      type: 'sample_a',
+      attributes: {
+        keyword: `a_${number}`,
+        boolean: true,
+      },
+    }));
+
+    await savedObjectsRepository.bulkCreate(sampleAObjs);
+
+    const legacyTypeObjs = range(5).map<SavedObjectsBulkCreateObject>((number) => ({
+      id: `legacy-${number}`,
+      type: 'legacy',
+      attributes: {
+        someField: `legacy ${number}`,
+      },
+    }));
+
+    await savedObjectsRepository.bulkCreate(legacyTypeObjs);
+  };
+
+  it('migrates the documents', async () => {
+    await createBaseline();
+
+    const typeA = getSampleAType();
+    const legacyType = getLegacyType();
+
+    // typeA -> we add a new field and bump the model version by one with a migration
+
+    typeA.mappings.properties = {
+      ...typeA.mappings.properties,
+      someAddedField: { type: 'keyword' },
+    };
+
+    typeA.modelVersions = {
+      ...typeA.modelVersions,
+      '2': {
+        modelChange: {
+          type: 'expansion',
+          transformation: {
+            up: (doc) => {
+              return {
+                document: {
+                  ...doc,
+                  attributes: {
+                    ...doc.attributes,
+                    someAddedField: `${doc.attributes.keyword}-mig`,
+                  },
+                },
+              };
+            },
+            down: jest.fn(),
+          },
+          addedMappings: {
+            someAddedField: { type: 'keyword' },
+          },
+        },
+      },
+    };
+
+    // legacyType -> we add a new migration
+
+    legacyType.mappings.properties = {
+      ...legacyType.mappings.properties,
+      newField: { type: 'text' },
+    };
+
+    legacyType.migrations = {
+      ...legacyType.migrations,
+      '8.0.0': (document) => {
+        return {
+          ...document,
+          attributes: {
+            ...document.attributes,
+            newField: `populated ${document.id}`,
+          },
+        };
+      },
+    };
+
+    const { runMigrations, client, savedObjectsRepository } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      logFilePath,
+      types: [typeA, legacyType],
+    });
+
+    await runMigrations();
+
+    const indices = await client.indices.get({ index: '.kibana*' });
+    expect(Object.keys(indices)).toEqual(['.kibana_1']);
+
+    const index = indices['.kibana_1'];
+    const mappings = index.mappings ?? {};
+    const mappingMeta = mappings._meta ?? {};
+
+    expect(mappings.properties).toEqual(
+      expect.objectContaining({
+        sample_a: typeA.mappings,
+        legacy: legacyType.mappings,
+      })
+    );
+
+    expect(mappingMeta.docVersions).toEqual({
+      sample_a: '10.2.0',
+      legacy: '8.0.0',
+    });
+
+    const { saved_objects: sampleADocs } = await savedObjectsRepository.find({ type: 'sample_a' });
+    const { saved_objects: legacyDocs } = await savedObjectsRepository.find({ type: 'legacy' });
+
+    expect(sampleADocs).toHaveLength(5);
+    expect(legacyDocs).toHaveLength(5);
+
+    const sampleAData = sortBy(sampleADocs, 'id').map((object) => ({
+      id: object.id,
+      type: object.type,
+      attributes: object.attributes,
+    }));
+
+    expect(sampleAData).toEqual([
+      {
+        id: 'a-0',
+        type: 'sample_a',
+        attributes: { boolean: true, keyword: 'a_0', someAddedField: 'a_0-mig' },
+      },
+      {
+        id: 'a-1',
+        type: 'sample_a',
+        attributes: { boolean: true, keyword: 'a_1', someAddedField: 'a_1-mig' },
+      },
+      {
+        id: 'a-2',
+        type: 'sample_a',
+        attributes: { boolean: true, keyword: 'a_2', someAddedField: 'a_2-mig' },
+      },
+      {
+        id: 'a-3',
+        type: 'sample_a',
+        attributes: { boolean: true, keyword: 'a_3', someAddedField: 'a_3-mig' },
+      },
+      {
+        id: 'a-4',
+        type: 'sample_a',
+        attributes: { boolean: true, keyword: 'a_4', someAddedField: 'a_4-mig' },
+      },
+    ]);
+
+    const sampleBData = sortBy(legacyDocs, 'id').map((object) => ({
+      id: object.id,
+      type: object.type,
+      attributes: object.attributes,
+    }));
+
+    expect(sampleBData).toEqual([
+      {
+        id: 'legacy-0',
+        type: 'legacy',
+        attributes: { someField: `legacy 0`, newField: `populated legacy-0` },
+      },
+      {
+        id: 'legacy-1',
+        type: 'legacy',
+        attributes: { someField: `legacy 1`, newField: `populated legacy-1` },
+      },
+      {
+        id: 'legacy-2',
+        type: 'legacy',
+        attributes: { someField: `legacy 2`, newField: `populated legacy-2` },
+      },
+      {
+        id: 'legacy-3',
+        type: 'legacy',
+        attributes: { someField: `legacy 3`, newField: `populated legacy-3` },
+      },
+      {
+        id: 'legacy-4',
+        type: 'legacy',
+        attributes: { someField: `legacy 4`, newField: `populated legacy-4` },
+      },
+    ]);
+
+    const records = await parseLogFile(logFilePath);
+    expect(records).toContainLogEntry('Starting to process 10 documents');
+    expect(records).toContainLogEntry('Migration completed');
+  });
+});
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
new file mode 100644
index 00000000000000..4933c5b712c219
--- /dev/null
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.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 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 Path from 'path';
+import fs from 'fs/promises';
+import '../jest_matchers';
+import { createTestServers, type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
+import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
+import { delay, parseLogFile } from '../test_utils';
+import { getBaseMigratorParams, getFooType, getLegacyType } from '../fixtures/zdt_base.fixtures';
+
+const logFilePath = Path.join(__dirname, 'create_index.test.log');
+
+describe('ZDT with v2 compat - running on a fresh cluster', () => {
+  let esServer: TestElasticsearchUtils['es'];
+
+  const startElasticsearch = async () => {
+    const { startES } = createTestServers({
+      adjustTimeout: (t: number) => jest.setTimeout(t),
+      settings: {
+        es: {
+          license: 'basic',
+        },
+      },
+    });
+    return await startES();
+  };
+
+  beforeAll(async () => {
+    await fs.unlink(logFilePath).catch(() => {});
+    esServer = await startElasticsearch();
+  });
+
+  afterAll(async () => {
+    await esServer?.stop();
+    await delay(10);
+  });
+
+  it('create the index with the correct mappings and meta', async () => {
+    const fooType = getFooType();
+    const legacyType = getLegacyType();
+
+    const { runMigrations, client } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      logFilePath,
+      types: [fooType, legacyType],
+    });
+
+    const result = await runMigrations();
+
+    expect(result).toEqual([
+      {
+        destIndex: '.kibana',
+        elapsedMs: expect.any(Number),
+        status: 'patched',
+      },
+    ]);
+
+    const indices = await client.indices.get({ index: '.kibana*' });
+
+    expect(Object.keys(indices)).toEqual(['.kibana_1']);
+
+    const index = indices['.kibana_1'];
+    const aliases = Object.keys(index.aliases ?? {}).sort();
+    const mappings = index.mappings ?? {};
+    const mappingMeta = mappings._meta ?? {};
+
+    expect(aliases).toEqual(['.kibana', '.kibana_8.8.0']);
+
+    expect(mappings.properties).toEqual(
+      expect.objectContaining({
+        foo: fooType.mappings,
+        legacy: legacyType.mappings,
+      })
+    );
+
+    expect(mappingMeta).toEqual({
+      docVersions: {
+        foo: '10.2.0',
+        legacy: '7.5.0',
+      },
+      mappingVersions: {
+        foo: '10.2.0',
+        legacy: '7.5.0',
+      },
+      migrationState: expect.objectContaining({
+        convertingDocuments: false,
+      }),
+    });
+
+    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');
+  });
+});
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/jest.integration.config.js b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/jest.integration.config.js
new file mode 100644
index 00000000000000..33c212f19a68ed
--- /dev/null
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/jest.integration.config.js
@@ -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.
+ */
+
+module.exports = {
+  // TODO replace the line below with
+  // preset: '@kbn/test/jest_integration_node
+  // to do so, we must fix all integration tests first
+  // see https://github.com/elastic/kibana/pull/130255/
+  preset: '@kbn/test/jest_integration',
+  rootDir: '../../../../../../..',
+  roots: ['<rootDir>/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat'],
+  // must override to match all test given there is no `integration_tests` subfolder
+  testMatch: ['**/*.test.{js,mjs,ts,tsx}'],
+};
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts
new file mode 100644
index 00000000000000..60aa99da52e72c
--- /dev/null
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts
@@ -0,0 +1,182 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 Path from 'path';
+import fs from 'fs/promises';
+import { range, sortBy } from 'lodash';
+import { createTestServers, type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
+import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
+import '../jest_matchers';
+import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
+import { delay, parseLogFile, createType } from '../test_utils';
+import { getBaseMigratorParams, noopMigration } from '../fixtures/zdt_base.fixtures';
+
+const logFilePath = Path.join(__dirname, 'switch_to_model_version.test.log');
+
+describe('ZDT with v2 compat - type switching from migration to model version', () => {
+  let esServer: TestElasticsearchUtils['es'];
+
+  const startElasticsearch = async () => {
+    const { startES } = createTestServers({
+      adjustTimeout: (t: number) => jest.setTimeout(t),
+      settings: {
+        es: {
+          license: 'basic',
+        },
+      },
+    });
+    return await startES();
+  };
+
+  beforeAll(async () => {
+    await fs.unlink(logFilePath).catch(() => {});
+    esServer = await startElasticsearch();
+  });
+
+  afterAll(async () => {
+    await esServer?.stop();
+    await delay(10);
+  });
+
+  const typeBefore = createType({
+    name: 'switching_type',
+    mappings: {
+      properties: {
+        text: { type: 'text' },
+        keyword: { type: 'keyword' },
+      },
+    },
+    migrations: {
+      '7.0.0': noopMigration,
+      '7.5.0': noopMigration,
+    },
+  });
+
+  const typeAfter = createType({
+    name: 'switching_type',
+    mappings: {
+      properties: {
+        text: { type: 'text' },
+        keyword: { type: 'keyword' },
+        newField1: { type: 'text' },
+        newField2: { type: 'text' },
+      },
+    },
+    migrations: {
+      '7.0.0': noopMigration,
+      '7.5.0': noopMigration,
+      '7.9.0': (doc) => {
+        return {
+          ...doc,
+          attributes: {
+            ...doc.attributes,
+            newField1: `new1 ${doc.id}`,
+          },
+        };
+      },
+    },
+    switchToModelVersionAt: '8.0.0',
+    modelVersions: {
+      1: {
+        modelChange: {
+          type: 'expansion',
+          transformation: {
+            up: (doc) => {
+              return {
+                document: {
+                  ...doc,
+                  attributes: {
+                    ...doc.attributes,
+                    newField2: `new2 ${doc.id}`,
+                  },
+                },
+              };
+            },
+            down: jest.fn(),
+          },
+        },
+      },
+    },
+  });
+
+  const createBaseline = async () => {
+    const { runMigrations, savedObjectsRepository } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      types: [typeBefore],
+    });
+    await runMigrations();
+
+    const sampleObjs = range(5).map<SavedObjectsBulkCreateObject>((number) => ({
+      id: `doc-${number}`,
+      type: 'switching_type',
+      attributes: {
+        text: `text ${number}`,
+        keyword: `kw ${number}`,
+      },
+    }));
+
+    await savedObjectsRepository.bulkCreate(sampleObjs);
+  };
+
+  it('migrates the documents', async () => {
+    await createBaseline();
+
+    const { runMigrations, client, savedObjectsRepository } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      logFilePath,
+      types: [typeAfter],
+    });
+
+    await runMigrations();
+
+    const indices = await client.indices.get({ index: '.kibana*' });
+    expect(Object.keys(indices)).toEqual(['.kibana_1']);
+
+    const index = indices['.kibana_1'];
+    const mappings = index.mappings ?? {};
+    const mappingMeta = mappings._meta ?? {};
+
+    expect(mappings.properties).toEqual(
+      expect.objectContaining({
+        switching_type: typeAfter.mappings,
+      })
+    );
+
+    expect(mappingMeta.docVersions).toEqual({
+      switching_type: '10.1.0',
+    });
+
+    const { saved_objects: sampleDocs } = await savedObjectsRepository.find({
+      type: 'switching_type',
+    });
+
+    expect(sampleDocs).toHaveLength(5);
+
+    const sampleData = sortBy(sampleDocs, 'id').map((object) => ({
+      id: object.id,
+      type: object.type,
+      attributes: object.attributes,
+    }));
+
+    expect(sampleData).toEqual(
+      range(5).map((i) => ({
+        id: `doc-${i}`,
+        type: 'switching_type',
+        attributes: {
+          text: `text ${i}`,
+          keyword: `kw ${i}`,
+          newField1: `new1 doc-${i}`,
+          newField2: `new2 doc-${i}`,
+        },
+      }))
+    );
+
+    const records = await parseLogFile(logFilePath);
+    expect(records).toContainLogEntry('Migration completed');
+  });
+});
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts
new file mode 100644
index 00000000000000..ea25e6549c189b
--- /dev/null
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright 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 Path from 'path';
+import fs from 'fs/promises';
+import { createTestServers, type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
+import '../jest_matchers';
+import { getKibanaMigratorTestKit } from '../kibana_migrator_test_kit';
+import { delay, parseLogFile } from '../test_utils';
+import {
+  getBaseMigratorParams,
+  getFooType,
+  getLegacyType,
+  dummyModelVersion,
+  noopMigration,
+} from '../fixtures/zdt_base.fixtures';
+
+export const logFilePath = Path.join(__dirname, 'update_mappings.test.log');
+
+describe('ZDT with v2 compat - basic mapping update', () => {
+  let esServer: TestElasticsearchUtils['es'];
+
+  const startElasticsearch = async () => {
+    const { startES } = createTestServers({
+      adjustTimeout: (t: number) => jest.setTimeout(t),
+      settings: {
+        es: {
+          license: 'basic',
+        },
+      },
+    });
+    return await startES();
+  };
+
+  beforeAll(async () => {
+    await fs.unlink(logFilePath).catch(() => {});
+    esServer = await startElasticsearch();
+  });
+
+  afterAll(async () => {
+    await esServer?.stop();
+    await delay(10);
+  });
+
+  const createBaseline = async () => {
+    const fooType = getFooType();
+    const legacyType = getLegacyType();
+    const { runMigrations } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      types: [fooType, legacyType],
+    });
+    await runMigrations();
+  };
+
+  it('updates the mappings and the meta', async () => {
+    await createBaseline();
+
+    const fooType = getFooType();
+    const legacyType = getLegacyType();
+
+    // increasing the model version of the types
+    fooType.modelVersions = {
+      ...fooType.modelVersions,
+      '3': dummyModelVersion,
+    };
+    fooType.mappings.properties = {
+      ...fooType.mappings.properties,
+      someAddedField: { type: 'keyword' },
+    };
+
+    legacyType.migrations = {
+      ...legacyType.migrations,
+      '8.0.0': noopMigration,
+    };
+    legacyType.mappings.properties = {
+      ...legacyType.mappings.properties,
+      anotherAddedField: { type: 'boolean' },
+    };
+
+    const { runMigrations, client } = await getKibanaMigratorTestKit({
+      ...getBaseMigratorParams(),
+      logFilePath,
+      types: [fooType, legacyType],
+    });
+
+    const result = await runMigrations();
+
+    expect(result).toEqual([
+      {
+        destIndex: '.kibana',
+        elapsedMs: expect.any(Number),
+        status: 'patched',
+      },
+    ]);
+
+    const indices = await client.indices.get({ index: '.kibana*' });
+
+    expect(Object.keys(indices)).toEqual(['.kibana_1']);
+
+    const index = indices['.kibana_1'];
+    const aliases = Object.keys(index.aliases ?? {}).sort();
+    const mappings = index.mappings ?? {};
+    const mappingMeta = mappings._meta ?? {};
+
+    expect(aliases).toEqual(['.kibana', '.kibana_8.8.0']);
+
+    expect(mappings.properties).toEqual(
+      expect.objectContaining({
+        foo: fooType.mappings,
+        legacy: legacyType.mappings,
+      })
+    );
+
+    expect(mappingMeta.mappingVersions).toEqual({
+      foo: '10.3.0',
+      legacy: '8.0.0',
+    });
+
+    const records = await parseLogFile(logFilePath);
+
+    expect(records).toContainLogEntry('INIT -> UPDATE_INDEX_MAPPINGS');
+    expect(records).toContainLogEntry(
+      'UPDATE_INDEX_MAPPINGS -> UPDATE_INDEX_MAPPINGS_WAIT_FOR_TASK'
+    );
+    expect(records).toContainLogEntry(
+      'UPDATE_INDEX_MAPPINGS_WAIT_FOR_TASK -> UPDATE_MAPPING_MODEL_VERSIONS'
+    );
+    expect(records).toContainLogEntry('UPDATE_MAPPING_MODEL_VERSIONS -> INDEX_STATE_UPDATE_DONE');
+    expect(records).toContainLogEntry('Migration completed');
+  });
+});
diff --git a/src/core/server/integration_tests/saved_objects/routes/import.test.ts b/src/core/server/integration_tests/saved_objects/routes/import.test.ts
index 24116ff52267c0..0a9ae5f1646357 100644
--- a/src/core/server/integration_tests/saved_objects/routes/import.test.ts
+++ b/src/core/server/integration_tests/saved_objects/routes/import.test.ts
@@ -46,12 +46,14 @@ describe(`POST ${URL}`, () => {
     id: 'my-pattern',
     attributes: { title: 'my-pattern-*' },
     references: [],
+    managed: false,
   };
   const mockDashboard = {
     type: 'dashboard',
     id: 'my-dashboard',
     attributes: { title: 'Look at my dashboard' },
     references: [],
+    managed: false,
   };
 
   beforeEach(async () => {
@@ -145,6 +147,7 @@ describe(`POST ${URL}`, () => {
           type: 'index-pattern',
           id: 'my-pattern',
           meta: { title: 'my-pattern-*', icon: 'index-pattern-icon' },
+          managed: false,
         },
       ],
       warnings: [],
@@ -156,11 +159,49 @@ describe(`POST ${URL}`, () => {
     );
   });
 
-  it('imports an index pattern and dashboard, ignoring empty lines in the file', async () => {
+  it('returns the default for managed as part of the successResults', async () => {
+    savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [mockIndexPattern] });
+
+    const result = await supertest(httpSetup.server.listener)
+      .post(URL)
+      .set('content-Type', 'multipart/form-data; boundary=EXAMPLE')
+      .send(
+        [
+          '--EXAMPLE',
+          'Content-Disposition: form-data; name="file"; filename="export.ndjson"',
+          'Content-Type: application/ndjson',
+          '',
+          '{"type":"index-pattern","id":"my-pattern","attributes":{"title":"my-pattern-*"}}',
+          '--EXAMPLE--',
+        ].join('\r\n')
+      )
+      .expect(200);
+
+    expect(result.body).toEqual({
+      success: true,
+      successCount: 1,
+      successResults: [
+        {
+          type: 'index-pattern',
+          id: 'my-pattern',
+          meta: { title: 'my-pattern-*', icon: 'index-pattern-icon' },
+          managed: false,
+        },
+      ],
+      warnings: [],
+    });
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
+    expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
+      [expect.objectContaining({ typeMigrationVersion: '', managed: false })],
+      expect.any(Object) // options
+    );
+  });
+
+  it('imports an index pattern, dashboard and visualization, ignoring empty lines in the file', async () => {
     // NOTE: changes to this scenario should be reflected in the docs
 
     savedObjectsClient.bulkCreate.mockResolvedValueOnce({
-      saved_objects: [mockIndexPattern, mockDashboard],
+      saved_objects: [mockIndexPattern, { ...mockDashboard, managed: false }],
     });
 
     const result = await supertest(httpSetup.server.listener)
@@ -190,11 +231,13 @@ describe(`POST ${URL}`, () => {
           type: mockIndexPattern.type,
           id: mockIndexPattern.id,
           meta: { title: mockIndexPattern.attributes.title, icon: 'index-pattern-icon' },
+          managed: false,
         },
         {
           type: mockDashboard.type,
           id: mockDashboard.id,
           meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+          managed: false,
         },
       ],
       warnings: [],
@@ -235,6 +278,7 @@ describe(`POST ${URL}`, () => {
           type: mockDashboard.type,
           id: mockDashboard.id,
           meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+          managed: false,
         },
       ],
       errors: [
@@ -287,11 +331,13 @@ describe(`POST ${URL}`, () => {
           id: mockIndexPattern.id,
           meta: { title: mockIndexPattern.attributes.title, icon: 'index-pattern-icon' },
           overwrite: true,
+          managed: false,
         },
         {
           type: mockDashboard.type,
           id: mockDashboard.id,
           meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+          managed: false,
         },
       ],
       warnings: [],
@@ -345,6 +391,7 @@ describe(`POST ${URL}`, () => {
           type: mockDashboard.type,
           id: mockDashboard.id,
           meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+          managed: false,
         },
       ],
       warnings: [],
@@ -414,6 +461,7 @@ describe(`POST ${URL}`, () => {
           type: mockDashboard.type,
           id: mockDashboard.id,
           meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+          managed: false,
         },
       ],
       warnings: [],
@@ -478,6 +526,7 @@ describe(`POST ${URL}`, () => {
           type: mockDashboard.type,
           id: mockDashboard.id,
           meta: { title: mockDashboard.attributes.title, icon: 'dashboard-icon' },
+          managed: false,
         },
       ],
       warnings: [],
@@ -505,12 +554,14 @@ describe(`POST ${URL}`, () => {
         id: 'new-id-1',
         attributes: { title: 'Look at my visualization' },
         references: [],
+        managed: false,
       };
       const obj2 = {
         type: 'dashboard',
         id: 'new-id-2',
         attributes: { title: 'Look at my dashboard' },
         references: [],
+        managed: false,
       };
       savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [obj1, obj2] });
 
@@ -539,12 +590,14 @@ describe(`POST ${URL}`, () => {
             id: 'my-vis',
             meta: { title: obj1.attributes.title, icon: 'visualization-icon' },
             destinationId: obj1.id,
+            managed: false,
           },
           {
             type: obj2.type,
             id: 'my-dashboard',
             meta: { title: obj2.attributes.title, icon: 'dashboard-icon' },
             destinationId: obj2.id,
+            managed: false,
           },
         ],
         warnings: [],
@@ -556,11 +609,13 @@ describe(`POST ${URL}`, () => {
             type: 'visualization',
             id: 'new-id-1',
             references: [{ name: 'ref_0', type: 'index-pattern', id: 'my-pattern' }],
+            managed: false,
           }),
           expect.objectContaining({
             type: 'dashboard',
             id: 'new-id-2',
             references: [{ name: 'ref_0', type: 'visualization', id: 'new-id-1' }],
+            managed: false,
           }),
         ],
         expect.any(Object) // options
@@ -769,6 +824,7 @@ describe(`POST ${URL}`, () => {
         originId: 'my-vis',
         attributes: { title: 'Look at my visualization' },
         references: [],
+        managed: false,
       };
       const obj2 = {
         type: 'dashboard',
@@ -776,6 +832,7 @@ describe(`POST ${URL}`, () => {
         originId: 'my-dashboard',
         attributes: { title: 'Look at my dashboard' },
         references: [],
+        managed: false,
       };
       savedObjectsClient.bulkCreate.mockResolvedValueOnce({
         saved_objects: [
@@ -785,6 +842,7 @@ describe(`POST ${URL}`, () => {
             id: obj2.id,
             attributes: {},
             references: [],
+            managed: false,
             error: { error: 'some-error', message: 'Why not?', statusCode: 503 },
           },
         ],
@@ -830,6 +888,7 @@ describe(`POST ${URL}`, () => {
             id: obj1.originId,
             meta: { title: obj1.attributes.title, icon: 'visualization-icon' },
             destinationId: obj1.id,
+            managed: false,
           },
         ],
         errors: [
@@ -843,6 +902,7 @@ describe(`POST ${URL}`, () => {
               statusCode: 503,
               type: 'unknown',
             },
+            managed: false,
           },
         ],
         warnings: [],
@@ -855,12 +915,14 @@ describe(`POST ${URL}`, () => {
             id: 'new-id-1',
             originId: 'my-vis',
             references: [{ name: 'ref_0', type: 'index-pattern', id: 'my-pattern' }],
+            managed: false,
           }),
           expect.objectContaining({
             type: 'dashboard',
             id: 'new-id-2',
             originId: 'my-dashboard',
             references: [{ name: 'ref_0', type: 'visualization', id: 'new-id-1' }],
+            managed: false,
           }),
         ],
         expect.any(Object) // options
@@ -905,7 +967,9 @@ describe(`POST ${URL}`, () => {
         attributes: { title: 'Look at my visualization' },
         references: [],
       };
-      savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [obj1] });
+      savedObjectsClient.bulkCreate.mockResolvedValueOnce({
+        saved_objects: [{ ...obj1, managed: false }],
+      });
 
       // Prepare mock results for the created legacy URL alias (for obj1 only).
       const legacyUrlAliasObj1 = {
@@ -956,6 +1020,7 @@ describe(`POST ${URL}`, () => {
             id: obj1.originId,
             meta: { title: obj1.attributes.title, icon: 'visualization-icon' },
             destinationId: obj1.id,
+            managed: false,
           },
         ],
         errors: [
@@ -969,6 +1034,7 @@ describe(`POST ${URL}`, () => {
               type: 'unknown',
             },
             meta: { title: 'Legacy URL alias (my-vis -> new-id-1)', icon: 'legacy-url-alias-icon' },
+            managed: false,
           },
         ],
         warnings: [],
@@ -981,6 +1047,7 @@ describe(`POST ${URL}`, () => {
             id: 'new-id-1',
             originId: 'my-vis',
             references: [{ name: 'ref_0', type: 'index-pattern', id: 'my-pattern' }],
+            managed: false,
           }),
         ],
         expect.any(Object) // options
diff --git a/src/core/server/integration_tests/saved_objects/routes/resolve_import_errors.test.ts b/src/core/server/integration_tests/saved_objects/routes/resolve_import_errors.test.ts
index 2202735df957f5..0e5af8e86be085 100644
--- a/src/core/server/integration_tests/saved_objects/routes/resolve_import_errors.test.ts
+++ b/src/core/server/integration_tests/saved_objects/routes/resolve_import_errors.test.ts
@@ -44,18 +44,21 @@ describe(`POST ${URL}`, () => {
     id: 'my-dashboard',
     attributes: { title: 'Look at my dashboard' },
     references: [],
+    managed: false,
   };
   const mockVisualization = {
     type: 'visualization',
     id: 'my-vis',
     attributes: { title: 'Look at my visualization' },
     references: [{ name: 'ref_0', type: 'index-pattern', id: 'existing' }],
+    managed: false,
   };
   const mockIndexPattern = {
     type: 'index-pattern',
     id: 'existing',
     attributes: {},
     references: [],
+    managed: false,
   };
 
   beforeEach(async () => {
@@ -155,12 +158,13 @@ describe(`POST ${URL}`, () => {
       type,
       id,
       attributes: { title },
+      managed,
     } = mockDashboard;
     const meta = { title, icon: 'dashboard-icon' };
     expect(result.body).toEqual({
       success: true,
       successCount: 1,
-      successResults: [{ type, id, meta }],
+      successResults: [{ type, id, meta, managed }],
       warnings: [],
     });
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
@@ -193,17 +197,17 @@ describe(`POST ${URL}`, () => {
       )
       .expect(200);
 
-    const { type, id, attributes } = mockDashboard;
+    const { type, id, attributes, managed } = mockDashboard;
     const meta = { title: attributes.title, icon: 'dashboard-icon' };
     expect(result.body).toEqual({
       success: true,
       successCount: 1,
-      successResults: [{ type, id, meta }],
+      successResults: [{ type, id, meta, managed }],
       warnings: [],
     });
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
-      [{ type, id, attributes, typeMigrationVersion: '' }],
+      [{ type, id, attributes, typeMigrationVersion: '', managed }],
       expect.objectContaining({ overwrite: undefined })
     );
   });
@@ -232,17 +236,17 @@ describe(`POST ${URL}`, () => {
       )
       .expect(200);
 
-    const { type, id, attributes } = mockDashboard;
+    const { type, id, attributes, managed } = mockDashboard;
     const meta = { title: attributes.title, icon: 'dashboard-icon' };
     expect(result.body).toEqual({
       success: true,
       successCount: 1,
-      successResults: [{ type, id, meta, overwrite: true }],
+      successResults: [{ type, id, meta, overwrite: true, managed }],
       warnings: [],
     });
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
-      [{ type, id, attributes, typeMigrationVersion: '' }],
+      [{ type, id, attributes, typeMigrationVersion: '', managed }],
       expect.objectContaining({ overwrite: true })
     );
   });
@@ -271,7 +275,7 @@ describe(`POST ${URL}`, () => {
       )
       .expect(200);
 
-    const { type, id, attributes, references } = mockVisualization;
+    const { type, id, attributes, references, managed } = mockVisualization;
     expect(result.body).toEqual({
       success: true,
       successCount: 1,
@@ -280,13 +284,14 @@ describe(`POST ${URL}`, () => {
           type: 'visualization',
           id: 'my-vis',
           meta: { title: 'Look at my visualization', icon: 'visualization-icon' },
+          managed,
         },
       ],
       warnings: [],
     });
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
-      [{ type, id, attributes, references, typeMigrationVersion: '' }],
+      [{ type, id, attributes, references, typeMigrationVersion: '', managed }],
       expect.objectContaining({ overwrite: undefined })
     );
     expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
@@ -319,7 +324,7 @@ describe(`POST ${URL}`, () => {
       )
       .expect(200);
 
-    const { type, id, attributes } = mockVisualization;
+    const { type, id, attributes, managed } = mockVisualization;
     const references = [{ name: 'ref_0', type: 'index-pattern', id: 'missing' }];
     expect(result.body).toEqual({
       success: true,
@@ -329,13 +334,14 @@ describe(`POST ${URL}`, () => {
           type: 'visualization',
           id: 'my-vis',
           meta: { title: 'Look at my visualization', icon: 'visualization-icon' },
+          managed,
         },
       ],
       warnings: [],
     });
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledTimes(1); // successResults objects were created because no resolvable errors are present
     expect(savedObjectsClient.bulkCreate).toHaveBeenCalledWith(
-      [{ type, id, attributes, references, typeMigrationVersion: '' }],
+      [{ type, id, attributes, references, typeMigrationVersion: '', managed }],
       expect.objectContaining({ overwrite: undefined })
     );
     expect(savedObjectsClient.bulkGet).not.toHaveBeenCalled();
@@ -351,12 +357,14 @@ describe(`POST ${URL}`, () => {
         id: 'new-id-1',
         attributes: { title: 'Look at my visualization' },
         references: [],
+        managed: false,
       };
       const obj2 = {
         type: 'dashboard',
         id: 'new-id-2',
         attributes: { title: 'Look at my dashboard' },
         references: [],
+        managed: false,
       };
       savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [obj1, obj2] });
 
@@ -389,12 +397,14 @@ describe(`POST ${URL}`, () => {
             id: 'my-vis',
             meta: { title: obj1.attributes.title, icon: 'visualization-icon' },
             destinationId: obj1.id,
+            managed: obj1.managed,
           },
           {
             type: obj2.type,
             id: 'my-dashboard',
             meta: { title: obj2.attributes.title, icon: 'dashboard-icon' },
             destinationId: obj2.id,
+            managed: obj2.managed,
           },
         ],
         warnings: [],
@@ -406,11 +416,13 @@ describe(`POST ${URL}`, () => {
             type: 'visualization',
             id: 'new-id-1',
             references: [{ name: 'ref_0', type: 'index-pattern', id: 'existing' }],
+            managed: false,
           }),
           expect.objectContaining({
             type: 'dashboard',
             id: 'new-id-2',
             references: [{ name: 'ref_0', type: 'visualization', id: 'new-id-1' }],
+            managed: false,
           }),
         ],
         expect.any(Object) // options
@@ -429,6 +441,7 @@ describe(`POST ${URL}`, () => {
         id: 'my-vis',
         attributes: { title: 'Look at my visualization' },
         references: [],
+        managed: false,
       };
       const obj2 = {
         type: 'dashboard',
@@ -436,6 +449,7 @@ describe(`POST ${URL}`, () => {
         originId: 'my-dashboard',
         attributes: { title: 'Look at my dashboard' },
         references: [],
+        managed: false,
       };
       savedObjectsClient.bulkCreate.mockResolvedValueOnce({ saved_objects: [obj1, obj2] });
 
@@ -451,6 +465,7 @@ describe(`POST ${URL}`, () => {
           targetId: obj2.id,
           purpose: 'savedObjectImport',
         },
+        managed: false,
       };
       savedObjectsClient.bulkCreate.mockResolvedValueOnce({
         saved_objects: [legacyUrlAliasObj2],
@@ -484,12 +499,14 @@ describe(`POST ${URL}`, () => {
             type: obj1.type,
             id: 'my-vis',
             meta: { title: obj1.attributes.title, icon: 'visualization-icon' },
+            managed: obj1.managed,
           },
           {
             type: obj2.type,
             id: 'my-dashboard',
             meta: { title: obj2.attributes.title, icon: 'dashboard-icon' },
             destinationId: obj2.id,
+            managed: obj2.managed,
           },
         ],
         warnings: [],
@@ -502,12 +519,14 @@ describe(`POST ${URL}`, () => {
             type: 'visualization',
             id: 'my-vis',
             references: [{ name: 'ref_0', type: 'index-pattern', id: 'existing' }],
+            managed: false,
           }),
           expect.objectContaining({
             type: 'dashboard',
             id: 'new-id-2',
             originId: 'my-dashboard',
             references: [{ name: 'ref_0', type: 'visualization', id: 'my-vis' }],
+            managed: false,
           }),
         ],
         expect.any(Object) // options
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/repository.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/repository.test.ts
index 205d59f0536fe7..e2d002331f773d 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/repository.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/repository.test.ts
@@ -46,8 +46,10 @@ describe('SavedObjectsRepository', () => {
   });
 
   afterAll(async () => {
-    await esServer.stop();
-    await root.shutdown();
+    if (root) {
+      await esServer.stop();
+      await root.shutdown();
+    }
   });
 
   describe('#incrementCounter', () => {
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts
index 255658d7fbe7ab..db24bf5a10765d 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts
@@ -139,9 +139,11 @@ describe('404s from proxies', () => {
   });
 
   afterAll(async () => {
-    await root.shutdown();
-    await hapiServer.stop({ timeout: 1000 });
-    await esServer.stop();
+    if (root) {
+      await root.shutdown();
+      await hapiServer.stop({ timeout: 1000 });
+      await esServer.stop();
+    }
   });
 
   describe('requests when a proxy relays request/responses with the correct product header', () => {
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 3123aa7f391dfb..7eaae8b09629f4 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -413,6 +413,7 @@ kibana_vars=(
     xpack.task_manager.version_conflict_threshold
     xpack.task_manager.event_loop_delay.monitor
     xpack.task_manager.event_loop_delay.warn_threshold
+    xpack.task_manager.worker_utilization_running_average_window
     xpack.uptime.index
     serverless
 )
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index 75a12b0884f8ad..aefe4bbd7e8ed2 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -85,6 +85,6 @@ export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
   '@elastic/ems-client@8.4.0': ['Elastic License 2.0'],
-  '@elastic/eui@77.1.1': ['SSPL-1.0 OR Elastic License 2.0'],
+  '@elastic/eui@77.1.2': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
 };
diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts
index e0509266102590..bd21a80a0d6ff5 100644
--- a/src/dev/storybook/aliases.ts
+++ b/src/dev/storybook/aliases.ts
@@ -44,6 +44,7 @@ export const storybookAliases = {
   lists: 'x-pack/plugins/lists/.storybook',
   observability: 'x-pack/plugins/observability/.storybook',
   presentation: 'src/plugins/presentation_util/storybook',
+  random_sampling: 'x-pack/packages/kbn-random-sampling/.storybook',
   security_solution: 'x-pack/plugins/security_solution/.storybook',
   security_solution_packages: 'x-pack/packages/security-solution/storybook/config',
   serverless: 'packages/serverless/storybook/config',
diff --git a/src/plugins/chart_expressions/expression_xy/public/types.ts b/src/plugins/chart_expressions/expression_xy/public/types.ts
index 884562f1a358c9..733dba9400bf29 100755
--- a/src/plugins/chart_expressions/expression_xy/public/types.ts
+++ b/src/plugins/chart_expressions/expression_xy/public/types.ts
@@ -118,13 +118,6 @@ export interface VisualizationType {
   showExperimentalBadge?: boolean;
 }
 
-export interface AccessorConfig {
-  columnId: string;
-  triggerIcon?: 'color' | 'disabled' | 'colorBy' | 'none' | 'invisible';
-  color?: string;
-  palette?: string[] | Array<{ color: string; stop: number }>;
-}
-
 export interface CellValueAction {
   id: string;
   iconType: string;
diff --git a/src/plugins/custom_integrations/common/index.ts b/src/plugins/custom_integrations/common/index.ts
index 1b6ec7a7bc44f7..d1733c7d076cef 100755
--- a/src/plugins/custom_integrations/common/index.ts
+++ b/src/plugins/custom_integrations/common/index.ts
@@ -15,6 +15,7 @@ export const PLUGIN_NAME = 'customIntegrations';
 export const INTEGRATION_CATEGORY_DISPLAY: {
   [key: string]: { title: string; parent_id?: string };
 } = {
+  advanced_analytics_ueba: { title: 'Advanced Analytics (UEBA', parent_id: 'security' },
   analytics_engine: { title: 'Analytics Engine', parent_id: 'observability' },
   application_observability: { title: 'Application', parent_id: 'observability' },
   app_search: { title: 'Application Search', parent_id: 'enterprise_search' },
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
index 947b062b3a5512..529d91a284e4ed 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { Observable } from 'rxjs';
+
 import {
   ContactCardEmbeddable,
   ContactCardEmbeddableFactory,
@@ -26,7 +28,7 @@ import { createDashboard } from './create_dashboard';
 import { getSampleDashboardPanel } from '../../../mocks';
 import { pluginServices } from '../../../services/plugin_services';
 import { DashboardCreationOptions } from '../dashboard_container_factory';
-import { Observable } from 'rxjs';
+import { DEFAULT_DASHBOARD_INPUT } from '../../../dashboard_constants';
 
 const embeddableId = 'create-dat-dashboard';
 
@@ -54,18 +56,28 @@ test('throws error when provided validation function returns invalid', async ()
 test('pulls state from dashboard saved object when given a saved object id', async () => {
   pluginServices.getServices().dashboardSavedObject.loadDashboardStateFromSavedObject = jest
     .fn()
-    .mockResolvedValue({ dashboardInput: { description: 'wow would you look at that? Wow.' } });
+    .mockResolvedValue({
+      dashboardInput: {
+        ...DEFAULT_DASHBOARD_INPUT,
+        description: `wow would you look at that? Wow.`,
+      },
+    });
   const dashboard = await createDashboard(embeddableId, {}, 0, 'wow-such-id');
   expect(
     pluginServices.getServices().dashboardSavedObject.loadDashboardStateFromSavedObject
   ).toHaveBeenCalledWith({ id: 'wow-such-id' });
-  expect(dashboard.getState().explicitInput.description).toBe('wow would you look at that? Wow.');
+  expect(dashboard.getState().explicitInput.description).toBe(`wow would you look at that? Wow.`);
 });
 
 test('pulls state from session storage which overrides state from saved object', async () => {
   pluginServices.getServices().dashboardSavedObject.loadDashboardStateFromSavedObject = jest
     .fn()
-    .mockResolvedValue({ dashboardInput: { description: 'wow this description is okay' } });
+    .mockResolvedValue({
+      dashboardInput: {
+        ...DEFAULT_DASHBOARD_INPUT,
+        description: 'wow this description is okay',
+      },
+    });
   pluginServices.getServices().dashboardSessionStorage.getState = jest
     .fn()
     .mockReturnValue({ description: 'wow this description marginally better' });
@@ -83,7 +95,12 @@ test('pulls state from session storage which overrides state from saved object',
 test('pulls state from creation options initial input which overrides all other state sources', async () => {
   pluginServices.getServices().dashboardSavedObject.loadDashboardStateFromSavedObject = jest
     .fn()
-    .mockResolvedValue({ dashboardInput: { description: 'wow this description is okay' } });
+    .mockResolvedValue({
+      dashboardInput: {
+        ...DEFAULT_DASHBOARD_INPUT,
+        description: 'wow this description is okay',
+      },
+    });
   pluginServices.getServices().dashboardSessionStorage.getState = jest
     .fn()
     .mockReturnValue({ description: 'wow this description marginally better' });
@@ -213,6 +230,7 @@ test('creates new embeddable with incoming embeddable if id does not match exist
       },
     },
   });
+
   // flush promises
   await new Promise((r) => setTimeout(r, 1));
   expect(mockContactCardFactory.create).toHaveBeenCalledWith(
diff --git a/src/plugins/data/common/exports/constants.ts b/src/plugins/data/common/exports/constants.ts
index 9c256d4d3ea97e..94b0cad9dc7fc1 100644
--- a/src/plugins/data/common/exports/constants.ts
+++ b/src/plugins/data/common/exports/constants.ts
@@ -9,3 +9,5 @@
 export const CSV_FORMULA_CHARS = ['=', '+', '-', '@'];
 export const nonAlphaNumRE = /[^a-zA-Z0-9]/;
 export const allDoubleQuoteRE = /"/g;
+// this is a non-exhaustive list of delimiters that require to be quoted
+export const commonQuotedDelimiters = new Set([',', ';', '\t', ' ', '|']);
diff --git a/src/plugins/data/common/exports/escape_value.test.ts b/src/plugins/data/common/exports/escape_value.test.ts
index 9463af644d4179..08247e0cd98a91 100644
--- a/src/plugins/data/common/exports/escape_value.test.ts
+++ b/src/plugins/data/common/exports/escape_value.test.ts
@@ -13,7 +13,11 @@ describe('escapeValue', function () {
   describe('quoteValues is true', function () {
     let escapeValue: (val: string) => string;
     beforeEach(function () {
-      escapeValue = createEscapeValue(true, false);
+      escapeValue = createEscapeValue({
+        separator: ',',
+        quoteValues: true,
+        escapeFormulaValues: false,
+      });
     });
 
     it('should escape value with spaces', function () {
@@ -48,7 +52,11 @@ describe('escapeValue', function () {
   describe('quoteValues is false', function () {
     let escapeValue: (val: string) => string;
     beforeEach(function () {
-      escapeValue = createEscapeValue(false, false);
+      escapeValue = createEscapeValue({
+        separator: ',',
+        quoteValues: false,
+        escapeFormulaValues: false,
+      });
     });
 
     it('should return the value unescaped', function () {
@@ -57,11 +65,15 @@ describe('escapeValue', function () {
     });
   });
 
-  describe('escapeValues', () => {
+  describe('escapeFormulaValues', () => {
     describe('when true', () => {
       let escapeValue: (val: string) => string;
       beforeEach(function () {
-        escapeValue = createEscapeValue(true, true);
+        escapeValue = createEscapeValue({
+          separator: ',',
+          quoteValues: true,
+          escapeFormulaValues: true,
+        });
       });
 
       ['@', '+', '-', '='].forEach((badChar) => {
@@ -76,7 +88,11 @@ describe('escapeValue', function () {
     describe('when false', () => {
       let escapeValue: (val: string) => string;
       beforeEach(function () {
-        escapeValue = createEscapeValue(true, false);
+        escapeValue = createEscapeValue({
+          separator: ',',
+          quoteValues: true,
+          escapeFormulaValues: false,
+        });
       });
 
       ['@', '+', '-', '='].forEach((badChar) => {
@@ -86,4 +102,64 @@ describe('escapeValue', function () {
       });
     });
   });
+
+  describe('csvSeparator', () => {
+    it('should escape when text contains the separator char with quotes enabled', () => {
+      const escapeValue = createEscapeValue({
+        separator: ';',
+        quoteValues: true,
+        escapeFormulaValues: false,
+      });
+      expect(escapeValue('a;b')).to.be('"a;b"');
+    });
+
+    it('should not escape when text contains the separator char if quotes are disabled', () => {
+      const escapeValue = createEscapeValue({
+        separator: ';',
+        quoteValues: false,
+        escapeFormulaValues: false,
+      });
+      expect(escapeValue('a;b')).to.be('a;b');
+    });
+
+    it.each([', ', ' , ', ' ,'])(
+      'should handle also delimiters that contains white spaces "%p"',
+      (separator) => {
+        const escapeValue = createEscapeValue({
+          separator,
+          quoteValues: true,
+          escapeFormulaValues: false,
+        });
+        const nonStringValue = {
+          toString() {
+            return `a${separator}b`;
+          },
+        };
+        expect(escapeValue(nonStringValue)).to.be(`"a${separator}b"`);
+      }
+    );
+
+    it('should handle also non-string values (array)', () => {
+      const escapeValue = createEscapeValue({
+        separator: ',',
+        quoteValues: true,
+        escapeFormulaValues: true,
+      });
+      expect(escapeValue(['a', 'b'])).to.be('"a,b"');
+    });
+
+    it('should not quote non-string values, even if escapable, when separator is not in the quoted delimiters list', () => {
+      const escapeValue = createEscapeValue({
+        separator: ':',
+        quoteValues: true,
+        escapeFormulaValues: true,
+      });
+      const nonStringValue = {
+        toString() {
+          return 'a:b';
+        },
+      };
+      expect(escapeValue(nonStringValue)).to.be('a:b');
+    });
+  });
 });
diff --git a/src/plugins/data/common/exports/escape_value.ts b/src/plugins/data/common/exports/escape_value.ts
index 393ce6043993a3..0b036f2dae4962 100644
--- a/src/plugins/data/common/exports/escape_value.ts
+++ b/src/plugins/data/common/exports/escape_value.ts
@@ -5,11 +5,18 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { allDoubleQuoteRE, nonAlphaNumRE } from './constants';
+import { allDoubleQuoteRE, commonQuotedDelimiters, nonAlphaNumRE } from './constants';
 import { cellHasFormulas } from './formula_checks';
 
 type RawValue = string | object | null | undefined;
 
+// string with the delimiter/separator already inside need to be wrapped in quotes
+// i.e. string with delimiter char in it like free text or some number formatting (1143 => 1,143)
+function shouldBeQuoted(value: string, delimiter: string) {
+  const trimmedSeparator = delimiter.trim();
+  return value.includes(trimmedSeparator) && commonQuotedDelimiters.has(trimmedSeparator);
+}
+
 /**
  * Create a function that will escape CSV values like "=", "@" and "+" with a
  * "'". This will also place CSV values in "" if contain non-alphanumeric chars.
@@ -21,17 +28,27 @@ type RawValue = string | object | null | undefined;
  *
  * See OWASP: https://www.owasp.org/index.php/CSV_Injection.
  */
-export function createEscapeValue(
-  quoteValues: boolean,
-  escapeFormulas: boolean
-): (val: RawValue) => string {
+export function createEscapeValue({
+  separator,
+  quoteValues,
+  escapeFormulaValues,
+}: {
+  separator: string;
+  quoteValues: boolean;
+  escapeFormulaValues: boolean;
+}): (val: RawValue) => string {
   return function escapeValue(val: RawValue) {
     if (val && typeof val === 'string') {
-      const formulasEscaped = escapeFormulas && cellHasFormulas(val) ? "'" + val : val;
-      if (quoteValues && nonAlphaNumRE.test(formulasEscaped)) {
-        return `"${formulasEscaped.replace(allDoubleQuoteRE, '""')}"`;
+      const formulasEscaped = escapeFormulaValues && cellHasFormulas(val) ? "'" + val : val;
+      if (quoteValues) {
+        if (nonAlphaNumRE.test(formulasEscaped)) {
+          return `"${formulasEscaped.replace(allDoubleQuoteRE, '""')}"`;
+        }
       }
     }
-    return val == null ? '' : val.toString();
+    // raw multi-terms are stringified as T1,T2,T3 so check if the final value contains the
+    // csv separator before returning (usually for raw values)
+    const stringVal = val == null ? '' : val.toString();
+    return quoteValues && shouldBeQuoted(stringVal, separator) ? `"${stringVal}"` : stringVal;
   };
 }
diff --git a/src/plugins/data/common/exports/export_csv.test.ts b/src/plugins/data/common/exports/export_csv.test.ts
index 7d4f1347c6cba3..0c005b4bdee2e4 100644
--- a/src/plugins/data/common/exports/export_csv.test.ts
+++ b/src/plugins/data/common/exports/export_csv.test.ts
@@ -84,4 +84,16 @@ describe('CSV exporter', () => {
       })
     ).toMatch('columnOne\r\n"\'=1"\r\n');
   });
+
+  test('should escape text with csvSeparator char in it', () => {
+    const datatable = getDataTable();
+    datatable.rows[0].col1 = 'a,b';
+    expect(
+      datatableToCSV(datatable, {
+        ...getDefaultOptions(),
+        escapeFormulaValues: true,
+        formatFactory: () => ({ convert: (v: unknown) => v } as FieldFormat),
+      })
+    ).toMatch('columnOne\r\n"a,b"\r\n');
+  });
 });
diff --git a/src/plugins/data/common/exports/export_csv.tsx b/src/plugins/data/common/exports/export_csv.tsx
index 94dd1b78d2737a..fe7d35fe03e49f 100644
--- a/src/plugins/data/common/exports/export_csv.tsx
+++ b/src/plugins/data/common/exports/export_csv.tsx
@@ -27,7 +27,11 @@ export function datatableToCSV(
   { columns, rows }: Datatable,
   { csvSeparator, quoteValues, formatFactory, raw, escapeFormulaValues }: CSVOptions
 ) {
-  const escapeValues = createEscapeValue(quoteValues, escapeFormulaValues);
+  const escapeValues = createEscapeValue({
+    separator: csvSeparator,
+    quoteValues,
+    escapeFormulaValues,
+  });
   // Build the header row by its names
   const header = columns.map((col) => escapeValues(col.name));
 
diff --git a/src/plugins/data/server/search/session/session_service.test.ts b/src/plugins/data/server/search/session/session_service.test.ts
index 38a4f027765df3..3f79049fa9666c 100644
--- a/src/plugins/data/server/search/session/session_service.test.ts
+++ b/src/plugins/data/server/search/session/session_service.test.ts
@@ -575,7 +575,11 @@ describe('SearchSessionService', () => {
         const [[findOptions]] = savedObjectsClient.find.mock.calls;
         expect(findOptions).toMatchInlineSnapshot(`
           Object {
-            "filter": undefined,
+            "filter": Object {
+              "arguments": Array [],
+              "function": "and",
+              "type": "function",
+            },
             "page": 0,
             "perPage": 5,
             "type": "search-session",
diff --git a/src/plugins/data_views/server/routes/fields_for.test.ts b/src/plugins/data_views/server/routes/fields_for.test.ts
new file mode 100644
index 00000000000000..57d1465f8a9ee8
--- /dev/null
+++ b/src/plugins/data_views/server/routes/fields_for.test.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { parseMetaFields } from './fields_for';
+
+describe('_fields_for_wildcard', () => {
+  describe('parseMetaFields', () => {
+    it('should throw if receiving a string of comma-separated values', () => {
+      const value = '_source,_id';
+      expect(() => parseMetaFields(value)).toThrowErrorMatchingInlineSnapshot(
+        `"metaFields should be an array of field names, a JSON-stringified array of field names, or a single field name"`
+      );
+    });
+
+    it('should parse a stringified list of values', () => {
+      const value = JSON.stringify(['_source', '_id']);
+      const fields = parseMetaFields(value);
+      expect(fields).toMatchInlineSnapshot(`
+      Array [
+        "_source",
+        "_id",
+      ]
+    `);
+    });
+
+    it('should wrap a single value in an array', () => {
+      const value = '_source';
+      const fields = parseMetaFields(value);
+      expect(fields).toMatchInlineSnapshot(`
+      Array [
+        "_source",
+      ]
+    `);
+    });
+
+    it('should return the array if already an array', () => {
+      const value = ['_source', '_id'];
+      const fields = parseMetaFields(value);
+      expect(fields).toMatchInlineSnapshot(`
+      Array [
+        "_source",
+        "_id",
+      ]
+    `);
+    });
+  });
+});
diff --git a/src/plugins/data_views/server/routes/fields_for.ts b/src/plugins/data_views/server/routes/fields_for.ts
index 415077258966de..8719fd5ce75491 100644
--- a/src/plugins/data_views/server/routes/fields_for.ts
+++ b/src/plugins/data_views/server/routes/fields_for.ts
@@ -17,14 +17,24 @@ import {
 import { IndexPatternsFetcher } from '../fetcher';
 import type { DataViewsServerPluginStart, DataViewsServerPluginStartDependencies } from '../types';
 
-const parseMetaFields = (metaFields: string | string[]) => {
-  let parsedFields: string[] = [];
-  if (typeof metaFields === 'string') {
-    parsedFields = JSON.parse(metaFields);
-  } else {
-    parsedFields = metaFields;
+/**
+ * Accepts one of the following:
+ * 1. An array of field names
+ * 2. A JSON-stringified array of field names
+ * 3. A single field name (not comma-separated)
+ * @returns an array of field names
+ * @param metaFields
+ */
+export const parseMetaFields = (metaFields: string | string[]): string[] => {
+  if (Array.isArray(metaFields)) return metaFields;
+  try {
+    return JSON.parse(metaFields);
+  } catch (e) {
+    if (!metaFields.includes(',')) return [metaFields];
+    throw new Error(
+      'metaFields should be an array of field names, a JSON-stringified array of field names, or a single field name'
+    );
   }
-  return parsedFields;
 };
 
 const path = '/api/index_patterns/_fields_for_wildcard';
@@ -32,7 +42,7 @@ const path = '/api/index_patterns/_fields_for_wildcard';
 type IBody = { index_filter?: estypes.QueryDslQueryContainer } | undefined;
 interface IQuery {
   pattern: string;
-  meta_fields: string[];
+  meta_fields: string | string[];
   type?: string;
   rollup_index?: string;
   allow_no_index?: boolean;
diff --git a/src/plugins/discover/common/index.ts b/src/plugins/discover/common/index.ts
index 97180412d67fb7..7cfec194603dd9 100644
--- a/src/plugins/discover/common/index.ts
+++ b/src/plugins/discover/common/index.ts
@@ -28,7 +28,6 @@ export const TRUNCATE_MAX_HEIGHT = 'truncate:maxHeight';
 export const ROW_HEIGHT_OPTION = 'discover:rowHeightOption';
 export const SEARCH_EMBEDDABLE_TYPE = 'search';
 export const HIDE_ANNOUNCEMENTS = 'hideAnnouncements';
-export const SHOW_LEGACY_FIELD_TOP_VALUES = 'discover:showLegacyFieldTopValues';
 export const ENABLE_SQL = 'discover:enableSql';
 
 export { DISCOVER_APP_LOCATOR, DiscoverAppLocatorDefinition } from './locator';
diff --git a/src/plugins/discover/public/application/context/context_app.tsx b/src/plugins/discover/public/application/context/context_app.tsx
index efd8992e48ca8f..4686eadc506467 100644
--- a/src/plugins/discover/public/application/context/context_app.tsx
+++ b/src/plugins/discover/public/application/context/context_app.tsx
@@ -10,12 +10,7 @@ import React, { Fragment, memo, useEffect, useRef, useMemo, useCallback } from '
 import './context_app.scss';
 import classNames from 'classnames';
 import { FormattedMessage } from '@kbn/i18n-react';
-import {
-  EuiText,
-  EuiPageContent_Deprecated as EuiPageContent,
-  EuiPage,
-  EuiSpacer,
-} from '@elastic/eui';
+import { EuiText, EuiPage, EuiPageBody, EuiSpacer } from '@elastic/eui';
 import { cloneDeep } from 'lodash';
 import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
 import { useExecutionContext } from '@kbn/kibana-react-plugin/public';
@@ -199,7 +194,12 @@ export const ContextApp = ({ dataView, anchorId, referrer }: ContextAppProps) =>
           </h1>
           <TopNavMenu {...getNavBarProps()} />
           <EuiPage className={classNames({ dscDocsPage: !isLegacy })}>
-            <EuiPageContent paddingSize="s" className="dscDocsContent">
+            <EuiPageBody
+              panelled
+              paddingSize="s"
+              className="dscDocsContent"
+              panelProps={{ role: 'main' }}
+            >
               <EuiSpacer size="s" />
               <EuiText data-test-subj="contextDocumentSurroundingHeader">
                 <strong>
@@ -230,7 +230,7 @@ export const ContextApp = ({ dataView, anchorId, referrer }: ContextAppProps) =>
                 predecessorsStatus={fetchedState.predecessorsStatus.value}
                 successorsStatus={fetchedState.successorsStatus.value}
               />
-            </EuiPageContent>
+            </EuiPageBody>
           </EuiPage>
         </Fragment>
       )}
diff --git a/src/plugins/discover/public/application/doc/components/doc.tsx b/src/plugins/discover/public/application/doc/components/doc.tsx
index f507d2794184a3..9bfea00a92fc28 100644
--- a/src/plugins/discover/public/application/doc/components/doc.tsx
+++ b/src/plugins/discover/public/application/doc/components/doc.tsx
@@ -8,13 +8,7 @@
 
 import React, { useEffect, useRef } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
-import {
-  EuiCallOut,
-  EuiLink,
-  EuiLoadingSpinner,
-  EuiPageContent_Deprecated as EuiPageContent,
-  EuiPage,
-} from '@elastic/eui';
+import { EuiCallOut, EuiLink, EuiLoadingSpinner, EuiPage, EuiPageBody } from '@elastic/eui';
 import type { DataView } from '@kbn/data-views-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { getRootBreadcrumbs } from '../../../utils/breadcrumbs';
@@ -78,7 +72,7 @@ export function Doc(props: DocProps) {
           values: { id: props.id },
         })}
       </h1>
-      <EuiPageContent>
+      <EuiPageBody panelled paddingSize="l" panelProps={{ role: 'main' }}>
         {reqState === ElasticRequestState.NotFoundDataView && (
           <EuiCallOut
             color="danger"
@@ -150,7 +144,7 @@ export function Doc(props: DocProps) {
             <DocViewer hit={hit} dataView={dataView} />
           </div>
         )}
-      </EuiPageContent>
+      </EuiPageBody>
     </EuiPage>
   );
 }
diff --git a/src/plugins/discover/public/application/doc/single_doc_route.tsx b/src/plugins/discover/public/application/doc/single_doc_route.tsx
index f3c53d4061b1e3..ad50a508fc0ecd 100644
--- a/src/plugins/discover/public/application/doc/single_doc_route.tsx
+++ b/src/plugins/discover/public/application/doc/single_doc_route.tsx
@@ -93,9 +93,5 @@ export const SingleDocRoute = () => {
     );
   }
 
-  return (
-    <div className="app-container">
-      <Doc id={id} index={index} dataView={dataView} referrer={locationState?.referrer} />
-    </div>
-  );
+  return <Doc id={id} index={index} dataView={dataView} referrer={locationState?.referrer} />;
 };
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.scss b/src/plugins/discover/public/application/main/components/layout/discover_layout.scss
index 5cb1f54edfd2e2..f3f552c76299f8 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.scss
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.scss
@@ -48,7 +48,12 @@ discover-app {
 }
 
 .dscPageContent--centered {
+  width: auto;
   height: auto;
+  align-self: center;
+  margin-top: auto;
+  margin-bottom: auto;
+  flex-grow: 0;
 }
 
 .dscTable {
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
index 74118cf674dad8..1dab027ca81fda 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
@@ -14,7 +14,7 @@ import {
   EuiHideFor,
   EuiPage,
   EuiPageBody,
-  EuiPageContent_Deprecated as EuiPageContent,
+  EuiPanel,
   EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -374,19 +374,17 @@ export function DiscoverLayout({
                 data-test-subj="discoverNoResultsError"
               />
             ) : (
-              <EuiPageContent
+              <EuiPanel
+                role="main"
                 panelRef={resizeRef}
-                verticalPosition={contentCentered ? 'center' : undefined}
-                horizontalPosition={contentCentered ? 'center' : undefined}
                 paddingSize="none"
                 hasShadow={false}
                 className={classNames('dscPageContent', {
                   'dscPageContent--centered': contentCentered,
-                  'dscPageContent--emptyPrompt': resultState === 'none',
                 })}
               >
                 {mainDisplay}
-              </EuiPageContent>
+              </EuiPanel>
             )}
           </EuiFlexItem>
         </EuiFlexGroup>
diff --git a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.test.tsx b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.test.tsx
index b90ec6673018b8..d3dae1cf148dc8 100644
--- a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.test.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.test.tsx
@@ -144,6 +144,7 @@ describe('useDiscoverHistogram', () => {
     beforeEach(() => {
       mockCheckHitCount.mockClear();
     });
+
     it('should subscribe to state changes', async () => {
       const { hook } = await renderUseDiscoverHistogram();
       const api = createMockUnifiedHistogramApi();
@@ -218,6 +219,7 @@ describe('useDiscoverHistogram', () => {
       act(() => {
         hook.result.current.ref(api);
       });
+      stateContainer.appState.update({ hideChart: true, interval: '1m', breakdownField: 'test' });
       expect(api.setTotalHits).toHaveBeenCalled();
       expect(api.setChartHidden).toHaveBeenCalled();
       expect(api.setTimeInterval).toHaveBeenCalled();
@@ -225,15 +227,15 @@ describe('useDiscoverHistogram', () => {
       expect(Object.keys(params ?? {})).toEqual([
         'totalHitsStatus',
         'totalHitsResult',
-        'chartHidden',
-        'timeInterval',
         'breakdownField',
+        'timeInterval',
+        'chartHidden',
       ]);
     });
 
     it('should exclude totalHitsStatus and totalHitsResult from Unified Histogram state updates after the first load', async () => {
       const stateContainer = getStateContainer();
-      const { hook, initialProps } = await renderUseDiscoverHistogram({ stateContainer });
+      const { hook } = await renderUseDiscoverHistogram({ stateContainer });
       const containerState = stateContainer.appState.getState();
       const state = {
         timeInterval: containerState.interval,
@@ -255,13 +257,14 @@ describe('useDiscoverHistogram', () => {
       act(() => {
         hook.result.current.ref(api);
       });
+      stateContainer.appState.update({ hideChart: true });
       expect(Object.keys(params ?? {})).toEqual([
         'totalHitsStatus',
         'totalHitsResult',
         'chartHidden',
       ]);
       params = {};
-      hook.rerender({ ...initialProps, hideChart: true });
+      stateContainer.appState.update({ hideChart: false });
       act(() => {
         subject$.next({
           ...state,
diff --git a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
index 50d3edefcd67c1..329e4f1cefca32 100644
--- a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
+++ b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
@@ -14,10 +14,11 @@ import {
 } from '@kbn/unified-histogram-plugin/public';
 import { isEqual } from 'lodash';
 import { useCallback, useEffect, useRef, useMemo, useState } from 'react';
-import { distinctUntilChanged, filter, map, Observable } from 'rxjs';
+import { distinctUntilChanged, filter, map, Observable, pairwise, startWith } from 'rxjs';
 import useObservable from 'react-use/lib/useObservable';
 import type { Suggestion } from '@kbn/lens-plugin/public';
 import useLatest from 'react-use/lib/useLatest';
+import type { RequestAdapter } from '@kbn/inspector-plugin/common';
 import { useDiscoverServices } from '../../../../hooks/use_discover_services';
 import { getUiActions } from '../../../../kibana_services';
 import { FetchStatus } from '../../../types';
@@ -25,10 +26,10 @@ import { useDataState } from '../../hooks/use_data_state';
 import type { InspectorAdapters } from '../../hooks/use_inspector';
 import type { DataDocuments$ } from '../../services/discover_data_state_container';
 import { checkHitCount, sendErrorTo } from '../../hooks/use_saved_search_messages';
-import { useAppStateSelector } from '../../services/discover_app_state_container';
 import type { DiscoverStateContainer } from '../../services/discover_state';
 import { addLog } from '../../../../utils/add_log';
 import { useInternalStateSelector } from '../../services/discover_internal_state_container';
+import type { DiscoverAppState } from '../../services/discover_app_state_container';
 
 export interface UseDiscoverHistogramProps {
   stateContainer: DiscoverStateContainer;
@@ -80,25 +81,26 @@ export const useDiscoverHistogram = ({
    */
 
   useEffect(() => {
-    const subscription = createStateSyncObservable(unifiedHistogram?.state$)?.subscribe((state) => {
-      inspectorAdapters.lensRequests = state.lensRequestAdapter;
-
-      const appState = stateContainer.appState.getState();
-      const oldState = {
-        hideChart: appState.hideChart,
-        interval: appState.interval,
-        breakdownField: appState.breakdownField,
-      };
-      const newState = {
-        hideChart: state.chartHidden,
-        interval: state.timeInterval,
-        breakdownField: state.breakdownField,
-      };
-
-      if (!isEqual(oldState, newState)) {
-        stateContainer.appState.update(newState);
+    const subscription = createUnifiedHistogramStateObservable(unifiedHistogram?.state$)?.subscribe(
+      (changes) => {
+        const { lensRequestAdapter, ...stateChanges } = changes;
+        const appState = stateContainer.appState.getState();
+        const oldState = {
+          hideChart: appState.hideChart,
+          interval: appState.interval,
+          breakdownField: appState.breakdownField,
+        };
+        const newState = { ...oldState, ...stateChanges };
+
+        if ('lensRequestAdapter' in changes) {
+          inspectorAdapters.lensRequests = lensRequestAdapter;
+        }
+
+        if (!isEqual(oldState, newState)) {
+          stateContainer.appState.update(newState);
+        }
       }
-    });
+    );
 
     return () => {
       subscription?.unsubscribe();
@@ -132,24 +134,26 @@ export const useDiscoverHistogram = ({
    */
 
   useEffect(() => {
-    if (typeof hideChart === 'boolean') {
-      unifiedHistogram?.setChartHidden(hideChart);
-    }
-  }, [hideChart, unifiedHistogram]);
-
-  const timeInterval = useAppStateSelector((state) => state.interval);
+    const subscription = createAppStateObservable(stateContainer.appState.state$).subscribe(
+      (changes) => {
+        if ('breakdownField' in changes) {
+          unifiedHistogram?.setBreakdownField(changes.breakdownField);
+        }
 
-  useEffect(() => {
-    if (timeInterval) {
-      unifiedHistogram?.setTimeInterval(timeInterval);
-    }
-  }, [timeInterval, unifiedHistogram]);
+        if ('timeInterval' in changes && changes.timeInterval) {
+          unifiedHistogram?.setTimeInterval(changes.timeInterval);
+        }
 
-  const breakdownField = useAppStateSelector((state) => state.breakdownField);
+        if ('chartHidden' in changes && typeof changes.chartHidden === 'boolean') {
+          unifiedHistogram?.setChartHidden(changes.chartHidden);
+        }
+      }
+    );
 
-  useEffect(() => {
-    unifiedHistogram?.setBreakdownField(breakdownField);
-  }, [breakdownField, unifiedHistogram]);
+    return () => {
+      subscription?.unsubscribe();
+    };
+  }, [stateContainer.appState.state$, unifiedHistogram]);
 
   /**
    * Columns
@@ -318,20 +322,70 @@ export const useDiscoverHistogram = ({
   };
 };
 
-const createStateSyncObservable = (state$?: Observable<UnifiedHistogramState>) => {
+// Use pairwise to diff the previous and current state (starting with undefined to ensure
+// pairwise triggers after a single emission), and return an object containing only the
+// changed properties. By only including the changed properties, we avoid accidentally
+// overwriting other state properties that may have been updated between the time this
+// obersverable was triggered and the time the state changes are applied.
+const createUnifiedHistogramStateObservable = (state$?: Observable<UnifiedHistogramState>) => {
   return state$?.pipe(
-    map(({ lensRequestAdapter, chartHidden, timeInterval, breakdownField }) => ({
-      lensRequestAdapter,
-      chartHidden,
-      timeInterval,
-      breakdownField,
-    })),
-    distinctUntilChanged((prev, curr) => {
-      const { lensRequestAdapter: prevLensRequestAdapter, ...prevRest } = prev;
-      const { lensRequestAdapter: currLensRequestAdapter, ...currRest } = curr;
+    startWith(undefined),
+    pairwise(),
+    map(([prev, curr]) => {
+      const changes: Partial<DiscoverAppState> & { lensRequestAdapter?: RequestAdapter } = {};
+
+      if (!curr) {
+        return changes;
+      }
+
+      if (prev?.lensRequestAdapter !== curr.lensRequestAdapter) {
+        changes.lensRequestAdapter = curr.lensRequestAdapter;
+      }
+
+      if (prev?.chartHidden !== curr.chartHidden) {
+        changes.hideChart = curr.chartHidden;
+      }
+
+      if (prev?.timeInterval !== curr.timeInterval) {
+        changes.interval = curr.timeInterval;
+      }
+
+      if (prev?.breakdownField !== curr.breakdownField) {
+        changes.breakdownField = curr.breakdownField;
+      }
+
+      return changes;
+    }),
+    filter((changes) => Object.keys(changes).length > 0)
+  );
+};
+
+const createAppStateObservable = (state$: Observable<DiscoverAppState>) => {
+  return state$.pipe(
+    startWith(undefined),
+    pairwise(),
+    map(([prev, curr]) => {
+      const changes: Partial<UnifiedHistogramState> = {};
+
+      if (!curr) {
+        return changes;
+      }
+
+      if (prev?.breakdownField !== curr.breakdownField) {
+        changes.breakdownField = curr.breakdownField;
+      }
+
+      if (prev?.interval !== curr.interval) {
+        changes.timeInterval = curr.interval;
+      }
+
+      if (prev?.hideChart !== curr.hideChart) {
+        changes.chartHidden = curr.hideChart;
+      }
 
-      return prevLensRequestAdapter === currLensRequestAdapter && isEqual(prevRest, currRest);
-    })
+      return changes;
+    }),
+    filter((changes) => Object.keys(changes).length > 0)
   );
 };
 
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_bucket.scss b/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_bucket.scss
deleted file mode 100644
index 90b645f70084e6..00000000000000
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_bucket.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.dscFieldDetails__barContainer {
-  // Constrains value to the flex item, and allows for truncation when necessary
-  min-width: 0;
-}
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_bucket.tsx b/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_bucket.tsx
deleted file mode 100644
index 47808d14e1cc38..00000000000000
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_bucket.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 React from 'react';
-import { EuiText, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { DataViewField } from '@kbn/data-views-plugin/public';
-import { StringFieldProgressBar } from './string_progress_bar';
-import { Bucket } from './types';
-import './discover_field_bucket.scss';
-
-interface Props {
-  bucket: Bucket;
-  field: DataViewField;
-  onAddFilter?: (field: DataViewField | string, value: string, type: '+' | '-') => void;
-}
-
-export function DiscoverFieldBucket({ field, bucket, onAddFilter }: Props) {
-  const emptyTxt = i18n.translate('discover.fieldChooser.detailViews.emptyStringText', {
-    defaultMessage: 'Empty string',
-  });
-  const addLabel = i18n.translate('discover.fieldChooser.detailViews.filterValueButtonAriaLabel', {
-    defaultMessage: 'Filter for {field}: "{value}"',
-    values: { value: bucket.value, field: field.name },
-  });
-  const removeLabel = i18n.translate(
-    'discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel',
-    {
-      defaultMessage: 'Filter out {field}: "{value}"',
-      values: { value: bucket.value, field: field.name },
-    }
-  );
-
-  return (
-    <>
-      <EuiFlexGroup justifyContent="spaceBetween" responsive={false} gutterSize="s">
-        <EuiFlexItem className="dscFieldDetails__barContainer" grow={1}>
-          <EuiFlexGroup justifyContent="spaceBetween" gutterSize="xs" responsive={false}>
-            <EuiFlexItem grow={1} className="eui-textTruncate">
-              <EuiText
-                title={
-                  bucket.display === ''
-                    ? emptyTxt
-                    : `${bucket.display}: ${bucket.count} (${bucket.percent}%)`
-                }
-                size="xs"
-                className="eui-textTruncate"
-              >
-                {bucket.display === '' ? emptyTxt : bucket.display}
-              </EuiText>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false} className="eui-textTruncate">
-              <EuiText color="success" size="xs" className="eui-textTruncate">
-                {bucket.percent}%
-              </EuiText>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <StringFieldProgressBar
-            value={bucket.value}
-            percent={bucket.percent}
-            count={bucket.count}
-          />
-        </EuiFlexItem>
-        {onAddFilter && field.filterable && (
-          <EuiFlexItem grow={false}>
-            <div>
-              <EuiButtonIcon
-                iconSize="s"
-                iconType="plusInCircle"
-                onClick={() => onAddFilter(field, bucket.value, '+')}
-                aria-label={addLabel}
-                data-test-subj={`plus-${field.name}-${bucket.value}`}
-                style={{
-                  minHeight: 'auto',
-                  minWidth: 'auto',
-                  paddingRight: 2,
-                  paddingLeft: 2,
-                  paddingTop: 0,
-                  paddingBottom: 0,
-                }}
-              />
-              <EuiButtonIcon
-                iconSize="s"
-                iconType="minusInCircle"
-                onClick={() => onAddFilter(field, bucket.value, '-')}
-                aria-label={removeLabel}
-                data-test-subj={`minus-${field.name}-${bucket.value}`}
-                style={{
-                  minHeight: 'auto',
-                  minWidth: 'auto',
-                  paddingTop: 0,
-                  paddingBottom: 0,
-                  paddingRight: 2,
-                  paddingLeft: 2,
-                }}
-              />
-            </div>
-          </EuiFlexItem>
-        )}
-      </EuiFlexGroup>
-      <EuiSpacer size="s" />
-    </>
-  );
-}
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_details.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_details.test.tsx
deleted file mode 100644
index 17945e7e3e027f..00000000000000
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_details.test.tsx
+++ /dev/null
@@ -1,110 +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 { findTestSubject } from '@elastic/eui/lib/test';
-import { ReactWrapper } from 'enzyme';
-import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { EuiLoadingSpinner } from '@elastic/eui';
-import { act } from 'react-dom/test-utils';
-import { DiscoverFieldDetails } from './discover_field_details';
-import { DataViewField } from '@kbn/data-views-plugin/public';
-import { stubDataView, stubLogstashDataView } from '@kbn/data-views-plugin/common/data_view.stub';
-import { BehaviorSubject } from 'rxjs';
-import { FetchStatus } from '../../../../types';
-import { DataDocuments$ } from '../../../services/discover_data_state_container';
-import { getDataTableRecords } from '../../../../../__fixtures__/real_hits';
-
-describe('discover sidebar field details', function () {
-  const onAddFilter = jest.fn();
-  const defaultProps = {
-    dataView: stubDataView,
-    details: { buckets: [], error: '', exists: 1, total: 2, columns: [] },
-    onAddFilter,
-  };
-  const hits = getDataTableRecords(stubLogstashDataView);
-  const documents$ = new BehaviorSubject({
-    fetchStatus: FetchStatus.COMPLETE,
-    result: hits,
-  }) as DataDocuments$;
-
-  function mountComponent(field: DataViewField) {
-    const compProps = { ...defaultProps, field, documents$ };
-    return mountWithIntl(<DiscoverFieldDetails {...compProps} />);
-  }
-
-  it('click on addFilter calls the function', function () {
-    const visualizableField = new DataViewField({
-      name: 'bytes',
-      type: 'number',
-      esTypes: ['long'],
-      count: 10,
-      scripted: false,
-      searchable: true,
-      aggregatable: true,
-      readFromDocValues: true,
-    });
-    const component = mountComponent(visualizableField);
-    const onAddButton = findTestSubject(component, 'onAddFilterButton');
-    onAddButton.simulate('click');
-    expect(onAddFilter).toHaveBeenCalledWith('_exists_', visualizableField.name, '+');
-  });
-
-  it('should stay in sync with documents$ state', async function () {
-    const testDocuments$ = new BehaviorSubject({
-      fetchStatus: FetchStatus.LOADING,
-    }) as DataDocuments$;
-    const visualizableField = new DataViewField({
-      name: 'bytes',
-      type: 'number',
-      esTypes: ['long'],
-      count: 10,
-      scripted: false,
-      searchable: true,
-      aggregatable: true,
-      readFromDocValues: true,
-    });
-    let component: ReactWrapper;
-
-    await act(async () => {
-      component = await mountWithIntl(
-        <DiscoverFieldDetails
-          {...defaultProps}
-          field={visualizableField}
-          documents$={testDocuments$}
-        />
-      );
-    });
-
-    expect(component!.find(EuiLoadingSpinner).exists()).toBeTruthy();
-
-    await act(async () => {
-      testDocuments$.next({
-        fetchStatus: FetchStatus.COMPLETE,
-        result: hits,
-      });
-    });
-
-    await component!.update();
-
-    expect(component!.find(EuiLoadingSpinner).exists()).toBeFalsy();
-    expect(
-      findTestSubject(component!, `discoverFieldDetails-${visualizableField.name}`).exists()
-    ).toBeTruthy();
-
-    await act(async () => {
-      testDocuments$.next({
-        fetchStatus: FetchStatus.UNINITIALIZED,
-      });
-    });
-
-    await component!.update();
-
-    expect(component!.isEmptyRender()).toBeTruthy();
-  });
-});
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_details.tsx b/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_details.tsx
deleted file mode 100644
index aa027376d9155d..00000000000000
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/discover_field_details.tsx
+++ /dev/null
@@ -1,117 +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, { useEffect, useState } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiLink, EuiSpacer, EuiText, EuiTitle, EuiLoadingSpinner } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { DataView, DataViewField } from '@kbn/data-views-plugin/public';
-import { DiscoverFieldBucket } from './discover_field_bucket';
-import { Bucket, FieldDetails } from './types';
-import { getDetails, isValidFieldDetails } from './get_details';
-import { FetchStatus } from '../../../../types';
-import { DataDocuments$ } from '../../../services/discover_data_state_container';
-
-interface DiscoverFieldDetailsProps {
-  /**
-   * hits fetched from ES, displayed in the doc table
-   */
-  documents$: DataDocuments$;
-  field: DataViewField;
-  dataView: DataView;
-  onAddFilter?: (field: DataViewField | string, value: string, type: '+' | '-') => void;
-}
-
-export function DiscoverFieldDetails({
-  documents$,
-  field,
-  dataView,
-  onAddFilter,
-}: DiscoverFieldDetailsProps) {
-  const [detailsState, setDetailsState] = useState<{
-    details?: FieldDetails;
-    loaded: boolean;
-  }>();
-
-  useEffect(() => {
-    const subscription = documents$.subscribe((data) => {
-      if (data.fetchStatus === FetchStatus.COMPLETE) {
-        setDetailsState({ details: getDetails(field, data.result, dataView), loaded: true });
-      } else {
-        setDetailsState({ details: undefined, loaded: data.fetchStatus !== FetchStatus.LOADING });
-      }
-    });
-
-    return () => {
-      subscription.unsubscribe();
-    };
-  }, [documents$, setDetailsState, dataView, field]);
-
-  if (!detailsState?.loaded) {
-    return <EuiLoadingSpinner />;
-  }
-
-  const details = detailsState?.details;
-  if (!details) {
-    return null;
-  }
-
-  return (
-    <div data-test-subj={`discoverFieldDetails-${field.name}`}>
-      <EuiTitle size="xxxs">
-        <h5>
-          {i18n.translate('discover.fieldChooser.discoverField.fieldTopValuesLabel', {
-            defaultMessage: 'Top 5 values',
-          })}
-        </h5>
-      </EuiTitle>
-      {!isValidFieldDetails(details) && <EuiText size="xs">{details.error}</EuiText>}
-      {isValidFieldDetails(details) && (
-        <>
-          <div style={{ marginTop: '4px' }}>
-            {details.buckets.map((bucket: Bucket, idx: number) => (
-              <DiscoverFieldBucket
-                key={`bucket${idx}`}
-                bucket={bucket}
-                field={field}
-                onAddFilter={onAddFilter}
-              />
-            ))}
-          </div>
-          <EuiSpacer size="xs" />
-          <EuiText size="xs">
-            {onAddFilter && !dataView.metaFields.includes(field.name) && !field.scripted ? (
-              <EuiLink
-                onClick={() => onAddFilter('_exists_', field.name, '+')}
-                data-test-subj="onAddFilterButton"
-              >
-                <FormattedMessage
-                  id="discover.fieldChooser.detailViews.existsInRecordsText"
-                  defaultMessage="Exists in {value} / {totalValue} records"
-                  values={{
-                    value: details.exists,
-                    totalValue: details.total,
-                  }}
-                />
-              </EuiLink>
-            ) : (
-              <FormattedMessage
-                id="discover.fieldChooser.detailViews.valueOfRecordsText"
-                defaultMessage="{value} / {totalValue} records"
-                values={{
-                  value: details.exists,
-                  totalValue: details.total,
-                }}
-              />
-            )}
-          </EuiText>
-        </>
-      )}
-    </div>
-  );
-}
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/field_calculator.test.ts b/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/field_calculator.test.ts
deleted file mode 100644
index ef397acc63aba8..00000000000000
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/field_calculator.test.ts
+++ /dev/null
@@ -1,199 +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.
- */
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { keys, clone, uniq, filter, map } from 'lodash';
-import { getDataTableRecords } from '../../../../../__fixtures__/real_hits';
-import { fieldCalculator, FieldCountsParams } from './field_calculator';
-import { stubLogstashDataView as dataView } from '@kbn/data-views-plugin/common/data_view.stub';
-import { FieldDetails, ValidFieldDetails } from './types';
-import { isValidFieldDetails } from './get_details';
-
-const validateResults = (
-  extensions: FieldDetails,
-  validate: (extensions: ValidFieldDetails) => void
-) => {
-  if (isValidFieldDetails(extensions)) {
-    validate(extensions);
-  } else {
-    throw new Error('extensions is not valid');
-  }
-};
-
-describe('fieldCalculator', function () {
-  it('should have a _countMissing that counts nulls & undefineds in an array', function () {
-    const values = [
-      ['foo', 'bar'],
-      'foo',
-      'foo',
-      undefined,
-      ['foo', 'bar'],
-      'bar',
-      'baz',
-      null,
-      null,
-      null,
-      'foo',
-      undefined,
-    ];
-    expect(fieldCalculator._countMissing(values)).toBe(5);
-  });
-
-  describe('_groupValues', function () {
-    let groups: Record<string, any>;
-    let params: any;
-    let values: any;
-    beforeEach(function () {
-      values = [
-        ['foo', 'bar'],
-        'foo',
-        'foo',
-        undefined,
-        ['foo', 'bar'],
-        'bar',
-        'baz',
-        null,
-        null,
-        null,
-        'foo',
-        undefined,
-      ];
-      params = {};
-      groups = fieldCalculator._groupValues(values, params);
-    });
-
-    it('should have a _groupValues that counts values', function () {
-      expect(groups).toBeInstanceOf(Object);
-    });
-
-    it('should throw an error if any value is a plain object', function () {
-      expect(function () {
-        fieldCalculator._groupValues([{}, true, false], params);
-      }).toThrowError();
-    });
-
-    it('should handle values with dots in them', function () {
-      values = ['0', '0.........', '0.......,.....'];
-      params = {};
-      groups = fieldCalculator._groupValues(values, params);
-      expect(groups[values[0]].count).toBe(1);
-      expect(groups[values[1]].count).toBe(1);
-      expect(groups[values[2]].count).toBe(1);
-    });
-
-    it('should have a a key for value in the array when not grouping array terms', function () {
-      expect(keys(groups).length).toBe(3);
-      expect(groups.foo).toBeInstanceOf(Object);
-      expect(groups.bar).toBeInstanceOf(Object);
-      expect(groups.baz).toBeInstanceOf(Object);
-    });
-
-    it('should count array terms independently', function () {
-      expect(groups['foo,bar']).toBe(undefined);
-      expect(groups.foo.count).toBe(5);
-      expect(groups.bar.count).toBe(3);
-      expect(groups.baz.count).toBe(1);
-    });
-
-    describe('grouped array terms', function () {
-      beforeEach(function () {
-        params.grouped = true;
-        groups = fieldCalculator._groupValues(values, params);
-      });
-
-      it('should group array terms when passed params.grouped', function () {
-        expect(keys(groups).length).toBe(4);
-        expect(groups['foo,bar']).toBeInstanceOf(Object);
-      });
-
-      it('should contain the original array as the value', function () {
-        expect(groups['foo,bar'].value).toEqual(['foo', 'bar']);
-      });
-
-      it('should count the pairs separately from the values they contain', function () {
-        expect(groups['foo,bar'].count).toBe(2);
-        expect(groups.foo.count).toBe(3);
-        expect(groups.bar.count).toBe(1);
-      });
-    });
-  });
-
-  describe('getFieldValues', function () {
-    let hits: any;
-
-    beforeEach(function () {
-      hits = getDataTableRecords(dataView);
-    });
-
-    it('Should return an array of values for _source fields', function () {
-      const extensions = fieldCalculator.getFieldValues(
-        hits,
-        dataView.fields.getByName('extension')!
-      );
-      expect(extensions).toBeInstanceOf(Array);
-      expect(filter(extensions, (v) => v === 'html').length).toBe(8);
-      expect(uniq(clone(extensions)).sort()).toEqual(['gif', 'html', 'php', 'png']);
-    });
-
-    it('Should return an array of values for core meta fields', function () {
-      const types = fieldCalculator.getFieldValues(hits, dataView.fields.getByName('_id')!);
-      expect(types).toBeInstanceOf(Array);
-      expect(types.length).toBe(20);
-    });
-  });
-
-  describe('getFieldValueCounts', function () {
-    let params: FieldCountsParams;
-    beforeEach(function () {
-      params = {
-        hits: getDataTableRecords(dataView),
-        field: dataView.fields.getByName('extension')!,
-        count: 3,
-        dataView,
-      };
-    });
-
-    it('counts the top 3 values', function () {
-      validateResults(fieldCalculator.getFieldValueCounts(params), (extensions) => {
-        expect(extensions).toBeInstanceOf(Object);
-        expect(extensions.buckets).toBeInstanceOf(Array);
-        expect(extensions.buckets.length).toBe(3);
-        expect(map(extensions.buckets, 'value')).toEqual(['html', 'php', 'gif']);
-      });
-    });
-
-    it('fails to analyze geo and attachment types', function () {
-      params.field = dataView.fields.getByName('point')!;
-      expect(isValidFieldDetails(fieldCalculator.getFieldValueCounts(params))).toBeFalsy();
-
-      params.field = dataView.fields.getByName('area')!;
-      expect(isValidFieldDetails(fieldCalculator.getFieldValueCounts(params))).toBeFalsy();
-
-      params.field = dataView.fields.getByName('request_body')!;
-      expect(isValidFieldDetails(fieldCalculator.getFieldValueCounts(params))).toBeFalsy();
-    });
-
-    it('fails to analyze fields that are in the mapping, but not the hits', function () {
-      params.field = dataView.fields.getByName('ip')!;
-      expect(isValidFieldDetails(fieldCalculator.getFieldValueCounts(params))).toBeFalsy();
-    });
-
-    it('counts the total hits', function () {
-      validateResults(fieldCalculator.getFieldValueCounts(params), (extensions) => {
-        expect(extensions.total).toBe(params.hits.length);
-      });
-    });
-
-    it('counts the hits the field exists in', function () {
-      params.field = dataView.fields.getByName('phpmemory')!;
-      validateResults(fieldCalculator.getFieldValueCounts(params), (extensions) => {
-        expect(extensions.exists).toBe(5);
-      });
-    });
-  });
-});
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/field_calculator.ts b/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/field_calculator.ts
deleted file mode 100644
index eff4ff793b2e49..00000000000000
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/field_calculator.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 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 { map, sortBy, without, each, defaults, isObject } from 'lodash';
-import { i18n } from '@kbn/i18n';
-import type { DataViewField, DataView } from '@kbn/data-views-plugin/common';
-import type { DataTableRecord } from '../../../../../types';
-import { Bucket, FieldDetails } from './types';
-
-export interface FieldCountsParams {
-  hits: DataTableRecord[];
-  field: DataViewField;
-  dataView: DataView;
-  count?: number;
-  grouped?: boolean;
-}
-
-interface FieldCountsBucket {
-  count: number;
-  value: string;
-}
-
-const getFieldValues = (hits: DataTableRecord[], field: DataViewField): unknown[] =>
-  map(hits, (hit) => hit.flattened[field.name]);
-
-const getFieldValueCounts = (params: FieldCountsParams): FieldDetails => {
-  params = defaults(params, {
-    count: 5,
-    grouped: false,
-  });
-
-  if (
-    params.field.type === 'geo_point' ||
-    params.field.type === 'geo_shape' ||
-    params.field.type === 'attachment'
-  ) {
-    return {
-      error: i18n.translate(
-        'discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage',
-        {
-          defaultMessage: 'Analysis is not available for geo fields.',
-        }
-      ),
-    };
-  }
-
-  const allValues = getFieldValues(params.hits, params.field);
-  const missing = _countMissing(allValues);
-
-  try {
-    const groups = _groupValues(allValues, params);
-    const counts: Bucket[] = sortBy(groups, 'count')
-      .reverse()
-      .slice(0, params.count)
-      .map((bucket: FieldCountsBucket) => ({
-        value: bucket.value,
-        count: bucket.count as number,
-        percent: Number(((bucket.count / (params.hits.length - missing)) * 100).toFixed(1)),
-        display: params.dataView.getFormatterForField(params.field).convert(bucket.value),
-      }));
-
-    if (params.hits.length - missing === 0) {
-      return {
-        error: i18n.translate(
-          'discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage',
-          {
-            defaultMessage:
-              'This field is present in your Elasticsearch mapping but not in the {hitsLength} documents shown in the doc table. You may still be able to visualize or search on it.',
-            values: {
-              hitsLength: params.hits.length,
-            },
-          }
-        ),
-      };
-    }
-
-    return {
-      total: params.hits.length,
-      exists: params.hits.length - missing,
-      missing,
-      buckets: counts,
-    };
-  } catch (e) {
-    return { error: e.message };
-  }
-};
-
-// returns a count of fields in the array that are undefined or null
-const _countMissing = (array: unknown[]) => array.length - without(array, undefined, null).length;
-
-const _groupValues = (allValues: unknown[], params: FieldCountsParams) => {
-  const groups: Record<string, FieldCountsBucket> = {};
-  let k;
-
-  allValues.forEach((value: unknown) => {
-    if (isObject(value) && !Array.isArray(value)) {
-      throw new Error(
-        i18n.translate(
-          'discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage',
-          {
-            defaultMessage: 'Analysis is not available for object fields.',
-          }
-        )
-      );
-    }
-
-    if (Array.isArray(value) && !params.grouped) {
-      k = value;
-    } else {
-      k = value == null ? undefined : [value];
-    }
-
-    each(k, (key: string) => {
-      if (groups.hasOwnProperty(key)) {
-        (groups[key] as FieldCountsBucket).count++;
-      } else {
-        groups[key] = {
-          value: params.grouped ? (value as string) : key,
-          count: 1,
-        };
-      }
-    });
-  });
-
-  return groups;
-};
-
-export const fieldCalculator = {
-  _groupValues,
-  _countMissing,
-  getFieldValues,
-  getFieldValueCounts,
-};
diff --git a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/get_details.ts b/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/get_details.ts
deleted file mode 100644
index d62d3e10dd3479..00000000000000
--- a/src/plugins/discover/public/application/main/components/sidebar/deprecated_stats/get_details.ts
+++ /dev/null
@@ -1,33 +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 { DataView, DataViewField } from '@kbn/data-views-plugin/public';
-import { fieldCalculator } from './field_calculator';
-import { DataTableRecord } from '../../../../../types';
-import { ErrorFieldDetails, FieldDetails, ValidFieldDetails } from './types';
-
-export const isValidFieldDetails = (details: FieldDetails): details is ValidFieldDetails =>
-  !(details as ErrorFieldDetails).error;
-
-export function getDetails(
-  field: DataViewField,
-  hits: DataTableRecord[] | undefined,
-  dataView: DataView
-) {
-  if (!hits) {
-    return undefined;
-  }
-
-  return fieldCalculator.getFieldValueCounts({
-    hits,
-    field,
-    count: 5,
-    grouped: false,
-    dataView,
-  });
-}
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
index 778de3c3e8f94d..83ccd775bc6778 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field.test.tsx
@@ -9,7 +9,6 @@
 import { act } from 'react-dom/test-utils';
 import { EuiButtonIcon, EuiPopover, EuiProgress } from '@elastic/eui';
 import React from 'react';
-import { BehaviorSubject } from 'rxjs';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DiscoverField, DiscoverFieldProps } from './discover_field';
@@ -18,15 +17,9 @@ import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { stubDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 import { DiscoverAppStateProvider } from '../../services/discover_app_state_container';
 import { getDiscoverStateMock } from '../../../../__mocks__/discover_state.mock';
-import { FetchStatus } from '../../../types';
-import { DataDocuments$ } from '../../services/discover_data_state_container';
-import { getDataTableRecords } from '../../../../__fixtures__/real_hits';
-import * as DetailsUtil from './deprecated_stats/get_details';
 import { createDiscoverServicesMock } from '../../../../__mocks__/services';
 import { FieldItemButton } from '@kbn/unified-field-list-plugin/public';
 
-jest.spyOn(DetailsUtil, 'getDetails');
-
 jest.mock('@kbn/unified-field-list-plugin/public/services/field_stats', () => ({
   loadFieldStats: jest.fn().mockResolvedValue({
     totalDocuments: 1624,
@@ -57,16 +50,12 @@ jest.mock('../../../../kibana_services', () => ({
 
 async function getComponent({
   selected = false,
-  showFieldStats = false,
   field,
   onAddFilterExists = true,
-  showLegacyFieldTopValues = false,
 }: {
   selected?: boolean;
-  showFieldStats?: boolean;
   field?: DataViewField;
   onAddFilterExists?: boolean;
-  showLegacyFieldTopValues?: boolean;
 }) {
   const finalField =
     field ??
@@ -83,21 +72,13 @@ async function getComponent({
   const dataView = stubDataView;
   dataView.toSpec = () => ({});
 
-  const hits = getDataTableRecords(dataView);
-  const documents$ = new BehaviorSubject({
-    fetchStatus: FetchStatus.COMPLETE,
-    result: hits,
-  }) as DataDocuments$;
-
   const props: DiscoverFieldProps = {
-    documents$,
     dataView: stubDataView,
     field: finalField,
     ...(onAddFilterExists && { onAddFilter: jest.fn() }),
     onAddField: jest.fn(),
     onEditField: jest.fn(),
     onRemoveField: jest.fn(),
-    showFieldStats,
     isSelected: selected,
     isEmpty: false,
     groupIndex: 1,
@@ -116,9 +97,6 @@ async function getComponent({
         if (key === 'fields:popularLimit') {
           return 5;
         }
-        if (key === 'discover:showLegacyFieldTopValues') {
-          return showLegacyFieldTopValues;
-        }
       },
     },
   };
@@ -141,10 +119,6 @@ async function getComponent({
 }
 
 describe('discover sidebar field', function () {
-  beforeEach(() => {
-    (DetailsUtil.getDetails as jest.Mock).mockClear();
-  });
-
   it('should allow selecting fields', async function () {
     const { comp, props } = await getComponent({});
     findTestSubject(comp, 'fieldToggle-bytes').simulate('click');
@@ -155,33 +129,6 @@ describe('discover sidebar field', function () {
     findTestSubject(comp, 'fieldToggle-bytes').simulate('click');
     expect(props.onRemoveField).toHaveBeenCalledWith('bytes');
   });
-  it('should trigger getDetails for showing the deprecated field stats', async function () {
-    const { comp, props } = await getComponent({
-      selected: true,
-      showFieldStats: true,
-      showLegacyFieldTopValues: true,
-    });
-    findTestSubject(comp, 'field-bytes-showDetails').simulate('click');
-    expect(DetailsUtil.getDetails).toHaveBeenCalledTimes(1);
-    expect(findTestSubject(comp, `discoverFieldDetails-${props.field.name}`).exists()).toBeTruthy();
-  });
-  it('should not allow clicking on _source', async function () {
-    const field = new DataViewField({
-      name: '_source',
-      type: '_source',
-      esTypes: ['_source'],
-      searchable: true,
-      aggregatable: true,
-      readFromDocValues: true,
-    });
-    const { comp } = await getComponent({
-      selected: true,
-      field,
-      showLegacyFieldTopValues: true,
-    });
-    findTestSubject(comp, 'field-_source-showDetails').simulate('click');
-    expect(DetailsUtil.getDetails).not.toHaveBeenCalledWith();
-  });
   it('displays warning for conflicting fields', async function () {
     const field = new DataViewField({
       name: 'troubled_field',
@@ -198,18 +145,6 @@ describe('discover sidebar field', function () {
     const dscField = findTestSubject(comp, 'field-troubled_field-showDetails');
     expect(dscField.find('.kbnFieldButton__infoIcon').length).toEqual(1);
   });
-  it('should not execute getDetails when rendered, since it can be expensive', async function () {
-    await getComponent({});
-    expect(DetailsUtil.getDetails).toHaveBeenCalledTimes(0);
-  });
-  it('should execute getDetails when show details is requested', async function () {
-    const { comp } = await getComponent({
-      showFieldStats: true,
-      showLegacyFieldTopValues: true,
-    });
-    findTestSubject(comp, 'field-bytes-showDetails').simulate('click');
-    expect(DetailsUtil.getDetails).toHaveBeenCalledTimes(1);
-  });
   it('should not enable the popover if onAddFilter is not provided', async function () {
     const field = new DataViewField({
       name: '_source',
@@ -236,7 +171,7 @@ describe('discover sidebar field', function () {
       searchable: true,
     });
 
-    const { comp } = await getComponent({ showFieldStats: true, field, onAddFilterExists: true });
+    const { comp } = await getComponent({ field, onAddFilterExists: true });
 
     await act(async () => {
       const fieldItem = findTestSubject(comp, 'field-machine.os.raw-showDetails');
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
index 01b503e9a8ca20..a6b694ca977d85 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_field.tsx
@@ -23,11 +23,8 @@ import {
 } from '@kbn/unified-field-list-plugin/public';
 import { DragDrop } from '@kbn/dom-drag-drop';
 import { DiscoverFieldStats } from './discover_field_stats';
-import { DiscoverFieldDetails } from './deprecated_stats/discover_field_details';
-import { useDiscoverServices } from '../../../../hooks/use_discover_services';
-import { PLUGIN_ID, SHOW_LEGACY_FIELD_TOP_VALUES } from '../../../../../common';
+import { PLUGIN_ID } from '../../../../../common';
 import { getUiActions } from '../../../../kibana_services';
-import { type DataDocuments$ } from '../../services/discover_data_state_container';
 
 interface GetCommonFieldItemButtonPropsParams {
   field: DataViewField;
@@ -111,10 +108,6 @@ const MultiFields: React.FC<MultiFieldsProps> = memo(
 );
 
 export interface DiscoverFieldProps {
-  /**
-   * hits fetched from ES, displayed in the doc table
-   */
-  documents$: DataDocuments$;
   /**
    * Determines whether add/remove button is displayed not only when focused
    */
@@ -169,10 +162,6 @@ export interface DiscoverFieldProps {
    */
   onDeleteField?: (fieldName: string) => void;
 
-  /**
-   * Optionally show or hide field stats in the popover
-   */
-  showFieldStats?: boolean;
   /**
    * Columns
    */
@@ -195,7 +184,6 @@ export interface DiscoverFieldProps {
 }
 
 function DiscoverFieldComponent({
-  documents$,
   alwaysShowActionButton = false,
   field,
   highlight,
@@ -209,12 +197,10 @@ function DiscoverFieldComponent({
   multiFields,
   onEditField,
   onDeleteField,
-  showFieldStats,
   contextualFields,
   groupIndex,
   itemIndex,
 }: DiscoverFieldProps) {
-  const services = useDiscoverServices();
   const [infoIsOpen, setOpen] = useState(false);
   const isDocumentRecord = !!onAddFilter;
 
@@ -272,33 +258,18 @@ function DiscoverFieldComponent({
   );
 
   const renderPopover = () => {
-    const showLegacyFieldStats = services.uiSettings.get(SHOW_LEGACY_FIELD_TOP_VALUES);
-
     return (
       <>
-        {showLegacyFieldStats ? ( // TODO: Deprecate and remove after ~v8.7
-          <>
-            {showFieldStats && (
-              <DiscoverFieldDetails
-                documents$={documents$}
-                dataView={dataView}
-                field={field}
-                onAddFilter={onAddFilter}
-              />
-            )}
-          </>
-        ) : (
-          <DiscoverFieldStats
-            field={field}
-            multiFields={multiFields}
-            dataView={dataView}
-            onAddFilter={addFilterAndClosePopover}
-          />
-        )}
+        <DiscoverFieldStats
+          field={field}
+          multiFields={multiFields}
+          dataView={dataView}
+          onAddFilter={addFilterAndClosePopover}
+        />
 
         {multiFields && (
           <>
-            {(showFieldStats || !showLegacyFieldStats) && <EuiSpacer size="m" />}
+            <EuiSpacer size="m" />
             <MultiFields
               multiFields={multiFields}
               alwaysShowActionButton={alwaysShowActionButton}
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
index b335054ec99603..dcb1d48b771c82 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar.tsx
@@ -9,12 +9,7 @@
 import './discover_sidebar.scss';
 import React, { memo, useCallback, useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import {
-  EuiButton,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPageSideBar_Deprecated as EuiPageSideBar,
-} from '@elastic/eui';
+import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiPageSidebar } from '@elastic/eui';
 import { DataViewPicker } from '@kbn/unified-search-plugin/public';
 import { type DataViewField, getFieldSubtypeMulti } from '@kbn/data-views-plugin/public';
 import {
@@ -101,7 +96,6 @@ export function DiscoverSidebarComponent({
   isProcessing,
   alwaysShowActionButtons = false,
   columns,
-  documents$,
   allFields,
   onAddField,
   onAddFilter,
@@ -125,7 +119,6 @@ export function DiscoverSidebarComponent({
     (state) => getRawRecordType(state.query) === RecordRawType.PLAIN
   );
 
-  const showFieldStats = useMemo(() => viewMode === VIEW_MODE.DOCUMENT_LEVEL, [viewMode]);
   const [selectedFieldsState, setSelectedFieldsState] = useState<SelectedFieldsResult>(
     INITIAL_SELECTED_FIELDS_RESULT
   );
@@ -233,12 +226,10 @@ export function DiscoverSidebarComponent({
           onAddField={onAddField}
           onRemoveField={onRemoveField}
           onAddFilter={onAddFilter}
-          documents$={documents$}
           trackUiMetric={trackUiMetric}
           multiFields={multiFieldsMap?.get(field.name)} // ideally we better calculate multifields when they are requested first from the popover
           onEditField={editField}
           onDeleteField={deleteField}
-          showFieldStats={showFieldStats}
           contextualFields={columns}
           groupIndex={groupIndex}
           itemIndex={itemIndex}
@@ -256,12 +247,10 @@ export function DiscoverSidebarComponent({
       onAddField,
       onRemoveField,
       onAddFilter,
-      documents$,
       trackUiMetric,
       multiFieldsMap,
       editField,
       deleteField,
-      showFieldStats,
       columns,
       selectedFieldsState.selectedFieldsMap,
     ]
@@ -272,7 +261,7 @@ export function DiscoverSidebarComponent({
   }
 
   return (
-    <EuiPageSideBar
+    <EuiPageSidebar
       className="dscSidebar"
       aria-label={i18n.translate('discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel', {
         defaultMessage: 'Index and fields',
@@ -333,7 +322,7 @@ export function DiscoverSidebarComponent({
           </FieldList>
         </EuiFlexItem>
       </EuiFlexGroup>
-    </EuiPageSideBar>
+    </EuiPageSidebar>
   );
 }
 
diff --git a/src/plugins/discover/public/application/main/hooks/use_test_based_query_language.test.ts b/src/plugins/discover/public/application/main/hooks/use_test_based_query_language.test.ts
index 7ac2fb6ef79162..d512477d9f53ea 100644
--- a/src/plugins/discover/public/application/main/hooks/use_test_based_query_language.test.ts
+++ b/src/plugins/discover/public/application/main/hooks/use_test_based_query_language.test.ts
@@ -14,21 +14,24 @@ import { useTextBasedQueryLanguage } from './use_text_based_query_language';
 import { BehaviorSubject } from 'rxjs';
 import { FetchStatus } from '../../types';
 import { DataDocuments$, RecordRawType } from '../services/discover_data_state_container';
+import { DiscoverAppState } from '../services/discover_app_state_container';
 import { DataTableRecord } from '../../../types';
 import { AggregateQuery, Query } from '@kbn/es-query';
 import { dataViewMock } from '../../../__mocks__/data_view';
 import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { savedSearchMock } from '../../../__mocks__/saved_search';
 import { getDiscoverStateMock } from '../../../__mocks__/discover_state.mock';
+import { VIEW_MODE } from '@kbn/saved-search-plugin/common';
 
 function getHookProps(
   query: AggregateQuery | Query | undefined,
-  dataViewsService?: DataViewsContract
+  dataViewsService?: DataViewsContract,
+  appState?: Partial<DiscoverAppState>
 ) {
   const replaceUrlState = jest.fn();
   const stateContainer = getDiscoverStateMock({ isTimeBased: true });
   stateContainer.appState.replaceUrlState = replaceUrlState;
-  stateContainer.appState.update({ columns: [] });
+  stateContainer.appState.update({ columns: [], ...appState });
   stateContainer.internalState.transitions.setSavedDataViews([dataViewMock as DataViewListItem]);
 
   const msgLoading = {
@@ -83,6 +86,20 @@ describe('useTextBasedQueryLanguage', () => {
       });
     });
   });
+  test('should change viewMode to DOCUMENT_LEVEL if it was AGGREGATED_LEVEL', async () => {
+    const props = getHookProps(query, undefined, {
+      viewMode: VIEW_MODE.AGGREGATED_LEVEL,
+    });
+    const { replaceUrlState } = props;
+
+    renderHook(() => useTextBasedQueryLanguage(props));
+
+    await waitFor(() => expect(replaceUrlState).toHaveBeenCalledTimes(1));
+    expect(replaceUrlState).toHaveBeenCalledWith({
+      index: 'the-data-view-id',
+      viewMode: VIEW_MODE.DOCUMENT_LEVEL,
+    });
+  });
   test('changing a text based query with different result columns should change state when loading and finished', async () => {
     const props = getHookProps(query);
     const { documents$, replaceUrlState } = props;
diff --git a/src/plugins/discover/public/application/main/hooks/use_text_based_query_language.ts b/src/plugins/discover/public/application/main/hooks/use_text_based_query_language.ts
index 5e2eb33efdbe91..ff401212748583 100644
--- a/src/plugins/discover/public/application/main/hooks/use_text_based_query_language.ts
+++ b/src/plugins/discover/public/application/main/hooks/use_text_based_query_language.ts
@@ -14,9 +14,10 @@ import {
 } from '@kbn/es-query';
 import { useCallback, useEffect, useRef } from 'react';
 import type { DataViewsContract } from '@kbn/data-views-plugin/public';
-import { SavedSearch } from '@kbn/saved-search-plugin/public';
+import { SavedSearch, VIEW_MODE } from '@kbn/saved-search-plugin/public';
 import type { DiscoverStateContainer } from '../services/discover_state';
 import type { DataDocuments$ } from '../services/discover_data_state_container';
+import { getValidViewMode } from '../utils/get_valid_view_mode';
 import { FetchStatus } from '../../types';
 
 const MAX_NUM_OF_COLUMNS = 50;
@@ -57,7 +58,7 @@ export function useTextBasedQueryLanguage({
       if (!query || next.fetchStatus === FetchStatus.ERROR) {
         return;
       }
-      const { columns: stateColumns, index } = stateContainer.appState.getState();
+      const { columns: stateColumns, index, viewMode } = stateContainer.appState.getState();
       let nextColumns: string[] = [];
       const isTextBasedQueryLang =
         recordRawType === 'plain' && isOfAggregateQueryType(query) && 'sql' in query;
@@ -115,6 +116,9 @@ export function useTextBasedQueryLanguage({
         const nextState = {
           ...(addDataViewToState && { index: dataViewObj.id }),
           ...(addColumnsToState && { columns: nextColumns }),
+          ...(viewMode === VIEW_MODE.AGGREGATED_LEVEL && {
+            viewMode: getValidViewMode({ viewMode, isTextBasedQueryMode: true }),
+          }),
         };
         stateContainer.appState.replaceUrlState(nextState);
       } else {
diff --git a/src/plugins/discover/public/application/main/utils/get_raw_record_type.ts b/src/plugins/discover/public/application/main/utils/get_raw_record_type.ts
index 595d54420e7ad6..36d9544b9e8510 100644
--- a/src/plugins/discover/public/application/main/utils/get_raw_record_type.ts
+++ b/src/plugins/discover/public/application/main/utils/get_raw_record_type.ts
@@ -25,7 +25,3 @@ export function getRawRecordType(query?: Query | AggregateQuery) {
 
   return RecordRawType.DOCUMENT;
 }
-
-export function isPlainRecord(query?: Query | AggregateQuery): query is AggregateQuery {
-  return getRawRecordType(query) === RecordRawType.PLAIN;
-}
diff --git a/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts b/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
index aed900821c747a..a994adc340f21f 100644
--- a/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
+++ b/src/plugins/discover/public/application/main/utils/get_state_defaults.test.ts
@@ -8,8 +8,9 @@
 
 import { getStateDefaults } from './get_state_defaults';
 import { createSearchSourceMock } from '@kbn/data-plugin/public/mocks';
+import { VIEW_MODE } from '@kbn/saved-search-plugin/common';
 import { dataViewWithTimefieldMock } from '../../../__mocks__/data_view_with_timefield';
-import { savedSearchMock } from '../../../__mocks__/saved_search';
+import { savedSearchMock, savedSearchMockWithSQL } from '../../../__mocks__/saved_search';
 import { dataViewMock } from '../../../__mocks__/data_view';
 import { discoverServiceMock } from '../../../__mocks__/services';
 
@@ -75,4 +76,42 @@ describe('getStateDefaults', () => {
       }
     `);
   });
+
+  test('should set view mode correctly', () => {
+    const actualForUndefinedViewMode = getStateDefaults({
+      services: discoverServiceMock,
+      savedSearch: {
+        ...savedSearchMockWithSQL,
+        viewMode: undefined,
+      },
+    });
+    expect(actualForUndefinedViewMode.viewMode).toBeUndefined();
+
+    const actualForTextBasedWithInvalidViewMode = getStateDefaults({
+      services: discoverServiceMock,
+      savedSearch: {
+        ...savedSearchMockWithSQL,
+        viewMode: VIEW_MODE.AGGREGATED_LEVEL,
+      },
+    });
+    expect(actualForTextBasedWithInvalidViewMode.viewMode).toBe(VIEW_MODE.DOCUMENT_LEVEL);
+
+    const actualForTextBasedWithValidViewMode = getStateDefaults({
+      services: discoverServiceMock,
+      savedSearch: {
+        ...savedSearchMockWithSQL,
+        viewMode: VIEW_MODE.DOCUMENT_LEVEL,
+      },
+    });
+    expect(actualForTextBasedWithValidViewMode.viewMode).toBe(VIEW_MODE.DOCUMENT_LEVEL);
+
+    const actualForWithValidViewMode = getStateDefaults({
+      services: discoverServiceMock,
+      savedSearch: {
+        ...savedSearchMock,
+        viewMode: VIEW_MODE.AGGREGATED_LEVEL,
+      },
+    });
+    expect(actualForWithValidViewMode.viewMode).toBe(VIEW_MODE.AGGREGATED_LEVEL);
+  });
 });
diff --git a/src/plugins/discover/public/application/main/utils/get_state_defaults.ts b/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
index 8acdc9ce6728b8..1ec3be8c3ec1a5 100644
--- a/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
+++ b/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
@@ -19,6 +19,8 @@ import {
   SEARCH_FIELDS_FROM_SOURCE,
   SORT_DEFAULT_ORDER_SETTING,
 } from '../../../../common';
+import { isTextBasedQuery } from './is_text_based_query';
+import { getValidViewMode } from './get_valid_view_mode';
 
 function getDefaultColumns(savedSearch: SavedSearch, uiSettings: IUiSettingsClient) {
   if (savedSearch.columns && savedSearch.columns.length > 0) {
@@ -81,7 +83,10 @@ export function getStateDefaults({
     defaultState.rowHeight = savedSearch.rowHeight;
   }
   if (savedSearch.viewMode) {
-    defaultState.viewMode = savedSearch.viewMode;
+    defaultState.viewMode = getValidViewMode({
+      viewMode: savedSearch.viewMode,
+      isTextBasedQueryMode: isTextBasedQuery(query),
+    });
   }
   if (savedSearch.hideAggregatedPreview) {
     defaultState.hideAggregatedPreview = savedSearch.hideAggregatedPreview;
diff --git a/src/plugins/discover/public/application/main/utils/get_valid_view_mode.test.ts b/src/plugins/discover/public/application/main/utils/get_valid_view_mode.test.ts
new file mode 100644
index 00000000000000..33431ba09b7c5e
--- /dev/null
+++ b/src/plugins/discover/public/application/main/utils/get_valid_view_mode.test.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { VIEW_MODE } from '@kbn/saved-search-plugin/common';
+import { getValidViewMode } from './get_valid_view_mode';
+
+describe('getValidViewMode', () => {
+  test('should work correctly for regular mode', () => {
+    expect(
+      getValidViewMode({
+        viewMode: undefined,
+        isTextBasedQueryMode: false,
+      })
+    ).toBeUndefined();
+
+    expect(
+      getValidViewMode({
+        viewMode: VIEW_MODE.DOCUMENT_LEVEL,
+        isTextBasedQueryMode: false,
+      })
+    ).toBe(VIEW_MODE.DOCUMENT_LEVEL);
+
+    expect(
+      getValidViewMode({
+        viewMode: VIEW_MODE.AGGREGATED_LEVEL,
+        isTextBasedQueryMode: false,
+      })
+    ).toBe(VIEW_MODE.AGGREGATED_LEVEL);
+  });
+
+  test('should work correctly for text-based mode', () => {
+    expect(
+      getValidViewMode({
+        viewMode: undefined,
+        isTextBasedQueryMode: true,
+      })
+    ).toBeUndefined();
+
+    expect(
+      getValidViewMode({
+        viewMode: VIEW_MODE.DOCUMENT_LEVEL,
+        isTextBasedQueryMode: true,
+      })
+    ).toBe(VIEW_MODE.DOCUMENT_LEVEL);
+
+    expect(
+      getValidViewMode({
+        viewMode: VIEW_MODE.AGGREGATED_LEVEL,
+        isTextBasedQueryMode: true,
+      })
+    ).toBe(VIEW_MODE.DOCUMENT_LEVEL);
+  });
+});
diff --git a/src/plugins/discover/public/application/main/utils/get_valid_view_mode.ts b/src/plugins/discover/public/application/main/utils/get_valid_view_mode.ts
new file mode 100644
index 00000000000000..4d6d660c28eef6
--- /dev/null
+++ b/src/plugins/discover/public/application/main/utils/get_valid_view_mode.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { VIEW_MODE } from '@kbn/saved-search-plugin/public';
+
+/**
+ * Returns a valid view mode
+ * @param viewMode
+ * @param isTextBasedQueryMode
+ */
+export const getValidViewMode = ({
+  viewMode,
+  isTextBasedQueryMode,
+}: {
+  viewMode?: VIEW_MODE;
+  isTextBasedQueryMode: boolean;
+}): VIEW_MODE | undefined => {
+  if (viewMode === VIEW_MODE.AGGREGATED_LEVEL && isTextBasedQueryMode) {
+    // only this mode is supported for text-based languages
+    return VIEW_MODE.DOCUMENT_LEVEL;
+  }
+
+  return viewMode;
+};
diff --git a/src/plugins/discover/public/application/main/utils/is_text_based_query.test.ts b/src/plugins/discover/public/application/main/utils/is_text_based_query.test.ts
new file mode 100644
index 00000000000000..53e85216ba0bf7
--- /dev/null
+++ b/src/plugins/discover/public/application/main/utils/is_text_based_query.test.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { isTextBasedQuery } from './is_text_based_query';
+
+describe('isTextBasedQuery', () => {
+  it('should work correctly', () => {
+    expect(isTextBasedQuery({ query: '', language: 'lucene' })).toEqual(false);
+    expect(isTextBasedQuery({ sql: 'SELECT * from foo' })).toEqual(true);
+    expect(isTextBasedQuery()).toEqual(false);
+  });
+});
diff --git a/src/plugins/discover/public/application/main/utils/is_text_based_query.ts b/src/plugins/discover/public/application/main/utils/is_text_based_query.ts
new file mode 100644
index 00000000000000..bf86af9304231c
--- /dev/null
+++ b/src/plugins/discover/public/application/main/utils/is_text_based_query.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { AggregateQuery, Query } from '@kbn/es-query';
+import { RecordRawType } from '../services/discover_data_state_container';
+import { getRawRecordType } from './get_raw_record_type';
+
+/**
+ * Checks if the query is of AggregateQuery type
+ * @param query
+ */
+export function isTextBasedQuery(query?: Query | AggregateQuery): query is AggregateQuery {
+  return getRawRecordType(query) === RecordRawType.PLAIN;
+}
diff --git a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
index 0e315d3b348e5c..1317916588184c 100644
--- a/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
+++ b/src/plugins/discover/public/embeddable/saved_search_embeddable.tsx
@@ -37,7 +37,6 @@ import { SavedSearch } from '@kbn/saved-search-plugin/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { VIEW_MODE } from '../../common/constants';
 import { getSortForEmbeddable, SortPair } from '../utils/sorting';
-import { RecordRawType } from '../application/main/services/discover_data_state_container';
 import { buildDataTableRecord } from '../utils/build_data_record';
 import { DataTableRecord, EsHitRecord } from '../types';
 import { ISearchEmbeddable, SearchInput, SearchOutput } from './types';
@@ -59,7 +58,8 @@ import { DiscoverGridSettings } from '../components/discover_grid/types';
 import { DocTableProps } from '../components/doc_table/doc_table_wrapper';
 import { updateSearchSource } from './utils/update_search_source';
 import { FieldStatisticsTable } from '../application/main/components/field_stats_table';
-import { getRawRecordType } from '../application/main/utils/get_raw_record_type';
+import { isTextBasedQuery } from '../application/main/utils/is_text_based_query';
+import { getValidViewMode } from '../application/main/utils/get_valid_view_mode';
 import { fetchSql } from '../application/main/utils/fetch_sql';
 import { ADHOC_DATA_VIEW_RENDER_EVENT } from '../constants';
 
@@ -169,6 +169,11 @@ export class SavedSearchEmbeddable
     return true;
   }
 
+  private isTextBasedSearch = (savedSearch: SavedSearch): boolean => {
+    const query = savedSearch.searchSource.getField('query');
+    return isTextBasedQuery(query);
+  };
+
   private fetch = async () => {
     const searchSessionId = this.input.searchSessionId;
     const useNewFieldsApi = !this.services.uiSettings.get(SEARCH_FIELDS_FROM_SOURCE, false);
@@ -229,8 +234,7 @@ export class SavedSearchEmbeddable
 
     const query = this.savedSearch.searchSource.getField('query');
     const dataView = this.savedSearch.searchSource.getField('index')!;
-    const recordRawType = getRawRecordType(query);
-    const useSql = recordRawType === RecordRawType.PLAIN;
+    const useSql = this.isTextBasedSearch(this.savedSearch);
 
     try {
       // Request SQL data
@@ -515,9 +519,14 @@ export class SavedSearchEmbeddable
       return;
     }
 
+    const viewMode = getValidViewMode({
+      viewMode: this.savedSearch.viewMode,
+      isTextBasedQueryMode: this.isTextBasedSearch(this.savedSearch),
+    });
+
     if (
       this.services.uiSettings.get(SHOW_FIELD_STATISTICS) === true &&
-      this.savedSearch.viewMode === VIEW_MODE.AGGREGATED_LEVEL &&
+      viewMode === VIEW_MODE.AGGREGATED_LEVEL &&
       searchProps.services &&
       searchProps.dataView &&
       Array.isArray(searchProps.columns)
diff --git a/src/plugins/discover/public/utils/convert_value_to_string.ts b/src/plugins/discover/public/utils/convert_value_to_string.ts
index f67abe8d53dc24..f310ba35bf1c0f 100644
--- a/src/plugins/discover/public/utils/convert_value_to_string.ts
+++ b/src/plugins/discover/public/utils/convert_value_to_string.ts
@@ -17,6 +17,8 @@ interface ConvertedResult {
   withFormula: boolean;
 }
 
+const separator = ',';
+
 export const convertValueToString = ({
   rowIndex,
   rows,
@@ -77,7 +79,7 @@ export const convertValueToString = ({
 
       return stringify(formattedValue, disableMultiline) || '';
     })
-    .join(', ');
+    .join(`${separator} `);
 
   return {
     formattedString: formatted,
@@ -97,7 +99,11 @@ const stringify = (val: object | string, disableMultiline: boolean) => {
   return disableMultiline ? JSON.stringify(val) : JSON.stringify(val, null, 2);
 };
 
-const escapeValueFn = createEscapeValue(true, true);
+const escapeValueFn = createEscapeValue({
+  separator,
+  quoteValues: true,
+  escapeFormulaValues: true,
+});
 
 const escapeFormattedValue = (formattedValue: string): string => {
   return escapeValueFn(formattedValue);
diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts
index d6985033cdb1dc..be3dde9392f665 100644
--- a/src/plugins/discover/server/ui_settings.ts
+++ b/src/plugins/discover/server/ui_settings.ts
@@ -30,7 +30,6 @@ import {
   TRUNCATE_MAX_HEIGHT,
   SHOW_FIELD_STATISTICS,
   ROW_HEIGHT_OPTION,
-  SHOW_LEGACY_FIELD_TOP_VALUES,
   ENABLE_SQL,
 } from '../common';
 import { DEFAULT_ROWS_PER_PAGE, ROWS_PER_PAGE_OPTIONS } from '../common/constants';
@@ -125,25 +124,6 @@ export const getUiSettings: (docLinks: DocLinksServiceSetup) => Record<string, U
     category: ['discover'],
     schema: schema.boolean(),
   },
-  [SHOW_LEGACY_FIELD_TOP_VALUES]: {
-    name: i18n.translate('discover.advancedSettings.showLegacyFieldStatsTitle', {
-      defaultMessage: 'Top values calculation',
-    }),
-    value: false,
-    type: 'boolean',
-    description: i18n.translate('discover.advancedSettings.showLegacyFieldStatsText', {
-      defaultMessage:
-        'To calculate the top values for a field in the sidebar using 500 instead of 5,000 records per shard, turn on this option.',
-    }),
-    category: ['discover'],
-    schema: schema.boolean(),
-    deprecation: {
-      message: i18n.translate('discover.advancedSettings.showLegacyFieldStatsTextDeprecation', {
-        defaultMessage: 'This setting is deprecated and will not be supported in a future version.',
-      }),
-      docLinksKey: 'discoverSettings',
-    },
-  },
   [DOC_HIDE_TIME_COLUMN_SETTING]: {
     name: i18n.translate('discover.advancedSettings.docTableHideTimeColumnTitle', {
       defaultMessage: "Hide 'Time' column",
diff --git a/src/plugins/files/common/types.ts b/src/plugins/files/common/types.ts
index c0cf5dacf687a6..8b6059bdb5637a 100644
--- a/src/plugins/files/common/types.ts
+++ b/src/plugins/files/common/types.ts
@@ -18,6 +18,7 @@ import type {
   FileKindBase,
   FileShareJSONWithToken,
 } from '@kbn/shared-ux-file-types';
+import type { UploadOptions } from '../server/blob_storage_service';
 import type { ES_FIXED_SIZE_INDEX_BLOB_STORE } from './constants';
 
 export type {
@@ -179,7 +180,7 @@ export interface File<Meta = unknown> {
    */
   data: FileJSON<Meta>;
   /**
-   * Update a file object's metadatathat can be updated.
+   * Update a file object's metadata that can be updated.
    *
    * @param attr - The of attributes to update.
    */
@@ -190,8 +191,13 @@ export interface File<Meta = unknown> {
    *
    * @param content - The content to stream to storage.
    * @param abort$ - An observable that can be used to abort the upload at any time.
+   * @param options - additional options.
    */
-  uploadContent(content: Readable, abort$?: Observable<unknown>): Promise<File<Meta>>;
+  uploadContent(
+    content: Readable,
+    abort$?: Observable<unknown>,
+    options?: Partial<Pick<UploadOptions, 'transforms'>>
+  ): Promise<File<Meta>>;
 
   /**
    * Stream file content from storage.
diff --git a/src/plugins/files/server/file/file.test.ts b/src/plugins/files/server/file/file.test.ts
index b42a360682cf9d..7fa062b85e2ec3 100644
--- a/src/plugins/files/server/file/file.test.ts
+++ b/src/plugins/files/server/file/file.test.ts
@@ -14,11 +14,9 @@ import {
   loggingSystemMock,
   savedObjectsServiceMock,
 } from '@kbn/core/server/mocks';
-import { Readable } from 'stream';
+import { Readable, Transform } from 'stream';
 import { promisify } from 'util';
 
-const setImmediate = promisify(global.setImmediate);
-
 import { BlobStorageService } from '../blob_storage_service';
 import { InternalFileService } from '../file_service/internal_file_service';
 import {
@@ -29,6 +27,10 @@ import {
 import { InternalFileShareService } from '../file_share_service';
 import { FileMetadataClient } from '../file_client';
 import { SavedObjectsFileMetadataClient } from '../file_client/file_metadata_client/adapters/saved_objects';
+import { File as IFile } from '../../common';
+import { createFileHashTransform } from '..';
+
+const setImmediate = promisify(global.setImmediate);
 
 describe('File', () => {
   let esClient: ElasticsearchClient;
@@ -110,4 +112,87 @@ describe('File', () => {
     expect(file.data.status).toBe('UPLOAD_ERROR');
     expect(blobStoreSpy.calledOnce).toBe(true);
   });
+
+  describe('#uploadContent() method', () => {
+    let file: IFile;
+    let fileContent: Readable;
+
+    beforeEach(async () => {
+      const fileSO = { attributes: { Status: 'AWAITING_UPLOAD' } };
+      (soClient.create as jest.Mock).mockResolvedValue(fileSO);
+      (soClient.update as jest.Mock).mockResolvedValue(fileSO);
+      (soClient.get as jest.Mock).mockResolvedValue({
+        attributes: {
+          created: '2023-04-27T19:57:19.640Z',
+          Updated: '2023-04-27T19:57:19.640Z',
+          name: 'test',
+          Status: 'DONE',
+          FileKind: fileKind,
+          hash: {
+            sha256: '9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08',
+          },
+        },
+      });
+
+      file = await fileService.createFile({ name: 'test', fileKind });
+      fileContent = Readable.from(['test']);
+    });
+
+    it('should allow custom transforms to be used', async () => {
+      let used = 0;
+      const customTransform = new Transform({
+        transform(chunk, _, next) {
+          used++;
+          next(null, chunk);
+        },
+      });
+
+      let used2 = 0;
+      const customTransform2 = new Transform({
+        transform(chunk, _, next) {
+          used2++;
+          next(null, chunk);
+        },
+      });
+
+      await file.uploadContent(fileContent, undefined, {
+        transforms: [customTransform, customTransform2],
+      });
+
+      expect(used).toBeGreaterThan(0);
+      expect(used2).toBeGreaterThan(0);
+      expect(file.data).toEqual({
+        created: expect.any(String),
+        updated: expect.any(String),
+        fileKind: 'fileKind',
+        size: 4,
+        status: 'READY',
+      });
+    });
+
+    it('should generate and store file hash when FileHashTransform is used', async () => {
+      await file.uploadContent(fileContent, undefined, {
+        transforms: [createFileHashTransform()],
+      });
+
+      expect(file.toJSON()).toEqual({
+        created: expect.any(String),
+        updated: expect.any(String),
+        fileKind: 'fileKind',
+        hash: {
+          sha256: '9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08',
+        },
+        size: 4,
+        status: 'READY',
+      });
+    });
+
+    it('should return file hash', async () => {
+      file = await fileService.getById({ id: '1' });
+
+      expect(file.data.hash).toEqual({
+        sha256: '9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08',
+      });
+    });
+  });
 });
diff --git a/src/plugins/files/server/file/file.ts b/src/plugins/files/server/file/file.ts
index fd5a27fd1bfaae..eeec150cfc78c6 100644
--- a/src/plugins/files/server/file/file.ts
+++ b/src/plugins/files/server/file/file.ts
@@ -19,6 +19,8 @@ import {
   Observable,
   lastValueFrom,
 } from 'rxjs';
+import { isFileHashTransform } from '../file_client/stream_transforms/file_hash_transform/file_hash_transform';
+import { UploadOptions } from '../blob_storage_service';
 import type { FileShareJSON, FileShareJSONWithToken } from '../../common/types';
 import type { File as IFile, UpdatableFileMetadata, FileJSON } from '../../common';
 import { fileAttributesReducer, Action } from './file_attributes_reducer';
@@ -70,13 +72,17 @@ export class File<M = unknown> implements IFile {
     return this;
   }
 
-  private upload(content: Readable): Observable<{ size: number }> {
-    return defer(() => this.fileClient.upload(this.metadata, content));
+  private upload(
+    content: Readable,
+    options?: Partial<Pick<UploadOptions, 'transforms'>>
+  ): Observable<{ size: number }> {
+    return defer(() => this.fileClient.upload(this.metadata, content, options));
   }
 
   public async uploadContent(
     content: Readable,
-    abort$: Observable<unknown> = NEVER
+    abort$: Observable<unknown> = NEVER,
+    options?: Partial<Pick<UploadOptions, 'transforms'>>
   ): Promise<IFile<M>> {
     if (this.uploadInProgress()) {
       throw new UploadInProgressError('Upload already in progress.');
@@ -90,7 +96,7 @@ export class File<M = unknown> implements IFile {
       from(this.updateFileState({ action: 'uploading' })).pipe(
         mergeMap(() =>
           race(
-            this.upload(content),
+            this.upload(content, options),
             abort$.pipe(
               map(() => {
                 throw new AbortedUploadError(`Aborted upload of ${this.id}!`);
@@ -99,7 +105,28 @@ export class File<M = unknown> implements IFile {
           )
         ),
         mergeMap(({ size }) => {
-          return this.updateFileState({ action: 'uploaded', payload: { size } });
+          const updatedStateAction: Action & { action: 'uploaded' } = {
+            action: 'uploaded',
+            payload: { size },
+          };
+
+          if (options && options.transforms) {
+            options.transforms.some((transform) => {
+              if (isFileHashTransform(transform)) {
+                const fileHash = transform.getFileHash();
+
+                updatedStateAction.payload.hash = {
+                  [fileHash.algorithm]: fileHash.value,
+                };
+
+                return true;
+              }
+
+              return false;
+            });
+          }
+
+          return this.updateFileState(updatedStateAction);
         }),
         catchError(async (e) => {
           try {
diff --git a/src/plugins/files/server/file/file_attributes_reducer.ts b/src/plugins/files/server/file/file_attributes_reducer.ts
index 1a035c32e1243f..1e8a71f05628d0 100644
--- a/src/plugins/files/server/file/file_attributes_reducer.ts
+++ b/src/plugins/files/server/file/file_attributes_reducer.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import { FileHashObj } from '../saved_objects/file';
 import { FileJSON, UpdatableFileMetadata } from '../../common';
 
 export type Action =
@@ -17,7 +18,10 @@ export type Action =
       action: 'uploading';
       payload?: undefined;
     }
-  | { action: 'uploaded'; payload: { size: number } }
+  | {
+      action: 'uploaded';
+      payload: { size: number; hash?: FileHashObj };
+    }
   | { action: 'uploadError'; payload?: undefined }
   | { action: 'updateFile'; payload: Partial<UpdatableFileMetadata> };
 
diff --git a/src/plugins/files/server/file/to_json.ts b/src/plugins/files/server/file/to_json.ts
index 2d01655c3a4e03..68870e94ee67c6 100644
--- a/src/plugins/files/server/file/to_json.ts
+++ b/src/plugins/files/server/file/to_json.ts
@@ -10,8 +10,20 @@ import { pickBy } from 'lodash';
 import type { FileMetadata, FileJSON } from '../../common/types';
 
 export function serializeJSON<M = unknown>(attrs: Partial<FileJSON>): Partial<FileMetadata<M>> {
-  const { name, mimeType, size, created, updated, fileKind, status, alt, extension, meta, user } =
-    attrs;
+  const {
+    name,
+    mimeType,
+    size,
+    created,
+    updated,
+    fileKind,
+    status,
+    alt,
+    extension,
+    meta,
+    user,
+    hash,
+  } = attrs;
   return pickBy(
     {
       name,
@@ -25,6 +37,7 @@ export function serializeJSON<M = unknown>(attrs: Partial<FileJSON>): Partial<Fi
       Meta: meta,
       Updated: updated,
       FileKind: fileKind,
+      hash,
     },
     (v) => v != null
   );
@@ -43,6 +56,7 @@ export function toJSON<M = unknown>(id: string, attrs: FileMetadata<M>): FileJSO
     Alt,
     extension,
     Meta,
+    hash,
   } = attrs;
   return pickBy<FileJSON<M>>(
     {
@@ -58,6 +72,7 @@ export function toJSON<M = unknown>(id: string, attrs: FileMetadata<M>): FileJSO
       meta: Meta,
       updated: Updated,
       fileKind: FileKind,
+      hash,
     },
     (v) => v != null
   ) as FileJSON<M>;
diff --git a/src/plugins/files/server/file_client/file_client.ts b/src/plugins/files/server/file_client/file_client.ts
index f08648aac107b1..3bce97f6bcade5 100644
--- a/src/plugins/files/server/file_client/file_client.ts
+++ b/src/plugins/files/server/file_client/file_client.ts
@@ -208,7 +208,7 @@ export class FileClientImpl implements FileClient {
 
   /**
    * Upload a blob
-   * @param id - The ID of the file content is associated with
+   * @param file - The file Record that the content is associated with
    * @param rs - The readable stream of the file content
    * @param options - Options for the upload
    */
diff --git a/src/plugins/files/server/file_client/file_metadata_client/adapters/es_index.ts b/src/plugins/files/server/file_client/file_metadata_client/adapters/es_index.ts
index d139c7cf6330ff..f5d1aa336e78ed 100644
--- a/src/plugins/files/server/file_client/file_metadata_client/adapters/es_index.ts
+++ b/src/plugins/files/server/file_client/file_metadata_client/adapters/es_index.ts
@@ -12,6 +12,8 @@ import { Logger } from '@kbn/core/server';
 import { toElasticsearchQuery } from '@kbn/es-query';
 import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
 import { MappingProperty, SearchTotalHits } from '@elastic/elasticsearch/lib/api/types';
+import pLimit from 'p-limit';
+
 import type { FilesMetrics, FileMetadata, Pagination } from '../../../../common';
 import type { FindFileArgs } from '../../../file_service';
 import type {
@@ -19,6 +21,7 @@ import type {
   FileDescriptor,
   FileMetadataClient,
   GetArg,
+  BulkGetArg,
   GetUsageMetricsArgs,
   UpdateArgs,
 } from '../file_metadata_client';
@@ -26,6 +29,7 @@ import { filterArgsToKuery } from './query_filters';
 import { fileObjectType } from '../../../saved_objects/file';
 
 const filterArgsToESQuery = pipe(filterArgsToKuery, toElasticsearchQuery);
+const bulkGetConcurrency = pLimit(10);
 
 const fileMappings: MappingProperty = {
   dynamic: false,
@@ -120,6 +124,22 @@ export class EsIndexFilesMetadataClient<M = unknown> implements FileMetadataClie
     };
   }
 
+  async bulkGet(arg: { ids: string[]; throwIfNotFound?: true }): Promise<FileDescriptor[]>;
+  async bulkGet({ ids, throwIfNotFound }: BulkGetArg): Promise<Array<FileDescriptor | null>> {
+    const promises = ids.map((id) =>
+      bulkGetConcurrency(() =>
+        this.get({ id }).catch((e) => {
+          if (throwIfNotFound) {
+            throw e;
+          }
+          return null;
+        })
+      )
+    );
+    const result = await Promise.all(promises);
+    return result;
+  }
+
   async delete({ id }: DeleteArg): Promise<void> {
     await this.esClient.delete({ index: this.index, id });
   }
diff --git a/src/plugins/files/server/file_client/file_metadata_client/adapters/saved_objects.ts b/src/plugins/files/server/file_client/file_metadata_client/adapters/saved_objects.ts
index f0f547bb4704f7..84274d695d2923 100644
--- a/src/plugins/files/server/file_client/file_metadata_client/adapters/saved_objects.ts
+++ b/src/plugins/files/server/file_client/file_metadata_client/adapters/saved_objects.ts
@@ -21,6 +21,8 @@ import type { FileMetadata, FilesMetrics, FileStatus } from '../../../../common/
 import type {
   FileMetadataClient,
   UpdateArgs,
+  GetArg,
+  BulkGetArg,
   FileDescriptor,
   GetUsageMetricsArgs,
 } from '../file_metadata_client';
@@ -54,7 +56,8 @@ export class SavedObjectsFileMetadataClient implements FileMetadataClient {
       metadata: result.attributes as FileDescriptor['metadata'],
     };
   }
-  async get({ id }: { id: string }): Promise<FileDescriptor> {
+
+  async get({ id }: GetArg): Promise<FileDescriptor> {
     const result = await this.soClient.get(this.soType, id);
     return {
       id: result.id,
@@ -62,6 +65,24 @@ export class SavedObjectsFileMetadataClient implements FileMetadataClient {
     };
   }
 
+  async bulkGet(arg: { ids: string[]; throwIfNotFound?: true }): Promise<FileDescriptor[]>;
+  async bulkGet({ ids, throwIfNotFound }: BulkGetArg): Promise<Array<FileDescriptor | null>> {
+    const result = await this.soClient.bulkGet(ids.map((id) => ({ id, type: this.soType })));
+    return result.saved_objects.map((so) => {
+      if (so.error) {
+        if (throwIfNotFound) {
+          throw new Error(`File [${so.id}] not found`);
+        }
+        return null;
+      }
+
+      return {
+        id: so.id,
+        metadata: so.attributes as FileDescriptor['metadata'],
+      };
+    });
+  }
+
   async find({ page, perPage, ...filterArgs }: FindFileArgs = {}): Promise<{
     total: number;
     files: Array<FileDescriptor<unknown>>;
diff --git a/src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts b/src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts
index 2738d75d8222cc..33117ad842afc1 100644
--- a/src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts
+++ b/src/plugins/files/server/file_client/file_metadata_client/file_metadata_client.ts
@@ -63,6 +63,21 @@ export interface GetArg {
   id: string;
 }
 
+/**
+ * Bulk get files
+ */
+export interface BulkGetArg {
+  /**
+   * Unique IDs of file metadata
+   */
+  ids: string[];
+  /**
+   * Flag to indicate if an Error is thrown if any of the file id is not found. If set to `false`, "null" will be returned.
+   * @default true
+   */
+  throwIfNotFound?: boolean;
+}
+
 export interface DeleteArg {
   /**
    * Unique ID of file metadata to delete
@@ -98,6 +113,16 @@ export interface FileMetadataClient {
    */
   get(arg: GetArg): Promise<FileDescriptor>;
 
+  /**
+   * Bulk get file metadata
+   *
+   * @param arg - Arguments to bulk retrieve file metadata
+   */
+  bulkGet(arg: { ids: string[]; throwIfNotFound?: true }): Promise<FileDescriptor[]>;
+  bulkGet(
+    arg: BulkGetArg | { ids: string[]; throwIfNotFound: false }
+  ): Promise<Array<FileDescriptor | null>>;
+
   /**
    * The file metadata to update
    *
diff --git a/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/file_hash_transform.test.ts b/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/file_hash_transform.test.ts
new file mode 100644
index 00000000000000..6e25f06cb515e5
--- /dev/null
+++ b/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/file_hash_transform.test.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright 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 { SupportedFileHashAlgorithm } from '../../../saved_objects/file';
+import { createFileHashTransform } from '../../..';
+import { File as IFile } from '../../../../common';
+import { Readable } from 'stream';
+import {
+  FileKindsRegistryImpl,
+  getFileKindsRegistry,
+  setFileKindsRegistry,
+} from '../../../../common/file_kinds_registry';
+import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
+import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
+import { savedObjectsServiceMock } from '@kbn/core-saved-objects-server-mocks';
+import { SavedObjectsFileMetadataClient } from '../..';
+import { BlobStorageService } from '../../../blob_storage_service';
+import { InternalFileShareService } from '../../../file_share_service';
+import { InternalFileService } from '../../../file_service/internal_file_service';
+
+describe('When using the FileHashTransform', () => {
+  let file: IFile;
+  let fileContent: Readable;
+
+  beforeAll(() => {
+    setFileKindsRegistry(new FileKindsRegistryImpl());
+    getFileKindsRegistry().register({ http: {}, id: 'fileKind' });
+  });
+
+  beforeEach(async () => {
+    const logger = loggingSystemMock.createLogger();
+    const esClient = elasticsearchServiceMock.createInternalClient();
+    const soClient = savedObjectsServiceMock.createStartContract().createInternalRepository();
+    const fileMetadaClient = new SavedObjectsFileMetadataClient('test', soClient, logger);
+    const blobStorageService = new BlobStorageService(esClient, logger);
+    const fileShareService = new InternalFileShareService(soClient);
+    const fileService = new InternalFileService(
+      fileMetadaClient,
+      blobStorageService,
+      fileShareService,
+      undefined,
+      getFileKindsRegistry(),
+      logger
+    );
+    const fileSO = { attributes: { Status: 'AWAITING_UPLOAD' } };
+
+    (soClient.create as jest.Mock).mockResolvedValue(fileSO);
+    (soClient.update as jest.Mock).mockResolvedValue(fileSO);
+    (soClient.get as jest.Mock).mockResolvedValue({
+      attributes: {
+        created: '2023-04-27T19:57:19.640Z',
+        Updated: '2023-04-27T19:57:19.640Z',
+        name: 'test',
+        Status: 'DONE',
+        FileKind: 'fileKind',
+        hash: {
+          sha256: '9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08',
+        },
+      },
+    });
+
+    file = await fileService.createFile({ name: 'test', fileKind: 'fileKind' });
+    fileContent = Readable.from(['test']);
+  });
+
+  it('should throw an error if `fileFileHash()` is called prior to processing ending', () => {
+    const fileHash = createFileHashTransform();
+
+    expect(() => fileHash.getFileHash()).toThrow('File hash generation not yet complete');
+  });
+
+  it.each([
+    ['md5', '098f6bcd4621d373cade4e832627b4f6'],
+    ['sha1', 'a94a8fe5ccb19ba61c4c0873d391e987982fbbd3'],
+    ['sha256', '9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08'],
+    [
+      'sha512',
+      'ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff',
+    ],
+  ] as Array<[SupportedFileHashAlgorithm, string]>)(
+    'should generate file hash using algorithm: %s',
+    async (algorithm, expectedHash) => {
+      const fileHash = createFileHashTransform(algorithm);
+      await file.uploadContent(fileContent, undefined, {
+        transforms: [fileHash],
+      });
+
+      expect(fileHash.getFileHash()).toEqual({ algorithm, value: expectedHash });
+    }
+  );
+});
diff --git a/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/file_hash_transform.ts b/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/file_hash_transform.ts
new file mode 100644
index 00000000000000..36f01644499c6e
--- /dev/null
+++ b/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/file_hash_transform.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { Transform, type TransformCallback } from 'stream';
+import { createHash, type Hash } from 'crypto';
+import { SupportedFileHashAlgorithm } from '../../../saved_objects/file';
+
+class FileHashTransform extends Transform {
+  private readonly hash: Hash;
+  private isFinished = false;
+  private hashValue: string | undefined = undefined;
+
+  constructor(private readonly algorithm: SupportedFileHashAlgorithm = 'sha256') {
+    super();
+    this.hash = createHash(this.algorithm);
+
+    this.once('finish', () => {
+      this.isFinished = true;
+    });
+  }
+
+  _transform(chunk: Buffer, _: BufferEncoding, next: TransformCallback) {
+    if (!Buffer.isBuffer(chunk)) {
+      throw new Error(`Received a non-buffer chunk. All chunk must be buffers.`);
+    }
+
+    if (chunk !== null) {
+      this.hash.update(chunk);
+    }
+
+    next(null, chunk);
+  }
+
+  public getFileHash(): { algorithm: SupportedFileHashAlgorithm; value: string } {
+    if (!this.isFinished) {
+      throw new Error('File hash generation not yet complete');
+    }
+
+    if (!this.hashValue) {
+      this.hashValue = this.hash.digest('hex');
+    }
+
+    return {
+      algorithm: this.algorithm,
+      value: this.hashValue,
+    };
+  }
+}
+
+/**
+ * Creates a `Transform` that will calculate a Hash based on the data provided by a Readable
+ * @param algorithm
+ */
+export const createFileHashTransform = (
+  algorithm: SupportedFileHashAlgorithm = 'sha256'
+): FileHashTransform => {
+  return new FileHashTransform(algorithm);
+};
+
+/**
+ * Type guard to check of a given Transform is a `FileHashTransform`
+ * @param transform
+ */
+export const isFileHashTransform = (transform: Transform): transform is FileHashTransform => {
+  return transform instanceof FileHashTransform;
+};
diff --git a/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/index.ts b/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/index.ts
new file mode 100644
index 00000000000000..0e6fb7858e40f7
--- /dev/null
+++ b/src/plugins/files/server/file_client/stream_transforms/file_hash_transform/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 { createFileHashTransform } from './file_hash_transform';
diff --git a/src/plugins/files/server/file_service/file_action_types.ts b/src/plugins/files/server/file_service/file_action_types.ts
index f0aad5e86e8eb3..e27d5f9af3fb0c 100644
--- a/src/plugins/files/server/file_service/file_action_types.ts
+++ b/src/plugins/files/server/file_service/file_action_types.ts
@@ -82,6 +82,26 @@ export interface GetByIdArgs {
   id: string;
 }
 
+/**
+ * Arguments to bulk get multiple files by their IDs.
+ */
+export interface BulkGetByIdArgs {
+  /**
+   * File IDs.
+   */
+  ids: string[];
+  /**
+   * Flag to indicate if an Error is thrown if any of the file id is not found. If set to `false`, "null" will be returned.
+   * @default true
+   */
+  throwIfNotFound?: boolean;
+  /**
+   * Format of the response, either a list of File[] (sorted by id passed) or a map `{[fileId: string]: File}`
+   * @default "array"
+   */
+  format?: 'array' | 'map';
+}
+
 /**
  * Arguments to filter for files.
  *
diff --git a/src/plugins/files/server/file_service/file_service.ts b/src/plugins/files/server/file_service/file_service.ts
index 0828d03ada7fd5..0fe24002f99d40 100644
--- a/src/plugins/files/server/file_service/file_service.ts
+++ b/src/plugins/files/server/file_service/file_service.ts
@@ -14,6 +14,7 @@ import type {
   DeleteFileArgs,
   BulkDeleteFilesArgs,
   GetByIdArgs,
+  BulkGetByIdArgs,
   FindFileArgs,
 } from './file_action_types';
 
@@ -58,6 +59,23 @@ export interface FileServiceStart {
    */
   getById<M>(args: GetByIdArgs): Promise<File<M>>;
 
+  /**
+   * Bulk get files by IDs. Will throw if any of the files fail to load (set `throwIfNotFound` to `false` to not throw and return `null` instead)
+   *
+   * @param args - bulk get files by IDs args
+   */
+  bulkGetById<M>(args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound?: true }): Promise<File[]>;
+  bulkGetById<M>(
+    args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound?: true; format: 'map' }
+  ): Promise<{ [id: string]: File }>;
+  bulkGetById<M>(
+    args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound: false }
+  ): Promise<Array<File | null>>;
+  bulkGetById<M>(
+    args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound: false; format: 'map' }
+  ): Promise<{ [id: string]: File | null }>;
+  bulkGetById<M>(args: BulkGetByIdArgs): Promise<Array<File<M> | { [id: string]: File | null }>>;
+
   /**
    * Find files given a set of parameters.
    *
diff --git a/src/plugins/files/server/file_service/file_service_factory.ts b/src/plugins/files/server/file_service/file_service_factory.ts
index bebb5b72c2b3d6..eb384f2e5cbe73 100644
--- a/src/plugins/files/server/file_service/file_service_factory.ts
+++ b/src/plugins/files/server/file_service/file_service_factory.ts
@@ -20,7 +20,13 @@ import { fileObjectType, fileShareObjectType, hiddenTypes } from '../saved_objec
 import { BlobStorageService } from '../blob_storage_service';
 import { FileClientImpl } from '../file_client/file_client';
 import { InternalFileShareService } from '../file_share_service';
-import { CreateFileArgs, FindFileArgs, GetByIdArgs, UpdateFileArgs } from './file_action_types';
+import {
+  CreateFileArgs,
+  FindFileArgs,
+  GetByIdArgs,
+  BulkGetByIdArgs,
+  UpdateFileArgs,
+} from './file_action_types';
 import { InternalFileService } from './internal_file_service';
 import { FileServiceStart } from './file_service';
 import { FileKindsRegistry } from '../../common/file_kinds_registry';
@@ -86,6 +92,26 @@ export class FileServiceFactoryImpl implements FileServiceFactory {
       this.logger
     );
 
+    function bulkGetById<M>(
+      args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound?: true }
+    ): Promise<Array<File<M>>>;
+    function bulkGetById<M>(
+      args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound?: true; format: 'map' }
+    ): Promise<{ [id: string]: File<M> }>;
+    function bulkGetById<M>(
+      args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound: false }
+    ): Promise<Array<File<M> | null>>;
+    function bulkGetById<M>(
+      args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound: false; format: 'map' }
+    ): Promise<{ [id: string]: File<M> | null }>;
+    function bulkGetById<M>(
+      args: BulkGetByIdArgs
+    ): Promise<Array<File<M> | null> | { [id: string]: File<M> | null }> {
+      return internalFileService.bulkGetById<M>(
+        args as Parameters<InternalFileService['bulkGetById']>[0]
+      );
+    }
+
     return {
       async create<M>(args: CreateFileArgs<M>) {
         return internalFileService.createFile(args) as Promise<File<M>>;
@@ -102,6 +128,7 @@ export class FileServiceFactoryImpl implements FileServiceFactory {
       async getById<M>(args: GetByIdArgs) {
         return internalFileService.getById(args) as Promise<File<M>>;
       },
+      bulkGetById,
       async find<M>(args: FindFileArgs) {
         return internalFileService.findFilesJSON(args) as Promise<{
           files: Array<FileJSON<M>>;
diff --git a/src/plugins/files/server/file_service/internal_file_service.ts b/src/plugins/files/server/file_service/internal_file_service.ts
index 653929f7b12365..b224a28313a70f 100644
--- a/src/plugins/files/server/file_service/internal_file_service.ts
+++ b/src/plugins/files/server/file_service/internal_file_service.ts
@@ -24,6 +24,7 @@ import type {
   BulkDeleteFilesArgs,
   FindFileArgs,
   GetByIdArgs,
+  BulkGetByIdArgs,
 } from './file_action_types';
 import { createFileClient, FileClientImpl } from '../file_client/file_client';
 
@@ -93,10 +94,71 @@ export class InternalFileService {
     }
   }
 
+  private async bulkGet<M>(
+    ids: string[],
+    {
+      throwIfNotFound = true,
+      format = 'array',
+    }: { throwIfNotFound?: boolean; format?: BulkGetByIdArgs['format'] } = {}
+  ): Promise<Array<IFile<M> | null> | { [id: string]: IFile<M> | null }> {
+    try {
+      const metadatas = await this.metadataClient.bulkGet({ ids, throwIfNotFound: false });
+      const result = metadatas.map((fileMetadata, i) => {
+        const notFound = !fileMetadata || !fileMetadata.metadata;
+        const deleted = fileMetadata?.metadata?.Status === 'DELETED';
+
+        if (notFound || deleted) {
+          if (!throwIfNotFound) {
+            return null;
+          }
+          throw new FileNotFoundError(
+            deleted ? 'File has been deleted' : `File [${fileMetadata?.id ?? ids[i]}] not found`
+          );
+        }
+
+        const { id, metadata } = fileMetadata;
+        return this.toFile<M>(id, metadata as FileMetadata<M>, metadata.FileKind);
+      });
+
+      return format === 'array'
+        ? result
+        : ids.reduce<{ [id: string]: IFile<M> | null }>(
+            (acc, id, i) => ({
+              ...acc,
+              [id]: result[i],
+            }),
+            {}
+          );
+    } catch (e) {
+      this.logger.error(`Could not retrieve files: ${e}`);
+      throw e;
+    }
+  }
+
   public async getById({ id }: GetByIdArgs): Promise<IFile> {
     return await this.get(id);
   }
 
+  public async bulkGetById<M>(
+    args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound?: true }
+  ): Promise<Array<IFile<M>>>;
+  public async bulkGetById<M>(
+    args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound?: true; format: 'map' }
+  ): Promise<{ [id: string]: IFile<M> }>;
+  public async bulkGetById<M>(
+    args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound: false }
+  ): Promise<Array<IFile<M> | null>>;
+  public async bulkGetById<M>(
+    args: Pick<BulkGetByIdArgs, 'ids'> & { throwIfNotFound: false; format: 'map' }
+  ): Promise<{ [id: string]: IFile<M> | null }>;
+  public async bulkGetById<M>({
+    ids,
+    throwIfNotFound,
+    format,
+  }: BulkGetByIdArgs): Promise<Array<IFile<M> | null> | { [id: string]: IFile<M> | null }> {
+    return await this.bulkGet<M>(ids, { throwIfNotFound, format });
+  }
+
   public getFileKind(id: string): FileKind {
     return this.fileKindRegistry.get(id);
   }
@@ -122,15 +184,15 @@ export class InternalFileService {
     return this.get(fileId);
   }
 
-  private toFile(
+  private toFile<M>(
     id: string,
-    fileMetadata: FileMetadata,
+    fileMetadata: FileMetadata<M>,
     fileKind: string,
     fileClient?: FileClientImpl
-  ): IFile {
-    return new File(
+  ): IFile<M> {
+    return new File<M>(
       id,
-      toJSON(id, fileMetadata),
+      toJSON<M>(id, fileMetadata),
       fileClient ?? this.createFileClient(fileKind),
       this.logger.get(`file-${id}`)
     );
diff --git a/src/plugins/files/server/index.ts b/src/plugins/files/server/index.ts
index 5fb3a1e7f6c8e0..181124fc27496e 100755
--- a/src/plugins/files/server/index.ts
+++ b/src/plugins/files/server/index.ts
@@ -22,6 +22,8 @@ export type {
 } from './file_client';
 export { createEsFileClient } from './file_client';
 
+export { createFileHashTransform } from './file_client/stream_transforms/file_hash_transform';
+
 export type { FilesSetup, FilesStart } from './types';
 export type {
   FileShareServiceStart,
diff --git a/src/plugins/files/server/integration_tests/file_service.test.ts b/src/plugins/files/server/integration_tests/file_service.test.ts
index 5ca1fa00bdd0a5..4c5933d61c9e65 100644
--- a/src/plugins/files/server/integration_tests/file_service.test.ts
+++ b/src/plugins/files/server/integration_tests/file_service.test.ts
@@ -140,6 +140,56 @@ describe('FileService', () => {
     expect(myFile?.id).toMatch(id);
   });
 
+  it('retrieves a file using the bulk method', async () => {
+    const { id } = await createDisposableFile({ fileKind, name: 'test' });
+    const [myFile] = await fileService.bulkGetById({ ids: [id] });
+    expect(myFile?.id).toMatch(id);
+  });
+
+  it('retrieves multiple files using the bulk method', async () => {
+    const file1 = await createDisposableFile({ fileKind, name: 'test' });
+    const file2 = await createDisposableFile({ fileKind, name: 'test' });
+    const [myFile1, myFile2] = await fileService.bulkGetById({ ids: [file1.id, file2.id] });
+    expect(myFile1?.id).toMatch(file1.id);
+    expect(myFile2?.id).toMatch(file2.id);
+  });
+
+  it('throws if one of the file does not exists', async () => {
+    const file1 = await createDisposableFile({ fileKind, name: 'test' });
+    const unknownID = 'foo';
+
+    expect(async () => {
+      await fileService.bulkGetById({ ids: [file1.id, unknownID] });
+    }).rejects.toThrowError(`File [${unknownID}] not found`);
+  });
+
+  it('does not throw if one of the file does not exists', async () => {
+    const file1 = await createDisposableFile({ fileKind, name: 'test' });
+    const unknownID = 'foo';
+
+    const [myFile1, myFile2] = await fileService.bulkGetById({
+      ids: [file1.id, unknownID],
+      throwIfNotFound: false,
+    });
+
+    expect(myFile1?.id).toBe(file1?.id);
+    expect(myFile2).toBe(null);
+  });
+
+  it('returns the files under a map of id/File', async () => {
+    const file1 = await createDisposableFile({ fileKind, name: 'test' });
+    const unknownID = 'foo';
+
+    const myFiles = await fileService.bulkGetById({
+      ids: [file1.id, unknownID],
+      throwIfNotFound: false,
+      format: 'map',
+    });
+
+    expect(myFiles[file1?.id]?.id).toBe(file1?.id);
+    expect(myFiles[unknownID]).toBe(null);
+  });
+
   it('lists files', async () => {
     await Promise.all([
       createDisposableFile({ fileKind, name: 'test-1' }),
diff --git a/src/plugins/files/server/mocks.ts b/src/plugins/files/server/mocks.ts
index da94d95b273c49..4da690b99240ef 100644
--- a/src/plugins/files/server/mocks.ts
+++ b/src/plugins/files/server/mocks.ts
@@ -19,6 +19,7 @@ export const createFileServiceMock = (): DeeplyMockedKeys<FileServiceStart> => (
   deleteShareObject: jest.fn(),
   find: jest.fn(),
   getById: jest.fn(),
+  bulkGetById: jest.fn(),
   getByToken: jest.fn(),
   getShareObject: jest.fn(),
   getUsageMetrics: jest.fn(),
diff --git a/src/plugins/files/server/saved_objects/file.ts b/src/plugins/files/server/saved_objects/file.ts
index 9997b665682d88..f00946aadc05c4 100644
--- a/src/plugins/files/server/saved_objects/file.ts
+++ b/src/plugins/files/server/saved_objects/file.ts
@@ -6,15 +6,22 @@
  * Side Public License, v 1.
  */
 
-import { SavedObjectsType, SavedObjectsFieldMapping } from '@kbn/core/server';
-import { FILE_SO_TYPE } from '../../common';
+import { SavedObjectsFieldMapping, SavedObjectsType } from '@kbn/core/server';
 import type { FileMetadata } from '../../common';
+import { BaseFileMetadata, FILE_SO_TYPE } from '../../common';
 
 type Properties = Record<
-  keyof Omit<FileMetadata, 'Alt' | 'Compression' | 'ChunkSize' | 'hash'>,
+  keyof Omit<FileMetadata, 'Alt' | 'Compression' | 'ChunkSize'>,
   SavedObjectsFieldMapping
 >;
 
+export type SupportedFileHashAlgorithm = keyof Pick<
+  Required<Required<BaseFileMetadata>['hash']>,
+  'md5' | 'sha1' | 'sha256' | 'sha512'
+>;
+
+export type FileHashObj = Partial<Record<SupportedFileHashAlgorithm, string>>;
+
 const properties: Properties = {
   created: {
     type: 'date',
@@ -46,6 +53,10 @@ const properties: Properties = {
   FileKind: {
     type: 'keyword',
   },
+  hash: {
+    dynamic: false,
+    properties: {},
+  },
 };
 
 export const fileObjectType: SavedObjectsType<FileMetadata> = {
diff --git a/src/plugins/files/tsconfig.json b/src/plugins/files/tsconfig.json
index ffeed3f22d46a5..12cdb22ef0f798 100644
--- a/src/plugins/files/tsconfig.json
+++ b/src/plugins/files/tsconfig.json
@@ -29,6 +29,8 @@
     "@kbn/ecs",
     "@kbn/safer-lodash-set",
     "@kbn/logging-mocks",
+    "@kbn/core-elasticsearch-server-mocks",
+    "@kbn/core-saved-objects-server-mocks",
   ],
   "exclude": [
     "target/**/*",
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
index 9525b7345a3804..6f66f70530d391 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -167,10 +167,6 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
   },
-  'discover:showLegacyFieldTopValues': {
-    type: 'boolean',
-    _meta: { description: 'Non-default value of setting.' },
-  },
   'discover:sampleSize': {
     type: 'long',
     _meta: { description: 'Non-default value of setting.' },
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
index 245cb553680155..27244be1b2efd6 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -80,7 +80,6 @@ export interface UsageStats {
   'doc_table:hideTimeColumn': boolean;
   'discover:sampleSize': number;
   'discover:sampleRowsPerPage': number;
-  'discover:showLegacyFieldTopValues': boolean;
   defaultColumns: string[];
   'context:defaultSize': number;
   'context:tieBreakerFields': string[];
diff --git a/src/plugins/management/public/application.tsx b/src/plugins/management/public/application.tsx
index dc16faa4f6d045..8c4a8af5103913 100644
--- a/src/plugins/management/public/application.tsx
+++ b/src/plugins/management/public/application.tsx
@@ -16,15 +16,6 @@ export const renderApp = async (
   { history, appBasePath, element, theme$ }: AppMountParameters,
   dependencies: ManagementAppDependencies
 ) => {
-  ReactDOM.render(
-    <ManagementApp
-      dependencies={dependencies}
-      appBasePath={appBasePath}
-      history={history}
-      theme$={theme$}
-    />,
-    element
-  );
-
+  ReactDOM.render(<ManagementApp {...{ history, appBasePath, theme$, dependencies }} />, element);
   return () => ReactDOM.unmountComponentAtNode(element);
 };
diff --git a/src/plugins/management/public/components/management_app/management_app.tsx b/src/plugins/management/public/components/management_app/management_app.tsx
index bc0b88e7dffcbd..50ab45a867c989 100644
--- a/src/plugins/management/public/components/management_app/management_app.tsx
+++ b/src/plugins/management/public/components/management_app/management_app.tsx
@@ -8,12 +8,15 @@
 import './management_app.scss';
 
 import React, { useState, useEffect, useCallback } from 'react';
+import { BehaviorSubject } from 'rxjs';
+
 import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from '@kbn/core/public';
 
 import { reactRouterNavigate, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { KibanaPageTemplate, KibanaPageTemplateProps } from '@kbn/shared-ux-page-kibana-template';
+import useObservable from 'react-use/lib/useObservable';
 import {
   ManagementSection,
   MANAGEMENT_BREADCRUMB,
@@ -34,12 +37,14 @@ export interface ManagementAppDependencies {
   sections: SectionsServiceStart;
   kibanaVersion: string;
   setBreadcrumbs: (newBreadcrumbs: ChromeBreadcrumb[]) => void;
+  isSidebarEnabled$: BehaviorSubject<boolean>;
 }
 
 export const ManagementApp = ({ dependencies, history, theme$ }: ManagementAppProps) => {
-  const { setBreadcrumbs } = dependencies;
+  const { setBreadcrumbs, isSidebarEnabled$ } = dependencies;
   const [selectedId, setSelectedId] = useState<string>('');
   const [sections, setSections] = useState<ManagementSection[]>();
+  const isSidebarEnabled = useObservable(isSidebarEnabled$);
 
   const onAppMounted = useCallback((id: string) => {
     setSelectedId(id);
@@ -75,18 +80,20 @@ export const ManagementApp = ({ dependencies, history, theme$ }: ManagementAppPr
     return null;
   }
 
-  const solution: KibanaPageTemplateProps['solutionNav'] = {
-    name: i18n.translate('management.nav.label', {
-      defaultMessage: 'Management',
-    }),
-    icon: 'managementApp',
-    'data-test-subj': 'mgtSideBarNav',
-    items: managementSidebarNav({
-      selectedId,
-      sections,
-      history,
-    }),
-  };
+  const solution: KibanaPageTemplateProps['solutionNav'] | undefined = isSidebarEnabled
+    ? {
+        name: i18n.translate('management.nav.label', {
+          defaultMessage: 'Management',
+        }),
+        icon: 'managementApp',
+        'data-test-subj': 'mgtSideBarNav',
+        items: managementSidebarNav({
+          selectedId,
+          sections,
+          history,
+        }),
+      }
+    : undefined;
 
   return (
     <I18nProvider>
diff --git a/src/plugins/management/public/mocks/index.ts b/src/plugins/management/public/mocks/index.ts
index 92f6f9e1ed4ce0..ec4ec2fa7883a8 100644
--- a/src/plugins/management/public/mocks/index.ts
+++ b/src/plugins/management/public/mocks/index.ts
@@ -42,7 +42,7 @@ const createSetupContract = (): ManagementSetup => ({
 });
 
 const createStartContract = (): ManagementStart => ({
-  sections: {},
+  setIsSidebarEnabled: jest.fn(),
 });
 
 export const managementPluginMock = {
diff --git a/src/plugins/management/public/plugin.ts b/src/plugins/management/public/plugin.ts
index 0cdb83d4b6793b..8310074a631595 100644
--- a/src/plugins/management/public/plugin.ts
+++ b/src/plugins/management/public/plugin.ts
@@ -71,11 +71,14 @@ export class ManagementPlugin
 
   private hasAnyEnabledApps = true;
 
+  private isSidebarEnabled$ = new BehaviorSubject<boolean>(true);
+
   constructor(private initializerContext: PluginInitializerContext) {}
 
   public setup(core: CoreSetup, { home, share }: ManagementSetupDependencies) {
     const kibanaVersion = this.initializerContext.env.packageInfo.version;
     const locator = share.url.locators.create(new ManagementAppLocatorDefinition());
+    const managementPlugin = this;
 
     if (home) {
       home.featureCatalogue.register({
@@ -111,6 +114,7 @@ export class ManagementPlugin
           sections: getSectionsServiceStartPrivate(),
           kibanaVersion,
           setBreadcrumbs: coreStart.chrome.setBreadcrumbs,
+          isSidebarEnabled$: managementPlugin.isSidebarEnabled$,
         });
       },
     });
@@ -121,7 +125,7 @@ export class ManagementPlugin
     };
   }
 
-  public start(core: CoreStart, plugins: ManagementStartDependencies) {
+  public start(core: CoreStart, _plugins: ManagementStartDependencies): ManagementStart {
     this.managementSections.start({ capabilities: core.application.capabilities });
     this.hasAnyEnabledApps = getSectionsServiceStartPrivate()
       .getSectionsEnabled()
@@ -136,6 +140,9 @@ export class ManagementPlugin
       });
     }
 
-    return {};
+    return {
+      setIsSidebarEnabled: (isSidebarEnabled: boolean) =>
+        this.isSidebarEnabled$.next(isSidebarEnabled),
+    };
   }
 }
diff --git a/src/plugins/management/public/types.ts b/src/plugins/management/public/types.ts
index 5d8d963ea981e7..0f632b818a9502 100644
--- a/src/plugins/management/public/types.ts
+++ b/src/plugins/management/public/types.ts
@@ -27,8 +27,9 @@ export interface DefinedSections {
   stack: ManagementSection;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface ManagementStart {}
+export interface ManagementStart {
+  setIsSidebarEnabled: (enabled: boolean) => void;
+}
 
 export interface ManagementSectionsStartPrivate {
   getSectionsEnabled: () => ManagementSection[];
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index 5d47ef2f9756c3..4bfbb99d6e2083 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -8636,12 +8636,6 @@
             "description": "Non-default value of setting."
           }
         },
-        "discover:showLegacyFieldTopValues": {
-          "type": "boolean",
-          "_meta": {
-            "description": "Non-default value of setting."
-          }
-        },
         "discover:sampleSize": {
           "type": "long",
           "_meta": {
diff --git a/src/plugins/unified_histogram/public/chart/chart.tsx b/src/plugins/unified_histogram/public/chart/chart.tsx
index 3c959776df2a54..1e24de48f55d6c 100644
--- a/src/plugins/unified_histogram/public/chart/chart.tsx
+++ b/src/plugins/unified_histogram/public/chart/chart.tsx
@@ -192,7 +192,7 @@ export function Chart({
     chartToolButtonCss,
   } = useChartStyles(chartVisible);
 
-  const lensAttributes = useMemo(
+  const lensAttributesContext = useMemo(
     () =>
       getLensAttributes({
         title: chart?.title,
@@ -218,7 +218,7 @@ export function Chart({
     services,
     dataView,
     relativeTimeRange: originalRelativeTimeRange ?? relativeTimeRange,
-    lensAttributes,
+    lensAttributes: lensAttributesContext.attributes,
   });
 
   return (
@@ -340,7 +340,7 @@ export function Chart({
               chart={chart}
               getTimeRange={getTimeRange}
               refetch$={refetch$}
-              lensAttributes={lensAttributes}
+              lensAttributesContext={lensAttributesContext}
               isPlainRecord={isPlainRecord}
               disableTriggers={disableTriggers}
               disabledActions={disabledActions}
diff --git a/src/plugins/unified_histogram/public/chart/histogram.test.tsx b/src/plugins/unified_histogram/public/chart/histogram.test.tsx
index 4699c78edff81f..314898daa88f31 100644
--- a/src/plugins/unified_histogram/public/chart/histogram.test.tsx
+++ b/src/plugins/unified_histogram/public/chart/histogram.test.tsx
@@ -66,7 +66,7 @@ function mountComponent() {
       to: '2020-05-14T11:20:13.590',
     }),
     refetch$,
-    lensAttributes: getMockLensAttributes(),
+    lensAttributesContext: getMockLensAttributes(),
     onTotalHitsChange: jest.fn(),
     onChartLoad: jest.fn(),
   };
@@ -91,7 +91,7 @@ describe('Histogram', () => {
     const originalProps = getLensProps({
       searchSessionId: props.request.searchSessionId,
       getTimeRange: props.getTimeRange,
-      attributes: getMockLensAttributes(),
+      attributes: getMockLensAttributes().attributes,
       onLoad: lensProps.onLoad,
     });
     expect(lensProps).toEqual(originalProps);
diff --git a/src/plugins/unified_histogram/public/chart/histogram.tsx b/src/plugins/unified_histogram/public/chart/histogram.tsx
index d3bb87a2c3f10f..61320c627bb13c 100644
--- a/src/plugins/unified_histogram/public/chart/histogram.tsx
+++ b/src/plugins/unified_histogram/public/chart/histogram.tsx
@@ -14,7 +14,7 @@ import type { DefaultInspectorAdapters } from '@kbn/expressions-plugin/common';
 import type { IKibanaSearchResponse } from '@kbn/data-plugin/public';
 import type { estypes } from '@elastic/elasticsearch';
 import type { TimeRange } from '@kbn/es-query';
-import type { LensEmbeddableInput, TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import type { LensEmbeddableInput } from '@kbn/lens-plugin/public';
 import { RequestStatus } from '@kbn/inspector-plugin/public';
 import type { Observable } from 'rxjs';
 import {
@@ -31,6 +31,7 @@ import { buildBucketInterval } from './utils/build_bucket_interval';
 import { useTimeRange } from './hooks/use_time_range';
 import { useStableCallback } from './hooks/use_stable_callback';
 import { useLensProps } from './hooks/use_lens_props';
+import type { LensAttributesContext } from './utils/get_lens_attributes';
 
 export interface HistogramProps {
   services: UnifiedHistogramServices;
@@ -41,7 +42,7 @@ export interface HistogramProps {
   isPlainRecord?: boolean;
   getTimeRange: () => TimeRange;
   refetch$: Observable<UnifiedHistogramInputMessage>;
-  lensAttributes: TypedLensByValueInput['attributes'];
+  lensAttributesContext: LensAttributesContext;
   disableTriggers?: LensEmbeddableInput['disableTriggers'];
   disabledActions?: LensEmbeddableInput['disabledActions'];
   onTotalHitsChange?: (status: UnifiedHistogramFetchStatus, result?: number | Error) => void;
@@ -59,7 +60,7 @@ export function Histogram({
   isPlainRecord,
   getTimeRange,
   refetch$,
-  lensAttributes: attributes,
+  lensAttributesContext: attributesContext,
   disableTriggers,
   disabledActions,
   onTotalHitsChange,
@@ -78,6 +79,8 @@ export function Histogram({
   });
   const chartRef = useRef<HTMLDivElement | null>(null);
   const { height: containerHeight, width: containerWidth } = useResizeObserver(chartRef.current);
+  const { attributes } = attributesContext;
+
   useEffect(() => {
     if (attributes.visualizationType === 'lnsMetric') {
       const size = containerHeight < containerWidth ? containerHeight : containerWidth;
@@ -131,11 +134,11 @@ export function Histogram({
     }
   );
 
-  const lensProps = useLensProps({
+  const { lensProps, requestData } = useLensProps({
     request,
     getTimeRange,
     refetch$,
-    attributes,
+    attributesContext,
     onLoad,
   });
 
@@ -172,6 +175,7 @@ export function Histogram({
       <div
         data-test-subj="unifiedHistogramChart"
         data-time-range={timeRangeText}
+        data-request-data={requestData}
         css={chartCss}
         ref={chartRef}
       >
diff --git a/src/plugins/unified_histogram/public/chart/hooks/use_lens_props.test.ts b/src/plugins/unified_histogram/public/chart/hooks/use_lens_props.test.ts
index 8d13ec7eb8102e..36b4e5c8f4e4d6 100644
--- a/src/plugins/unified_histogram/public/chart/hooks/use_lens_props.test.ts
+++ b/src/plugins/unified_histogram/public/chart/hooks/use_lens_props.test.ts
@@ -20,7 +20,7 @@ describe('useLensProps', () => {
     const getTimeRange = jest.fn();
     const refetch$ = new Subject<UnifiedHistogramInputMessage>();
     const onLoad = jest.fn();
-    const attributes = getLensAttributes({
+    const attributesContext = getLensAttributes({
       title: 'test',
       filters: [],
       query: {
@@ -40,15 +40,15 @@ describe('useLensProps', () => {
         },
         getTimeRange,
         refetch$,
-        attributes,
+        attributesContext,
         onLoad,
       });
     });
-    expect(lensProps.result.current).toEqual(
+    expect(lensProps.result.current.lensProps).toEqual(
       getLensProps({
         searchSessionId: 'id',
         getTimeRange,
-        attributes,
+        attributes: attributesContext.attributes,
         onLoad,
       })
     );
@@ -58,7 +58,7 @@ describe('useLensProps', () => {
     const getTimeRange = jest.fn();
     const refetch$ = new Subject<UnifiedHistogramInputMessage>();
     const onLoad = jest.fn();
-    const attributes = getLensAttributes({
+    const attributesContext = getLensAttributes({
       title: 'test',
       filters: [],
       query: {
@@ -78,15 +78,15 @@ describe('useLensProps', () => {
         },
         getTimeRange,
         refetch$,
-        attributes,
+        attributesContext,
         onLoad,
       });
     });
-    expect(lensProps.result.current).toEqual(
+    expect(lensProps.result.current.lensProps).toEqual(
       getLensProps({
         searchSessionId: 'id',
         getTimeRange,
-        attributes,
+        attributes: attributesContext.attributes,
         onLoad,
       })
     );
@@ -103,7 +103,7 @@ describe('useLensProps', () => {
       },
       getTimeRange,
       refetch$,
-      attributes: getLensAttributes({
+      attributesContext: getLensAttributes({
         title: 'test',
         filters: [],
         query: {
diff --git a/src/plugins/unified_histogram/public/chart/hooks/use_lens_props.ts b/src/plugins/unified_histogram/public/chart/hooks/use_lens_props.ts
index cea2f28521efd8..29827a46dd7050 100644
--- a/src/plugins/unified_histogram/public/chart/hooks/use_lens_props.ts
+++ b/src/plugins/unified_histogram/public/chart/hooks/use_lens_props.ts
@@ -13,41 +13,44 @@ import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { useCallback, useEffect, useState } from 'react';
 import type { Observable } from 'rxjs';
 import type { UnifiedHistogramInputMessage, UnifiedHistogramRequestContext } from '../../types';
+import type { LensAttributesContext } from '../utils/get_lens_attributes';
 import { useStableCallback } from './use_stable_callback';
 
 export const useLensProps = ({
   request,
   getTimeRange,
   refetch$,
-  attributes,
+  attributesContext,
   onLoad,
 }: {
   request?: UnifiedHistogramRequestContext;
   getTimeRange: () => TimeRange;
   refetch$: Observable<UnifiedHistogramInputMessage>;
-  attributes: TypedLensByValueInput['attributes'];
+  attributesContext: LensAttributesContext;
   onLoad: (isLoading: boolean, adapters: Partial<DefaultInspectorAdapters> | undefined) => void;
 }) => {
-  const buildLensProps = useCallback(
-    () =>
-      getLensProps({
+  const buildLensProps = useCallback(() => {
+    const { attributes, requestData } = attributesContext;
+    return {
+      requestData: JSON.stringify(requestData),
+      lensProps: getLensProps({
         searchSessionId: request?.searchSessionId,
         getTimeRange,
         attributes,
         onLoad,
       }),
-    [attributes, getTimeRange, onLoad, request?.searchSessionId]
-  );
+    };
+  }, [attributesContext, getTimeRange, onLoad, request?.searchSessionId]);
 
-  const [lensProps, setLensProps] = useState(buildLensProps());
-  const updateLensProps = useStableCallback(() => setLensProps(buildLensProps()));
+  const [lensPropsContext, setLensPropsContext] = useState(buildLensProps());
+  const updateLensPropsContext = useStableCallback(() => setLensPropsContext(buildLensProps()));
 
   useEffect(() => {
-    const subscription = refetch$.subscribe(updateLensProps);
+    const subscription = refetch$.subscribe(updateLensPropsContext);
     return () => subscription.unsubscribe();
-  }, [refetch$, updateLensProps]);
+  }, [refetch$, updateLensPropsContext]);
 
-  return lensProps;
+  return lensPropsContext;
 };
 
 export const getLensProps = ({
diff --git a/src/plugins/unified_histogram/public/chart/utils/get_lens_attributes.test.ts b/src/plugins/unified_histogram/public/chart/utils/get_lens_attributes.test.ts
index 9bb8707e6d7c21..e95c5ad41d44ab 100644
--- a/src/plugins/unified_histogram/public/chart/utils/get_lens_attributes.test.ts
+++ b/src/plugins/unified_histogram/public/chart/utils/get_lens_attributes.test.ts
@@ -57,134 +57,142 @@ describe('getLensAttributes', () => {
       })
     ).toMatchInlineSnapshot(`
       Object {
-        "references": Array [
-          Object {
-            "id": "index-pattern-with-timefield-id",
-            "name": "indexpattern-datasource-current-indexpattern",
-            "type": "index-pattern",
-          },
-          Object {
-            "id": "index-pattern-with-timefield-id",
-            "name": "indexpattern-datasource-layer-unifiedHistogram",
-            "type": "index-pattern",
-          },
-        ],
-        "state": Object {
-          "datasourceStates": Object {
-            "formBased": Object {
-              "layers": Object {
-                "unifiedHistogram": Object {
-                  "columnOrder": Array [
-                    "date_column",
-                    "count_column",
-                  ],
-                  "columns": Object {
-                    "count_column": Object {
-                      "dataType": "number",
-                      "isBucketed": false,
-                      "label": "Count of records",
-                      "operationType": "count",
-                      "params": Object {
-                        "format": Object {
-                          "id": "number",
-                          "params": Object {
-                            "decimals": 0,
+        "attributes": Object {
+          "references": Array [
+            Object {
+              "id": "index-pattern-with-timefield-id",
+              "name": "indexpattern-datasource-current-indexpattern",
+              "type": "index-pattern",
+            },
+            Object {
+              "id": "index-pattern-with-timefield-id",
+              "name": "indexpattern-datasource-layer-unifiedHistogram",
+              "type": "index-pattern",
+            },
+          ],
+          "state": Object {
+            "datasourceStates": Object {
+              "formBased": Object {
+                "layers": Object {
+                  "unifiedHistogram": Object {
+                    "columnOrder": Array [
+                      "date_column",
+                      "count_column",
+                    ],
+                    "columns": Object {
+                      "count_column": Object {
+                        "dataType": "number",
+                        "isBucketed": false,
+                        "label": "Count of records",
+                        "operationType": "count",
+                        "params": Object {
+                          "format": Object {
+                            "id": "number",
+                            "params": Object {
+                              "decimals": 0,
+                            },
                           },
                         },
+                        "scale": "ratio",
+                        "sourceField": "___records___",
                       },
-                      "scale": "ratio",
-                      "sourceField": "___records___",
-                    },
-                    "date_column": Object {
-                      "dataType": "date",
-                      "isBucketed": true,
-                      "label": "timestamp",
-                      "operationType": "date_histogram",
-                      "params": Object {
-                        "interval": "auto",
+                      "date_column": Object {
+                        "dataType": "date",
+                        "isBucketed": true,
+                        "label": "timestamp",
+                        "operationType": "date_histogram",
+                        "params": Object {
+                          "interval": "auto",
+                        },
+                        "scale": "interval",
+                        "sourceField": "timestamp",
                       },
-                      "scale": "interval",
-                      "sourceField": "timestamp",
                     },
                   },
                 },
               },
             },
-          },
-          "filters": Array [
-            Object {
-              "$state": Object {
-                "store": "appState",
-              },
-              "meta": Object {
-                "alias": null,
-                "disabled": false,
-                "index": "index-pattern-with-timefield-id",
-                "key": "extension",
-                "negate": false,
-                "params": Object {
-                  "query": "js",
+            "filters": Array [
+              Object {
+                "$state": Object {
+                  "store": "appState",
                 },
-                "type": "phrase",
-              },
-              "query": Object {
-                "match": Object {
-                  "extension": Object {
+                "meta": Object {
+                  "alias": null,
+                  "disabled": false,
+                  "index": "index-pattern-with-timefield-id",
+                  "key": "extension",
+                  "negate": false,
+                  "params": Object {
                     "query": "js",
-                    "type": "phrase",
                   },
+                  "type": "phrase",
                 },
-              },
-            },
-          ],
-          "query": Object {
-            "language": "kuery",
-            "query": "extension : css",
-          },
-          "visualization": Object {
-            "axisTitlesVisibilitySettings": Object {
-              "x": false,
-              "yLeft": false,
-              "yRight": false,
-            },
-            "fittingFunction": "None",
-            "gridlinesVisibilitySettings": Object {
-              "x": true,
-              "yLeft": true,
-              "yRight": false,
-            },
-            "layers": Array [
-              Object {
-                "accessors": Array [
-                  "count_column",
-                ],
-                "layerId": "unifiedHistogram",
-                "layerType": "data",
-                "seriesType": "bar_stacked",
-                "xAccessor": "date_column",
-                "yConfig": Array [
-                  Object {
-                    "forAccessor": "count_column",
+                "query": Object {
+                  "match": Object {
+                    "extension": Object {
+                      "query": "js",
+                      "type": "phrase",
+                    },
                   },
-                ],
+                },
               },
             ],
-            "legend": Object {
-              "isVisible": true,
-              "position": "right",
+            "query": Object {
+              "language": "kuery",
+              "query": "extension : css",
             },
-            "preferredSeriesType": "bar_stacked",
-            "showCurrentTimeMarker": true,
-            "tickLabelsVisibilitySettings": Object {
-              "x": true,
-              "yLeft": true,
-              "yRight": false,
+            "visualization": Object {
+              "axisTitlesVisibilitySettings": Object {
+                "x": false,
+                "yLeft": false,
+                "yRight": false,
+              },
+              "fittingFunction": "None",
+              "gridlinesVisibilitySettings": Object {
+                "x": true,
+                "yLeft": true,
+                "yRight": false,
+              },
+              "layers": Array [
+                Object {
+                  "accessors": Array [
+                    "count_column",
+                  ],
+                  "layerId": "unifiedHistogram",
+                  "layerType": "data",
+                  "seriesType": "bar_stacked",
+                  "xAccessor": "date_column",
+                  "yConfig": Array [
+                    Object {
+                      "forAccessor": "count_column",
+                    },
+                  ],
+                },
+              ],
+              "legend": Object {
+                "isVisible": true,
+                "position": "right",
+              },
+              "preferredSeriesType": "bar_stacked",
+              "showCurrentTimeMarker": true,
+              "tickLabelsVisibilitySettings": Object {
+                "x": true,
+                "yLeft": true,
+                "yRight": false,
+              },
+              "valueLabels": "hide",
             },
-            "valueLabels": "hide",
           },
+          "title": "test",
+          "visualizationType": "lnsXY",
+        },
+        "requestData": Object {
+          "breakdownField": undefined,
+          "dataViewId": "index-pattern-with-timefield-id",
+          "timeField": "timestamp",
+          "timeInterval": "auto",
         },
-        "title": "test",
-        "visualizationType": "lnsXY",
       }
     `);
   });
@@ -205,152 +213,160 @@ describe('getLensAttributes', () => {
       })
     ).toMatchInlineSnapshot(`
       Object {
-        "references": Array [
-          Object {
-            "id": "index-pattern-with-timefield-id",
-            "name": "indexpattern-datasource-current-indexpattern",
-            "type": "index-pattern",
-          },
-          Object {
-            "id": "index-pattern-with-timefield-id",
-            "name": "indexpattern-datasource-layer-unifiedHistogram",
-            "type": "index-pattern",
-          },
-        ],
-        "state": Object {
-          "datasourceStates": Object {
-            "formBased": Object {
-              "layers": Object {
-                "unifiedHistogram": Object {
-                  "columnOrder": Array [
-                    "breakdown_column",
-                    "date_column",
-                    "count_column",
-                  ],
-                  "columns": Object {
-                    "breakdown_column": Object {
-                      "dataType": "string",
-                      "isBucketed": true,
-                      "label": "Top 3 values of extension",
-                      "operationType": "terms",
-                      "params": Object {
-                        "missingBucket": false,
-                        "orderBy": Object {
-                          "columnId": "count_column",
-                          "type": "column",
-                        },
-                        "orderDirection": "desc",
-                        "otherBucket": true,
-                        "parentFormat": Object {
-                          "id": "terms",
+        "attributes": Object {
+          "references": Array [
+            Object {
+              "id": "index-pattern-with-timefield-id",
+              "name": "indexpattern-datasource-current-indexpattern",
+              "type": "index-pattern",
+            },
+            Object {
+              "id": "index-pattern-with-timefield-id",
+              "name": "indexpattern-datasource-layer-unifiedHistogram",
+              "type": "index-pattern",
+            },
+          ],
+          "state": Object {
+            "datasourceStates": Object {
+              "formBased": Object {
+                "layers": Object {
+                  "unifiedHistogram": Object {
+                    "columnOrder": Array [
+                      "breakdown_column",
+                      "date_column",
+                      "count_column",
+                    ],
+                    "columns": Object {
+                      "breakdown_column": Object {
+                        "dataType": "string",
+                        "isBucketed": true,
+                        "label": "Top 3 values of extension",
+                        "operationType": "terms",
+                        "params": Object {
+                          "missingBucket": false,
+                          "orderBy": Object {
+                            "columnId": "count_column",
+                            "type": "column",
+                          },
+                          "orderDirection": "desc",
+                          "otherBucket": true,
+                          "parentFormat": Object {
+                            "id": "terms",
+                          },
+                          "size": 3,
                         },
-                        "size": 3,
+                        "scale": "ordinal",
+                        "sourceField": "extension",
                       },
-                      "scale": "ordinal",
-                      "sourceField": "extension",
-                    },
-                    "count_column": Object {
-                      "dataType": "number",
-                      "isBucketed": false,
-                      "label": "Count of records",
-                      "operationType": "count",
-                      "params": Object {
-                        "format": Object {
-                          "id": "number",
-                          "params": Object {
-                            "decimals": 0,
+                      "count_column": Object {
+                        "dataType": "number",
+                        "isBucketed": false,
+                        "label": "Count of records",
+                        "operationType": "count",
+                        "params": Object {
+                          "format": Object {
+                            "id": "number",
+                            "params": Object {
+                              "decimals": 0,
+                            },
                           },
                         },
+                        "scale": "ratio",
+                        "sourceField": "___records___",
                       },
-                      "scale": "ratio",
-                      "sourceField": "___records___",
-                    },
-                    "date_column": Object {
-                      "dataType": "date",
-                      "isBucketed": true,
-                      "label": "timestamp",
-                      "operationType": "date_histogram",
-                      "params": Object {
-                        "interval": "auto",
+                      "date_column": Object {
+                        "dataType": "date",
+                        "isBucketed": true,
+                        "label": "timestamp",
+                        "operationType": "date_histogram",
+                        "params": Object {
+                          "interval": "auto",
+                        },
+                        "scale": "interval",
+                        "sourceField": "timestamp",
                       },
-                      "scale": "interval",
-                      "sourceField": "timestamp",
                     },
                   },
                 },
               },
             },
-          },
-          "filters": Array [
-            Object {
-              "$state": Object {
-                "store": "appState",
-              },
-              "meta": Object {
-                "alias": null,
-                "disabled": false,
-                "index": "index-pattern-with-timefield-id",
-                "key": "extension",
-                "negate": false,
-                "params": Object {
-                  "query": "js",
+            "filters": Array [
+              Object {
+                "$state": Object {
+                  "store": "appState",
                 },
-                "type": "phrase",
-              },
-              "query": Object {
-                "match": Object {
-                  "extension": Object {
+                "meta": Object {
+                  "alias": null,
+                  "disabled": false,
+                  "index": "index-pattern-with-timefield-id",
+                  "key": "extension",
+                  "negate": false,
+                  "params": Object {
                     "query": "js",
-                    "type": "phrase",
+                  },
+                  "type": "phrase",
+                },
+                "query": Object {
+                  "match": Object {
+                    "extension": Object {
+                      "query": "js",
+                      "type": "phrase",
+                    },
                   },
                 },
-              },
-            },
-          ],
-          "query": Object {
-            "language": "kuery",
-            "query": "extension : css",
-          },
-          "visualization": Object {
-            "axisTitlesVisibilitySettings": Object {
-              "x": false,
-              "yLeft": false,
-              "yRight": false,
-            },
-            "fittingFunction": "None",
-            "gridlinesVisibilitySettings": Object {
-              "x": true,
-              "yLeft": true,
-              "yRight": false,
-            },
-            "layers": Array [
-              Object {
-                "accessors": Array [
-                  "count_column",
-                ],
-                "layerId": "unifiedHistogram",
-                "layerType": "data",
-                "seriesType": "bar_stacked",
-                "splitAccessor": "breakdown_column",
-                "xAccessor": "date_column",
               },
             ],
-            "legend": Object {
-              "isVisible": true,
-              "position": "right",
+            "query": Object {
+              "language": "kuery",
+              "query": "extension : css",
             },
-            "preferredSeriesType": "bar_stacked",
-            "showCurrentTimeMarker": true,
-            "tickLabelsVisibilitySettings": Object {
-              "x": true,
-              "yLeft": true,
-              "yRight": false,
+            "visualization": Object {
+              "axisTitlesVisibilitySettings": Object {
+                "x": false,
+                "yLeft": false,
+                "yRight": false,
+              },
+              "fittingFunction": "None",
+              "gridlinesVisibilitySettings": Object {
+                "x": true,
+                "yLeft": true,
+                "yRight": false,
+              },
+              "layers": Array [
+                Object {
+                  "accessors": Array [
+                    "count_column",
+                  ],
+                  "layerId": "unifiedHistogram",
+                  "layerType": "data",
+                  "seriesType": "bar_stacked",
+                  "splitAccessor": "breakdown_column",
+                  "xAccessor": "date_column",
+                },
+              ],
+              "legend": Object {
+                "isVisible": true,
+                "position": "right",
+              },
+              "preferredSeriesType": "bar_stacked",
+              "showCurrentTimeMarker": true,
+              "tickLabelsVisibilitySettings": Object {
+                "x": true,
+                "yLeft": true,
+                "yRight": false,
+              },
+              "valueLabels": "hide",
             },
-            "valueLabels": "hide",
           },
+          "title": "test",
+          "visualizationType": "lnsXY",
+        },
+        "requestData": Object {
+          "breakdownField": "extension",
+          "dataViewId": "index-pattern-with-timefield-id",
+          "timeField": "timestamp",
+          "timeInterval": "auto",
         },
-        "title": "test",
-        "visualizationType": "lnsXY",
       }
     `);
   });
@@ -371,134 +387,142 @@ describe('getLensAttributes', () => {
       })
     ).toMatchInlineSnapshot(`
       Object {
-        "references": Array [
-          Object {
-            "id": "index-pattern-with-timefield-id",
-            "name": "indexpattern-datasource-current-indexpattern",
-            "type": "index-pattern",
-          },
-          Object {
-            "id": "index-pattern-with-timefield-id",
-            "name": "indexpattern-datasource-layer-unifiedHistogram",
-            "type": "index-pattern",
-          },
-        ],
-        "state": Object {
-          "datasourceStates": Object {
-            "formBased": Object {
-              "layers": Object {
-                "unifiedHistogram": Object {
-                  "columnOrder": Array [
-                    "date_column",
-                    "count_column",
-                  ],
-                  "columns": Object {
-                    "count_column": Object {
-                      "dataType": "number",
-                      "isBucketed": false,
-                      "label": "Count of records",
-                      "operationType": "count",
-                      "params": Object {
-                        "format": Object {
-                          "id": "number",
-                          "params": Object {
-                            "decimals": 0,
+        "attributes": Object {
+          "references": Array [
+            Object {
+              "id": "index-pattern-with-timefield-id",
+              "name": "indexpattern-datasource-current-indexpattern",
+              "type": "index-pattern",
+            },
+            Object {
+              "id": "index-pattern-with-timefield-id",
+              "name": "indexpattern-datasource-layer-unifiedHistogram",
+              "type": "index-pattern",
+            },
+          ],
+          "state": Object {
+            "datasourceStates": Object {
+              "formBased": Object {
+                "layers": Object {
+                  "unifiedHistogram": Object {
+                    "columnOrder": Array [
+                      "date_column",
+                      "count_column",
+                    ],
+                    "columns": Object {
+                      "count_column": Object {
+                        "dataType": "number",
+                        "isBucketed": false,
+                        "label": "Count of records",
+                        "operationType": "count",
+                        "params": Object {
+                          "format": Object {
+                            "id": "number",
+                            "params": Object {
+                              "decimals": 0,
+                            },
                           },
                         },
+                        "scale": "ratio",
+                        "sourceField": "___records___",
                       },
-                      "scale": "ratio",
-                      "sourceField": "___records___",
-                    },
-                    "date_column": Object {
-                      "dataType": "date",
-                      "isBucketed": true,
-                      "label": "timestamp",
-                      "operationType": "date_histogram",
-                      "params": Object {
-                        "interval": "auto",
+                      "date_column": Object {
+                        "dataType": "date",
+                        "isBucketed": true,
+                        "label": "timestamp",
+                        "operationType": "date_histogram",
+                        "params": Object {
+                          "interval": "auto",
+                        },
+                        "scale": "interval",
+                        "sourceField": "timestamp",
                       },
-                      "scale": "interval",
-                      "sourceField": "timestamp",
                     },
                   },
                 },
               },
             },
-          },
-          "filters": Array [
-            Object {
-              "$state": Object {
-                "store": "appState",
-              },
-              "meta": Object {
-                "alias": null,
-                "disabled": false,
-                "index": "index-pattern-with-timefield-id",
-                "key": "extension",
-                "negate": false,
-                "params": Object {
-                  "query": "js",
+            "filters": Array [
+              Object {
+                "$state": Object {
+                  "store": "appState",
                 },
-                "type": "phrase",
-              },
-              "query": Object {
-                "match": Object {
-                  "extension": Object {
+                "meta": Object {
+                  "alias": null,
+                  "disabled": false,
+                  "index": "index-pattern-with-timefield-id",
+                  "key": "extension",
+                  "negate": false,
+                  "params": Object {
                     "query": "js",
-                    "type": "phrase",
                   },
+                  "type": "phrase",
                 },
-              },
-            },
-          ],
-          "query": Object {
-            "language": "kuery",
-            "query": "extension : css",
-          },
-          "visualization": Object {
-            "axisTitlesVisibilitySettings": Object {
-              "x": false,
-              "yLeft": false,
-              "yRight": false,
-            },
-            "fittingFunction": "None",
-            "gridlinesVisibilitySettings": Object {
-              "x": true,
-              "yLeft": true,
-              "yRight": false,
-            },
-            "layers": Array [
-              Object {
-                "accessors": Array [
-                  "count_column",
-                ],
-                "layerId": "unifiedHistogram",
-                "layerType": "data",
-                "seriesType": "bar_stacked",
-                "xAccessor": "date_column",
-                "yConfig": Array [
-                  Object {
-                    "forAccessor": "count_column",
+                "query": Object {
+                  "match": Object {
+                    "extension": Object {
+                      "query": "js",
+                      "type": "phrase",
+                    },
                   },
-                ],
+                },
               },
             ],
-            "legend": Object {
-              "isVisible": true,
-              "position": "right",
+            "query": Object {
+              "language": "kuery",
+              "query": "extension : css",
             },
-            "preferredSeriesType": "bar_stacked",
-            "showCurrentTimeMarker": true,
-            "tickLabelsVisibilitySettings": Object {
-              "x": true,
-              "yLeft": true,
-              "yRight": false,
+            "visualization": Object {
+              "axisTitlesVisibilitySettings": Object {
+                "x": false,
+                "yLeft": false,
+                "yRight": false,
+              },
+              "fittingFunction": "None",
+              "gridlinesVisibilitySettings": Object {
+                "x": true,
+                "yLeft": true,
+                "yRight": false,
+              },
+              "layers": Array [
+                Object {
+                  "accessors": Array [
+                    "count_column",
+                  ],
+                  "layerId": "unifiedHistogram",
+                  "layerType": "data",
+                  "seriesType": "bar_stacked",
+                  "xAccessor": "date_column",
+                  "yConfig": Array [
+                    Object {
+                      "forAccessor": "count_column",
+                    },
+                  ],
+                },
+              ],
+              "legend": Object {
+                "isVisible": true,
+                "position": "right",
+              },
+              "preferredSeriesType": "bar_stacked",
+              "showCurrentTimeMarker": true,
+              "tickLabelsVisibilitySettings": Object {
+                "x": true,
+                "yLeft": true,
+                "yRight": false,
+              },
+              "valueLabels": "hide",
             },
-            "valueLabels": "hide",
           },
+          "title": "test",
+          "visualizationType": "lnsXY",
+        },
+        "requestData": Object {
+          "breakdownField": "scripted",
+          "dataViewId": "index-pattern-with-timefield-id",
+          "timeField": "timestamp",
+          "timeInterval": "auto",
         },
-        "title": "test",
-        "visualizationType": "lnsXY",
       }
     `);
   });
@@ -516,194 +540,202 @@ describe('getLensAttributes', () => {
       })
     ).toMatchInlineSnapshot(`
       Object {
-        "references": Array [
-          Object {
-            "id": "index-pattern-with-timefield-id",
-            "name": "indexpattern-datasource-current-indexpattern",
-            "type": "index-pattern",
-          },
-          Object {
-            "id": "index-pattern-with-timefield-id",
-            "name": "indexpattern-datasource-layer-unifiedHistogram",
-            "type": "index-pattern",
-          },
-        ],
-        "state": Object {
-          "datasourceStates": Object {
-            "textBased": Object {
-              "fieldList": Array [],
-              "indexPatternRefs": Array [],
-              "initialContext": Object {
-                "contextualFields": Array [
-                  "Dest",
-                  "AvgTicketPrice",
-                ],
-                "dataViewSpec": Object {
-                  "allowNoIndex": false,
-                  "fields": Object {
-                    "AvgTicketPrice": Object {
-                      "aggregatable": true,
-                      "count": 0,
-                      "esTypes": Array [
-                        "float",
-                      ],
-                      "format": Object {
-                        "id": "number",
-                        "params": Object {
-                          "pattern": "$0,0.[00]",
+        "attributes": Object {
+          "references": Array [
+            Object {
+              "id": "index-pattern-with-timefield-id",
+              "name": "indexpattern-datasource-current-indexpattern",
+              "type": "index-pattern",
+            },
+            Object {
+              "id": "index-pattern-with-timefield-id",
+              "name": "indexpattern-datasource-layer-unifiedHistogram",
+              "type": "index-pattern",
+            },
+          ],
+          "state": Object {
+            "datasourceStates": Object {
+              "textBased": Object {
+                "fieldList": Array [],
+                "indexPatternRefs": Array [],
+                "initialContext": Object {
+                  "contextualFields": Array [
+                    "Dest",
+                    "AvgTicketPrice",
+                  ],
+                  "dataViewSpec": Object {
+                    "allowNoIndex": false,
+                    "fields": Object {
+                      "AvgTicketPrice": Object {
+                        "aggregatable": true,
+                        "count": 0,
+                        "esTypes": Array [
+                          "float",
+                        ],
+                        "format": Object {
+                          "id": "number",
+                          "params": Object {
+                            "pattern": "$0,0.[00]",
+                          },
                         },
+                        "isMapped": true,
+                        "name": "AvgTicketPrice",
+                        "readFromDocValues": true,
+                        "scripted": false,
+                        "searchable": true,
+                        "shortDotsEnable": false,
+                        "type": "number",
                       },
-                      "isMapped": true,
-                      "name": "AvgTicketPrice",
-                      "readFromDocValues": true,
-                      "scripted": false,
-                      "searchable": true,
-                      "shortDotsEnable": false,
-                      "type": "number",
-                    },
-                    "Dest": Object {
-                      "aggregatable": true,
-                      "count": 0,
-                      "esTypes": Array [
-                        "keyword",
-                      ],
-                      "format": Object {
-                        "id": "string",
+                      "Dest": Object {
+                        "aggregatable": true,
+                        "count": 0,
+                        "esTypes": Array [
+                          "keyword",
+                        ],
+                        "format": Object {
+                          "id": "string",
+                        },
+                        "isMapped": true,
+                        "name": "Dest",
+                        "readFromDocValues": true,
+                        "scripted": false,
+                        "searchable": true,
+                        "shortDotsEnable": false,
+                        "type": "string",
                       },
-                      "isMapped": true,
-                      "name": "Dest",
-                      "readFromDocValues": true,
-                      "scripted": false,
-                      "searchable": true,
-                      "shortDotsEnable": false,
-                      "type": "string",
-                    },
-                    "timestamp": Object {
-                      "aggregatable": true,
-                      "count": 0,
-                      "esTypes": Array [
-                        "date",
-                      ],
-                      "format": Object {
-                        "id": "date",
+                      "timestamp": Object {
+                        "aggregatable": true,
+                        "count": 0,
+                        "esTypes": Array [
+                          "date",
+                        ],
+                        "format": Object {
+                          "id": "date",
+                        },
+                        "isMapped": true,
+                        "name": "timestamp",
+                        "readFromDocValues": true,
+                        "scripted": false,
+                        "searchable": true,
+                        "shortDotsEnable": false,
+                        "type": "date",
                       },
-                      "isMapped": true,
-                      "name": "timestamp",
-                      "readFromDocValues": true,
-                      "scripted": false,
-                      "searchable": true,
-                      "shortDotsEnable": false,
-                      "type": "date",
                     },
+                    "id": "d3d7af60-4c81-11e8-b3d7-01146121b73d",
+                    "name": "Kibana Sample Data Flights",
+                    "sourceFilters": Array [],
+                    "timeFieldName": "timestamp",
+                    "title": "kibana_sample_data_flights",
+                    "version": "WzM1ODA3LDFd",
+                  },
+                  "fieldName": "",
+                  "query": Object {
+                    "sql": "SELECT Dest, AvgTicketPrice FROM \\"kibana_sample_data_flights\\"",
                   },
-                  "id": "d3d7af60-4c81-11e8-b3d7-01146121b73d",
-                  "name": "Kibana Sample Data Flights",
-                  "sourceFilters": Array [],
-                  "timeFieldName": "timestamp",
-                  "title": "kibana_sample_data_flights",
-                  "version": "WzM1ODA3LDFd",
-                },
-                "fieldName": "",
-                "query": Object {
-                  "sql": "SELECT Dest, AvgTicketPrice FROM \\"kibana_sample_data_flights\\"",
                 },
-              },
-              "layers": Object {
-                "46aa21fa-b747-4543-bf90-0b40007c546d": Object {
-                  "allColumns": Array [
-                    Object {
-                      "columnId": "81e332d6-ee37-42a8-a646-cea4fc75d2d3",
-                      "fieldName": "Dest",
-                      "meta": Object {
-                        "type": "string",
+                "layers": Object {
+                  "46aa21fa-b747-4543-bf90-0b40007c546d": Object {
+                    "allColumns": Array [
+                      Object {
+                        "columnId": "81e332d6-ee37-42a8-a646-cea4fc75d2d3",
+                        "fieldName": "Dest",
+                        "meta": Object {
+                          "type": "string",
+                        },
                       },
-                    },
-                    Object {
-                      "columnId": "5b9b8b76-0836-4a12-b9c0-980c9900502f",
-                      "fieldName": "AvgTicketPrice",
-                      "meta": Object {
-                        "type": "number",
+                      Object {
+                        "columnId": "5b9b8b76-0836-4a12-b9c0-980c9900502f",
+                        "fieldName": "AvgTicketPrice",
+                        "meta": Object {
+                          "type": "number",
+                        },
                       },
-                    },
-                  ],
-                  "columns": Array [
-                    Object {
-                      "columnId": "81e332d6-ee37-42a8-a646-cea4fc75d2d3",
-                      "fieldName": "Dest",
-                      "meta": Object {
-                        "type": "string",
+                    ],
+                    "columns": Array [
+                      Object {
+                        "columnId": "81e332d6-ee37-42a8-a646-cea4fc75d2d3",
+                        "fieldName": "Dest",
+                        "meta": Object {
+                          "type": "string",
+                        },
                       },
-                    },
-                    Object {
-                      "columnId": "5b9b8b76-0836-4a12-b9c0-980c9900502f",
-                      "fieldName": "AvgTicketPrice",
-                      "meta": Object {
-                        "type": "number",
+                      Object {
+                        "columnId": "5b9b8b76-0836-4a12-b9c0-980c9900502f",
+                        "fieldName": "AvgTicketPrice",
+                        "meta": Object {
+                          "type": "number",
+                        },
                       },
+                    ],
+                    "index": "d3d7af60-4c81-11e8-b3d7-01146121b73d",
+                    "query": Object {
+                      "sql": "SELECT Dest, AvgTicketPrice FROM \\"kibana_sample_data_flights\\"",
                     },
-                  ],
-                  "index": "d3d7af60-4c81-11e8-b3d7-01146121b73d",
-                  "query": Object {
-                    "sql": "SELECT Dest, AvgTicketPrice FROM \\"kibana_sample_data_flights\\"",
+                    "timeField": "timestamp",
                   },
-                  "timeField": "timestamp",
                 },
               },
             },
-          },
-          "filters": Array [
-            Object {
-              "$state": Object {
-                "store": "appState",
-              },
-              "meta": Object {
-                "alias": null,
-                "disabled": false,
-                "index": "index-pattern-with-timefield-id",
-                "key": "extension",
-                "negate": false,
-                "params": Object {
-                  "query": "js",
+            "filters": Array [
+              Object {
+                "$state": Object {
+                  "store": "appState",
                 },
-                "type": "phrase",
-              },
-              "query": Object {
-                "match": Object {
-                  "extension": Object {
+                "meta": Object {
+                  "alias": null,
+                  "disabled": false,
+                  "index": "index-pattern-with-timefield-id",
+                  "key": "extension",
+                  "negate": false,
+                  "params": Object {
                     "query": "js",
-                    "type": "phrase",
+                  },
+                  "type": "phrase",
+                },
+                "query": Object {
+                  "match": Object {
+                    "extension": Object {
+                      "query": "js",
+                      "type": "phrase",
+                    },
                   },
                 },
               },
+            ],
+            "query": Object {
+              "language": "kuery",
+              "query": "extension : css",
             },
-          ],
-          "query": Object {
-            "language": "kuery",
-            "query": "extension : css",
-          },
-          "visualization": Object {
-            "gridConfig": Object {
-              "isCellLabelVisible": false,
-              "isXAxisLabelVisible": true,
-              "isXAxisTitleVisible": false,
-              "isYAxisLabelVisible": true,
-              "isYAxisTitleVisible": false,
-              "type": "heatmap_grid",
-            },
-            "layerId": "46aa21fa-b747-4543-bf90-0b40007c546d",
-            "layerType": "data",
-            "legend": Object {
-              "isVisible": true,
-              "position": "right",
-              "type": "heatmap_legend",
+            "visualization": Object {
+              "gridConfig": Object {
+                "isCellLabelVisible": false,
+                "isXAxisLabelVisible": true,
+                "isXAxisTitleVisible": false,
+                "isYAxisLabelVisible": true,
+                "isYAxisTitleVisible": false,
+                "type": "heatmap_grid",
+              },
+              "layerId": "46aa21fa-b747-4543-bf90-0b40007c546d",
+              "layerType": "data",
+              "legend": Object {
+                "isVisible": true,
+                "position": "right",
+                "type": "heatmap_legend",
+              },
+              "shape": "heatmap",
+              "valueAccessor": "5b9b8b76-0836-4a12-b9c0-980c9900502f",
+              "xAccessor": "81e332d6-ee37-42a8-a646-cea4fc75d2d3",
             },
-            "shape": "heatmap",
-            "valueAccessor": "5b9b8b76-0836-4a12-b9c0-980c9900502f",
-            "xAccessor": "81e332d6-ee37-42a8-a646-cea4fc75d2d3",
           },
+          "title": "test",
+          "visualizationType": "lnsHeatmap",
+        },
+        "requestData": Object {
+          "breakdownField": undefined,
+          "dataViewId": "index-pattern-with-timefield-id",
+          "timeField": "timestamp",
+          "timeInterval": "auto",
         },
-        "title": "test",
-        "visualizationType": "lnsHeatmap",
       }
     `);
   });
diff --git a/src/plugins/unified_histogram/public/chart/utils/get_lens_attributes.ts b/src/plugins/unified_histogram/public/chart/utils/get_lens_attributes.ts
index 5f6b8214e5863c..ecf67b80731fd2 100644
--- a/src/plugins/unified_histogram/public/chart/utils/get_lens_attributes.ts
+++ b/src/plugins/unified_histogram/public/chart/utils/get_lens_attributes.ts
@@ -19,6 +19,18 @@ import type {
 } from '@kbn/lens-plugin/public';
 import { fieldSupportsBreakdown } from './field_supports_breakdown';
 
+export interface LensRequestData {
+  dataViewId?: string;
+  timeField?: string;
+  timeInterval?: string;
+  breakdownField?: string;
+}
+
+export interface LensAttributesContext {
+  attributes: TypedLensByValueInput['attributes'];
+  requestData: LensRequestData;
+}
+
 export const getLensAttributes = ({
   title,
   filters,
@@ -35,7 +47,7 @@ export const getLensAttributes = ({
   timeInterval: string | undefined;
   breakdownField: DataViewField | undefined;
   suggestion: Suggestion | undefined;
-}) => {
+}): LensAttributesContext => {
   const showBreakdown = breakdownField && fieldSupportsBreakdown(breakdownField);
 
   let columnOrder = ['date_column', 'count_column'];
@@ -169,8 +181,7 @@ export const getLensAttributes = ({
           yRight: false,
         },
       };
-
-  return {
+  const attributes = {
     title:
       title ??
       i18n.translate('unifiedHistogram.lensTitle', {
@@ -196,4 +207,14 @@ export const getLensAttributes = ({
     },
     visualizationType: suggestion ? suggestion.visualizationId : 'lnsXY',
   } as TypedLensByValueInput['attributes'];
+
+  return {
+    attributes,
+    requestData: {
+      dataViewId: dataView.id,
+      timeField: dataView.timeFieldName,
+      timeInterval,
+      breakdownField: breakdownField?.name,
+    },
+  };
 };
diff --git a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
index 37bd3c94a37132..be1e7f2c2322a3 100644
--- a/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
+++ b/src/plugins/unified_search/public/filter_bar/filter_editor/phrase_suggestor.tsx
@@ -88,7 +88,7 @@ export class PhraseSuggestorUI<T extends PhraseSuggestorProps> extends React.Com
       signal: this.abortController.signal,
       useTimeRange: timeRangeForSuggestionsOverride,
       boolFilter: buildQueryFromFilters(filtersForSuggestions, undefined).filter,
-      method: filtersForSuggestions?.length ? 'terms_agg' : 'terms_enum',
+      method: filtersForSuggestions?.length ? 'terms_agg' : undefined,
     });
 
     this.setState({ suggestions, isLoading: false });
diff --git a/src/plugins/unified_search/public/query_string_input/query_string_input.tsx b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
index 25740f092dd688..4a774a1c8fa512 100644
--- a/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_string_input.tsx
@@ -286,7 +286,7 @@ export default class QueryStringInputUI extends PureComponent<QueryStringInputPr
           signal: this.abortController.signal,
           useTimeRange: this.props.timeRangeForSuggestionsOverride,
           boolFilter: buildQueryFromFilters(this.props.filtersForSuggestions, undefined).filter,
-          method: this.props.filtersForSuggestions?.length ? 'terms_agg' : 'terms_enum',
+          method: this.props.filtersForSuggestions?.length ? 'terms_agg' : undefined,
         })) || [];
       return [...suggestions, ...recentSearchSuggestions];
     } catch (e) {
diff --git a/src/plugins/visualization_ui_components/.i18nrc.json b/src/plugins/visualization_ui_components/.i18nrc.json
new file mode 100755
index 00000000000000..8ec382bca5a930
--- /dev/null
+++ b/src/plugins/visualization_ui_components/.i18nrc.json
@@ -0,0 +1,6 @@
+{
+  "prefix": "visualizationUiComponents",
+  "paths": {
+    "visualizationUiComponents": "."
+  }
+}
diff --git a/src/plugins/visualization_ui_components/README.md b/src/plugins/visualization_ui_components/README.md
new file mode 100644
index 00000000000000..dc50b4ede1e207
--- /dev/null
+++ b/src/plugins/visualization_ui_components/README.md
@@ -0,0 +1,3 @@
+# @kbn/visualization-ui-components
+
+A series of UI components pulled out of Lens to make them available outside Lens.
diff --git a/src/plugins/visualization_ui_components/jest.config.js b/src/plugins/visualization_ui_components/jest.config.js
new file mode 100644
index 00000000000000..bd0b14b660033d
--- /dev/null
+++ b/src/plugins/visualization_ui_components/jest.config.js
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/src/plugins/visualization_ui_components'],
+  coverageDirectory:
+    '<rootDir>/target/kibana-coverage/jest/src/plugins/visualization_ui_components',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: [
+    '<rootDir>/src/plugins/visualization_ui_components/{common,public,server}/**/*.{js,ts,tsx}',
+  ],
+  setupFiles: ['jest-canvas-mock'],
+};
diff --git a/src/plugins/visualization_ui_components/kibana.jsonc b/src/plugins/visualization_ui_components/kibana.jsonc
new file mode 100644
index 00000000000000..f7d42af5133382
--- /dev/null
+++ b/src/plugins/visualization_ui_components/kibana.jsonc
@@ -0,0 +1,14 @@
+{
+  "type": "plugin",
+  "id": "@kbn/visualization-ui-components",
+  "owner": "@elastic/kibana-visualizations",
+  "plugin": {
+    "id": "visualizationUiComponents",
+    "server": false,
+    "browser": true,
+    "requiredBundles": [
+      "unifiedSearch",
+      "unifiedFieldList"
+    ]
+  }
+}
diff --git a/src/plugins/visualization_ui_components/package.json b/src/plugins/visualization_ui_components/package.json
new file mode 100644
index 00000000000000..4df9dbe5d1ee0d
--- /dev/null
+++ b/src/plugins/visualization_ui_components/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@kbn/visualization-ui-components",
+  "private": true,
+  "version": "1.0.0",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/color_picker.tsx b/src/plugins/visualization_ui_components/public/components/color_picker.tsx
similarity index 87%
rename from x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/color_picker.tsx
rename to src/plugins/visualization_ui_components/public/components/color_picker.tsx
index 22166ba85fc348..56ea66b1a7edb8 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/color_picker.tsx
+++ b/src/plugins/visualization_ui_components/public/components/color_picker.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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, { useEffect, useRef, useState } from 'react';
@@ -16,16 +17,16 @@ import {
   EuiIcon,
   euiPaletteColorBlind,
 } from '@elastic/eui';
-import { TooltipWrapper } from '../../../shared_components';
+import { TooltipWrapper } from './tooltip_wrapper';
 
 const tooltipContent = {
-  auto: i18n.translate('xpack.lens.configPanel.color.tooltip.auto', {
+  auto: i18n.translate('visualizationUiComponents.colorPicker.tooltip.auto', {
     defaultMessage: 'Lens automatically picks colors for you unless you specify a custom color.',
   }),
-  custom: i18n.translate('xpack.lens.configPanel.color.tooltip.custom', {
+  custom: i18n.translate('visualizationUiComponents.colorPicker.tooltip.custom', {
     defaultMessage: 'Clear the custom color to return to “Auto” mode.',
   }),
-  disabled: i18n.translate('xpack.lens.configPanel.color.tooltip.disabled', {
+  disabled: i18n.translate('visualizationUiComponents.colorPicker.tooltip.disabled', {
     defaultMessage:
       'You are unable to apply custom colors to individual series when the layer includes a "Break down by" field.',
   }),
@@ -42,7 +43,7 @@ function isValidPonyfill(colorString: string) {
   }
 }
 
-export function isValidColor(colorString?: string) {
+function isValidColor(colorString?: string) {
   // chroma can handle also hex values with alpha channel/transparency
   // chroma accepts also hex without #, so test for it
   return (
@@ -107,7 +108,7 @@ export const ColorPicker = ({
 
   const inputLabel =
     label ??
-    i18n.translate('xpack.lens.xyChart.seriesColor.label', {
+    i18n.translate('visualizationUiComponents.colorPicker.seriesColor.label', {
       defaultMessage: 'Series color',
     });
 
@@ -122,7 +123,7 @@ export const ColorPicker = ({
       disabled={disabled}
       placeholder={
         defaultColor?.toUpperCase() ||
-        i18n.translate('xpack.lens.xyChart.seriesColor.auto', {
+        i18n.translate('visualizationUiComponents.colorPicker.seriesColor.auto', {
           defaultMessage: 'Auto',
         })
       }
diff --git a/x-pack/plugins/lens/public/shared_components/debounced_input.test.tsx b/src/plugins/visualization_ui_components/public/components/debounced_input.test.tsx
similarity index 91%
rename from x-pack/plugins/lens/public/shared_components/debounced_input.test.tsx
rename to src/plugins/visualization_ui_components/public/components/debounced_input.test.tsx
index feab19d02c7202..beec64618c45d4 100644
--- a/x-pack/plugins/lens/public/shared_components/debounced_input.test.tsx
+++ b/src/plugins/visualization_ui_components/public/components/debounced_input.test.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
diff --git a/x-pack/plugins/lens/public/shared_components/debounced_input.tsx b/src/plugins/visualization_ui_components/public/components/debounced_input.tsx
similarity index 88%
rename from x-pack/plugins/lens/public/shared_components/debounced_input.tsx
rename to src/plugins/visualization_ui_components/public/components/debounced_input.tsx
index cd309a2bb0bfd4..e892cba9e80226 100644
--- a/x-pack/plugins/lens/public/shared_components/debounced_input.tsx
+++ b/src/plugins/visualization_ui_components/public/components/debounced_input.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
diff --git a/x-pack/plugins/lens/public/shared_components/debounced_value.test.ts b/src/plugins/visualization_ui_components/public/components/debounced_value.test.ts
similarity index 88%
rename from x-pack/plugins/lens/public/shared_components/debounced_value.test.ts
rename to src/plugins/visualization_ui_components/public/components/debounced_value.test.ts
index e5dd747be51ff1..ddff83ea661575 100644
--- a/x-pack/plugins/lens/public/shared_components/debounced_value.test.ts
+++ b/src/plugins/visualization_ui_components/public/components/debounced_value.test.ts
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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 { act, renderHook } from '@testing-library/react-hooks';
diff --git a/x-pack/plugins/lens/public/shared_components/debounced_value.ts b/src/plugins/visualization_ui_components/public/components/debounced_value.ts
similarity index 91%
rename from x-pack/plugins/lens/public/shared_components/debounced_value.ts
rename to src/plugins/visualization_ui_components/public/components/debounced_value.ts
index 77848e678b1352..2321ee72817f3d 100644
--- a/x-pack/plugins/lens/public/shared_components/debounced_value.ts
+++ b/src/plugins/visualization_ui_components/public/components/debounced_value.ts
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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 { useState, useMemo, useEffect, useRef } from 'react';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/dimension_button.tsx b/src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx
similarity index 71%
rename from x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/dimension_button.tsx
rename to src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx
index 71f7a2928bc41f..2e75a1704d6153 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/buttons/dimension_button.tsx
+++ b/src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
@@ -10,18 +11,18 @@ import { EuiButtonIcon, EuiLink, EuiToolTip, EuiFlexGroup, EuiFlexItem } from '@
 import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
 import { euiThemeVars } from '@kbn/ui-theme';
-import { DimensionButtonIcon } from '../dimension_button_icon';
-import { PaletteIndicator } from '../palette_indicator';
-import { VisualizationDimensionGroupConfig, AccessorConfig, UserMessage } from '../../../../types';
+import { DimensionButtonIcon } from './dimension_button_icon';
+import { PaletteIndicator } from './palette_indicator';
+import { AccessorConfig, Message } from './types';
 
 const triggerLinkA11yText = (label: string) =>
-  i18n.translate('xpack.lens.configure.editConfig', {
+  i18n.translate('visualizationUiComponents.dimensionButton.editConfig', {
     defaultMessage: 'Edit {label} configuration',
     values: { label },
   });
 
 export function DimensionButton({
-  group,
+  groupLabel,
   children,
   onClick,
   onRemoveClick,
@@ -31,22 +32,19 @@ export function DimensionButton({
   ...otherProps // from Drag&Drop integration
 }: {
   className?: string;
-  group: VisualizationDimensionGroupConfig;
+  groupLabel: string;
   children: React.ReactElement;
   onClick: (id: string) => void;
   onRemoveClick: (id: string) => void;
   accessorConfig: AccessorConfig;
   label: string;
-  message: UserMessage | undefined;
+  message?: Message;
 }) {
   return (
     <div {...otherProps}>
       <EuiFlexGroup direction="row" alignItems="center" gutterSize="none" responsive={false}>
         <EuiFlexItem>
-          <EuiToolTip
-            content={message?.shortMessage || message?.longMessage || undefined}
-            position="left"
-          >
+          <EuiToolTip content={message?.content} position="left">
             <EuiLink
               className="lnsLayerPanel__dimensionLink"
               data-test-subj="lnsLayerPanel-dimensionLink"
@@ -61,7 +59,7 @@ export function DimensionButton({
                   : 'text'
               }
             >
-              <DimensionButtonIcon message={message} accessorConfig={accessorConfig}>
+              <DimensionButtonIcon severity={message?.severity} accessorConfig={accessorConfig}>
                 {children}
               </DimensionButtonIcon>
             </EuiLink>
@@ -74,13 +72,13 @@ export function DimensionButton({
         iconType="trash"
         size="xs"
         color="danger"
-        aria-label={i18n.translate('xpack.lens.indexPattern.removeColumnLabel', {
+        aria-label={i18n.translate('visualizationUiComponents.dimensionButton.removeColumnLabel', {
           defaultMessage: 'Remove configuration from "{groupLabel}"',
-          values: { groupLabel: group.groupLabel },
+          values: { groupLabel },
         })}
-        title={i18n.translate('xpack.lens.indexPattern.removeColumnLabel', {
+        title={i18n.translate('visualizationUiComponents.dimensionButton.removeColumnLabel', {
           defaultMessage: 'Remove configuration from "{groupLabel}"',
-          values: { groupLabel: group.groupLabel },
+          values: { groupLabel },
         })}
         onClick={() => onRemoveClick(accessorConfig.columnId)}
         css={css`
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_button_icon.tsx b/src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button_icon.tsx
similarity index 52%
rename from x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_button_icon.tsx
rename to src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button_icon.tsx
index 489e56c09055c7..bcb3ddb1e44bb6 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_button_icon.tsx
+++ b/src/plugins/visualization_ui_components/public/components/dimension_buttons/dimension_button_icon.tsx
@@ -1,15 +1,15 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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 { EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { AccessorConfig, UserMessage } from '../../../types';
-import { IconError, IconWarning } from '../custom_icons';
+import type { AccessorConfig, Message } from './types';
 
 const baseIconProps = {
   className: 'lnsLayerPanel__colorIndicator',
@@ -22,12 +22,15 @@ const getIconFromAccessorConfig = (accessorConfig: AccessorConfig) => (
         {...baseIconProps}
         color={accessorConfig.color}
         type="stopFilled"
-        aria-label={i18n.translate('xpack.lens.editorFrame.colorIndicatorLabel', {
-          defaultMessage: 'Color of this dimension: {hex}',
-          values: {
-            hex: accessorConfig.color,
-          },
-        })}
+        aria-label={i18n.translate(
+          'visualizationUiComponents.dimensionButtonIcon.colorIndicatorLabel',
+          {
+            defaultMessage: 'Color of this dimension: {hex}',
+            values: {
+              hex: accessorConfig.color,
+            },
+          }
+        )}
       />
     )}
     {accessorConfig.triggerIconType === 'disabled' && (
@@ -35,9 +38,12 @@ const getIconFromAccessorConfig = (accessorConfig: AccessorConfig) => (
         {...baseIconProps}
         type="stopSlash"
         color="subdued"
-        aria-label={i18n.translate('xpack.lens.editorFrame.noColorIndicatorLabel', {
-          defaultMessage: 'This dimension does not have an individual color',
-        })}
+        aria-label={i18n.translate(
+          'visualizationUiComponents.dimensionButtonIcon.noColorIndicatorLabel',
+          {
+            defaultMessage: 'This dimension does not have an individual color',
+          }
+        )}
       />
     )}
     {accessorConfig.triggerIconType === 'invisible' && (
@@ -45,9 +51,12 @@ const getIconFromAccessorConfig = (accessorConfig: AccessorConfig) => (
         {...baseIconProps}
         type="eyeClosed"
         color="subdued"
-        aria-label={i18n.translate('xpack.lens.editorFrame.invisibleIndicatorLabel', {
-          defaultMessage: 'This dimension is currently not visible in the chart',
-        })}
+        aria-label={i18n.translate(
+          'visualizationUiComponents.dimensionButtonIcon.invisibleIndicatorLabel',
+          {
+            defaultMessage: 'This dimension is currently not visible in the chart',
+          }
+        )}
       />
     )}
     {accessorConfig.triggerIconType === 'aggregate' && (
@@ -55,10 +64,13 @@ const getIconFromAccessorConfig = (accessorConfig: AccessorConfig) => (
         {...baseIconProps}
         type="fold"
         color="subdued"
-        aria-label={i18n.translate('xpack.lens.editorFrame.aggregateIndicatorLabel', {
-          defaultMessage:
-            'This dimension is not visible in the chart because all individual values are aggregated into a single value',
-        })}
+        aria-label={i18n.translate(
+          'visualizationUiComponents.dimensionButtonIcon.aggregateIndicatorLabel',
+          {
+            defaultMessage:
+              'This dimension is not visible in the chart because all individual values are aggregated into a single value',
+          }
+        )}
       />
     )}
     {accessorConfig.triggerIconType === 'colorBy' && (
@@ -66,9 +78,12 @@ const getIconFromAccessorConfig = (accessorConfig: AccessorConfig) => (
         {...baseIconProps}
         type="color"
         color="subdued"
-        aria-label={i18n.translate('xpack.lens.editorFrame.paletteColorIndicatorLabel', {
-          defaultMessage: 'This dimension is using a palette',
-        })}
+        aria-label={i18n.translate(
+          'visualizationUiComponents.dimensionButtonIcon.paletteColorIndicatorLabel',
+          {
+            defaultMessage: 'This dimension is using a palette',
+          }
+        )}
       />
     )}
     {accessorConfig.triggerIconType === 'custom' && accessorConfig.customIcon && (
@@ -76,9 +91,12 @@ const getIconFromAccessorConfig = (accessorConfig: AccessorConfig) => (
         {...baseIconProps}
         type={accessorConfig.customIcon}
         color={accessorConfig.color}
-        aria-label={i18n.translate('xpack.lens.editorFrame.customIconIndicatorLabel', {
-          defaultMessage: 'This dimension is using a custom icon',
-        })}
+        aria-label={i18n.translate(
+          'visualizationUiComponents.dimensionButtonIcon.customIconIndicatorLabel',
+          {
+            defaultMessage: 'This dimension is using a custom icon',
+          }
+        )}
       />
     )}
   </>
@@ -86,26 +104,23 @@ const getIconFromAccessorConfig = (accessorConfig: AccessorConfig) => (
 
 export function DimensionButtonIcon({
   accessorConfig,
-  message,
+  severity,
   children,
 }: {
   accessorConfig: AccessorConfig;
-  message: UserMessage | undefined;
+  severity?: Message['severity'];
   children: React.ReactChild;
 }) {
   let indicatorIcon = null;
-  if (message || accessorConfig.triggerIconType !== 'none') {
+  if (severity || accessorConfig.triggerIconType !== 'none') {
     indicatorIcon = (
       <>
         {accessorConfig.triggerIconType !== 'none' && (
           <EuiFlexItem grow={false}>{getIconFromAccessorConfig(accessorConfig)}</EuiFlexItem>
         )}
-        {message && (
+        {severity && (
           <EuiFlexItem grow={false}>
-            <EuiIcon
-              {...baseIconProps}
-              type={message.severity === 'error' ? IconError : IconWarning}
-            />
+            <EuiIcon {...baseIconProps} type={severity === 'error' ? 'error' : 'alert'} />
           </EuiFlexItem>
         )}
       </>
diff --git a/src/plugins/visualization_ui_components/public/components/dimension_buttons/index.ts b/src/plugins/visualization_ui_components/public/components/dimension_buttons/index.ts
new file mode 100644
index 00000000000000..54df2c7911488b
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/components/dimension_buttons/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright 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 * from './dimension_button';
+
+export type { AccessorConfig } from './types';
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/palette_indicator.tsx b/src/plugins/visualization_ui_components/public/components/dimension_buttons/palette_indicator.tsx
similarity index 73%
rename from x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/palette_indicator.tsx
rename to src/plugins/visualization_ui_components/public/components/dimension_buttons/palette_indicator.tsx
index 21a44bceed7883..5befa0ece26e16 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/palette_indicator.tsx
+++ b/src/plugins/visualization_ui_components/public/components/dimension_buttons/palette_indicator.tsx
@@ -1,13 +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.
+ * 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 { EuiColorPaletteDisplay } from '@elastic/eui';
-import { AccessorConfig } from '../../../types';
+import { AccessorConfig } from './types';
 
 export function PaletteIndicator({ accessorConfig }: { accessorConfig: AccessorConfig }) {
   if (accessorConfig.triggerIconType !== 'colorBy' || !accessorConfig.palette) return null;
diff --git a/src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts b/src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts
new file mode 100644
index 00000000000000..80ba91115818a7
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/components/dimension_buttons/types.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { IconType } from '@elastic/eui';
+
+export interface AccessorConfig {
+  columnId: string;
+  triggerIconType?:
+    | 'color'
+    | 'disabled'
+    | 'colorBy'
+    | 'none'
+    | 'invisible'
+    | 'aggregate'
+    | 'custom';
+  customIcon?: IconType;
+  color?: string;
+  palette?: string[] | Array<{ color: string; stop: number }>;
+}
+
+export interface Message {
+  severity: 'warning' | 'error' | 'info';
+  content: React.ReactNode;
+}
diff --git a/x-pack/plugins/lens/public/shared_components/dimension_section.scss b/src/plugins/visualization_ui_components/public/components/dimension_editor_section.scss
similarity index 99%
rename from x-pack/plugins/lens/public/shared_components/dimension_section.scss
rename to src/plugins/visualization_ui_components/public/components/dimension_editor_section.scss
index 2057a976aa9168..d5358ca90d3784 100644
--- a/x-pack/plugins/lens/public/shared_components/dimension_section.scss
+++ b/src/plugins/visualization_ui_components/public/components/dimension_editor_section.scss
@@ -13,6 +13,7 @@
 
 .lnsDimensionEditorSection__border {
   position: relative;
+
   &:before {
     content: '';
     position: absolute;
@@ -25,4 +26,4 @@
 
 .lnsDimensionEditorSection__heading {
   padding-bottom: 16px;
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/lens/public/shared_components/dimension_section.tsx b/src/plugins/visualization_ui_components/public/components/dimension_editor_section.tsx
similarity index 74%
rename from x-pack/plugins/lens/public/shared_components/dimension_section.tsx
rename to src/plugins/visualization_ui_components/public/components/dimension_editor_section.tsx
index a0f0ca0054a0f9..22b0d5f51401a0 100644
--- a/x-pack/plugins/lens/public/shared_components/dimension_section.tsx
+++ b/src/plugins/visualization_ui_components/public/components/dimension_editor_section.tsx
@@ -1,12 +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.
+ * 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 { EuiTitle } from '@elastic/eui';
 import React from 'react';
-import './dimension_section.scss';
+import './dimension_editor_section.scss';
 
 export const DimensionEditorSection = ({
   children,
diff --git a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/buckets.test.tsx b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.test.tsx
similarity index 91%
rename from x-pack/plugins/lens/public/shared_components/drag_drop_bucket/buckets.test.tsx
rename to src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.test.tsx
index 9826049bb8433a..c3c5b78f32c99f 100644
--- a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/buckets.test.tsx
+++ b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.test.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
@@ -17,7 +18,7 @@ jest.mock('@elastic/eui', () => {
     ...original,
     EuiDragDropContext: 'eui-drag-drop-context',
     EuiDroppable: 'eui-droppable',
-    EuiDraggable: (props: any) => props.children(), // eslint-disable-line @typescript-eslint/no-explicit-any
+    EuiDraggable: (props: any) => props.children(),
   };
 });
 
diff --git a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/buckets.tsx b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx
similarity index 93%
rename from x-pack/plugins/lens/public/shared_components/drag_drop_bucket/buckets.tsx
rename to src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx
index 7d0893cdd54ee3..b82f3ce7138c92 100644
--- a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/buckets.tsx
+++ b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/buckets.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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, { useCallback, useState } from 'react';
diff --git a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/default_bucket_container.tsx b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/default_bucket_container.tsx
similarity index 75%
rename from x-pack/plugins/lens/public/shared_components/drag_drop_bucket/default_bucket_container.tsx
rename to src/plugins/visualization_ui_components/public/components/drag_drop_bucket/default_bucket_container.tsx
index e87a1f7c7f143f..d73c46064a3ca6 100644
--- a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/default_bucket_container.tsx
+++ b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/default_bucket_container.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
@@ -15,8 +16,8 @@ import {
   EuiPanel,
   useEuiTheme,
 } from '@elastic/eui';
-import type { BucketContainerProps } from './types';
 import { TooltipWrapper } from '../tooltip_wrapper';
+import type { BucketContainerProps } from './types';
 
 export const DefaultBucketContainer = ({
   idx,
@@ -43,9 +44,12 @@ export const DefaultBucketContainer = ({
       <EuiFlexGroup gutterSize="s" alignItems="center" responsive={false}>
         <EuiFlexItem grow={false} {...(draggableProvided?.dragHandleProps ?? {})}>
           <TooltipWrapper
-            tooltipContent={i18n.translate('xpack.lens.fieldsBucketContainer.dragHandleDisabled', {
-              defaultMessage: 'Reordering requires more than one item.',
-            })}
+            tooltipContent={i18n.translate(
+              'visualizationUiComponents.fieldsBucketContainer.dragHandleDisabled',
+              {
+                defaultMessage: 'Reordering requires more than one item.',
+              }
+            )}
             condition={isNotDraggable ?? true}
           >
             <EuiIcon
@@ -57,9 +61,12 @@ export const DefaultBucketContainer = ({
               aria-label={
                 isInvalid
                   ? invalidMessage
-                  : i18n.translate('xpack.lens.customBucketContainer.dragToReorder', {
-                      defaultMessage: 'Drag to reorder',
-                    })
+                  : i18n.translate(
+                      'visualizationUiComponents.customBucketContainer.dragToReorder',
+                      {
+                        defaultMessage: 'Drag to reorder',
+                      }
+                    )
               }
               data-test-subj={`${dataTestSubj}-dragToReorder-${idx}`}
             />
@@ -69,7 +76,7 @@ export const DefaultBucketContainer = ({
         <EuiFlexItem grow={false}>
           <TooltipWrapper
             tooltipContent={i18n.translate(
-              'xpack.lens.fieldsBucketContainer.deleteButtonDisabled',
+              'visualizationUiComponents.fieldsBucketContainer.deleteButtonDisabled',
               {
                 defaultMessage: 'A minimum of one item is required.',
               }
diff --git a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/fields_bucket_container.tsx b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/fields_bucket_container.tsx
similarity index 72%
rename from x-pack/plugins/lens/public/shared_components/drag_drop_bucket/fields_bucket_container.tsx
rename to src/plugins/visualization_ui_components/public/components/drag_drop_bucket/fields_bucket_container.tsx
index eedcba3fee5ecd..cfc5b074b6c335 100644
--- a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/fields_bucket_container.tsx
+++ b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/fields_bucket_container.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
@@ -15,7 +16,7 @@ import {
   EuiPanel,
   useEuiTheme,
 } from '@elastic/eui';
-import { TooltipWrapper } from '..';
+import { TooltipWrapper } from '../tooltip_wrapper';
 import type { BucketContainerProps } from './types';
 
 export const FieldsBucketContainer = ({
@@ -41,18 +42,24 @@ export const FieldsBucketContainer = ({
       <EuiFlexGroup direction={'row'} gutterSize="s" alignItems="center" responsive={false}>
         <EuiFlexItem grow={false} {...(draggableProvided?.dragHandleProps ?? {})}>
           <TooltipWrapper
-            tooltipContent={i18n.translate('xpack.lens.fieldsBucketContainer.dragHandleDisabled', {
-              defaultMessage: 'Reordering requires more than one item.',
-            })}
+            tooltipContent={i18n.translate(
+              'visualizationUiComponents.fieldsBucketContainer.dragHandleDisabled',
+              {
+                defaultMessage: 'Reordering requires more than one item.',
+              }
+            )}
             condition={isNotDraggable ?? true}
           >
             <EuiIcon
               size="s"
               color={euiTheme.colors[isNotDraggable ? 'disabled' : 'text']}
               type="grab"
-              aria-label={i18n.translate('xpack.lens.fieldsBucketContainer.dragToReorder', {
-                defaultMessage: 'Drag to reorder',
-              })}
+              aria-label={i18n.translate(
+                'visualizationUiComponents.fieldsBucketContainer.dragToReorder',
+                {
+                  defaultMessage: 'Drag to reorder',
+                }
+              )}
               data-test-subj={`${dataTestSubj}-dragToReorder-${idx}`}
             />
           </TooltipWrapper>
@@ -63,7 +70,7 @@ export const FieldsBucketContainer = ({
         <EuiFlexItem grow={false}>
           <TooltipWrapper
             tooltipContent={i18n.translate(
-              'xpack.lens.fieldsBucketContainer.deleteButtonDisabled',
+              'visualizationUiComponents.fieldsBucketContainer.deleteButtonDisabled',
               {
                 defaultMessage: 'A minimum of one item is required.',
               }
diff --git a/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/index.tsx b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/index.tsx
new file mode 100644
index 00000000000000..6cf5a40a9f0dfc
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/index.tsx
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { NewBucketButton } from './new_bucket_button';
+export { FieldsBucketContainer } from './fields_bucket_container';
+
+export * from './buckets';
diff --git a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/new_bucket_button.tsx b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/new_bucket_button.tsx
similarity index 80%
rename from x-pack/plugins/lens/public/shared_components/drag_drop_bucket/new_bucket_button.tsx
rename to src/plugins/visualization_ui_components/public/components/drag_drop_bucket/new_bucket_button.tsx
index 38b74ca7c83fbb..1eab1b41bf0dbf 100644
--- a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/new_bucket_button.tsx
+++ b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/new_bucket_button.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
diff --git a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/types.ts b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/types.ts
similarity index 75%
rename from x-pack/plugins/lens/public/shared_components/drag_drop_bucket/types.ts
rename to src/plugins/visualization_ui_components/public/components/drag_drop_bucket/types.ts
index fe08048e875c27..2185b15a264ff7 100644
--- a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/types.ts
+++ b/src/plugins/visualization_ui_components/public/components/drag_drop_bucket/types.ts
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
diff --git a/x-pack/plugins/lens/public/shared_components/field_picker/field_picker.scss b/src/plugins/visualization_ui_components/public/components/field_picker/field_picker.scss
similarity index 100%
rename from x-pack/plugins/lens/public/shared_components/field_picker/field_picker.scss
rename to src/plugins/visualization_ui_components/public/components/field_picker/field_picker.scss
diff --git a/x-pack/plugins/lens/public/shared_components/field_picker/field_picker.tsx b/src/plugins/visualization_ui_components/public/components/field_picker/field_picker.tsx
similarity index 92%
rename from x-pack/plugins/lens/public/shared_components/field_picker/field_picker.tsx
rename to src/plugins/visualization_ui_components/public/components/field_picker/field_picker.tsx
index 7be1f1bd1a7bb3..880c121afd7755 100644
--- a/x-pack/plugins/lens/public/shared_components/field_picker/field_picker.tsx
+++ b/src/plugins/visualization_ui_components/public/components/field_picker/field_picker.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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 './field_picker.scss';
@@ -12,7 +13,7 @@ import useEffectOnce from 'react-use/lib/useEffectOnce';
 import { EuiComboBox, EuiComboBoxProps, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { FieldIcon } from '@kbn/unified-field-list-plugin/public';
 import classNames from 'classnames';
-import { DataType } from '../../types';
+import { DataType } from './types';
 import { TruncatedLabel } from './truncated_label';
 import type { FieldOptionValue, FieldOption } from './types';
 
@@ -100,7 +101,7 @@ export function FieldPicker<T extends FieldOptionValue = FieldOptionValue>({
         compressed
         isClearable={false}
         data-test-subj={dataTestSub ?? 'indexPattern-dimension-field'}
-        placeholder={i18n.translate('xpack.lens.fieldPicker.fieldPlaceholder', {
+        placeholder={i18n.translate('visualizationUiComponents.fieldPicker.fieldPlaceholder', {
           defaultMessage: 'Select a field',
         })}
         options={styledOptions}
diff --git a/src/plugins/visualization_ui_components/public/components/field_picker/index.ts b/src/plugins/visualization_ui_components/public/components/field_picker/index.ts
new file mode 100644
index 00000000000000..96f53e2bfc74a8
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/components/field_picker/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright 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 { FieldPicker } from './field_picker';
+export { TruncatedLabel } from './truncated_label';
+export type { FieldOptionValue, FieldOption, DataType } from './types';
diff --git a/x-pack/plugins/lens/public/shared_components/field_picker/truncated_label.test.tsx b/src/plugins/visualization_ui_components/public/components/field_picker/truncated_label.test.tsx
similarity index 93%
rename from x-pack/plugins/lens/public/shared_components/field_picker/truncated_label.test.tsx
rename to src/plugins/visualization_ui_components/public/components/field_picker/truncated_label.test.tsx
index e26d33f4b9e8ae..fb9b7581bbdc61 100644
--- a/x-pack/plugins/lens/public/shared_components/field_picker/truncated_label.test.tsx
+++ b/src/plugins/visualization_ui_components/public/components/field_picker/truncated_label.test.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
diff --git a/x-pack/plugins/lens/public/shared_components/field_picker/truncated_label.tsx b/src/plugins/visualization_ui_components/public/components/field_picker/truncated_label.tsx
similarity index 93%
rename from x-pack/plugins/lens/public/shared_components/field_picker/truncated_label.tsx
rename to src/plugins/visualization_ui_components/public/components/field_picker/truncated_label.tsx
index 47b1313a74c4ed..e4bcc6c193c7a6 100644
--- a/x-pack/plugins/lens/public/shared_components/field_picker/truncated_label.tsx
+++ b/src/plugins/visualization_ui_components/public/components/field_picker/truncated_label.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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, { useMemo } from 'react';
diff --git a/x-pack/plugins/lens/public/shared_components/field_picker/types.ts b/src/plugins/visualization_ui_components/public/components/field_picker/types.ts
similarity index 59%
rename from x-pack/plugins/lens/public/shared_components/field_picker/types.ts
rename to src/plugins/visualization_ui_components/public/components/field_picker/types.ts
index 4d607b47ef9149..b5927fdab53f9a 100644
--- a/x-pack/plugins/lens/public/shared_components/field_picker/types.ts
+++ b/src/plugins/visualization_ui_components/public/components/field_picker/types.ts
@@ -1,11 +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.
+ * 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 { EuiComboBoxOptionOption } from '@elastic/eui';
-import type { DataType } from '../../types';
+
+type FieldOnlyDataType =
+  | 'document'
+  | 'ip'
+  | 'histogram'
+  | 'geo_point'
+  | 'geo_shape'
+  | 'counter'
+  | 'gauge'
+  | 'murmur3';
+export type DataType = 'string' | 'number' | 'date' | 'boolean' | FieldOnlyDataType;
 
 export interface FieldOptionValue {
   type: 'field';
diff --git a/x-pack/plugins/lens/public/shared_components/icon_select/icon_select.tsx b/src/plugins/visualization_ui_components/public/components/icon_select.tsx
similarity index 62%
rename from x-pack/plugins/lens/public/shared_components/icon_select/icon_select.tsx
rename to src/plugins/visualization_ui_components/public/components/icon_select.tsx
index 74eb23e3e8297a..5b9d30c6cfb779 100644
--- a/x-pack/plugins/lens/public/shared_components/icon_select/icon_select.tsx
+++ b/src/plugins/visualization_ui_components/public/components/icon_select.tsx
@@ -1,13 +1,21 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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 { EuiComboBox, EuiFlexGroup, EuiFlexItem, EuiIcon, IconType } from '@elastic/eui';
-import { AvailableReferenceLineIcon } from '@kbn/expression-xy-plugin/common';
+import {
+  EuiComboBox,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiIcon,
+  IconType,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 
 export function hasIcon(icon: string | undefined): icon is string {
   return icon != null && icon !== 'empty';
@@ -33,7 +41,7 @@ const IconView = (props: { value?: string; label: string; icon?: IconType }) =>
   );
 };
 
-export function IconSelect<Icon extends string = AvailableReferenceLineIcon>({
+export function IconSelect<Icon extends string>({
   value,
   onChange,
   customIconSet,
@@ -74,3 +82,32 @@ export function IconSelect<Icon extends string = AvailableReferenceLineIcon>({
     />
   );
 }
+
+export function IconSelectSetting<Icon extends string = string>({
+  currentIcon,
+  setIcon,
+  customIconSet,
+  defaultIcon = 'empty',
+}: {
+  currentIcon?: Icon;
+  setIcon: (icon: Icon) => void;
+  customIconSet: IconSet<Icon>;
+  defaultIcon?: string;
+}) {
+  return (
+    <EuiFormRow
+      display="columnCompressed"
+      fullWidth
+      label={i18n.translate('visualizationUiComponents.iconSelect.label', {
+        defaultMessage: 'Icon decoration',
+      })}
+    >
+      <IconSelect
+        defaultIcon={defaultIcon}
+        customIconSet={customIconSet}
+        value={currentIcon}
+        onChange={setIcon}
+      />
+    </EuiFormRow>
+  );
+}
diff --git a/src/plugins/visualization_ui_components/public/components/index.ts b/src/plugins/visualization_ui_components/public/components/index.ts
new file mode 100644
index 00000000000000..4de1805bc472ae
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/components/index.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 * from './field_picker';
+
+export * from './name_input';
+
+export * from './debounced_input';
+
+export * from './debounced_value';
+
+export * from './tooltip_wrapper';
+
+export * from './color_picker';
+
+export * from './icon_select';
+
+export * from './drag_drop_bucket';
+
+export * from './query_input';
+
+export * from './dimension_editor_section';
+
+export * from './dimension_buttons';
+
+export type { AccessorConfig } from './dimension_buttons';
+
+export type { FieldOptionValue, FieldOption, DataType } from './field_picker';
+
+export type { IconSet } from './icon_select';
diff --git a/x-pack/plugins/lens/public/shared_components/name_input.tsx b/src/plugins/visualization_ui_components/public/components/name_input.tsx
similarity index 76%
rename from x-pack/plugins/lens/public/shared_components/name_input.tsx
rename to src/plugins/visualization_ui_components/public/components/name_input.tsx
index e455caa199dd00..1a3f3e836e98d5 100644
--- a/x-pack/plugins/lens/public/shared_components/name_input.tsx
+++ b/src/plugins/visualization_ui_components/public/components/name_input.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
@@ -21,7 +22,7 @@ export const NameInput = ({
 }) => {
   return (
     <EuiFormRow
-      label={i18n.translate('xpack.lens.indexPattern.columnLabel', {
+      label={i18n.translate('visualizationUiComponents.nameInput.columnLabel', {
         defaultMessage: 'Name',
         description: 'Name of a column of data',
       })}
diff --git a/x-pack/plugins/lens/public/shared_components/filter_query_input.tsx b/src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx
similarity index 73%
rename from x-pack/plugins/lens/public/shared_components/filter_query_input.tsx
rename to src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx
index ae198fa1d3955d..2747f87c90f310 100644
--- a/x-pack/plugins/lens/public/shared_components/filter_query_input.tsx
+++ b/src/plugins/visualization_ui_components/public/components/query_input/filter_query_input.tsx
@@ -1,9 +1,11 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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, { useCallback, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import {
@@ -16,11 +18,12 @@ import {
   EuiIconTip,
   EuiPopoverProps,
 } from '@elastic/eui';
-import type { Query } from '@kbn/es-query';
-import { QueryInput, useDebouncedValue, validateQuery } from '.';
-import type { IndexPattern } from '../types';
+import type { DataViewBase, Query } from '@kbn/es-query';
+import { useDebouncedValue } from '../debounced_value';
+import { QueryInput, validateQuery } from '.';
+import type { QueryInputServices } from '.';
 
-const filterByLabel = i18n.translate('xpack.lens.indexPattern.filterBy.label', {
+const filterByLabel = i18n.translate('visualizationUiComponents.filterQueryInput.label', {
   defaultMessage: 'Filter by',
 });
 
@@ -33,19 +36,23 @@ export const defaultFilter: Query = {
 export function FilterQueryInput({
   inputFilter,
   onChange,
-  indexPattern,
+  dataView,
   helpMessage,
   label = filterByLabel,
   initiallyOpen,
   ['data-test-subj']: dataTestSubj,
+  queryInputServices,
+  appName,
 }: {
   inputFilter: Query | undefined;
   onChange: (query: Query) => void;
-  indexPattern: IndexPattern;
+  dataView: DataViewBase;
   helpMessage?: string | null;
   label?: string;
   initiallyOpen?: boolean;
   ['data-test-subj']?: string;
+  queryInputServices: QueryInputServices;
+  appName: string;
 }) {
   const [filterPopoverOpen, setFilterPopoverOpen] = useState(Boolean(initiallyOpen));
   const { inputValue: queryInput, handleInputChange: setQueryInput } = useDebouncedValue<Query>({
@@ -57,10 +64,10 @@ export function FilterQueryInput({
     setFilterPopoverOpen(false);
   }, []);
 
-  const { isValid: isInputFilterValid } = validateQuery(inputFilter, indexPattern);
+  const { isValid: isInputFilterValid } = validateQuery(inputFilter, dataView);
   const { isValid: isQueryInputValid, error: queryInputError } = validateQuery(
     queryInput,
-    indexPattern
+    dataView
   );
 
   return (
@@ -108,14 +115,20 @@ export function FilterQueryInput({
                         setFilterPopoverOpen(!filterPopoverOpen);
                       }}
                       color={isInputFilterValid ? 'text' : 'danger'}
-                      title={i18n.translate('xpack.lens.indexPattern.filterBy.clickToEdit', {
-                        defaultMessage: 'Click to edit',
-                      })}
+                      title={i18n.translate(
+                        'visualizationUiComponents.filterQueryInput.clickToEdit',
+                        {
+                          defaultMessage: 'Click to edit',
+                        }
+                      )}
                     >
                       {inputFilter?.query ||
-                        i18n.translate('xpack.lens.indexPattern.filterBy.emptyFilterQuery', {
-                          defaultMessage: '(empty)',
-                        })}
+                        i18n.translate(
+                          'visualizationUiComponents.filterQueryInput.emptyFilterQuery',
+                          {
+                            defaultMessage: '(empty)',
+                          }
+                        )}
                     </EuiLink>
                   </EuiFlexItem>
                 </EuiFlexGroup>
@@ -130,10 +143,10 @@ export function FilterQueryInput({
               data-test-subj="indexPattern-filter-by-input"
             >
               <QueryInput
-                indexPattern={
-                  indexPattern.id
-                    ? { type: 'id', value: indexPattern.id }
-                    : { type: 'title', value: indexPattern.title }
+                dataView={
+                  dataView.id
+                    ? { type: 'id', value: dataView.id }
+                    : { type: 'title', value: dataView.title }
                 }
                 disableAutoFocus={true}
                 value={queryInput}
@@ -141,6 +154,8 @@ export function FilterQueryInput({
                 isInvalid={!isQueryInputValid}
                 onSubmit={() => {}}
                 data-test-subj={dataTestSubj}
+                appName={appName}
+                services={queryInputServices}
               />
             </EuiFormRow>
           </EuiPopover>
diff --git a/x-pack/plugins/lens/public/shared_components/query_input/helpers.ts b/src/plugins/visualization_ui_components/public/components/query_input/helpers.ts
similarity index 51%
rename from x-pack/plugins/lens/public/shared_components/query_input/helpers.ts
rename to src/plugins/visualization_ui_components/public/components/query_input/helpers.ts
index 1b598a10f6f508..82cca375715dea 100644
--- a/x-pack/plugins/lens/public/shared_components/query_input/helpers.ts
+++ b/src/plugins/visualization_ui_components/public/components/query_input/helpers.ts
@@ -1,22 +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.
+ * 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 { Query } from '@kbn/es-query';
+import type { DataViewBase, Query } from '@kbn/es-query';
 import { toElasticsearchQuery, fromKueryExpression, luceneStringToDsl } from '@kbn/es-query';
-import { IndexPattern } from '../../types';
 
-export const validateQuery = (input: Query | undefined, indexPattern: IndexPattern) => {
+export const validateQuery = (input: Query | undefined, dataView: DataViewBase) => {
   let isValid = true;
   let error: string | undefined;
 
   try {
     if (input) {
       if (input.language === 'kuery') {
-        toElasticsearchQuery(fromKueryExpression(input.query), indexPattern);
+        toElasticsearchQuery(fromKueryExpression(input.query), dataView);
       } else {
         luceneStringToDsl(input.query);
       }
@@ -29,5 +29,5 @@ export const validateQuery = (input: Query | undefined, indexPattern: IndexPatte
   return { isValid, error };
 };
 
-export const isQueryValid = (input: Query, indexPattern: IndexPattern) =>
-  validateQuery(input, indexPattern).isValid;
+export const isQueryValid = (input: Query, dataView: DataViewBase) =>
+  validateQuery(input, dataView).isValid;
diff --git a/src/plugins/visualization_ui_components/public/components/query_input/index.ts b/src/plugins/visualization_ui_components/public/components/query_input/index.ts
new file mode 100644
index 00000000000000..8104fd9af97269
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/components/query_input/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { QueryInput } from './query_input';
+export { FilterQueryInput } from './filter_query_input';
+export { validateQuery, isQueryValid } from './helpers';
+export type { QueryInputServices } from './query_input';
diff --git a/x-pack/plugins/lens/public/shared_components/query_input/query_input.tsx b/src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx
similarity index 54%
rename from x-pack/plugins/lens/public/shared_components/query_input/query_input.tsx
rename to src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx
index c5cbdebf20fffd..4a6c4c4ecb3ba9 100644
--- a/x-pack/plugins/lens/public/shared_components/query_input/query_input.tsx
+++ b/src/plugins/visualization_ui_components/public/components/query_input/query_input.tsx
@@ -1,8 +1,9 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 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';
@@ -10,34 +11,51 @@ import { i18n } from '@kbn/i18n';
 import { isEqual } from 'lodash';
 import type { Query } from '@kbn/es-query';
 import { QueryStringInput } from '@kbn/unified-search-plugin/public';
-import { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { HttpStart } from '@kbn/core-http-browser';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
+import type { NotificationsStart } from '@kbn/core-notifications-browser';
+import type { DocLinksStart } from '@kbn/core-doc-links-browser';
 import { useDebouncedValue } from '../debounced_value';
-import { LensAppServices } from '../../app_plugin/types';
+
+export interface QueryInputServices {
+  http: HttpStart;
+  storage: IStorageWrapper;
+  dataViews: DataViewsPublicPluginStart;
+  data: DataPublicPluginStart;
+  uiSettings: IUiSettingsClient;
+  notifications: NotificationsStart;
+  unifiedSearch: UnifiedSearchPublicPluginStart;
+  docLinks: DocLinksStart;
+}
 
 export const QueryInput = ({
   value,
   onChange,
-  indexPattern,
+  dataView,
   isInvalid,
   onSubmit,
   disableAutoFocus,
   ['data-test-subj']: dataTestSubj,
   placeholder,
+  appName,
+  services: { data, uiSettings, http, notifications, docLinks, storage, unifiedSearch, dataViews },
 }: {
   value: Query;
   onChange: (input: Query) => void;
-  indexPattern: string | { type: 'title' | 'id'; value: string };
+  dataView: string | { type: 'title' | 'id'; value: string };
   isInvalid: boolean;
   onSubmit: () => void;
   disableAutoFocus?: boolean;
   'data-test-subj'?: string;
   placeholder?: string;
+  appName: string;
+  services: QueryInputServices;
 }) => {
   const { inputValue, handleInputChange } = useDebouncedValue({ value, onChange });
-  const lensAppServices = useKibana<LensAppServices>().services;
-
-  const { data, uiSettings, http, notifications, docLinks, storage, unifiedSearch, dataViews } =
-    lensAppServices;
 
   return (
     <QueryStringInput
@@ -46,7 +64,7 @@ export const QueryInput = ({
       disableAutoFocus={disableAutoFocus}
       isInvalid={isInvalid}
       bubbleSubmitEvent={false}
-      indexPatterns={[indexPattern]}
+      indexPatterns={[dataView]}
       query={inputValue}
       onChange={(newQuery) => {
         if (!isEqual(newQuery, inputValue)) {
@@ -61,19 +79,17 @@ export const QueryInput = ({
       placeholder={
         placeholder ??
         (inputValue.language === 'kuery'
-          ? i18n.translate('xpack.lens.indexPattern.filters.queryPlaceholderKql', {
+          ? i18n.translate('visualizationUiComponents.queryInput.queryPlaceholderKql', {
               defaultMessage: '{example}',
               values: { example: 'method : "GET" or status : "404"' },
             })
-          : i18n.translate('xpack.lens.indexPattern.filters.queryPlaceholderLucene', {
+          : i18n.translate('visualizationUiComponents.queryInput.queryPlaceholderLucene', {
               defaultMessage: '{example}',
               values: { example: 'method:GET OR status:404' },
             }))
       }
       languageSwitcherPopoverAnchorPosition="rightDown"
-      appName={i18n.translate('xpack.lens.queryInput.appName', {
-        defaultMessage: 'Lens',
-      })}
+      appName={appName}
       deps={{ unifiedSearch, notifications, http, docLinks, uiSettings, data, storage, dataViews }}
     />
   );
diff --git a/src/plugins/visualization_ui_components/public/components/tooltip_wrapper.tsx b/src/plugins/visualization_ui_components/public/components/tooltip_wrapper.tsx
new file mode 100644
index 00000000000000..65605ac8e3a33e
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/components/tooltip_wrapper.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { EuiToolTip, EuiToolTipProps } from '@elastic/eui';
+
+type TooltipWrapperProps = Partial<Omit<EuiToolTipProps, 'content'>> & {
+  tooltipContent: string;
+  /** When the condition is truthy, the tooltip will be shown */
+  condition: boolean;
+};
+
+export const TooltipWrapper: React.FunctionComponent<TooltipWrapperProps> = ({
+  children,
+  condition,
+  tooltipContent,
+  ...tooltipProps
+}) => {
+  return (
+    <>
+      {condition ? (
+        <EuiToolTip content={tooltipContent} delay="long" {...tooltipProps}>
+          <>{children}</>
+        </EuiToolTip>
+      ) : (
+        children
+      )}
+    </>
+  );
+};
diff --git a/src/plugins/visualization_ui_components/public/index.ts b/src/plugins/visualization_ui_components/public/index.ts
new file mode 100644
index 00000000000000..63a283ccf1dbeb
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/index.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import chroma from 'chroma-js';
+import { VisualizationUiComponentsPlugin } from './plugin';
+
+export { chroma };
+
+export {
+  FieldPicker,
+  TruncatedLabel,
+  NameInput,
+  DebouncedInput,
+  useDebouncedValue,
+  TooltipWrapper,
+  ColorPicker,
+  IconSelect,
+  IconSelectSetting,
+  NewBucketButton,
+  DragDropBuckets,
+  DraggableBucketContainer,
+  FieldsBucketContainer,
+  FilterQueryInput,
+  QueryInput,
+  validateQuery,
+  isQueryValid,
+  DimensionEditorSection,
+  DimensionButton,
+} from './components';
+
+export type {
+  DataType,
+  FieldOptionValue,
+  FieldOption,
+  IconSet,
+  AccessorConfig,
+} from './components';
+
+export function plugin() {
+  return new VisualizationUiComponentsPlugin();
+}
diff --git a/src/plugins/visualization_ui_components/public/plugin.ts b/src/plugins/visualization_ui_components/public/plugin.ts
new file mode 100755
index 00000000000000..1ed621a3cfdf5e
--- /dev/null
+++ b/src/plugins/visualization_ui_components/public/plugin.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 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 { Plugin } from '@kbn/core/public';
+
+// This plugin should really be a package, but we have to currently have to put the components in a "public"
+// directory to avoid violating the @kbn/imports/no_boundary_crossing rules.
+//
+// Moving the dependencies of this plugin (unified search, unified field list) to static packages will
+// make it possible to convert this to a package as well.
+export class VisualizationUiComponentsPlugin implements Plugin<{}, {}> {
+  public setup() {
+    return {};
+  }
+
+  public start() {
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/src/plugins/visualization_ui_components/tsconfig.json b/src/plugins/visualization_ui_components/tsconfig.json
new file mode 100644
index 00000000000000..7a5784a9c6310e
--- /dev/null
+++ b/src/plugins/visualization_ui_components/tsconfig.json
@@ -0,0 +1,32 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types",
+  },
+  "include": [
+    "../../typings/**/*",
+    "common/**/*",
+    "public/**/*",
+    "server/**/*",
+  ],
+  "kbn_references": [
+    "@kbn/unified-field-list-plugin",
+    "@kbn/i18n",
+    "@kbn/unified-search-plugin",
+    "@kbn/utility-types",
+    "@kbn/es-query",
+    "@kbn/core-http-browser",
+    "@kbn/kibana-utils-plugin",
+    "@kbn/data-views-plugin",
+    "@kbn/data-plugin",
+    "@kbn/core-ui-settings-browser",
+    "@kbn/core-notifications-browser",
+    "@kbn/core-doc-links-browser",
+    "@kbn/core",
+    "@kbn/ui-theme"
+  ],
+  "exclude": [
+    "target/**/*",
+  ]
+}
+
diff --git a/test/analytics/tests/instrumented_events/from_the_browser/viewport_resize.ts b/test/analytics/tests/instrumented_events/from_the_browser/viewport_resize.ts
index f5e084810a3751..845b3c68ec3ffc 100644
--- a/test/analytics/tests/instrumented_events/from_the_browser/viewport_resize.ts
+++ b/test/analytics/tests/instrumented_events/from_the_browser/viewport_resize.ts
@@ -23,11 +23,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('should emit a "viewport_resize" event when the browser is resized', async () => {
-      const events = await ebtUIHelper.getEvents(1, {
+      let preResizeTs = new Date().toISOString();
+      const events = await ebtUIHelper.getEvents(Infinity, {
         eventTypes: ['viewport_resize'],
         withTimeoutMs: 100,
       });
-      expect(events.length).to.be(0);
+      if (events.length) {
+        const lastEvent = events.pop()!;
+        preResizeTs = lastEvent.timestamp;
+      }
+
       // Resize the window
       await browser.setWindowSize(500, 500);
       const { height, width } = await browser.getWindowSize();
@@ -37,7 +42,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       const actualInnerHeight = await browser.execute(() => window.innerHeight);
       expect(actualInnerHeight <= height).to.be(true); // The address bar takes some space when not running on HEADLESS
 
-      const [event] = await ebtUIHelper.getEvents(1, { eventTypes: ['viewport_resize'] });
+      const [event] = await ebtUIHelper.getEvents(1, {
+        eventTypes: ['viewport_resize'],
+        fromTimestamp: preResizeTs, // Fetch the event after a known TS
+      });
       expect(event.event_type).to.eql('viewport_resize');
       expect(event.properties).to.eql({
         viewport_width: 500,
diff --git a/test/api_integration/apis/data_views/fields_for_wildcard_route/params.js b/test/api_integration/apis/data_views/fields_for_wildcard_route/params.js
index b91c307cc1743a..595d12f38c5014 100644
--- a/test/api_integration/apis/data_views/fields_for_wildcard_route/params.js
+++ b/test/api_integration/apis/data_views/fields_for_wildcard_route/params.js
@@ -49,6 +49,15 @@ export default function ({ getService }) {
         })
         .expect(200));
 
+    it('accepts single meta_fields query param', () =>
+      supertest
+        .get('/api/index_patterns/_fields_for_wildcard')
+        .query({
+          pattern: '*',
+          meta_fields: ['_id'],
+        })
+        .expect(200));
+
     it('rejects a comma-separated list of meta_fields', () =>
       supertest
         .get('/api/index_patterns/_fields_for_wildcard')
diff --git a/test/api_integration/apis/saved_objects/bulk_create.ts b/test/api_integration/apis/saved_objects/bulk_create.ts
index b365df10f7d741..5119e43368cc57 100644
--- a/test/api_integration/apis/saved_objects/bulk_create.ts
+++ b/test/api_integration/apis/saved_objects/bulk_create.ts
@@ -75,7 +75,7 @@ export default function ({ getService }: FtrProviderContext) {
                 },
                 coreMigrationVersion: '8.8.0',
                 typeMigrationVersion: resp.body.saved_objects[1].typeMigrationVersion,
-                managed: resp.body.saved_objects[1].managed,
+                managed: false,
                 references: [],
                 namespaces: [SPACE_ID],
               },
diff --git a/test/api_integration/apis/saved_objects/bulk_get.ts b/test/api_integration/apis/saved_objects/bulk_get.ts
index 6c97efd94d70a0..c3adf21b6c55ea 100644
--- a/test/api_integration/apis/saved_objects/bulk_get.ts
+++ b/test/api_integration/apis/saved_objects/bulk_get.ts
@@ -28,17 +28,42 @@ export default function ({ getService }: FtrProviderContext) {
     },
   ];
 
+  const BULK_REQUESTS_MANAGED = [
+    {
+      type: 'visualization',
+      id: '3fdaa535-5baf-46bc-8265-705eda43b181',
+    },
+    {
+      type: 'tag',
+      id: '0ed60f29-2021-4fd2-ba4e-943c61e2738c',
+    },
+    {
+      type: 'tag',
+      id: '00ad6a46-6ac3-4f6c-892c-2f72c54a5e7d',
+    },
+    {
+      type: 'dashboard',
+      id: '11fb046d-0e50-48a0-a410-a744b82cbffd',
+    },
+  ];
+
   describe('_bulk_get', () => {
     before(async () => {
       await kibanaServer.importExport.load(
         'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
       );
+      await kibanaServer.importExport.load(
+        'test/api_integration/fixtures/kbn_archiver/saved_objects/managed_basic.json'
+      );
     });
 
     after(async () => {
       await kibanaServer.importExport.unload(
         'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
       );
+      await kibanaServer.importExport.unload(
+        'test/api_integration/fixtures/kbn_archiver/saved_objects/managed_basic.json'
+      );
     });
 
     it('should return 200 with individual responses', async () =>
@@ -115,5 +140,130 @@ export default function ({ getService }: FtrProviderContext) {
           expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
           expect(resp.body.saved_objects[0].typeMigrationVersion).to.be.ok();
         }));
+
+    it('should return 200 with individual responses that include the managed property of each object', async () =>
+      await supertest
+        .post(`/api/saved_objects/_bulk_get`)
+        .send(BULK_REQUESTS_MANAGED)
+        .expect(200)
+        .then((resp) => {
+          const mockDate = '2015-01-01T00:00:00.000Z';
+          resp.body.saved_objects[0].updated_at = mockDate;
+          resp.body.saved_objects[1].updated_at = mockDate;
+          resp.body.saved_objects[2].updated_at = mockDate;
+          resp.body.saved_objects[3].updated_at = mockDate;
+          resp.body.saved_objects[0].created_at = mockDate;
+          resp.body.saved_objects[1].created_at = mockDate;
+          resp.body.saved_objects[2].created_at = mockDate;
+          resp.body.saved_objects[3].created_at = mockDate;
+          expect(resp.body.saved_objects.length).to.eql(4);
+          expect(resp.body).to.eql({
+            saved_objects: [
+              {
+                id: '3fdaa535-5baf-46bc-8265-705eda43b181',
+                type: 'visualization',
+                namespaces: ['default'],
+                migrationVersion: {
+                  visualization: '8.5.0',
+                },
+                coreMigrationVersion: '8.8.0',
+                typeMigrationVersion: '8.5.0',
+                updated_at: '2015-01-01T00:00:00.000Z',
+                created_at: '2015-01-01T00:00:00.000Z',
+                version: resp.body.saved_objects[0].version,
+                attributes: {
+                  description: '',
+                  kibanaSavedObjectMeta: {
+                    searchSourceJSON:
+                      resp.body.saved_objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON,
+                  },
+                  title: 'Managed Count of requests',
+                  uiStateJSON: '{"spy":{"mode":{"name":null,"fill":false}}}',
+                  version: resp.body.saved_objects[0].attributes.version,
+                  visState: resp.body.saved_objects[0].attributes.visState,
+                },
+                references: [
+                  {
+                    id: '91200a00-9efd-11e7-acb3-3dab96693fab',
+                    name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
+                    type: 'index-pattern',
+                  },
+                ],
+                managed: true,
+              },
+              {
+                id: '0ed60f29-2021-4fd2-ba4e-943c61e2738c',
+                type: 'tag',
+                updated_at: '2015-01-01T00:00:00.000Z',
+                created_at: '2015-01-01T00:00:00.000Z',
+                namespaces: ['default'],
+                migrationVersion: {
+                  tag: '8.0.0',
+                },
+                coreMigrationVersion: '8.8.0',
+                typeMigrationVersion: '8.0.0',
+                version: resp.body.saved_objects[1].version,
+                attributes: { color: '#E7664C', description: 'read-only', name: 'managed' },
+                references: [],
+                managed: true,
+              },
+              {
+                id: '00ad6a46-6ac3-4f6c-892c-2f72c54a5e7d',
+                type: 'tag',
+                namespaces: ['default'],
+                migrationVersion: {
+                  tag: '8.0.0',
+                },
+                coreMigrationVersion: '8.8.0',
+                typeMigrationVersion: '8.0.0',
+                updated_at: '2015-01-01T00:00:00.000Z',
+                created_at: '2015-01-01T00:00:00.000Z',
+                version: resp.body.saved_objects[2].version,
+                attributes: { color: '#173a58', description: 'Editable', name: 'unmanaged' },
+                references: [],
+                managed: false,
+              },
+              {
+                id: '11fb046d-0e50-48a0-a410-a744b82cbffd',
+                type: 'dashboard',
+                namespaces: ['default'],
+                migrationVersion: {
+                  dashboard: '8.7.0',
+                },
+                coreMigrationVersion: '8.8.0',
+                typeMigrationVersion: '8.7.0',
+                updated_at: '2015-01-01T00:00:00.000Z',
+                created_at: '2015-01-01T00:00:00.000Z',
+                version: resp.body.saved_objects[3].version,
+                attributes: {
+                  description: '',
+                  hits: 0,
+                  kibanaSavedObjectMeta:
+                    resp.body.saved_objects[3].attributes.kibanaSavedObjectMeta,
+                  optionsJSON: '{"darkTheme":false}',
+                  panelsJSON: resp.body.saved_objects[3].attributes.panelsJSON,
+                  refreshInterval: resp.body.saved_objects[3].attributes.refreshInterval,
+                  timeFrom: 'Wed Sep 16 2015 22:52:17 GMT-0700',
+                  timeRestore: true,
+                  timeTo: 'Fri Sep 18 2015 12:24:38 GMT-0700',
+                  title: 'Managed Requests',
+                  version: resp.body.saved_objects[3].attributes.version,
+                },
+                references: [
+                  {
+                    id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                    name: '1:panel_1',
+                    type: 'visualization',
+                  },
+                ],
+                managed: true,
+              },
+            ],
+          });
+          expect(resp.body.saved_objects[0].managed).to.be.ok();
+          expect(resp.body.saved_objects[1].managed).to.be.ok();
+          expect(resp.body.saved_objects[2].managed).not.to.be.ok();
+          expect(resp.body.saved_objects[3].managed).to.be.ok();
+        }));
   });
 }
diff --git a/test/api_integration/apis/saved_objects/export.ts b/test/api_integration/apis/saved_objects/export.ts
index ec7b82453ffcec..0b22ec93c2b2c6 100644
--- a/test/api_integration/apis/saved_objects/export.ts
+++ b/test/api_integration/apis/saved_objects/export.ts
@@ -26,7 +26,9 @@ export default function ({ getService }: FtrProviderContext) {
       );
     });
 
-    after(() => kibanaServer.spaces.delete(SPACE_ID));
+    after(async () => {
+      await kibanaServer.spaces.delete(SPACE_ID);
+    });
 
     describe('basic amount of saved objects', () => {
       it('should return objects in dependency order', async () => {
@@ -578,5 +580,46 @@ export default function ({ getService }: FtrProviderContext) {
           .expect(200);
       });
     });
+
+    describe('should retain the managed property value of exported saved objects', () => {
+      before(async () => {
+        await kibanaServer.importExport.unload(
+          'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json',
+          { space: SPACE_ID }
+        );
+        await kibanaServer.importExport.load(
+          'test/api_integration/fixtures/kbn_archiver/saved_objects/managed_objects.json',
+          { space: SPACE_ID }
+        );
+      });
+      after(async () => {
+        await kibanaServer.importExport.unload(
+          'test/api_integration/fixtures/kbn_archiver/saved_objects/managed_objects.json',
+          { space: SPACE_ID }
+        );
+      });
+      it('should retain all existing saved object properties', async () => {
+        // we're specifically asserting that the `managed` property isn't overwritten during export.
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            type: ['config', 'index-pattern'],
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = ndjsonToObject(resp.text);
+            expect(objects).to.have.length(3);
+            expect(objects[0]).to.have.property('id', '6cda943f-a70e-43d4-b0cb-feb1b624cb62');
+            expect(objects[0]).to.have.property('type', 'index-pattern');
+            expect(objects[0]).to.have.property('managed', true);
+            expect(objects[1]).to.have.property('id', 'c1818992-bb2c-4a9a-b276-83ada7cce03e');
+            expect(objects[1]).to.have.property('type', 'config');
+            expect(objects[1]).to.have.property('managed', false);
+            expect(objects[2]).to.have.property('exportedCount', 2);
+            expect(objects[2]).to.have.property('missingRefCount', 0);
+            expect(objects[2].missingReferences).to.have.length(0);
+          });
+      });
+    });
   });
 }
diff --git a/test/api_integration/apis/saved_objects/get.ts b/test/api_integration/apis/saved_objects/get.ts
index a7b1f58c531f4f..bf4ca7d240a89d 100644
--- a/test/api_integration/apis/saved_objects/get.ts
+++ b/test/api_integration/apis/saved_objects/get.ts
@@ -18,11 +18,17 @@ export default function ({ getService }: FtrProviderContext) {
       await kibanaServer.importExport.load(
         'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
       );
+      await kibanaServer.importExport.load(
+        'test/api_integration/fixtures/kbn_archiver/saved_objects/managed_basic.json'
+      );
     });
     after(async () => {
       await kibanaServer.importExport.unload(
         'test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json'
       );
+      await kibanaServer.importExport.unload(
+        'test/api_integration/fixtures/kbn_archiver/saved_objects/managed_basic.json'
+      );
     });
 
     it('should return 200', async () =>
@@ -60,8 +66,52 @@ export default function ({ getService }: FtrProviderContext) {
           });
           expect(resp.body.migrationVersion).to.be.ok();
           expect(resp.body.typeMigrationVersion).to.be.ok();
-          expect(resp.body.managed).to.not.be.ok();
+          expect(resp.body.managed).not.to.be.ok();
         }));
+    it("should return an object's managed property", async () => {
+      await supertest
+        .get(`/api/saved_objects/dashboard/11fb046d-0e50-48a0-a410-a744b82cbffd`)
+        .expect(200)
+        .then((resp) => {
+          expect(resp.body).to.eql({
+            id: '11fb046d-0e50-48a0-a410-a744b82cbffd',
+            type: 'dashboard',
+            namespaces: ['default'],
+            migrationVersion: {
+              dashboard: '8.7.0',
+            },
+            coreMigrationVersion: '8.8.0',
+            typeMigrationVersion: '8.7.0',
+            updated_at: resp.body.updated_at,
+            created_at: resp.body.created_at,
+            version: resp.body.version,
+            attributes: {
+              description: '',
+              hits: 0,
+              kibanaSavedObjectMeta: resp.body.attributes.kibanaSavedObjectMeta,
+              optionsJSON: '{"darkTheme":false}',
+              panelsJSON: resp.body.attributes.panelsJSON,
+              refreshInterval: resp.body.attributes.refreshInterval,
+              timeFrom: resp.body.attributes.timeFrom,
+              timeRestore: true,
+              timeTo: resp.body.attributes.timeTo,
+              title: 'Managed Requests',
+              version: resp.body.attributes.version,
+            },
+            references: [
+              {
+                id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                name: '1:panel_1',
+                type: 'visualization',
+              },
+            ],
+            managed: true,
+          });
+          expect(resp.body.migrationVersion).to.be.ok();
+          expect(resp.body.typeMigrationVersion).to.be.ok();
+          expect(resp.body.managed).to.be.ok();
+        });
+    });
 
     describe('doc does not exist', () => {
       it('should return same generic error as when index does not exist', async () =>
diff --git a/test/api_integration/apis/saved_objects/import.ts b/test/api_integration/apis/saved_objects/import.ts
index 0d9cfed365a002..507c692194f927 100644
--- a/test/api_integration/apis/saved_objects/import.ts
+++ b/test/api_integration/apis/saved_objects/import.ts
@@ -40,6 +40,42 @@ export default function ({ getService }: FtrProviderContext) {
       id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
       meta: { title: 'Requests', icon: 'dashboardApp' },
     };
+    const managedVis = {
+      id: '3fdaa535-5baf-46bc-8265-705eda43b181',
+      type: 'visualization',
+      meta: {
+        icon: 'visualizeApp',
+        title: 'Managed Count of requests',
+      },
+      managed: true,
+    };
+    const managedTag = {
+      id: '0ed60f29-2021-4fd2-ba4e-943c61e2738c',
+      type: 'tag',
+      meta: {
+        icon: 'tag',
+        title: 'managed',
+      },
+      managed: true,
+    };
+    const unmanagedTag = {
+      id: '00ad6a46-6ac3-4f6c-892c-2f72c54a5e7d',
+      type: 'tag',
+      meta: {
+        icon: 'tag',
+        title: 'unmanaged',
+      },
+      managed: false,
+    };
+    const managedDB = {
+      id: '11fb046d-0e50-48a0-a410-a744b82cbffd',
+      type: 'dashboard',
+      meta: {
+        icon: 'dashboardApp',
+        title: 'Managed Requests',
+      },
+      managed: true,
+    };
 
     describe('with basic data existing', () => {
       before(async () => {
@@ -96,9 +132,9 @@ export default function ({ getService }: FtrProviderContext) {
               success: true,
               successCount: 3,
               successResults: [
-                { ...indexPattern, overwrite: true },
-                { ...visualization, overwrite: true },
-                { ...dashboard, overwrite: true },
+                { ...indexPattern, overwrite: true, managed: false },
+                { ...visualization, overwrite: true, managed: false },
+                { ...dashboard, overwrite: true, managed: false },
               ],
               warnings: [],
             });
@@ -155,6 +191,7 @@ export default function ({ getService }: FtrProviderContext) {
                 title: 'dashboard-b',
               },
               type: 'dashboard',
+              managed: false,
             },
             {
               id: 'dashboard-a',
@@ -163,6 +200,7 @@ export default function ({ getService }: FtrProviderContext) {
                 title: 'dashboard-a',
               },
               type: 'dashboard',
+              managed: false,
             },
           ],
           warnings: [],
@@ -239,6 +277,74 @@ export default function ({ getService }: FtrProviderContext) {
             });
           });
       });
+
+      it('should retain existing saved object managed property', async () => {
+        const objectsToImport = [
+          JSON.stringify({
+            type: 'config',
+            id: '1234',
+            attributes: {},
+            references: [],
+            managed: true,
+          }),
+        ];
+        await supertest
+          .post('/api/saved_objects/_import')
+          .attach('file', Buffer.from(objectsToImport.join('\n'), 'utf8'), 'export.ndjson')
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              success: true,
+              successCount: 1,
+              successResults: [
+                {
+                  id: '1234',
+                  meta: {
+                    title: 'Advanced Settings [1234]',
+                  },
+                  type: 'config',
+                  managed: true,
+                },
+              ],
+              warnings: [],
+            });
+          });
+      });
+
+      it('should not overwrite managed if set on objects beging imported', async () => {
+        await supertest
+          .post('/api/saved_objects/_import')
+          .attach('file', join(__dirname, '../../fixtures/import_managed.ndjson'))
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              success: true,
+              successCount: 4,
+              successResults: [managedVis, unmanagedTag, managedTag, managedDB],
+              warnings: [],
+            });
+          });
+      });
+      it('should return 200 when conflicts exist but overwrite is passed in, without changing managed property on the object', async () => {
+        await supertest
+          .post('/api/saved_objects/_import')
+          .query({ overwrite: true })
+          .attach('file', join(__dirname, '../../fixtures/import_managed.ndjson'))
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              success: true,
+              successCount: 4,
+              successResults: [
+                { ...managedVis, overwrite: true },
+                { ...unmanagedTag, overwrite: true },
+                { ...managedTag, overwrite: true },
+                { ...managedDB, overwrite: true },
+              ],
+              warnings: [],
+            });
+          });
+      });
     });
   });
 }
diff --git a/test/api_integration/apis/saved_objects/resolve_import_errors.ts b/test/api_integration/apis/saved_objects/resolve_import_errors.ts
index 7ca61a26a11c1e..ce9ca42a1dedca 100644
--- a/test/api_integration/apis/saved_objects/resolve_import_errors.ts
+++ b/test/api_integration/apis/saved_objects/resolve_import_errors.ts
@@ -84,9 +84,9 @@ export default function ({ getService }: FtrProviderContext) {
               success: true,
               successCount: 3,
               successResults: [
-                { ...indexPattern, overwrite: true },
-                { ...visualization, overwrite: true },
-                { ...dashboard, overwrite: true },
+                { ...indexPattern, overwrite: true, managed: false },
+                { ...visualization, overwrite: true, managed: false },
+                { ...dashboard, overwrite: true, managed: false },
               ],
               warnings: [],
             });
@@ -112,7 +112,7 @@ export default function ({ getService }: FtrProviderContext) {
             expect(resp.body).to.eql({
               success: true,
               successCount: 1,
-              successResults: [{ ...visualization, overwrite: true }],
+              successResults: [{ ...visualization, overwrite: true, managed: false }],
               warnings: [],
             });
           });
@@ -163,6 +163,7 @@ export default function ({ getService }: FtrProviderContext) {
                   type: 'visualization',
                   id: '1',
                   meta: { title: 'My favorite vis', icon: 'visualizeApp' },
+                  managed: false,
                 },
               ],
               warnings: [],
diff --git a/test/api_integration/fixtures/import_managed.ndjson b/test/api_integration/fixtures/import_managed.ndjson
new file mode 100644
index 00000000000000..82ebc57a8b688b
--- /dev/null
+++ b/test/api_integration/fixtures/import_managed.ndjson
@@ -0,0 +1,4 @@
+{"id":"3fdaa535-5baf-46bc-8265-705eda43b181","type":"visualization","namespaces":["default"],"coreMigrationVersion":"8.8.0","typeMigrationVersion":"8.5.0","updated_at":"2023-04-24T19:57:13.859Z","created_at":"2023-04-24T19:57:13.859Z","version":"WzExNCwxXQ==","attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"},"title":"Managed Count of requests","uiStateJSON":"{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}","version":1,"visState":"{\"title\":\"Count of requests\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100,\"filter\":true},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\",\"legendSize\":\"auto\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1,\"extended_bounds\":{}}}]}"},"references":[{"id":"91200a00-9efd-11e7-acb3-3dab96693fab","name":"kibanaSavedObjectMeta.searchSourceJSON.index","type":"index-pattern"}],"managed":true}
+{"id":"00ad6a46-6ac3-4f6c-892c-2f72c54a5e7d","type":"tag","namespaces":["default"],"coreMigrationVersion":"8.8.0","typeMigrationVersion":"8.0.0","updated_at":"2023-04-24T19:58:24.550Z","created_at":"2023-04-24T19:58:24.550Z","version":"WzEyMSwxXQ==","attributes":{"color":"#173a58","description":"Editable","name":"unmanaged"},"references":[],"managed":false}
+{"id":"0ed60f29-2021-4fd2-ba4e-943c61e2738c","type":"tag","namespaces":["default"],"coreMigrationVersion":"8.8.0","typeMigrationVersion":"8.0.0","updated_at":"2023-04-24T19:58:24.550Z","created_at":"2023-04-24T19:58:24.550Z","version":"WzEyMiwxXQ==","attributes":{"color":"#E7664C","description":"read-only","name":"managed"},"references":[],"managed":true}
+{"id":"11fb046d-0e50-48a0-a410-a744b82cbffd","type":"dashboard","namespaces":["default"],"coreMigrationVersion":"8.8.0","typeMigrationVersion":"8.7.0","updated_at":"2023-04-24T20:54:57.921Z","created_at":"2023-04-24T20:54:57.921Z","version":"WzMwOSwxXQ==","attributes":{"description":"","hits":0,"kibanaSavedObjectMeta":{"searchSourceJSON":"{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"},"optionsJSON":"{\"darkTheme\":false}","panelsJSON":"[{\"version\":\"7.3.0\",\"type\":\"visualization\",\"gridData\":{\"x\":0,\"y\":0,\"w\":24,\"h\":12,\"i\":\"1\"},\"panelIndex\":\"1\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_1\"}]","refreshInterval":{"display":"Off","pause":false,"value":0},"timeFrom":"Wed Sep 16 2015 22:52:17 GMT-0700","timeRestore":true,"timeTo":"Fri Sep 18 2015 12:24:38 GMT-0700","title":"Managed Requests","version":1},"references":[{"id":"dd7caf20-9efd-11e7-acb3-3dab96693fab","name":"1:panel_1","type":"visualization"}],"managed":true}
diff --git a/test/api_integration/fixtures/kbn_archiver/saved_objects/managed_basic.json b/test/api_integration/fixtures/kbn_archiver/saved_objects/managed_basic.json
new file mode 100644
index 00000000000000..4ca74083f824f2
--- /dev/null
+++ b/test/api_integration/fixtures/kbn_archiver/saved_objects/managed_basic.json
@@ -0,0 +1,110 @@
+{
+  "id": "3fdaa535-5baf-46bc-8265-705eda43b181",
+  "type": "visualization",
+  "namespaces": [
+    "default"
+  ],
+  "coreMigrationVersion": "8.8.0",
+  "typeMigrationVersion": "8.5.0",
+  "updated_at": "2023-04-24T19:57:13.859Z",
+  "created_at": "2023-04-24T19:57:13.859Z",
+  "version": "WzExNCwxXQ==",
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "title": "Managed Count of requests",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{\"title\":\"Count of requests\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100,\"filter\":true},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\",\"legendSize\":\"auto\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1,\"extended_bounds\":{}}}]}"
+  },
+  "references": [
+    {
+      "id": "91200a00-9efd-11e7-acb3-3dab96693fab",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "managed": true
+}
+
+{
+  "id": "00ad6a46-6ac3-4f6c-892c-2f72c54a5e7d",
+  "type": "tag",
+  "namespaces": [
+    "default"
+  ],
+  "coreMigrationVersion": "8.8.0",
+  "typeMigrationVersion": "8.0.0",
+  "updated_at": "2023-04-24T19:58:24.550Z",
+  "created_at": "2023-04-24T19:58:24.550Z",
+  "version": "WzEyMSwxXQ==",
+  "attributes": {
+    "color": "#173a58",
+    "description": "Editable",
+    "name": "unmanaged"
+  },
+  "references": [],
+  "managed": false
+}
+
+{
+  "id": "0ed60f29-2021-4fd2-ba4e-943c61e2738c",
+  "type": "tag",
+  "namespaces": [
+    "default"
+  ],
+  "coreMigrationVersion": "8.8.0",
+  "typeMigrationVersion": "8.0.0",
+  "updated_at": "2023-04-24T19:58:24.550Z",
+  "created_at": "2023-04-24T19:58:24.550Z",
+  "version": "WzEyMiwxXQ==",
+  "attributes": {
+    "color": "#E7664C",
+    "description": "read-only",
+    "name": "managed"
+  },
+  "references": [],
+  "managed": true
+}
+
+{
+  "id": "11fb046d-0e50-48a0-a410-a744b82cbffd",
+  "type": "dashboard",
+  "namespaces": [
+    "default"
+  ],
+  "coreMigrationVersion": "8.8.0",
+  "typeMigrationVersion": "8.7.0",
+  "updated_at": "2023-04-24T20:54:57.921Z",
+  "created_at": "2023-04-24T20:54:57.921Z",
+  "version": "WzMwOSwxXQ==",
+  "attributes": {
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
+    },
+    "optionsJSON": "{\"darkTheme\":false}",
+    "panelsJSON": "[{\"version\":\"7.3.0\",\"type\":\"visualization\",\"gridData\":{\"x\":0,\"y\":0,\"w\":24,\"h\":12,\"i\":\"1\"},\"panelIndex\":\"1\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_1\"}]",
+    "refreshInterval": {
+      "display": "Off",
+      "pause": false,
+      "value": 0
+    },
+    "timeFrom": "Wed Sep 16 2015 22:52:17 GMT-0700",
+    "timeRestore": true,
+    "timeTo": "Fri Sep 18 2015 12:24:38 GMT-0700",
+    "title": "Managed Requests",
+    "version": 1
+  },
+  "references": [
+    {
+      "id": "dd7caf20-9efd-11e7-acb3-3dab96693fab",
+      "name": "1:panel_1",
+      "type": "visualization"
+    }
+  ],
+  "managed": true
+}
diff --git a/test/api_integration/fixtures/kbn_archiver/saved_objects/managed_objects.json b/test/api_integration/fixtures/kbn_archiver/saved_objects/managed_objects.json
new file mode 100644
index 00000000000000..7aa1e872adf41d
--- /dev/null
+++ b/test/api_integration/fixtures/kbn_archiver/saved_objects/managed_objects.json
@@ -0,0 +1,98 @@
+{
+  "attributes": {
+    "buildNum": 8467,
+    "defaultIndex": "91200a00-9efd-11e7-acb3-3dab96693fab"
+  },
+  "coreMigrationVersion": "8.8.0",
+  "created_at": "2023-04-21T23:19:26.101Z",
+  "id": "c1818992-bb2c-4a9a-b276-83ada7cce03e",
+  "managed": false,
+  "references": [],
+  "type": "config",
+  "typeMigrationVersion": "8.7.0",
+  "updated_at": "2023-04-21T23:19:26.101Z",
+  "version": "WzkzLDFd"
+}
+
+{
+  "attributes": {
+    "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+    "timeFieldName": "@timestamp",
+    "title": "logstash-*"
+  },
+  "coreMigrationVersion": "8.8.0",
+  "created_at": "2023-04-21T23:19:26.101Z",
+  "id": "6cda943f-a70e-43d4-b0cb-feb1b624cb62",
+  "managed": true,
+  "references": [],
+  "type": "index-pattern",
+  "typeMigrationVersion": "7.11.0",
+  "updated_at": "2023-04-21T23:19:26.101Z",
+  "version": "Wzk0LDFd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "title": "Count of requests",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{\"title\":\"Count of requests\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100,\"filter\":true},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\",\"legendSize\":\"auto\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1,\"extended_bounds\":{}}}]}"
+  },
+  "coreMigrationVersion": "8.8.0",
+  "created_at": "2023-04-21T23:19:26.101Z",
+  "id": "37fb7899-4b68-4a5b-9b4c-f9587ab7f0bc",
+  "managed": true,
+  "references": [
+    {
+      "id": "6cda943f-a70e-43d4-b0cb-feb1b624cb62",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "visualization",
+  "typeMigrationVersion": "8.5.0",
+  "updated_at": "2023-04-21T23:19:26.101Z",
+  "version": "Wzk1LDFd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
+    },
+    "optionsJSON": "{\"darkTheme\":false}",
+    "panelsJSON": "[{\"version\":\"7.3.0\",\"type\":\"visualization\",\"gridData\":{\"x\":0,\"y\":0,\"w\":24,\"h\":12,\"i\":\"1\"},\"panelIndex\":\"1\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_1\"}]",
+    "refreshInterval": {
+      "display": "Off",
+      "pause": false,
+      "value": 0
+    },
+    "timeFrom": "Wed Sep 16 2015 22:52:17 GMT-0700",
+    "timeRestore": true,
+    "timeTo": "Fri Sep 18 2015 12:24:38 GMT-0700",
+    "title": "Requests",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.8.0",
+  "created_at": "2023-04-21T23:19:26.101Z",
+  "id": "def09d77-089a-4e4f-b30b-eb9848d59648",
+  "managed": true,
+  "references": [
+    {
+      "id": "37fb7899-4b68-4a5b-9b4c-f9587ab7f0bc",
+      "name": "1:panel_1",
+      "type": "visualization"
+    }
+  ],
+  "type": "dashboard",
+  "typeMigrationVersion": "8.7.0",
+  "updated_at": "2023-04-21T23:19:26.101Z",
+  "version": "Wzk2LDFd"
+}
+
diff --git a/test/functional/apps/discover/group1/_discover_histogram.ts b/test/functional/apps/discover/group1/_discover_histogram.ts
index 03608566969a5b..c19005bfb12ff3 100644
--- a/test/functional/apps/discover/group1/_discover_histogram.ts
+++ b/test/functional/apps/discover/group1/_discover_histogram.ts
@@ -292,5 +292,35 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       // check no error state
       expect(await PageObjects.discover.isChartVisible()).to.be(true);
     });
+
+    it('should reset all histogram state when resetting the saved search', async () => {
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.discover.waitUntilSearchingHasFinished();
+      await PageObjects.timePicker.setDefaultAbsoluteRange();
+      const savedSearch = 'histogram state';
+      await PageObjects.discover.saveSearch(savedSearch);
+      await PageObjects.discover.chooseBreakdownField('extension.keyword');
+      await PageObjects.discover.setChartInterval('Second');
+      let requestData = await testSubjects.getAttribute(
+        'unifiedHistogramChart',
+        'data-request-data'
+      );
+      expect(JSON.parse(requestData)).to.eql({
+        dataViewId: 'long-window-logstash-*',
+        timeField: '@timestamp',
+        timeInterval: 's',
+        breakdownField: 'extension.keyword',
+      });
+      await PageObjects.discover.toggleChartVisibility();
+      await PageObjects.discover.waitUntilSearchingHasFinished();
+      await PageObjects.discover.clickResetSavedSearchButton();
+      await PageObjects.discover.waitUntilSearchingHasFinished();
+      requestData = await testSubjects.getAttribute('unifiedHistogramChart', 'data-request-data');
+      expect(JSON.parse(requestData)).to.eql({
+        dataViewId: 'long-window-logstash-*',
+        timeField: '@timestamp',
+        timeInterval: 'auto',
+      });
+    });
   });
 }
diff --git a/test/functional/apps/management/_scripted_fields_classic_table.ts b/test/functional/apps/management/_scripted_fields_classic_table.ts
index bf39bae5668160..2af753aa7d18ec 100644
--- a/test/functional/apps/management/_scripted_fields_classic_table.ts
+++ b/test/functional/apps/management/_scripted_fields_classic_table.ts
@@ -32,6 +32,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
   const filterBar = getService('filterBar');
+  const docTable = getService('docTable');
   const PageObjects = getPageObjects([
     'common',
     'header',
@@ -50,7 +51,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await kibanaServer.uiSettings.replace({});
       await kibanaServer.uiSettings.update({
         'doc_table:legacy': true,
-        'discover:showLegacyFieldTopValues': true,
       });
     });
 
@@ -437,12 +437,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should filter by scripted field value in Discover', async function () {
-        await PageObjects.discover.clickFieldListItem(scriptedPainlessFieldName2);
-        await log.debug('filter by "Sep 17, 2015 @ 23:00" in the expanded scripted field list');
-        await PageObjects.discover.clickFieldListPlusFilter(
-          scriptedPainlessFieldName2,
-          '1442531297065'
-        );
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await docTable.toggleRowExpanded();
+        const firstRow = await docTable.getDetailsRow();
+        await docTable.addInclusiveFilter(firstRow, scriptedPainlessFieldName2);
         await PageObjects.header.waitUntilLoadingHasFinished();
 
         await retry.try(async function () {
diff --git a/test/functional/apps/visualize/group6/_tsvb_tsdb_basic.ts b/test/functional/apps/visualize/group6/_tsvb_tsdb_basic.ts
new file mode 100644
index 00000000000000..765c7a9d3ec4d1
--- /dev/null
+++ b/test/functional/apps/visualize/group6/_tsvb_tsdb_basic.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default function ({ getPageObjects, getService }: FtrProviderContext) {
+  const { visualBuilder } = getPageObjects(['visualBuilder']);
+  const log = getService('log');
+  const kibanaServer = getService('kibanaServer');
+  const esArchiver = getService('esArchiver');
+  const testSubjects = getService('testSubjects');
+
+  describe('visual builder tsdb check', function describeIndexTests() {
+    before(async () => {
+      log.info(`loading sample TSDB index...`);
+      await esArchiver.load('test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb');
+      log.info(`creating the TSDB data view...`);
+      await kibanaServer.importExport.load(
+        'test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb'
+      );
+      log.info(`setting the TSDB dataView as default...`);
+      await kibanaServer.uiSettings.replace({
+        defaultIndex: '90943e30-9a47-11e8-b64d-95841ca0c247',
+      });
+    });
+
+    after(async () => {
+      log.info(`removing the TSDB index...`);
+      await esArchiver.unload('test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb');
+      log.info(`removing the TSDB dataView...`);
+      await kibanaServer.importExport.unload(
+        'test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb'
+      );
+      log.info(`unsetting the TSDB dataView default...`);
+      await kibanaServer.uiSettings.unset('defaultIndex');
+    });
+
+    beforeEach(async () => {
+      await visualBuilder.resetPage();
+    });
+
+    it('should render from a tsdb dataView regular fields with no issues', async () => {
+      await visualBuilder.selectAggType('Average');
+      await visualBuilder.setFieldForAggregation('bytes');
+      const isFieldForAggregationValid = await visualBuilder.checkFieldForAggregationValidity();
+      expect(isFieldForAggregationValid).to.be(true);
+      expect(await testSubjects.exists('visualization-error-text')).to.be(false);
+    });
+
+    it('should render from a tsdb dataView supported tsdb field type', async () => {
+      await visualBuilder.selectAggType('Average');
+      await visualBuilder.setFieldForAggregation('bytes_gauge');
+      const isFieldForAggregationValid = await visualBuilder.checkFieldForAggregationValidity();
+      expect(isFieldForAggregationValid).to.be(true);
+      expect(await testSubjects.exists('visualization-error-text')).to.be(false);
+    });
+
+    it('should show an error when using an unsupported tsdb field type', async () => {
+      await visualBuilder.selectAggType('Average');
+      await visualBuilder.setFieldForAggregation('bytes_counter');
+      // this is still returning true
+      const isFieldForAggregationValid = await visualBuilder.checkFieldForAggregationValidity();
+      expect(isFieldForAggregationValid).to.be(true);
+      // but an error should appear in visualization
+      expect(await testSubjects.exists('visualization-error-text')).to.be(true);
+    });
+  });
+}
diff --git a/test/functional/apps/visualize/group6/index.ts b/test/functional/apps/visualize/group6/index.ts
index 03027c7a31a8ad..062f558625771a 100644
--- a/test/functional/apps/visualize/group6/index.ts
+++ b/test/functional/apps/visualize/group6/index.ts
@@ -27,6 +27,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./_tag_cloud'));
     loadTestFile(require.resolve('./_tsvb_markdown'));
     loadTestFile(require.resolve('./_tsvb_table'));
+    loadTestFile(require.resolve('./_tsvb_tsdb_basic'));
     loadTestFile(require.resolve('./_vega_chart'));
   });
 }
diff --git a/test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb/data.json.gz b/test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb/data.json.gz
new file mode 100644
index 00000000000000..7c358cfc48ac1e
Binary files /dev/null and b/test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb/data.json.gz differ
diff --git a/test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb/mappings.json b/test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb/mappings.json
new file mode 100644
index 00000000000000..19722e1df922b0
--- /dev/null
+++ b/test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb/mappings.json
@@ -0,0 +1,174 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+    },
+    "index": "kibana_sample_data_logstsdb",
+    "mappings": {
+      "_data_stream_timestamp": {
+        "enabled": true
+      },
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "bytes": {
+          "type": "long"
+        },
+        "bytes_counter": {
+          "time_series_metric": "counter",
+          "type": "long"
+        },
+        "bytes_gauge": {
+          "time_series_metric": "gauge",
+          "type": "long"
+        },
+        "clientip": {
+          "type": "ip"
+        },
+        "event": {
+          "properties": {
+            "dataset": {
+              "type": "keyword"
+            }
+          }
+        },
+        "extension": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "geo": {
+          "properties": {
+            "coordinates": {
+              "type": "geo_point"
+            },
+            "dest": {
+              "type": "keyword"
+            },
+            "src": {
+              "type": "keyword"
+            },
+            "srcdest": {
+              "type": "keyword"
+            }
+          }
+        },
+        "host": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "index": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "ip": {
+          "type": "ip"
+        },
+        "machine": {
+          "properties": {
+            "os": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "ram": {
+              "type": "long"
+            }
+          }
+        },
+        "memory": {
+          "type": "double"
+        },
+        "message": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "phpmemory": {
+          "type": "long"
+        },
+        "referer": {
+          "type": "keyword"
+        },
+        "request": {
+          "time_series_dimension": true,
+          "type": "keyword"
+        },
+        "response": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "tags": {
+          "fields": {
+            "keyword": {
+              "ignore_above": 256,
+              "type": "keyword"
+            }
+          },
+          "type": "text"
+        },
+        "timestamp": {
+          "path": "@timestamp",
+          "type": "alias"
+        },
+        "url": {
+          "time_series_dimension": true,
+          "type": "keyword"
+        },
+        "utc_time": {
+          "type": "date"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "mode": "time_series",
+        "number_of_replicas": "0",
+        "number_of_shards": "1",
+        "routing_path": "request",
+        "time_series": {
+          "end_time": "2023-06-28T09:17:00.283Z",
+          "start_time": "2023-03-28T09:17:00.283Z"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb.json b/test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb.json
new file mode 100644
index 00000000000000..6d2c95fa0ac3d8
--- /dev/null
+++ b/test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb.json
@@ -0,0 +1,22 @@
+{
+    "attributes": {
+        "fieldFormatMap": "{\"hour_of_day\":{}}",
+        "name": "Kibana Sample Data Logs (TSDB)",
+        "runtimeFieldMap": "{\"hour_of_day\":{\"type\":\"long\",\"script\":{\"source\":\"emit(doc['timestamp'].value.getHour());\"}}}",
+        "timeFieldName": "timestamp",
+        "title": "kibana_sample_data_logstsdb"
+    },
+    "coreMigrationVersion": "8.8.0",
+    "created_at": "2023-04-27T13:09:20.333Z",
+    "id": "90943e30-9a47-11e8-b64d-95841ca0c247",
+    "managed": false,
+    "references": [],
+    "sort": [
+        1682600960333,
+        64
+    ],
+    "type": "index-pattern",
+    "typeMigrationVersion": "7.11.0",
+    "updated_at": "2023-04-27T13:09:20.333Z",
+    "version": "WzIxLDFd"
+}
\ No newline at end of file
diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts
index f8fa3c11a1b8ce..897170a5f6a303 100644
--- a/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts
+++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts
@@ -47,6 +47,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
                 meta: {
                   title: 'my title',
                 },
+                managed: false,
               },
             ],
           });
diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts
index be2af8cd5d115f..26688ddd200464 100644
--- a/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts
+++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts
@@ -59,6 +59,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
                   title: 'new title!',
                 },
                 overwrite: true,
+                managed: false,
               },
             ],
           });
diff --git a/test/plugin_functional/test_suites/saved_objects_management/hidden_from_http_apis.ts b/test/plugin_functional/test_suites/saved_objects_management/hidden_from_http_apis.ts
index d9516ee0331c45..c37bd671a764ff 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/hidden_from_http_apis.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/hidden_from_http_apis.ts
@@ -188,6 +188,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
                       title: 'I am hidden from http apis but the client can still see me',
                     },
                     type: 'test-hidden-from-http-apis-importable-exportable',
+                    managed: false,
                   },
                   {
                     id: 'not-hidden-from-http-apis-import1',
@@ -195,6 +196,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
                       title: 'I am not hidden from http apis',
                     },
                     type: 'test-not-hidden-from-http-apis-importable-exportable',
+                    managed: false,
                   },
                 ],
                 warnings: [],
diff --git a/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts b/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
index c4cbd575dc0646..3567db0172ac81 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/visible_in_management.ts
@@ -89,6 +89,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
                     title: 'Saved object type that is not visible in management',
                   },
                   type: 'test-not-visible-in-management',
+                  managed: false,
                 },
               ],
               warnings: [],
diff --git a/tsconfig.base.json b/tsconfig.base.json
index f333d6f58b34f8..01e7276e6bb869 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -116,6 +116,8 @@
       "@kbn/chart-icons/*": ["packages/kbn-chart-icons/*"],
       "@kbn/charts-plugin": ["src/plugins/charts"],
       "@kbn/charts-plugin/*": ["src/plugins/charts/*"],
+      "@kbn/check-mappings-update-cli": ["packages/kbn-check-mappings-update-cli"],
+      "@kbn/check-mappings-update-cli/*": ["packages/kbn-check-mappings-update-cli/*"],
       "@kbn/ci-stats-core": ["packages/kbn-ci-stats-core"],
       "@kbn/ci-stats-core/*": ["packages/kbn-ci-stats-core/*"],
       "@kbn/ci-stats-performance-metrics": ["packages/kbn-ci-stats-performance-metrics"],
@@ -910,6 +912,8 @@
       "@kbn/maps-plugin/*": ["x-pack/plugins/maps/*"],
       "@kbn/ml-agg-utils": ["x-pack/packages/ml/agg_utils"],
       "@kbn/ml-agg-utils/*": ["x-pack/packages/ml/agg_utils/*"],
+      "@kbn/ml-anomaly-utils": ["x-pack/packages/ml/anomaly_utils"],
+      "@kbn/ml-anomaly-utils/*": ["x-pack/packages/ml/anomaly_utils/*"],
       "@kbn/ml-date-picker": ["x-pack/packages/ml/date_picker"],
       "@kbn/ml-date-picker/*": ["x-pack/packages/ml/date_picker/*"],
       "@kbn/ml-error-utils": ["x-pack/packages/ml/error_utils"],
@@ -1000,6 +1004,8 @@
       "@kbn/presentation-util-plugin/*": ["src/plugins/presentation_util/*"],
       "@kbn/profiling-plugin": ["x-pack/plugins/profiling"],
       "@kbn/profiling-plugin/*": ["x-pack/plugins/profiling/*"],
+      "@kbn/random-sampling": ["x-pack/packages/kbn-random-sampling"],
+      "@kbn/random-sampling/*": ["x-pack/packages/kbn-random-sampling/*"],
       "@kbn/react-field": ["packages/kbn-react-field"],
       "@kbn/react-field/*": ["packages/kbn-react-field/*"],
       "@kbn/remote-clusters-plugin": ["x-pack/plugins/remote_clusters"],
@@ -1140,8 +1146,14 @@
       "@kbn/server-route-repository/*": ["packages/kbn-server-route-repository/*"],
       "@kbn/serverless": ["x-pack/plugins/serverless"],
       "@kbn/serverless/*": ["x-pack/plugins/serverless/*"],
+      "@kbn/serverless-observability": ["x-pack/plugins/serverless_observability"],
+      "@kbn/serverless-observability/*": ["x-pack/plugins/serverless_observability/*"],
       "@kbn/serverless-project-switcher": ["packages/serverless/project_switcher"],
       "@kbn/serverless-project-switcher/*": ["packages/serverless/project_switcher/*"],
+      "@kbn/serverless-search": ["x-pack/plugins/serverless_search"],
+      "@kbn/serverless-search/*": ["x-pack/plugins/serverless_search/*"],
+      "@kbn/serverless-security": ["x-pack/plugins/serverless_security"],
+      "@kbn/serverless-security/*": ["x-pack/plugins/serverless_security/*"],
       "@kbn/serverless-storybook-config": ["packages/serverless/storybook/config"],
       "@kbn/serverless-storybook-config/*": ["packages/serverless/storybook/config/*"],
       "@kbn/serverless-types": ["packages/serverless/types"],
@@ -1176,6 +1188,8 @@
       "@kbn/shared-ux-card-no-data-mocks/*": ["packages/shared-ux/card/no_data/mocks/*"],
       "@kbn/shared-ux-card-no-data-types": ["packages/shared-ux/card/no_data/types"],
       "@kbn/shared-ux-card-no-data-types/*": ["packages/shared-ux/card/no_data/types/*"],
+      "@kbn/shared-ux-chrome-navigation": ["packages/shared-ux/chrome/navigation"],
+      "@kbn/shared-ux-chrome-navigation/*": ["packages/shared-ux/chrome/navigation/*"],
       "@kbn/shared-ux-file-context": ["packages/shared-ux/file/context"],
       "@kbn/shared-ux-file-context/*": ["packages/shared-ux/file/context/*"],
       "@kbn/shared-ux-file-image": ["packages/shared-ux/file/image/impl"],
@@ -1428,6 +1442,8 @@
       "@kbn/vis-type-vislib-plugin/*": ["src/plugins/vis_types/vislib/*"],
       "@kbn/vis-type-xy-plugin": ["src/plugins/vis_types/xy"],
       "@kbn/vis-type-xy-plugin/*": ["src/plugins/vis_types/xy/*"],
+      "@kbn/visualization-ui-components": ["src/plugins/visualization_ui_components"],
+      "@kbn/visualization-ui-components/*": ["src/plugins/visualization_ui_components/*"],
       "@kbn/visualizations-plugin": ["src/plugins/visualizations"],
       "@kbn/visualizations-plugin/*": ["src/plugins/visualizations/*"],
       "@kbn/watcher-plugin": ["x-pack/plugins/watcher"],
diff --git a/versions.json b/versions.json
index 5b24835e23d972..1569a8e6dff4fd 100644
--- a/versions.json
+++ b/versions.json
@@ -14,13 +14,13 @@
       "previousMinor": true
     },
     {
-      "version": "8.7.1",
+      "version": "8.7.2",
       "branch": "8.7",
       "currentMajor": true,
       "previousMinor": true
     },
     {
-      "version": "7.17.10",
+      "version": "7.17.11",
       "branch": "7.17",
       "previousMajor": true
     }
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index 8e85011f366d82..59dea3cb2c9a38 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -2,6 +2,7 @@
   "prefix": "xpack",
   "paths": {
     "xpack.actions": "plugins/actions",
+    "xpack.aiops": ["packages/ml/aiops_components", "plugins/aiops"],
     "xpack.alerting": "plugins/alerting",
     "xpack.eventLog": "plugins/event_log",
     "xpack.stackAlerts": "plugins/stack_alerts",
@@ -45,8 +46,12 @@
     "xpack.logstash": ["plugins/logstash"],
     "xpack.main": "legacy/plugins/xpack_main",
     "xpack.maps": ["plugins/maps"],
-    "xpack.aiops": ["packages/ml/aiops_components", "plugins/aiops"],
-    "xpack.ml": ["packages/ml/date_picker", "packages/ml/trained_models_utils", "plugins/ml"],
+    "xpack.ml": [
+      "packages/ml/anomaly_utils",
+      "packages/ml/date_picker",
+      "packages/ml/trained_models_utils",
+      "plugins/ml"
+    ],
     "xpack.monitoring": ["plugins/monitoring"],
     "xpack.observability": "plugins/observability",
     "xpack.observabilityShared": "plugins/observability_shared",
diff --git a/x-pack/packages/kbn-random-sampling/.storybook/main.js b/x-pack/packages/kbn-random-sampling/.storybook/main.js
new file mode 100644
index 00000000000000..cf33a3d9fbff0e
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/.storybook/main.js
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+const baseConfig = require('@kbn/storybook').defaultConfig;
+
+module.exports = {
+  ...baseConfig,
+  stories: ['../**/*.stories.mdx', ...baseConfig.stories],
+  typescript: {
+    reactDocgen: 'react-docgen-typescript',
+  },
+};
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/__mocks__/use_get_url_search.ts b/x-pack/packages/kbn-random-sampling/.storybook/preview.js
similarity index 70%
rename from x-pack/plugins/security_solution/public/common/components/navigation/__mocks__/use_get_url_search.ts
rename to x-pack/packages/kbn-random-sampling/.storybook/preview.js
index 63a9648da35c6e..2b39ca72208004 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/__mocks__/use_get_url_search.ts
+++ b/x-pack/packages/kbn-random-sampling/.storybook/preview.js
@@ -5,6 +5,9 @@
  * 2.0.
  */
 
-import type { SearchNavTab } from '../types';
-
-export const useGetUrlSearch = (tab: SearchNavTab) => '';
+export const parameters = {
+  viewMode: 'docs',
+  previewTabs: {
+    canvas: { hidden: true },
+  },
+};
diff --git a/x-pack/packages/kbn-random-sampling/README.md b/x-pack/packages/kbn-random-sampling/README.md
new file mode 100755
index 00000000000000..9bff0e029527ec
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/README.md
@@ -0,0 +1,10 @@
+# @kbn/random-sampling
+
+Contains all the components of Kibana's random sampling experience. Specifically:
+ - UI components for rendering the random sampling configuration;
+
+---
+
+## Development
+
+See the [kibana contributing guide](https://github.com/elastic/kibana/blob/main/CONTRIBUTING.md) for instructions setting up your development environment.
diff --git a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/index.tsx b/x-pack/packages/kbn-random-sampling/index.ts
similarity index 62%
rename from x-pack/plugins/lens/public/shared_components/drag_drop_bucket/index.tsx
rename to x-pack/packages/kbn-random-sampling/index.ts
index 127471dc2cca5e..d9e9a6ea2576da 100644
--- a/x-pack/plugins/lens/public/shared_components/drag_drop_bucket/index.tsx
+++ b/x-pack/packages/kbn-random-sampling/index.ts
@@ -5,7 +5,5 @@
  * 2.0.
  */
 
-export { NewBucketButton } from './new_bucket_button';
-export { FieldsBucketContainer } from './fields_bucket_container';
-
-export * from './buckets';
+export { RandomSamplingSlider, RandomSamplingIcon } from './src';
+export type { RandomSamplingSliderProps, RandomSamplingIconProps } from './src';
diff --git a/x-pack/packages/kbn-random-sampling/jest.config.js b/x-pack/packages/kbn-random-sampling/jest.config.js
new file mode 100644
index 00000000000000..ea198cd7ad3bd4
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/jest.config.js
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/x-pack/packages/kbn-random-sampling'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/packages/kbn-random-sampling',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: ['<rootDir>/x-pack/packages/kbn-random-sampling/public/**/*.{ts,tsx}'],
+};
diff --git a/x-pack/packages/kbn-random-sampling/kibana.jsonc b/x-pack/packages/kbn-random-sampling/kibana.jsonc
new file mode 100644
index 00000000000000..963ef9add20b1d
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/kibana.jsonc
@@ -0,0 +1,5 @@
+{
+  "type": "shared-browser",
+  "id": "@kbn/random-sampling",
+  "owner": "@elastic/kibana-visualizations",
+}
diff --git a/x-pack/packages/kbn-random-sampling/package.json b/x-pack/packages/kbn-random-sampling/package.json
new file mode 100644
index 00000000000000..d66789e69e3c59
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/package.json
@@ -0,0 +1,6 @@
+{
+    "name": "@kbn/random-sampling",
+    "private": true,
+    "version": "1.0.0",
+    "license": "Elastic License 2.0"
+  }
\ No newline at end of file
diff --git a/x-pack/packages/kbn-random-sampling/src/__stories__/control_slider.stories.mdx b/x-pack/packages/kbn-random-sampling/src/__stories__/control_slider.stories.mdx
new file mode 100644
index 00000000000000..dff3556ea9d610
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/src/__stories__/control_slider.stories.mdx
@@ -0,0 +1,62 @@
+import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs/blocks';
+import { I18nProvider } from '@kbn/i18n-react';
+import { ControlSlider } from '../ui/slider_control'
+
+
+export const Template = (args) => <I18nProvider><ControlSlider {...args} /></I18nProvider>;
+
+<Meta 
+    title="Random Sampling/Control Slider"
+    component={ControlSlider}
+/>
+
+
+# Overview
+
+The following control slider component has been designed to work as a shared component in Kibana:
+
+<Canvas>
+    <Story 
+        name='basic'
+        args={
+            {
+                values:[0.00001, 0.0001, 0.001, 0.01, 0.1, 1],
+                currentValue:0.001,
+                'data-test-subj':'test-id'
+            }
+        }
+        argTypes={
+            { onChange: { action: 'changed' } }
+        }
+        >
+    {Template.bind({})}
+    </Story>
+</Canvas>
+
+When the control slider is disabled an explanation tooltip is shown to the user:
+
+<Canvas>
+    <Story 
+    name='disabled'
+    args={
+            {
+                values:[0.00001, 0.0001, 0.001, 0.01, 0.1, 1],
+                currentValue:0.001,
+                disabled:true,
+                disabledReason:'Control was disabled due to X and Y',
+                'data-test-subj':'test-id'
+            }
+        }
+        argTypes={
+            { onChange: { action: 'changed' } }
+        }
+        >
+    {Template.bind({})}
+    </Story>
+</Canvas>
+
+## Component props
+
+The component exposes the following properties:
+
+<ArgsTable story="basic"/>
diff --git a/x-pack/packages/kbn-random-sampling/src/__stories__/sampling_icon.stories.mdx b/x-pack/packages/kbn-random-sampling/src/__stories__/sampling_icon.stories.mdx
new file mode 100644
index 00000000000000..b30eaef920ef48
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/src/__stories__/sampling_icon.stories.mdx
@@ -0,0 +1,19 @@
+import { Canvas, Meta, Story, ArgsTable } from '@storybook/addon-docs/blocks';
+import { RandomSamplingIcon } from '../ui/icon/sampling_icon'
+
+<Meta title="Random Sampling/Icon" />
+
+# Overview
+The shared Random Sampling icon is the following
+
+<Canvas>
+    <Story name='Basic Icon'>
+        <RandomSamplingIcon />
+    </Story>
+</Canvas>
+
+## Component table props
+
+On top of common SVGElement props also the following props are supported by the component:
+
+<ArgsTable of={RandomSamplingIcon}/>
diff --git a/x-pack/packages/kbn-random-sampling/src/index.ts b/x-pack/packages/kbn-random-sampling/src/index.ts
new file mode 100755
index 00000000000000..f7cf156502a04f
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/src/index.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { RandomSamplingIcon, type RandomSamplingIconProps } from './ui/icon/sampling_icon';
+export {
+  ControlSlider as RandomSamplingSlider,
+  type ControlSliderProps as RandomSamplingSliderProps,
+} from './ui/slider_control';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/sampling_icon.tsx b/x-pack/packages/kbn-random-sampling/src/ui/icon/sampling_icon.tsx
similarity index 96%
rename from x-pack/plugins/lens/public/datasources/form_based/sampling_icon.tsx
rename to x-pack/packages/kbn-random-sampling/src/ui/icon/sampling_icon.tsx
index 8241c1d86a5fca..aa3dc05d84cec6 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/sampling_icon.tsx
+++ b/x-pack/packages/kbn-random-sampling/src/ui/icon/sampling_icon.tsx
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+
 import React from 'react';
 
 interface CustomProps {
@@ -11,11 +12,9 @@ interface CustomProps {
   titleId?: string;
 }
 
-export function RandomSamplingIcon({
-  title,
-  titleId,
-  ...props
-}: React.SVGProps<SVGSVGElement> & CustomProps) {
+export type RandomSamplingIconProps = React.SVGProps<SVGSVGElement> & CustomProps;
+
+export function RandomSamplingIcon({ title, titleId, ...props }: RandomSamplingIconProps) {
   return (
     <svg
       width="15"
diff --git a/x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.test.tsx b/x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.test.tsx
new file mode 100644
index 00000000000000..57a8eb1fac6c7b
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.test.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom/extend-expect';
+import React from 'react';
+import { I18nProvider } from '@kbn/i18n-react';
+import { ControlSlider } from '.';
+
+describe('Slider Control', () => {
+  it('should basically work', () => {
+    render(
+      <I18nProvider>
+        <ControlSlider
+          values={[0.1, 1]}
+          currentValue={0.1}
+          onChange={jest.fn()}
+          data-test-subj="test-id"
+        />
+      </I18nProvider>
+    );
+    const input = screen.getByTestId('test-id') as HTMLInputElement;
+    expect(input.value).toBe('0'); // index 0 of the values array
+  });
+
+  it('should fallback to 1 when the provided value is not present within the values', () => {
+    render(
+      <I18nProvider>
+        <ControlSlider
+          values={[0.1, 0.5, 1]}
+          currentValue={2}
+          onChange={jest.fn()}
+          data-test-subj="test-id"
+        />
+      </I18nProvider>
+    );
+    const input = screen.getByTestId('test-id') as HTMLInputElement;
+    expect(input.value).toBe('2'); // index 2 of the values array
+  });
+});
diff --git a/x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx b/x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx
new file mode 100644
index 00000000000000..1f7495e4312985
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/src/ui/slider_control/index.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiRange, EuiText, useEuiTheme } from '@elastic/eui';
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { TooltipWrapper } from './tooltip_wrapper';
+
+export interface ControlSliderProps {
+  /** Allowed values to show on the Control Slider */
+  values: number[];
+  /** Current value set */
+  currentValue: number | undefined;
+  /** When set will show the control in a disabled state */
+  disabled?: boolean;
+  /** An explanation for the disabled state of the control */
+  disabledReason?: string;
+  /** A way to pass the test id parameter */
+  'data-test-subj'?: string;
+  /** A callback for when the slider value changes */
+  onChange: (newValue: number) => void;
+}
+
+export function ControlSlider({
+  values,
+  currentValue,
+  disabled = false,
+  disabledReason = '',
+  onChange,
+  'data-test-subj': dataTestSubj,
+}: ControlSliderProps) {
+  const { euiTheme } = useEuiTheme();
+  const samplingIndex = values.findIndex((v) => v === currentValue);
+  const currentSamplingIndex = samplingIndex > -1 ? samplingIndex : values.length - 1;
+  return (
+    <TooltipWrapper
+      tooltipContent={disabledReason}
+      condition={disabled}
+      delay="regular"
+      display="block"
+    >
+      <EuiFlexGroup gutterSize="none">
+        <EuiFlexItem grow={false}>
+          <EuiText
+            color={disabled ? euiTheme.colors.disabledText : euiTheme.colors.subduedText}
+            size="xs"
+          >
+            <FormattedMessage
+              id="randomSampling.ui.sliderControl.performanceLabel"
+              defaultMessage="Performance"
+            />
+          </EuiText>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiRange
+            data-test-subj={dataTestSubj}
+            value={currentSamplingIndex}
+            disabled={disabled}
+            fullWidth
+            onChange={(e) => {
+              onChange(values[Number(e.currentTarget.value)]);
+            }}
+            showInput={false}
+            showRange={false}
+            showTicks
+            step={1}
+            min={0}
+            max={values.length - 1}
+            ticks={values.map((v, i) => ({
+              // Remove the initial 0 from values with decimal digits: 0.001 => .001
+              label: `${v * 100}%`.slice(Number.isInteger(v * 100) ? 0 : 1),
+              value: i,
+            }))}
+          />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiText
+            color={disabled ? euiTheme.colors.disabledText : euiTheme.colors.subduedText}
+            size="xs"
+          >
+            <FormattedMessage
+              id="randomSampling.ui.sliderControl.accuracyLabel"
+              defaultMessage="Accuracy"
+            />
+          </EuiText>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </TooltipWrapper>
+  );
+}
diff --git a/x-pack/plugins/lens/public/shared_components/tooltip_wrapper.tsx b/x-pack/packages/kbn-random-sampling/src/ui/slider_control/tooltip_wrapper.tsx
similarity index 100%
rename from x-pack/plugins/lens/public/shared_components/tooltip_wrapper.tsx
rename to x-pack/packages/kbn-random-sampling/src/ui/slider_control/tooltip_wrapper.tsx
diff --git a/x-pack/packages/kbn-random-sampling/tsconfig.json b/x-pack/packages/kbn-random-sampling/tsconfig.json
new file mode 100644
index 00000000000000..5c5673e4b67870
--- /dev/null
+++ b/x-pack/packages/kbn-random-sampling/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types",
+    "types": [
+      "jest",
+      "react"
+    ]
+  },
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+  ],
+  "kbn_references": [
+    "@kbn/i18n-react",
+  ],
+  "exclude": [
+    "target/**/*",
+  ]
+}
diff --git a/x-pack/packages/ml/anomaly_utils/README.md b/x-pack/packages/ml/anomaly_utils/README.md
new file mode 100644
index 00000000000000..941771b80f7ef7
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/README.md
@@ -0,0 +1,3 @@
+# @kbn/ml-anomaly-utils
+
+Utility functions, constants and types for Machine Learning's Anomaly Detection.
diff --git a/x-pack/packages/ml/anomaly_utils/anomaly_severity.ts b/x-pack/packages/ml/anomaly_utils/anomaly_severity.ts
new file mode 100644
index 00000000000000..bd11286784042e
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/anomaly_severity.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * Labels displayed in the ML UI to indicate the severity of the anomaly according
+ * to the normalized anomaly score.
+ */
+export enum ML_ANOMALY_SEVERITY {
+  /**
+   * Anomalies are displayed as critical severity when the score is greater than or equal to 75.
+   */
+  CRITICAL = 'critical',
+
+  /**
+   * Anomalies are displayed as major severity when the score is greater than or equal to 50 and less than 75.
+   */
+  MAJOR = 'major',
+
+  /**
+   * Anomalies are displayed as minor severity when the score is greater than or equal to 25 and less than 50.
+   */
+  MINOR = 'minor',
+
+  /**
+   * Anomalies are displayed as warning severity when the score is greater than or equal to 3 and less than 25.
+   * Note in some parts of the UI, warning severity is used when the score is greater than or equal to 0.
+   */
+  WARNING = 'warning',
+
+  /**
+   * Anomalies are displayed as low severity in some parts of the ML UI when the score is greater than or equal to 0 and less than 3.
+   */
+  LOW = 'low',
+
+  /**
+   * Anomalies are displayed as unknown severity if the anomaly score is not known.
+   */
+  UNKNOWN = 'unknown',
+}
+
+/**
+ * Interface for severity types to be used in ML_ANOMALY_SEVERITY_TYPES.
+ *
+ * @export
+ * @interface MlSeverityType
+ * @typedef {MlSeverityType}
+ */
+export interface MlSeverityType {
+  /**
+   * One of ML_ANOMALY_SEVERITY
+   * @type {ML_ANOMALY_SEVERITY}
+   */
+  id: ML_ANOMALY_SEVERITY;
+  /**
+   * Translated ML_ANOMALY_SEVERITY
+   * @type {string}
+   */
+  label: string;
+}
diff --git a/x-pack/packages/ml/anomaly_utils/anomaly_severity_types.ts b/x-pack/packages/ml/anomaly_utils/anomaly_severity_types.ts
new file mode 100644
index 00000000000000..e3377896b6c996
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/anomaly_severity_types.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 { type MlSeverityType, ML_ANOMALY_SEVERITY } from './anomaly_severity';
+
+export const ML_ANOMALY_SEVERITY_TYPES: Record<ML_ANOMALY_SEVERITY, MlSeverityType> = {
+  critical: {
+    id: ML_ANOMALY_SEVERITY.CRITICAL,
+    label: i18n.translate('xpack.ml.anomalyUtils.severity.criticalLabel', {
+      defaultMessage: 'critical',
+    }),
+  },
+  major: {
+    id: ML_ANOMALY_SEVERITY.MAJOR,
+    label: i18n.translate('xpack.ml.anomalyUtils.severity.majorLabel', {
+      defaultMessage: 'major',
+    }),
+  },
+  minor: {
+    id: ML_ANOMALY_SEVERITY.MINOR,
+    label: i18n.translate('xpack.ml.anomalyUtils.severity.minorLabel', {
+      defaultMessage: 'minor',
+    }),
+  },
+  warning: {
+    id: ML_ANOMALY_SEVERITY.WARNING,
+    label: i18n.translate('xpack.ml.anomalyUtils.severity.warningLabel', {
+      defaultMessage: 'warning',
+    }),
+  },
+  unknown: {
+    id: ML_ANOMALY_SEVERITY.UNKNOWN,
+    label: i18n.translate('xpack.ml.anomalyUtils.severity.unknownLabel', {
+      defaultMessage: 'unknown',
+    }),
+  },
+  low: {
+    id: ML_ANOMALY_SEVERITY.LOW,
+    label: i18n.translate('xpack.ml.anomalyUtils.severityWithLow.lowLabel', {
+      defaultMessage: 'low',
+    }),
+  },
+};
diff --git a/x-pack/packages/ml/anomaly_utils/anomaly_threshold.ts b/x-pack/packages/ml/anomaly_utils/anomaly_threshold.ts
new file mode 100644
index 00000000000000..aed964be280dee
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/anomaly_threshold.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.
+ */
+
+/**
+ * Anomaly score numeric thresholds to indicate the severity of the anomaly.
+ */
+export enum ML_ANOMALY_THRESHOLD {
+  /**
+   * Threshold at which anomalies are labelled in the UI as critical.
+   */
+  CRITICAL = 75,
+
+  /**
+   * Threshold at which anomalies are labelled in the UI as major.
+   */
+  MAJOR = 50,
+
+  /**
+   * Threshold at which anomalies are labelled in the UI as minor.
+   */
+  MINOR = 25,
+
+  /**
+   * Threshold at which anomalies are labelled in the UI as warning.
+   */
+  WARNING = 3,
+
+  /**
+   * Threshold at which anomalies are labelled in the UI as low.
+   */
+  LOW = 0,
+}
diff --git a/x-pack/plugins/ml/common/util/anomaly_utils.test.ts b/x-pack/packages/ml/anomaly_utils/anomaly_utils.test.ts
similarity index 84%
rename from x-pack/plugins/ml/common/util/anomaly_utils.test.ts
rename to x-pack/packages/ml/anomaly_utils/anomaly_utils.test.ts
index b707a61d5b9bc5..9b2f25982b00a2 100644
--- a/x-pack/plugins/ml/common/util/anomaly_utils.test.ts
+++ b/x-pack/packages/ml/anomaly_utils/anomaly_utils.test.ts
@@ -5,16 +5,14 @@
  * 2.0.
  */
 
-import { AnomalyRecordDoc } from '../types/anomalies';
+import type { MlAnomalyRecordDoc } from './types';
 
 import {
   aggregationTypeTransform,
   getEntityFieldList,
   getEntityFieldName,
   getEntityFieldValue,
-  getSeverity,
   getSeverityWithLow,
-  getSeverityColor,
   isRuleSupported,
   showActualForFunction,
   showTypicalForFunction,
@@ -22,7 +20,7 @@ import {
 } from './anomaly_utils';
 
 describe('ML - anomaly utils', () => {
-  const partitionEntityRecord: AnomalyRecordDoc = {
+  const partitionEntityRecord: MlAnomalyRecordDoc = {
     job_id: 'farequote',
     result_type: 'record',
     probability: 0.012818,
@@ -39,7 +37,7 @@ describe('ML - anomaly utils', () => {
     field_name: 'responsetime',
   };
 
-  const byEntityRecord: AnomalyRecordDoc = {
+  const byEntityRecord: MlAnomalyRecordDoc = {
     job_id: 'farequote',
     result_type: 'record',
     probability: 0.012818,
@@ -56,7 +54,7 @@ describe('ML - anomaly utils', () => {
     field_name: 'responsetime',
   };
 
-  const overEntityRecord: AnomalyRecordDoc = {
+  const overEntityRecord: MlAnomalyRecordDoc = {
     job_id: 'gallery',
     result_type: 'record',
     probability: 2.81806e-9,
@@ -74,7 +72,7 @@ describe('ML - anomaly utils', () => {
     over_field_value: '37.157.32.164',
   };
 
-  const noEntityRecord: AnomalyRecordDoc = {
+  const noEntityRecord: MlAnomalyRecordDoc = {
     job_id: 'farequote_no_by',
     result_type: 'record',
     probability: 0.0191711,
@@ -89,7 +87,7 @@ describe('ML - anomaly utils', () => {
     field_name: 'responsetime',
   };
 
-  const metricNoEntityRecord: AnomalyRecordDoc = {
+  const metricNoEntityRecord: MlAnomalyRecordDoc = {
     job_id: 'farequote_metric',
     result_type: 'record',
     probability: 0.030133495093182184,
@@ -113,7 +111,7 @@ describe('ML - anomaly utils', () => {
     airline: ['NKS'],
   };
 
-  const rareEntityRecord: AnomalyRecordDoc = {
+  const rareEntityRecord: MlAnomalyRecordDoc = {
     job_id: 'gallery',
     result_type: 'record',
     probability: 0.02277014211908481,
@@ -166,34 +164,6 @@ describe('ML - anomaly utils', () => {
     status: ['206'],
   };
 
-  describe('getSeverity', () => {
-    test('returns warning for 0 <= score < 25', () => {
-      expect(getSeverity(0).id).toBe('warning');
-      expect(getSeverity(0.001).id).toBe('warning');
-      expect(getSeverity(24.99).id).toBe('warning');
-    });
-
-    test('returns minor for 25 <= score < 50', () => {
-      expect(getSeverity(25).id).toBe('minor');
-      expect(getSeverity(49.99).id).toBe('minor');
-    });
-
-    test('returns minor for 50 <= score < 75', () => {
-      expect(getSeverity(50).id).toBe('major');
-      expect(getSeverity(74.99).id).toBe('major');
-    });
-
-    test('returns critical for score >= 75', () => {
-      expect(getSeverity(75).id).toBe('critical');
-      expect(getSeverity(100).id).toBe('critical');
-      expect(getSeverity(1000).id).toBe('critical');
-    });
-
-    test('returns unknown for scores less than 0', () => {
-      expect(getSeverity(-10).id).toBe('unknown');
-    });
-  });
-
   describe('getSeverityWithLow', () => {
     test('returns low for 0 <= score < 3', () => {
       expect(getSeverityWithLow(0).id).toBe('low');
@@ -227,41 +197,8 @@ describe('ML - anomaly utils', () => {
     });
   });
 
-  describe('getSeverityColor', () => {
-    test('returns correct hex code for low for 0 <= score < 3', () => {
-      expect(getSeverityColor(0)).toBe('#d2e9f7');
-      expect(getSeverityColor(0.001)).toBe('#d2e9f7');
-      expect(getSeverityColor(2.99)).toBe('#d2e9f7');
-    });
-
-    test('returns correct hex code for warning for 3 <= score < 25', () => {
-      expect(getSeverityColor(3)).toBe('#8bc8fb');
-      expect(getSeverityColor(24.99)).toBe('#8bc8fb');
-    });
-
-    test('returns correct hex code for minor for 25 <= score < 50', () => {
-      expect(getSeverityColor(25)).toBe('#fdec25');
-      expect(getSeverityColor(49.99)).toBe('#fdec25');
-    });
-
-    test('returns correct hex code for major for 50 <= score < 75', () => {
-      expect(getSeverityColor(50)).toBe('#fba740');
-      expect(getSeverityColor(74.99)).toBe('#fba740');
-    });
-
-    test('returns correct hex code for critical for score >= 75', () => {
-      expect(getSeverityColor(75)).toBe('#fe5050');
-      expect(getSeverityColor(100)).toBe('#fe5050');
-      expect(getSeverityColor(1000)).toBe('#fe5050');
-    });
-
-    test('returns correct hex code for unknown for scores less than 0', () => {
-      expect(getSeverityColor(-10)).toBe('#ffffff');
-    });
-  });
-
   describe('isMultiBucketAnomaly', () => {
-    const singleBucketAnomaly: AnomalyRecordDoc = {
+    const singleBucketAnomaly: MlAnomalyRecordDoc = {
       job_id: 'farequote_sb',
       result_type: 'record',
       probability: 0.0191711,
@@ -283,7 +220,7 @@ describe('ML - anomaly utils', () => {
       },
     };
 
-    const multiBucketAnomaly: AnomalyRecordDoc = {
+    const multiBucketAnomaly: MlAnomalyRecordDoc = {
       job_id: 'farequote_mb',
       result_type: 'record',
       probability: 0.0191711,
@@ -305,7 +242,7 @@ describe('ML - anomaly utils', () => {
       },
     };
 
-    const multiBucketAnomaly2: AnomalyRecordDoc = {
+    const multiBucketAnomaly2: MlAnomalyRecordDoc = {
       job_id: 'farequote_mb2',
       result_type: 'record',
       probability: 0.0191711,
@@ -326,7 +263,7 @@ describe('ML - anomaly utils', () => {
       },
     };
 
-    const noASEAnomaly: AnomalyRecordDoc = {
+    const noASEAnomaly: MlAnomalyRecordDoc = {
       job_id: 'farequote_ase',
       result_type: 'record',
       probability: 0.0191711,
@@ -341,7 +278,7 @@ describe('ML - anomaly utils', () => {
       field_name: 'responsetime',
     };
 
-    const noMBIAnomaly: AnomalyRecordDoc = {
+    const noMBIAnomaly: MlAnomalyRecordDoc = {
       job_id: 'farequote_sbi',
       result_type: 'record',
       probability: 0.0191711,
@@ -362,7 +299,7 @@ describe('ML - anomaly utils', () => {
       },
     };
 
-    const singleBucketAnomaly2: AnomalyRecordDoc = {
+    const singleBucketAnomaly2: MlAnomalyRecordDoc = {
       job_id: 'farequote_sb2',
       result_type: 'record',
       probability: 0.0191711,
diff --git a/x-pack/plugins/ml/common/util/anomaly_utils.ts b/x-pack/packages/ml/anomaly_utils/anomaly_utils.ts
similarity index 57%
rename from x-pack/plugins/ml/common/util/anomaly_utils.ts
rename to x-pack/packages/ml/anomaly_utils/anomaly_utils.ts
index 31a2a5fe49ca55..b209a038dd384b 100644
--- a/x-pack/plugins/ml/common/util/anomaly_utils.ts
+++ b/x-pack/packages/ml/anomaly_utils/anomaly_utils.ts
@@ -10,35 +10,67 @@
  * to extract information for display in dashboards.
  */
 
-import { i18n } from '@kbn/i18n';
-import { CONDITIONS_NOT_SUPPORTED_FUNCTIONS } from '../constants/detector_rule';
-import { ANOMALY_SEVERITY, ANOMALY_THRESHOLD, SEVERITY_COLORS } from '../constants/anomalies';
-import type { AnomaliesTableRecord, AnomalyRecordDoc } from '../types/anomalies';
-
-export interface SeverityType {
-  id: ANOMALY_SEVERITY;
-  label: string;
-}
+import type { MlSeverityType } from './anomaly_severity';
+import { ML_ANOMALY_THRESHOLD } from './anomaly_threshold';
+import { ML_ANOMALY_SEVERITY_TYPES } from './anomaly_severity_types';
+import type { MlAnomaliesTableRecord, MlAnomalyRecordDoc } from './types';
+import { ML_DETECTOR_RULE_CONDITIONS_NOT_SUPPORTED_FUNCTIONS } from './detector_rule';
 
-export enum ENTITY_FIELD_TYPE {
+/**
+ * Enum of entity field types
+ * @export
+ * @enum {number}
+ */
+export enum ML_ENTITY_FIELD_TYPE {
   BY = 'by',
   OVER = 'over',
   PARTITON = 'partition',
 }
 
-export const ENTITY_FIELD_OPERATIONS = {
+/**
+ * Custom enum of entity field operations
+ * @type {{ readonly ADD: "+"; readonly REMOVE: "-"; }}
+ */
+export const ML_ENTITY_FIELD_OPERATIONS = {
   ADD: '+',
   REMOVE: '-',
 } as const;
 
-export type EntityFieldOperation =
-  typeof ENTITY_FIELD_OPERATIONS[keyof typeof ENTITY_FIELD_OPERATIONS];
+/**
+ * Union type of entity field operations
+ * @export
+ * @typedef {MlEntityFieldOperation}
+ */
+export type MlEntityFieldOperation =
+  typeof ML_ENTITY_FIELD_OPERATIONS[keyof typeof ML_ENTITY_FIELD_OPERATIONS];
 
-export interface EntityField {
+/**
+ * Interface of an entity field
+ * @export
+ * @interface MlEntityField
+ * @typedef {MlEntityField}
+ */
+export interface MlEntityField {
+  /**
+   * The field name
+   * @type {string}
+   */
   fieldName: string;
+  /**
+   * The field value
+   * @type {(string | number | undefined)}
+   */
   fieldValue: string | number | undefined;
-  fieldType?: ENTITY_FIELD_TYPE;
-  operation?: EntityFieldOperation;
+  /**
+   * Optional field type
+   * @type {?ML_ENTITY_FIELD_TYPE}
+   */
+  fieldType?: ML_ENTITY_FIELD_TYPE;
+  /**
+   * Optional entity field operation
+   * @type {?MlEntityFieldOperation}
+   */
+  operation?: MlEntityFieldOperation;
 }
 
 // List of function descriptions for which actual values from record level results should be displayed.
@@ -71,153 +103,33 @@ const DISPLAY_TYPICAL_FUNCTIONS = [
   'time',
 ];
 
-let severityTypes: Record<string, SeverityType>;
-
-function getSeverityTypes() {
-  if (severityTypes) {
-    return severityTypes;
-  }
-
-  return (severityTypes = {
-    critical: {
-      id: ANOMALY_SEVERITY.CRITICAL,
-      label: i18n.translate('xpack.ml.anomalyUtils.severity.criticalLabel', {
-        defaultMessage: 'critical',
-      }),
-    },
-    major: {
-      id: ANOMALY_SEVERITY.MAJOR,
-      label: i18n.translate('xpack.ml.anomalyUtils.severity.majorLabel', {
-        defaultMessage: 'major',
-      }),
-    },
-    minor: {
-      id: ANOMALY_SEVERITY.MINOR,
-      label: i18n.translate('xpack.ml.anomalyUtils.severity.minorLabel', {
-        defaultMessage: 'minor',
-      }),
-    },
-    warning: {
-      id: ANOMALY_SEVERITY.WARNING,
-      label: i18n.translate('xpack.ml.anomalyUtils.severity.warningLabel', {
-        defaultMessage: 'warning',
-      }),
-    },
-    unknown: {
-      id: ANOMALY_SEVERITY.UNKNOWN,
-      label: i18n.translate('xpack.ml.anomalyUtils.severity.unknownLabel', {
-        defaultMessage: 'unknown',
-      }),
-    },
-    low: {
-      id: ANOMALY_SEVERITY.LOW,
-      label: i18n.translate('xpack.ml.anomalyUtils.severityWithLow.lowLabel', {
-        defaultMessage: 'low',
-      }),
-    },
-  });
-}
-
 /**
  * Returns whether the anomaly is in a categorization analysis.
  * @param anomaly Anomaly table record
  */
-export function isCategorizationAnomaly(anomaly: AnomaliesTableRecord): boolean {
+export function isCategorizationAnomaly(anomaly: MlAnomaliesTableRecord): boolean {
   return anomaly.entityName === 'mlcategory';
 }
 
-/**
- * Returns formatted severity score.
- * @param score - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
- */
-export function getFormattedSeverityScore(score: number): string {
-  return score < 1 ? '< 1' : String(parseInt(String(score), 10));
-}
-
-/**
- * Returns a severity label (one of critical, major, minor, warning or unknown)
- * for the supplied normalized anomaly score (a value between 0 and 100).
- * @param normalizedScore - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
- */
-export function getSeverity(normalizedScore: number): SeverityType {
-  const severityTypesList = getSeverityTypes();
-
-  if (normalizedScore >= ANOMALY_THRESHOLD.CRITICAL) {
-    return severityTypesList.critical;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.MAJOR) {
-    return severityTypesList.major;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.MINOR) {
-    return severityTypesList.minor;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.LOW) {
-    return severityTypesList.warning;
-  } else {
-    return severityTypesList.unknown;
-  }
-}
-
-/**
- * Returns a severity type (indicating a critical, major, minor, warning or low severity anomaly)
- * for the supplied normalized anomaly score (a value between 0 and 100).
- * @param normalizedScore - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
- */
-export function getSeverityType(normalizedScore: number): ANOMALY_SEVERITY {
-  if (normalizedScore >= 75) {
-    return ANOMALY_SEVERITY.CRITICAL;
-  } else if (normalizedScore >= 50) {
-    return ANOMALY_SEVERITY.MAJOR;
-  } else if (normalizedScore >= 25) {
-    return ANOMALY_SEVERITY.MINOR;
-  } else if (normalizedScore >= 3) {
-    return ANOMALY_SEVERITY.WARNING;
-  } else if (normalizedScore >= 0) {
-    return ANOMALY_SEVERITY.LOW;
-  } else {
-    return ANOMALY_SEVERITY.UNKNOWN;
-  }
-}
-
 /**
  * Returns a severity label (one of critical, major, minor, warning, low or unknown)
  * for the supplied normalized anomaly score (a value between 0 and 100), where scores
  * less than 3 are assigned a severity of 'low'.
  * @param normalizedScore - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
  */
-export function getSeverityWithLow(normalizedScore: number): SeverityType {
-  const severityTypesList = getSeverityTypes();
-
-  if (normalizedScore >= ANOMALY_THRESHOLD.CRITICAL) {
-    return severityTypesList.critical;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.MAJOR) {
-    return severityTypesList.major;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.MINOR) {
-    return severityTypesList.minor;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.WARNING) {
-    return severityTypesList.warning;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.LOW) {
-    return severityTypesList.low;
-  } else {
-    return severityTypesList.unknown;
-  }
-}
-
-/**
- * Returns a severity RGB color (one of critical, major, minor, warning, low or blank)
- * for the supplied normalized anomaly score (a value between 0 and 100).
- * @param normalizedScore - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
- */
-export function getSeverityColor(normalizedScore: number): string {
-  if (normalizedScore >= ANOMALY_THRESHOLD.CRITICAL) {
-    return SEVERITY_COLORS.CRITICAL;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.MAJOR) {
-    return SEVERITY_COLORS.MAJOR;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.MINOR) {
-    return SEVERITY_COLORS.MINOR;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.WARNING) {
-    return SEVERITY_COLORS.WARNING;
-  } else if (normalizedScore >= ANOMALY_THRESHOLD.LOW) {
-    return SEVERITY_COLORS.LOW;
+export function getSeverityWithLow(normalizedScore: number): MlSeverityType {
+  if (normalizedScore >= ML_ANOMALY_THRESHOLD.CRITICAL) {
+    return ML_ANOMALY_SEVERITY_TYPES.critical;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.MAJOR) {
+    return ML_ANOMALY_SEVERITY_TYPES.major;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.MINOR) {
+    return ML_ANOMALY_SEVERITY_TYPES.minor;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.WARNING) {
+    return ML_ANOMALY_SEVERITY_TYPES.warning;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.LOW) {
+    return ML_ANOMALY_SEVERITY_TYPES.low;
   } else {
-    return SEVERITY_COLORS.BLANK;
+    return ML_ANOMALY_SEVERITY_TYPES.unknown;
   }
 }
 
@@ -226,7 +138,7 @@ export function getSeverityColor(normalizedScore: number): string {
  * for example in anomaly charts with a cross-shaped marker.
  * @param anomaly Anomaly table record
  */
-export function isMultiBucketAnomaly(anomaly: AnomalyRecordDoc): boolean {
+export function isMultiBucketAnomaly(anomaly: MlAnomalyRecordDoc): boolean {
   if (anomaly.anomaly_score_explanation === undefined) {
     return false;
   }
@@ -278,7 +190,7 @@ export function getAnomalyScoreExplanationImpactValue(score: number): number {
  * then partition_field, returning undefined if none of these fields are present.
  * @param record - anomaly record result for which to obtain the entity field name.
  */
-export function getEntityFieldName(record: AnomalyRecordDoc): string | undefined {
+export function getEntityFieldName(record: MlAnomalyRecordDoc): string | undefined {
   // Analyses with by and over fields, will have a top-level by_field_name, but
   // the by_field_value(s) will be in the nested causes array.
   if (record.by_field_name !== undefined && record.by_field_value !== undefined) {
@@ -300,7 +212,7 @@ export function getEntityFieldName(record: AnomalyRecordDoc): string | undefined
  * then partition_field, returning undefined if none of these fields are present.
  * @param record - anomaly record result for which to obtain the entity field value.
  */
-export function getEntityFieldValue(record: AnomalyRecordDoc): string | number | undefined {
+export function getEntityFieldValue(record: MlAnomalyRecordDoc): string | number | undefined {
   if (record.by_field_value !== undefined) {
     return record.by_field_value;
   }
@@ -319,13 +231,13 @@ export function getEntityFieldValue(record: AnomalyRecordDoc): string | number |
  * of objects in the form { fieldName: airline, fieldValue: AAL, fieldType: partition }
  * @param record - anomaly record result for which to obtain the entity field list.
  */
-export function getEntityFieldList(record: AnomalyRecordDoc): EntityField[] {
-  const entityFields: EntityField[] = [];
+export function getEntityFieldList(record: MlAnomalyRecordDoc): MlEntityField[] {
+  const entityFields: MlEntityField[] = [];
   if (record.partition_field_name !== undefined) {
     entityFields.push({
       fieldName: record.partition_field_name,
       fieldValue: record.partition_field_value,
-      fieldType: ENTITY_FIELD_TYPE.PARTITON,
+      fieldType: ML_ENTITY_FIELD_TYPE.PARTITON,
     });
   }
 
@@ -333,7 +245,7 @@ export function getEntityFieldList(record: AnomalyRecordDoc): EntityField[] {
     entityFields.push({
       fieldName: record.over_field_name,
       fieldValue: record.over_field_value,
-      fieldType: ENTITY_FIELD_TYPE.OVER,
+      fieldType: ML_ENTITY_FIELD_TYPE.OVER,
     });
   }
 
@@ -344,7 +256,7 @@ export function getEntityFieldList(record: AnomalyRecordDoc): EntityField[] {
     entityFields.push({
       fieldName: record.by_field_name,
       fieldValue: record.by_field_value,
-      fieldType: ENTITY_FIELD_TYPE.BY,
+      fieldType: ML_ENTITY_FIELD_TYPE.BY,
     });
   }
 
@@ -375,11 +287,11 @@ export function showTypicalForFunction(functionDescription: string): boolean {
  * Returns whether a rule can be configured against the specified anomaly.
  * @param record - anomaly record result
  */
-export function isRuleSupported(record: AnomalyRecordDoc): boolean {
+export function isRuleSupported(record: MlAnomalyRecordDoc): boolean {
   // A rule can be configured with a numeric condition if the function supports it,
   // and/or with scope if there is a partitioning fields.
   return (
-    CONDITIONS_NOT_SUPPORTED_FUNCTIONS.indexOf(record.function) === -1 ||
+    ML_DETECTOR_RULE_CONDITIONS_NOT_SUPPORTED_FUNCTIONS.indexOf(record.function) === -1 ||
     getEntityFieldName(record) !== undefined
   );
 }
@@ -404,6 +316,11 @@ export function isRuleSupported(record: AnomalyRecordDoc): boolean {
  * function_description field of anomaly records.
  */
 export const aggregationTypeTransform = {
+  /**
+   * transform from ML to ES agg type
+   * @param {string} oldAggType the aggregation type to be transformed
+   * @returns {string}
+   */
   toES(oldAggType: string): string {
     let newAggType = oldAggType;
 
@@ -417,6 +334,11 @@ export const aggregationTypeTransform = {
 
     return newAggType;
   },
+  /**
+   * transform from ES to ML agg type
+   * @param {string} oldAggType the aggregation type to be transformed
+   * @returns {string}
+   */
   toML(oldAggType: string): string {
     let newAggType = oldAggType;
 
diff --git a/x-pack/packages/ml/anomaly_utils/constants.ts b/x-pack/packages/ml/anomaly_utils/constants.ts
new file mode 100644
index 00000000000000..7825b0f753b668
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/constants.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 { ML_ANOMALY_THRESHOLD } from './anomaly_threshold';
+import { ML_SEVERITY_COLORS } from './severity_colors';
+
+/**
+ * Severity color ramp.
+ */
+export const ML_SEVERITY_COLOR_RAMP = [
+  {
+    stop: ML_ANOMALY_THRESHOLD.LOW,
+    color: ML_SEVERITY_COLORS.WARNING,
+  },
+  {
+    stop: ML_ANOMALY_THRESHOLD.MINOR,
+    color: ML_SEVERITY_COLORS.MINOR,
+  },
+  {
+    stop: ML_ANOMALY_THRESHOLD.MAJOR,
+    color: ML_SEVERITY_COLORS.MAJOR,
+  },
+  {
+    stop: ML_ANOMALY_THRESHOLD.CRITICAL,
+    color: ML_SEVERITY_COLORS.CRITICAL,
+  },
+];
+
+/**
+ * Custom enum for anomaly result type
+ * @type {{ readonly BUCKET: "bucket"; readonly RECORD: "record"; readonly INFLUENCER: "influencer"; }}
+ */
+export const ML_ANOMALY_RESULT_TYPE = {
+  BUCKET: 'bucket',
+  RECORD: 'record',
+  INFLUENCER: 'influencer',
+} as const;
+
+/**
+ * Array of partition fields.
+ * @type {readonly ["partition_field", "over_field", "by_field"]}
+ */
+export const ML_PARTITION_FIELDS = ['partition_field', 'over_field', 'by_field'] as const;
+
+/**
+ * Machine learning job id attribute name.
+ * @type {"job_id"}
+ */
+export const ML_JOB_ID = 'job_id';
+
+/**
+ * Machine learning partition field value attribute name.
+ * @type {"partition_field_value"}
+ */
+export const ML_PARTITION_FIELD_VALUE = 'partition_field_value';
diff --git a/x-pack/packages/ml/anomaly_utils/custom_urls.ts b/x-pack/packages/ml/anomaly_utils/custom_urls.ts
new file mode 100644
index 00000000000000..1a77dc06c3874b
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/custom_urls.ts
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { isPopulatedObject } from '@kbn/ml-is-populated-object';
+import type { MlAnomalyRecordDoc } from './types';
+
+/**
+ * Base Interface for basic custom URL.
+ *
+ * @export
+ * @interface BaseUrlConfig
+ * @typedef {BaseUrlConfig}
+ */
+interface BaseUrlConfig {
+  /**
+   * The url name of the configuration.
+   * @type {string}
+   */
+  url_name: string;
+  /**
+   * The url value of the configuration.
+   * @type {string}
+   */
+  url_value: string;
+}
+
+/**
+ * Extended interface for custom URLs including an optional time range.
+ *
+ * @export
+ * @interface MlKibanaUrlConfig
+ * @typedef {MlKibanaUrlConfig}
+ * @extends {BaseUrlConfig}
+ */
+export interface MlKibanaUrlConfig extends BaseUrlConfig {
+  /**
+   * The optional time range for the custom URL configuration
+   * @type {?string}
+   */
+  time_range?: string;
+}
+
+/**
+ * Extended interface for custom URLs including a time range.
+ *
+ * @export
+ * @interface MlKibanaUrlConfigWithTimeRange
+ * @typedef {MlKibanaUrlConfigWithTimeRange}
+ * @extends {BaseUrlConfig}
+ */
+export interface MlKibanaUrlConfigWithTimeRange extends BaseUrlConfig {
+  /**
+   * The time range for the custom URL configuration
+   * @type {string}
+   */
+  time_range: string;
+}
+
+/**
+ * Union type of different custom URL configurations
+ *
+ * @export
+ * @typedef {MlUrlConfig}
+ */
+export type MlUrlConfig = BaseUrlConfig | MlKibanaUrlConfig;
+
+/**
+ * Extended interface of MlAnomalyRecordDoc to include time range information.
+ *
+ * @export
+ * @interface MlCustomUrlAnomalyRecordDoc
+ * @typedef {MlCustomUrlAnomalyRecordDoc}
+ * @extends {MlAnomalyRecordDoc}
+ */
+export interface MlCustomUrlAnomalyRecordDoc extends MlAnomalyRecordDoc {
+  /**
+   * The `earliest` timestamp.
+   * @type {string}
+   */
+  earliest: string;
+  /**
+   * The `latest` timestamp.
+   * @type {string}
+   */
+  latest: string;
+}
+
+/**
+ * Type guard to idenfity MlKibanaUrlConfigWithTimeRange.
+ *
+ * @export
+ * @param {unknown} arg The unknown type to be evaluated
+ * @returns {arg is MlKibanaUrlConfigWithTimeRange} whether arg is of type MlKibanaUrlConfigWithTimeRange
+ */
+export function isMlKibanaUrlConfigWithTimeRange(
+  arg: unknown
+): arg is MlKibanaUrlConfigWithTimeRange {
+  return (
+    isPopulatedObject(arg, ['url_name', 'url_value', 'time_range']) &&
+    typeof arg.time_range === 'string'
+  );
+}
diff --git a/x-pack/plugins/ml/common/constants/detector_rule.ts b/x-pack/packages/ml/anomaly_utils/detector_rule.ts
similarity index 50%
rename from x-pack/plugins/ml/common/constants/detector_rule.ts
rename to x-pack/packages/ml/anomaly_utils/detector_rule.ts
index c122de865d74a0..a944130d830079 100644
--- a/x-pack/plugins/ml/common/constants/detector_rule.ts
+++ b/x-pack/packages/ml/anomaly_utils/detector_rule.ts
@@ -9,28 +9,55 @@
  * Contains values for ML job detector rules.
  */
 
-export enum ACTION {
+/**
+ * Enum ML_DETECTOR_RULE_ACTION
+ * @export
+ * @enum {number}
+ */
+export enum ML_DETECTOR_RULE_ACTION {
   SKIP_MODEL_UPDATE = 'skip_model_update',
   SKIP_RESULT = 'skip_result',
 }
 
-export enum FILTER_TYPE {
+/**
+ * Enum ML_DETECTOR_RULE_FILTER_TYPE
+ * @export
+ * @enum {number}
+ */
+export enum ML_DETECTOR_RULE_FILTER_TYPE {
   EXCLUDE = 'exclude',
   INCLUDE = 'include',
 }
 
-export enum APPLIES_TO {
+/**
+ * Enum ML_DETECTOR_RULE_APPLIES_TO
+ * @export
+ * @enum {number}
+ */
+export enum ML_DETECTOR_RULE_APPLIES_TO {
   ACTUAL = 'actual',
   DIFF_FROM_TYPICAL = 'diff_from_typical',
   TYPICAL = 'typical',
 }
 
-export enum OPERATOR {
+/**
+ * Enum ML_DETECTOR_RULE_OPERATOR
+ * @export
+ * @enum {number}
+ */
+export enum ML_DETECTOR_RULE_OPERATOR {
   LESS_THAN = 'lt',
   LESS_THAN_OR_EQUAL = 'lte',
   GREATER_THAN = 'gt',
   GREATER_THAN_OR_EQUAL = 'gte',
 }
 
-// List of detector functions which don't support rules with numeric conditions.
-export const CONDITIONS_NOT_SUPPORTED_FUNCTIONS = ['freq_rare', 'lat_long', 'metric', 'rare'];
+/**
+ * List of detector functions which don't support rules with numeric conditions.
+ */
+export const ML_DETECTOR_RULE_CONDITIONS_NOT_SUPPORTED_FUNCTIONS = [
+  'freq_rare',
+  'lat_long',
+  'metric',
+  'rare',
+];
diff --git a/x-pack/packages/ml/anomaly_utils/get_formatted_severity_score.ts b/x-pack/packages/ml/anomaly_utils/get_formatted_severity_score.ts
new file mode 100644
index 00000000000000..19663302f6564b
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/get_formatted_severity_score.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.
+ */
+
+/**
+ * Returns formatted severity score.
+ * @param score - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
+ */
+export function getFormattedSeverityScore(score: number): string {
+  return score < 1 ? '< 1' : String(parseInt(String(score), 10));
+}
diff --git a/x-pack/packages/ml/anomaly_utils/get_severity.test.ts b/x-pack/packages/ml/anomaly_utils/get_severity.test.ts
new file mode 100644
index 00000000000000..c655c0f82cf5c9
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/get_severity.test.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 { getSeverity } from './get_severity';
+
+describe('getSeverity', () => {
+  test('returns warning for 0 <= score < 25', () => {
+    expect(getSeverity(0).id).toBe('warning');
+    expect(getSeverity(0.001).id).toBe('warning');
+    expect(getSeverity(24.99).id).toBe('warning');
+  });
+
+  test('returns minor for 25 <= score < 50', () => {
+    expect(getSeverity(25).id).toBe('minor');
+    expect(getSeverity(49.99).id).toBe('minor');
+  });
+
+  test('returns minor for 50 <= score < 75', () => {
+    expect(getSeverity(50).id).toBe('major');
+    expect(getSeverity(74.99).id).toBe('major');
+  });
+
+  test('returns critical for score >= 75', () => {
+    expect(getSeverity(75).id).toBe('critical');
+    expect(getSeverity(100).id).toBe('critical');
+    expect(getSeverity(1000).id).toBe('critical');
+  });
+
+  test('returns unknown for scores less than 0', () => {
+    expect(getSeverity(-10).id).toBe('unknown');
+  });
+});
diff --git a/x-pack/packages/ml/anomaly_utils/get_severity.ts b/x-pack/packages/ml/anomaly_utils/get_severity.ts
new file mode 100644
index 00000000000000..9259c7f2032cbe
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/get_severity.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ML_ANOMALY_THRESHOLD } from './anomaly_threshold';
+import type { MlSeverityType } from './anomaly_severity';
+import { ML_ANOMALY_SEVERITY_TYPES } from './anomaly_severity_types';
+
+/**
+ * Returns a severity label (one of critical, major, minor, warning or unknown)
+ * for the supplied normalized anomaly score (a value between 0 and 100).
+ * @param normalizedScore - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
+ */
+export function getSeverity(normalizedScore: number): MlSeverityType {
+  if (normalizedScore >= ML_ANOMALY_THRESHOLD.CRITICAL) {
+    return ML_ANOMALY_SEVERITY_TYPES.critical;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.MAJOR) {
+    return ML_ANOMALY_SEVERITY_TYPES.major;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.MINOR) {
+    return ML_ANOMALY_SEVERITY_TYPES.minor;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.LOW) {
+    return ML_ANOMALY_SEVERITY_TYPES.warning;
+  } else {
+    return ML_ANOMALY_SEVERITY_TYPES.unknown;
+  }
+}
diff --git a/x-pack/packages/ml/anomaly_utils/get_severity_color.test.ts b/x-pack/packages/ml/anomaly_utils/get_severity_color.test.ts
new file mode 100644
index 00000000000000..64bf7a5284c893
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/get_severity_color.test.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 { getSeverityColor } from './get_severity_color';
+
+describe('getSeverityColor', () => {
+  test('returns correct hex code for low for 0 <= score < 3', () => {
+    expect(getSeverityColor(0)).toBe('#d2e9f7');
+    expect(getSeverityColor(0.001)).toBe('#d2e9f7');
+    expect(getSeverityColor(2.99)).toBe('#d2e9f7');
+  });
+
+  test('returns correct hex code for warning for 3 <= score < 25', () => {
+    expect(getSeverityColor(3)).toBe('#8bc8fb');
+    expect(getSeverityColor(24.99)).toBe('#8bc8fb');
+  });
+
+  test('returns correct hex code for minor for 25 <= score < 50', () => {
+    expect(getSeverityColor(25)).toBe('#fdec25');
+    expect(getSeverityColor(49.99)).toBe('#fdec25');
+  });
+
+  test('returns correct hex code for major for 50 <= score < 75', () => {
+    expect(getSeverityColor(50)).toBe('#fba740');
+    expect(getSeverityColor(74.99)).toBe('#fba740');
+  });
+
+  test('returns correct hex code for critical for score >= 75', () => {
+    expect(getSeverityColor(75)).toBe('#fe5050');
+    expect(getSeverityColor(100)).toBe('#fe5050');
+    expect(getSeverityColor(1000)).toBe('#fe5050');
+  });
+
+  test('returns correct hex code for unknown for scores less than 0', () => {
+    expect(getSeverityColor(-10)).toBe('#ffffff');
+  });
+});
diff --git a/x-pack/packages/ml/anomaly_utils/get_severity_color.ts b/x-pack/packages/ml/anomaly_utils/get_severity_color.ts
new file mode 100644
index 00000000000000..f17609ecef5e7b
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/get_severity_color.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ML_ANOMALY_THRESHOLD } from './anomaly_threshold';
+import { ML_SEVERITY_COLORS } from './severity_colors';
+
+/**
+ * Returns a severity RGB color (one of critical, major, minor, warning, low or blank)
+ * for the supplied normalized anomaly score (a value between 0 and 100).
+ * @param normalizedScore - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
+ */
+export function getSeverityColor(normalizedScore: number): string {
+  if (normalizedScore >= ML_ANOMALY_THRESHOLD.CRITICAL) {
+    return ML_SEVERITY_COLORS.CRITICAL;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.MAJOR) {
+    return ML_SEVERITY_COLORS.MAJOR;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.MINOR) {
+    return ML_SEVERITY_COLORS.MINOR;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.WARNING) {
+    return ML_SEVERITY_COLORS.WARNING;
+  } else if (normalizedScore >= ML_ANOMALY_THRESHOLD.LOW) {
+    return ML_SEVERITY_COLORS.LOW;
+  } else {
+    return ML_SEVERITY_COLORS.BLANK;
+  }
+}
diff --git a/x-pack/packages/ml/anomaly_utils/get_severity_type.ts b/x-pack/packages/ml/anomaly_utils/get_severity_type.ts
new file mode 100644
index 00000000000000..22093feefff017
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/get_severity_type.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ML_ANOMALY_SEVERITY } from './anomaly_severity';
+
+/**
+ * Returns a severity type (indicating a critical, major, minor, warning or low severity anomaly)
+ * for the supplied normalized anomaly score (a value between 0 and 100).
+ * @param normalizedScore - A normalized score between 0-100, which is based on the probability of the anomalousness of this record
+ */
+export function getSeverityType(normalizedScore: number): ML_ANOMALY_SEVERITY {
+  if (normalizedScore >= 75) {
+    return ML_ANOMALY_SEVERITY.CRITICAL;
+  } else if (normalizedScore >= 50) {
+    return ML_ANOMALY_SEVERITY.MAJOR;
+  } else if (normalizedScore >= 25) {
+    return ML_ANOMALY_SEVERITY.MINOR;
+  } else if (normalizedScore >= 3) {
+    return ML_ANOMALY_SEVERITY.WARNING;
+  } else if (normalizedScore >= 0) {
+    return ML_ANOMALY_SEVERITY.LOW;
+  } else {
+    return ML_ANOMALY_SEVERITY.UNKNOWN;
+  }
+}
diff --git a/x-pack/packages/ml/anomaly_utils/index.ts b/x-pack/packages/ml/anomaly_utils/index.ts
new file mode 100644
index 00000000000000..12ec691ae4dd23
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/index.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { type MlSeverityType, ML_ANOMALY_SEVERITY } from './anomaly_severity';
+export { ML_ANOMALY_THRESHOLD } from './anomaly_threshold';
+export { ML_SEVERITY_COLORS } from './severity_colors';
+
+export {
+  aggregationTypeTransform,
+  getAnomalyScoreExplanationImpactValue,
+  getEntityFieldList,
+  getEntityFieldName,
+  getEntityFieldValue,
+  getSeverityWithLow,
+  isCategorizationAnomaly,
+  isRuleSupported,
+  isMultiBucketAnomaly,
+  showActualForFunction,
+  showTypicalForFunction,
+  type MlEntityField,
+  type MlEntityFieldOperation,
+  ML_ENTITY_FIELD_OPERATIONS,
+  ML_ENTITY_FIELD_TYPE,
+} from './anomaly_utils';
+
+export {
+  ML_ANOMALY_RESULT_TYPE,
+  ML_PARTITION_FIELD_VALUE,
+  ML_PARTITION_FIELDS,
+  ML_JOB_ID,
+  ML_SEVERITY_COLOR_RAMP,
+} from './constants';
+
+export {
+  isMlKibanaUrlConfigWithTimeRange,
+  type MlCustomUrlAnomalyRecordDoc,
+  type MlKibanaUrlConfig,
+  type MlUrlConfig,
+} from './custom_urls';
+
+export {
+  ML_DETECTOR_RULE_ACTION,
+  ML_DETECTOR_RULE_APPLIES_TO,
+  ML_DETECTOR_RULE_CONDITIONS_NOT_SUPPORTED_FUNCTIONS,
+  ML_DETECTOR_RULE_FILTER_TYPE,
+  ML_DETECTOR_RULE_OPERATOR,
+} from './detector_rule';
+
+export { getFormattedSeverityScore } from './get_formatted_severity_score';
+export { getSeverity } from './get_severity';
+export { getSeverityColor } from './get_severity_color';
+export { getSeverityType } from './get_severity_type';
+
+export type {
+  MlEntityFieldType,
+  MlInfluencer,
+  MLAnomalyDoc,
+  MlAnomalyCategorizerStatsDoc,
+  MlAnomalyRecordDoc,
+  MlAnomaliesTableRecord,
+  MlAnomaliesTableRecordExtended,
+  MlAnomalyResultType,
+  MlPartitionFieldsType,
+  MlRecordForInfluencer,
+} from './types';
diff --git a/x-pack/packages/ml/anomaly_utils/jest.config.js b/x-pack/packages/ml/anomaly_utils/jest.config.js
new file mode 100644
index 00000000000000..d16d2ef76a83ca
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/jest.config.js
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../..',
+  roots: ['<rootDir>/x-pack/packages/ml/anomaly_utils'],
+};
diff --git a/x-pack/packages/ml/anomaly_utils/kibana.jsonc b/x-pack/packages/ml/anomaly_utils/kibana.jsonc
new file mode 100644
index 00000000000000..92fa54e6104de4
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/kibana.jsonc
@@ -0,0 +1,5 @@
+{
+  "type": "shared-common",
+  "id": "@kbn/ml-anomaly-utils",
+  "owner": "@elastic/ml-ui"
+}
diff --git a/x-pack/packages/ml/anomaly_utils/package.json b/x-pack/packages/ml/anomaly_utils/package.json
new file mode 100644
index 00000000000000..f49b343d58cd15
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@kbn/ml-anomaly-utils",
+  "private": true,
+  "version": "1.0.0",
+  "license": "Elastic License 2.0"
+}
\ No newline at end of file
diff --git a/x-pack/packages/ml/anomaly_utils/severity_colors.ts b/x-pack/packages/ml/anomaly_utils/severity_colors.ts
new file mode 100644
index 00000000000000..e8715284633991
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/severity_colors.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * RGB hex codes used to indicate the severity of an anomaly according to its anomaly score.
+ */
+export const ML_SEVERITY_COLORS = {
+  /**
+   * Color used in the UI to indicate a critical anomaly, with a score greater than or equal to 75.
+   */
+  CRITICAL: '#fe5050',
+
+  /**
+   * Color used in the UI to indicate a major anomaly, with a score greater than or equal to 50 and less than 75 .
+   */
+  MAJOR: '#fba740',
+
+  /**
+   * Color used in the UI to indicate a minor anomaly, with a score greater than or equal to 25 and less than 50.
+   */
+  MINOR: '#fdec25',
+
+  /**
+   * Color used in the UI to indicate a warning anomaly, with a score greater than or equal to 3 and less than 25.
+   * Note in some parts of the UI, warning severity is used when the score is greater than or equal to 0.
+   */
+  WARNING: '#8bc8fb',
+
+  /**
+   * Color used in some parts of the UI to indicate a low severity anomaly, with a score greater than or equal to 0 and less than 3.
+   */
+  LOW: '#d2e9f7',
+
+  /**
+   * Color used in the UI to indicate an anomaly for which the score is unknown.
+   */
+  BLANK: '#ffffff',
+};
diff --git a/x-pack/packages/ml/anomaly_utils/tsconfig.json b/x-pack/packages/ml/anomaly_utils/tsconfig.json
new file mode 100644
index 00000000000000..2712b8bbffdb36
--- /dev/null
+++ b/x-pack/packages/ml/anomaly_utils/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types",
+    "types": [
+      "jest",
+      "node",
+      "react"
+    ]
+  },
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+  ],
+  "exclude": [
+    "target/**/*"
+  ],
+  "kbn_references": [
+    "@kbn/i18n",
+    "@kbn/ml-is-populated-object",
+  ]
+}
diff --git a/x-pack/plugins/ml/common/types/anomalies.ts b/x-pack/packages/ml/anomaly_utils/types.ts
similarity index 78%
rename from x-pack/plugins/ml/common/types/anomalies.ts
rename to x-pack/packages/ml/anomaly_utils/types.ts
index 1bc5ac86ff79a3..af87be8f1edf9b 100644
--- a/x-pack/plugins/ml/common/types/anomalies.ts
+++ b/x-pack/packages/ml/anomaly_utils/types.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { PARTITION_FIELDS, ANOMALY_RESULT_TYPE } from '../constants/anomalies';
-import type { KibanaUrlConfig } from './custom_urls';
+import { ML_PARTITION_FIELDS, ML_ANOMALY_RESULT_TYPE } from './constants';
+import type { MlKibanaUrlConfig } from './custom_urls';
 
 /**
  * Influencers are the entities that have contributed to, or are to blame for, the anomalies.
  * Influencer results are available only if an influencer_field_name is specified in the job configuration.
  */
-export interface Influencer {
+export interface MlInfluencer {
   /**
    * The field name of the influencer.
    */
@@ -24,15 +24,26 @@ export interface Influencer {
   influencer_field_values: string[];
 }
 
-export type MLAnomalyDoc = AnomalyRecordDoc;
+/**
+ * Alias of MlAnomalyRecordDoc
+ * @export
+ * @typedef {MLAnomalyDoc}
+ */
+export type MLAnomalyDoc = MlAnomalyRecordDoc;
 
-export type RecordForInfluencer = AnomalyRecordDoc;
+/**
+ * MlRecordForInfluencer, an alias based on MlAnomalyRecordDoc.
+ *
+ * @export
+ * @typedef {MlRecordForInfluencer}
+ */
+export type MlRecordForInfluencer = MlAnomalyRecordDoc;
 
 /**
  * Anomaly record document. Records contain the detailed analytical results.
  * They describe the anomalous activity that has been identified in the input data based on the detector configuration.
  */
-export interface AnomalyRecordDoc {
+export interface MlAnomalyRecordDoc {
   /**
    * Index signature to cover dynamic attributes added to the record depending on the fields being analyzed.
    * For example, if the job is analyzing hostname as a by field, then a field hostname is added to the result document.
@@ -130,7 +141,7 @@ export interface AnomalyRecordDoc {
    * If influencers was specified in the detector configuration, this array contains influencers
    * that contributed to or were to blame for an anomaly.
    */
-  influencers?: Influencer[];
+  influencers?: MlInfluencer[];
 
   /**
    * The field used to split the data. In particular, this property is used for analyzing the splits
@@ -238,7 +249,7 @@ export interface AnomalyRecordDoc {
 /**
  * Anomaly table record, representing the fields shown in the ML UI anomalies table.
  */
-export interface AnomaliesTableRecord {
+export interface MlAnomaliesTableRecord {
   /**
    * The start time of the interval for which the anomaly data in the table is being aggregated.
    * Anomalies in the table are commonly aggregated by day, hour, or at the bucket span of the job.
@@ -248,7 +259,7 @@ export interface AnomaliesTableRecord {
   /**
    * The source anomaly record document, containing the full source anomaly record fields.
    */
-  source: AnomalyRecordDoc;
+  source: MlAnomalyRecordDoc;
 
   /**
    * Unique identifier for the table row.
@@ -321,7 +332,7 @@ export interface AnomaliesTableRecord {
    * List of custom URL drilldowns from the table row to other pages such as
    * Discover, Dashboard or other web pages.
    */
-  customUrls?: KibanaUrlConfig[];
+  customUrls?: MlKibanaUrlConfig[];
 
   /**
    * Returns true if the anomaly record represented by the table row is for a time series
@@ -345,33 +356,131 @@ export interface AnomaliesTableRecord {
  * and rules length.
  * Used by the AnomaliesTable component
  */
-export interface AnomaliesTableRecordExtended extends AnomaliesTableRecord {
+export interface MlAnomaliesTableRecordExtended extends MlAnomaliesTableRecord {
+  /**
+   * The detector name.
+   * @type {string}
+   */
   detector: string;
+  /**
+   * The length of the rule.
+   * @type {?number}
+   */
   rulesLength?: number;
 }
 
-export type PartitionFieldsType = typeof PARTITION_FIELDS[number];
+/**
+ * Union type for partitiion field types.
+ *
+ * @export
+ * @typedef {MlPartitionFieldsType}
+ */
+export type MlPartitionFieldsType = typeof ML_PARTITION_FIELDS[number];
 
-export interface AnomalyCategorizerStatsDoc {
+/**
+ * Anomaly record document for categorizer stats.
+ *
+ * @export
+ * @interface MlAnomalyCategorizerStatsDoc
+ * @typedef {MlAnomalyCategorizerStatsDoc}
+ */
+export interface MlAnomalyCategorizerStatsDoc {
+  /**
+   * Index signature to cover dynamic attributes added to the record depending on the fields being analyzed.
+   * For example, if the job is analyzing hostname as a by field, then a field hostname is added to the result document.
+   */
   [key: string]: any;
+
+  /**
+   * The identifier for the anomaly detection job.
+   * @type {string}
+   */
   job_id: string;
+
+  /**
+   * The type of the result document.
+   * @type {'categorizer_stats'}
+   */
   result_type: 'categorizer_stats';
+
+  /**
+   * The field used to segment the analysis.
+   * When you use this property, you have completely independent baselines for each value of this field.
+   * @type {?string}
+   */
   partition_field_name?: string;
+
+  /**
+   * The value of the partition field.
+   * @type {?string}
+   */
   partition_field_value?: string;
+
+  /**
+   * The number of documents.
+   * @type {number}
+   */
   categorized_doc_count: number;
+
+  /**
+   * The total number of categories.
+   * @type {number}
+   */
   total_category_count: number;
+
+  /**
+   * The number of frequent categories.
+   * @type {number}
+   */
   frequent_category_count: number;
+
+  /**
+   * The number of rare categories.
+   * @type {number}
+   */
   rare_category_count: number;
+
+  /**
+   * The number of dead categories.
+   * @type {number}
+   */
   dead_category_count: number;
+
+  /**
+   * The number of failed categories.
+   * @type {number}
+   */
   failed_category_count: number;
+
+  /**
+   * The categorization status.
+   * @type {('ok' | 'warn')}
+   */
   categorization_status: 'ok' | 'warn';
+
+  /**
+   * The log time.
+   * @type {number}
+   */
   log_time: number;
+
+  /**
+   * The start time of the bucket for which these results were calculated.
+   * @type {number}
+   */
   timestamp: number;
 }
 
-export type EntityFieldType = 'partition_field' | 'over_field' | 'by_field';
+/**
+ * Union type for entity field types.
+ *
+ * @export
+ * @typedef {MlEntityFieldType}
+ */
+export type MlEntityFieldType = 'partition_field' | 'over_field' | 'by_field';
 
 /**
  * The type of the anomaly result, such as bucket, influencer or record.
  */
-export type AnomalyResultType = typeof ANOMALY_RESULT_TYPE[keyof typeof ANOMALY_RESULT_TYPE];
+export type MlAnomalyResultType =
+  typeof ML_ANOMALY_RESULT_TYPE[keyof typeof ML_ANOMALY_RESULT_TYPE];
diff --git a/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts b/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
index 3376af46daa2b2..e1a5d35afdc2e9 100644
--- a/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
+++ b/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
@@ -50,14 +50,14 @@ export const BUILT_IN_MODEL_TAG = 'prepackaged';
 export const CURATED_MODEL_TAG = 'curated';
 
 export const CURATED_MODEL_DEFINITIONS = {
-  '.elser_model_1_SNAPSHOT': {
+  '.elser_model_1': {
     config: {
       input: {
         field_names: ['text_field'],
       },
     },
     description: i18n.translate('xpack.ml.trainedModels.modelsList.elserDescription', {
-      defaultMessage: 'Elastic Learned Sparse EncodeR',
+      defaultMessage: 'Elastic Learned Sparse EncodeR v1 (Tech Preview)',
     }),
   },
 } as const;
diff --git a/x-pack/plugins/aiops/public/components/spike_analysis_table/spike_analysis_table_groups.tsx b/x-pack/plugins/aiops/public/components/spike_analysis_table/spike_analysis_table_groups.tsx
index ca55b43907bd69..104906f1a216d3 100644
--- a/x-pack/plugins/aiops/public/components/spike_analysis_table/spike_analysis_table_groups.tsx
+++ b/x-pack/plugins/aiops/public/components/spike_analysis_table/spike_analysis_table_groups.tsx
@@ -189,12 +189,8 @@ export const SpikeAnalysisGroupsTable: FC<SpikeAnalysisTableProps> = ({
           const { fieldName, fieldValue, duplicate } = groupItem;
           if (valuesBadges.length >= MAX_GROUP_BADGES) break;
           valuesBadges.push(
-            <>
-              <EuiBadge
-                key={`${fieldName}-id`}
-                data-test-subj="aiopsSpikeAnalysisTableColumnGroupBadge"
-                color="hollow"
-              >
+            <span key={`${fieldName}-id`}>
+              <EuiBadge data-test-subj="aiopsSpikeAnalysisTableColumnGroupBadge" color="hollow">
                 <span>
                   {(duplicate ?? 0) <= 1 ? '* ' : ''}
                   {`${fieldName}: `}
@@ -202,7 +198,7 @@ export const SpikeAnalysisGroupsTable: FC<SpikeAnalysisTableProps> = ({
                 <span style={{ color: visColors[2] }}>{`${fieldValue}`}</span>
               </EuiBadge>
               <EuiSpacer size="xs" />
-            </>
+            </span>
           );
         }
 
diff --git a/x-pack/plugins/alerting/README.md b/x-pack/plugins/alerting/README.md
index e1225d8a9af0bd..06188a199ba967 100644
--- a/x-pack/plugins/alerting/README.md
+++ b/x-pack/plugins/alerting/README.md
@@ -17,6 +17,7 @@ Table of Contents
 	- [Plugin Status](#plugin-status)
 	- [Rule Types](#rule-types)
 		- [Methods](#methods)
+		- [Alerts as Data](#alerts-as-data)
 		- [Executor](#executor)
 		- [Action variables](#action-variables)
 	- [Recovered Alerts](#recovered-alerts)
@@ -38,16 +39,13 @@ Table of Contents
 
 > Disclaimer: We are actively working to update the terminology of the Alerting Framework. While all user-facing terminology has been updated, much of the codebase is still a work in progress.
 
-
-> References to `rule` and `rule type` entities are still named `AlertType` within the codebase.
-
 **Rule Type**: A function that takes parameters and executes actions on alerts.
 
 **Rule**: A configuration that defines a schedule, a rule type w/ parameters, state information and actions.
 
 **Alert**: The alert(s) created from a rule execution.
 
-A Kibana rule detects a condition and executes one or more actions when that condition occurs.  Rules work by going through the followings steps:
+A Kibana rule checks the condition defined by its rule type and executes one or more actions when that condition is met.  Rules work by going through the followings steps:
 
 1. Run a periodic check to detect a condition (the check is provided by a rule type).
 2. Convert that condition into one or more stateful alerts.
@@ -88,20 +86,23 @@ The following table describes the properties of the `options` object.
 |name|A user-friendly name for the rule type. These will be displayed in dropdowns when choosing rule types.|string|
 |actionGroups|An explicit list of groups the rule type may schedule actions for, each specifying the ActionGroup's unique ID and human readable name. Each rule type's `actions` validation will use this list to ensure configured groups are valid. We highly encourage using `kbn-i18n` to translate the names of actionGroup  when registering the rule type. |Array<{id:string, name:string}>|
 |defaultActionGroupId|ID value for the default action group for the rule type.|string|
-|recoveryActionGroup|The action group to use when an alert goes from an active state to an inactive one. This action group should not be specified under the `actionGroups` property. If no recoveryActionGroup is specified, the default `recovered` action group will be used. |{id:string, name:string}|
-|actionVariables|An explicit list of action variables that the rule type makes available via context and state in action parameter templates, and a short human readable description for each. The Alerting UI  will use this to display prompts for the users for these variables, in action parameter editors. We highly encourage using `kbn-i18n` to translate the descriptions. |{ context: Array<{name:string, description:string}, state: Array<{name:string, description:string}>|
+|recoveryActionGroup|(Optional) The action group to use when an alert goes from an active state to an inactive one. This action group should not be specified under the `actionGroups` property. If no recoveryActionGroup is specified, the default `recovered` action group will be used. |{id:string, name:string}|
+|actionVariables|(Optional) An explicit list of action variables that the rule type makes available via context and state in action parameter templates, and a short human readable description for each. The Alerting UI  will use this to display prompts for the users for these variables, in action parameter editors. We highly encourage using `kbn-i18n` to translate the descriptions. |{ context: Array<{name:string, description:string}, state: Array<{name:string, description:string}>|
 |validate.params|When developing a rule type, you can choose to accept a series of parameters. You may also choose to have the parameters validated before they are passed to the `executor` function or created as a saved object. In order to do this, provide a `@kbn/config-schema` schema that we will use to validate the `params` attribute.|@kbn/config-schema|
 |executor|This is where the code for the rule type lives. This is a function to be called when executing a rule on an interval basis. For full details, see the executor section below.|Function|
 |producer|The id of the application producing this rule type.|string|
 |minimumLicenseRequired|The value of a minimum license. Most of the rules are licensed as "basic".|string|
-|ruleTaskTimeout|The length of time a rule can run before being cancelled due to timeout. By default, this value is "5m".|string|
-|cancelAlertsOnRuleTimeout|Whether to skip writing alerts and scheduling actions if a rule execution is cancelled due to timeout. By default, this value is set to "true".|boolean|
+|ruleTaskTimeout|(Optional) The length of time a rule can run before being cancelled due to timeout. If not specified, the default value of "5m" is used.|string|
+|cancelAlertsOnRuleTimeout|(Optional) Whether to skip writing alerts and scheduling actions if a rule execution is cancelled due to timeout. If not specified, the default value of "true" is used.|boolean|
 |useSavedObjectReferences.extractReferences|(Optional) When developing a rule type, you can choose to implement hooks for extracting saved object references from rule parameters. This hook will be invoked when a rule is created or updated. Implementing this hook is optional, but if an extract hook is implemented, an inject hook must also be implemented.|Function
 |useSavedObjectReferences.injectReferences|(Optional) When developing a rule type, you can choose to implement hooks for injecting saved object references into rule parameters. This hook will be invoked when a rule is retrieved (get or find). Implementing this hook is optional, but if an inject hook is implemented, an extract hook must also be implemented.|Function
 |isExportable|Whether the rule type is exportable from the Saved Objects Management UI.|boolean|
-|defaultScheduleInterval|The default interval that will show up in the UI when creating a rule of this rule type.|boolean|
-|doesSetRecoveryContext|Whether the rule type will set context variables for recovered alerts. Defaults to `false`. If this is set to true, context variables are made available for the recovery action group and executors will be provided with the ability to set recovery context.|boolean|
+|defaultScheduleInterval|(Optional) The default interval that will show up in the UI when creating a rule of this rule type.|boolean|
+|doesSetRecoveryContext|(Optional) Whether the rule type will set context variables for recovered alerts. Defaults to `false`. If this is set to true, context variables are made available for the recovery action group and executors will be provided with the ability to set recovery context.|boolean|
 |getSummarizedAlerts|(Optional) When developing a rule type, you can choose to implement this hook for retrieving summarized alerts based on execution UUID or time range. This hook will be invoked when an alert summary action is configured for the rule.|Function|
+|alerts|(Optional) Specify options for writing alerts as data documents for this rule type. This feature is currently under development so this field is optional but we will eventually make this a requirement of all rule types. For full details, see the alerts as data section below.|IRuleTypeAlerts|
+|autoRecoverAlerts|(Optional) Whether the framework should determine if alerts have recovered between rule runs. If not specified, the default value of `true` is used. |boolean|
+|getViewInAppRelativeUrl|(Optional) When developing a rule type, you can choose to implement this hook for generating a link back to the Kibana application that can be used in alert actions. If not specified, a generic link back to the Rule Management app is generated.|Function|
 
 ### Executor
 
@@ -140,6 +141,56 @@ This is the primary function for a rule type. Whenever the rule needs to execute
 |rule.throttle|The configured throttle interval for this rule.|
 |rule.notifyWhen|The configured notification type for this rule.|
 
+### Alerts as Data
+
+The `alerts` property on a rule type should contain the information needed for the framework to install the Elasticsearch assets required to support writing alert documents.
+
+|Property|Description|Type|
+|---|---|---|
+|context|The namespace to use for this rule type. Multiple rule types can specify the same value for their alert context.|string|
+|mappings|Specify custom mappings for this rule type. These mappings will be translated into a component template.|ComponentTemplateSpec|
+|useEcs|(Optional) Whether to include the ECS component template for this rule type's alerts. If not specified, this value defaults to `false`.|boolean|
+|useLegacyAlerts|(Optional) Whether to include the legacy alert component template for this rule type's alerts. This should only be used by rule types that previously registered with the rule registry. If not specified, this value defaults to `false`.|boolean|
+|isSpaceAware|(Optional) Whether this rule type's alerts should be space-aware. If set to `true`, space specific alerts indices will be created during rule execution. If not specified, this value defaults to `false`.|boolean|
+|secondaryAlias|(Optional) Secondary alias to include. This option is included to support the signals alias for detection rules.|string|
+
+Regardless of whether any rule type specifies an `alerts` definition, the alerting framework will install the following common Elasticsearch assets on plugin setup:
+
+|Type|Name|Descripton|
+|---|---|---|
+|ILM Policy|`.alerts-ilm-policy`|Roll over after 30 days or if index exceeds 50 gigabytes|
+|Component Template|`.alerts-framework-mappings`|Includes mappings for all framework alerting fields|
+|Component Template|`.alerts-legacy-alert-mappings`|Includes mappings for all legacy alert fields. Use these mappings along with the framework mappings to match the rule registry technical mappings.|
+|Component Template|`.alerts-ecs-mappings`|Includes mappings for all ECS fields, excluding those of type `constant_keyword`|
+
+When a rule type specifies an `alerts` definition, the alerting framework will install Elasticsearch assets for the rule type on plugin setup. The following example definition
+
+```js
+{
+  context: `mySpecialRule`,
+  mappings: {
+    fieldMap: {
+      mySpecialRuleField: {
+        type: 'keyword',
+        required: false
+      }
+    }
+  },
+  useEcs: true
+}
+```
+
+will result in the following assets being installed:
+
+|Type|Name|Descripton|
+|---|---|---|
+|Component Template|`.alerts-mySpecialRule-mappings`|Includes mappings for fields in the specified fieldMap|
+|Index Template|`.alerts-mySpecialRule.alerts-default-index-template`|Includes references to the framework component template, the `.alerts-mySpecialRule-mappings` component template and the ECS component templates because `useEcs: true`|
+|Alias|`.alerts-mySpecialRule.alerts-default`||
+|Index|`.internal.alerts-mySpecialRule.alerts-default-000001`|Concrete write index for the `.alerts-mySpecialRule.alerts-default` alias|
+
+It is important to note that while multiple rule types can specify the same `context` in order to consolidate their alerts into a single index, the `alerts` definition must be the same across all these rule types. If, for example, RuleTypeA registers alert context `ourRules` with `useEcs: true` and RuleTypeB registers alert context `ourRules` with `useEcs: false`, an error will be thrown during registration.
+
 ### Action Variables
 
 The `actionVariables` property should contain the **flattened** names of the state and context variables available when an executor calls `alertInstance.scheduleActions(actionGroup, context)`.  These names are meant to be used in prompters in the Alerting UI, are used as text values for display, and can be inserted into to an action parameter text entry field via a UI gesture (e.g., clicking a menu item from a menu built with these names).  They should be flattened, so if a state or context variable is an object with properties, these should be listed with the "parent" property/properties in the name, separated by a `.` (period).
diff --git a/x-pack/plugins/alerting/common/index.ts b/x-pack/plugins/alerting/common/index.ts
index 1fa0806effdef7..d71b69bcb51e79 100644
--- a/x-pack/plugins/alerting/common/index.ts
+++ b/x-pack/plugins/alerting/common/index.ts
@@ -66,4 +66,4 @@ export const INTERNAL_ALERTING_API_GET_ACTIVE_MAINTENANCE_WINDOWS_PATH =
 
 export const ALERTS_FEATURE_ID = 'alerts';
 export const MONITORING_HISTORY_LIMIT = 200;
-export const ENABLE_MAINTENANCE_WINDOWS = false;
+export const ENABLE_MAINTENANCE_WINDOWS = true;
diff --git a/x-pack/plugins/alerting/public/lib/test_utils.tsx b/x-pack/plugins/alerting/public/lib/test_utils.tsx
index 56485d7c88ad1c..6e1642bfe0d364 100644
--- a/x-pack/plugins/alerting/public/lib/test_utils.tsx
+++ b/x-pack/plugins/alerting/public/lib/test_utils.tsx
@@ -11,7 +11,7 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { I18nProvider } from '@kbn/i18n-react';
 import { KibanaContextProvider, KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { render as reactRender, RenderOptions, RenderResult } from '@testing-library/react';
-import { CoreStart } from '@kbn/core/public';
+import { Capabilities, CoreStart } from '@kbn/core/public';
 import { coreMock } from '@kbn/core/public/mocks';
 import { euiDarkVars } from '@kbn/ui-theme';
 import type { ILicense } from '@kbn/licensing-plugin/public';
@@ -22,6 +22,7 @@ import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
 
 interface AppMockRendererArgs {
+  capabilities?: Capabilities;
   license?: ILicense | null;
 }
 
@@ -30,9 +31,15 @@ export interface AppMockRenderer {
   coreStart: CoreStart;
   queryClient: QueryClient;
   AppWrapper: React.FC<{ children: React.ReactElement }>;
+  mocked: {
+    setBadge: jest.Mock;
+  };
 }
 
-export const createAppMockRenderer = ({ license }: AppMockRendererArgs = {}): AppMockRenderer => {
+export const createAppMockRenderer = ({
+  capabilities,
+  license,
+}: AppMockRendererArgs = {}): AppMockRenderer => {
   const theme$ = of({ eui: euiDarkVars, darkMode: true });
 
   const licensingPluginMock = licensingMock.createStart();
@@ -53,13 +60,26 @@ export const createAppMockRenderer = ({ license }: AppMockRendererArgs = {}): Ap
       error: () => {},
     },
   });
+
+  const mockedSetBadge = jest.fn();
   const core = coreMock.createStart();
   const services = {
     ...core,
+    application: {
+      ...core.application,
+      capabilities: {
+        ...core.application.capabilities,
+        ...capabilities,
+      },
+    },
     licensing:
       license != null
         ? { ...licensingPluginMock, license$: new BehaviorSubject(license) }
         : licensingPluginMock,
+    chrome: {
+      ...core.chrome,
+      setBadge: mockedSetBadge,
+    },
   };
   const AppWrapper: React.FC<{ children: React.ReactElement }> = React.memo(({ children }) => (
     <I18nProvider>
@@ -85,5 +105,8 @@ export const createAppMockRenderer = ({ license }: AppMockRendererArgs = {}): Ap
     render,
     queryClient,
     AppWrapper,
+    mocked: {
+      setBadge: mockedSetBadge,
+    },
   };
 };
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/empty_prompt.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/empty_prompt.tsx
index 63e7a36c74e069..4b733f1a7289bc 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/empty_prompt.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/empty_prompt.tsx
@@ -41,7 +41,12 @@ export const EmptyPrompt = React.memo<EmptyPromptProps>(
     }, [showCreateButton, onClickCreate, docLinks]);
 
     return (
-      <EuiPageTemplate.EmptyPrompt title={emptyTitle} body={emptyBody} actions={renderActions} />
+      <EuiPageTemplate.EmptyPrompt
+        data-test-subj="mw-empty-prompt"
+        title={emptyTitle}
+        body={emptyBody}
+        actions={renderActions}
+      />
     );
   }
 );
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/license_prompt.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/license_prompt.tsx
index 61de0593e387b1..4d1b0588fda4a4 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/license_prompt.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/license_prompt.tsx
@@ -24,6 +24,7 @@ export const LicensePrompt = React.memo(() => {
 
   return (
     <EuiPageTemplate.EmptyPrompt
+      data-test-subj="mw-license-prompt"
       title={title}
       body={
         <EuiFlexGroup direction="column">
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx
index ed3fcb08394412..6cb9708199e0f7 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.test.tsx
@@ -94,7 +94,12 @@ describe('MaintenanceWindowsList', () => {
 
   test('it renders', () => {
     const result = appMockRenderer.render(
-      <MaintenanceWindowsList refreshData={() => {}} loading={false} items={items} />
+      <MaintenanceWindowsList
+        refreshData={() => {}}
+        loading={false}
+        items={items}
+        readOnly={false}
+      />
     );
 
     expect(result.getAllByTestId('list-item')).toHaveLength(items.length);
@@ -115,5 +120,24 @@ describe('MaintenanceWindowsList', () => {
 
     // check the endDate formatting
     expect(result.getAllByText('05/05/23 00:00 AM')).toHaveLength(4);
+
+    // check if action menu is there
+    expect(result.getAllByTestId('table-actions-icon-button')).toHaveLength(items.length);
+  });
+
+  test('it does NOT renders action column in readonly', () => {
+    const result = appMockRenderer.render(
+      <MaintenanceWindowsList
+        refreshData={() => {}}
+        loading={false}
+        items={items}
+        readOnly={true}
+      />
+    );
+
+    expect(result.getAllByTestId('list-item')).toHaveLength(items.length);
+
+    // check if action menu is there
+    expect(result.queryByTestId('table-actions-icon-button')).not.toBeInTheDocument();
   });
 });
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx
index 705219b9baa2aa..7c817a1d708096 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/components/maintenance_windows_list.tsx
@@ -32,10 +32,11 @@ import { useFinishAndArchiveMaintenanceWindow } from '../../../hooks/use_finish_
 interface MaintenanceWindowsListProps {
   loading: boolean;
   items: MaintenanceWindowFindResponse[];
+  readOnly: boolean;
   refreshData: () => void;
 }
 
-const columns: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = [
+const COLUMNS: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = [
   {
     field: 'title',
     name: i18n.NAME,
@@ -99,7 +100,7 @@ const search: { filters: SearchFilterConfig[] } = {
 };
 
 export const MaintenanceWindowsList = React.memo<MaintenanceWindowsListProps>(
-  ({ loading, items, refreshData }) => {
+  ({ loading, items, readOnly, refreshData }) => {
     const { euiTheme } = useEuiTheme();
     const { navigateToEditMaintenanceWindows } = useEditMaintenanceWindowsNavigation();
     const onEdit = useCallback(
@@ -139,32 +140,41 @@ export const MaintenanceWindowsList = React.memo<MaintenanceWindowsListProps>(
       `;
     }, [euiTheme.colors.highlight]);
 
-    const actions: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = [
-      {
-        name: '',
-        render: ({ status, id }: { status: MaintenanceWindowStatus; id: string }) => {
-          return (
-            <TableActionsPopover
-              id={id}
-              status={status}
-              onEdit={onEdit}
-              onCancel={onCancel}
-              onArchive={onArchive}
-              onCancelAndArchive={onCancelAndArchive}
-            />
-          );
+    const actions: Array<EuiBasicTableColumn<MaintenanceWindowFindResponse>> = useMemo(
+      () => [
+        {
+          name: '',
+          render: ({ status, id }: { status: MaintenanceWindowStatus; id: string }) => {
+            return (
+              <TableActionsPopover
+                id={id}
+                status={status}
+                onEdit={onEdit}
+                onCancel={onCancel}
+                onArchive={onArchive}
+                onCancelAndArchive={onCancelAndArchive}
+              />
+            );
+          },
         },
-      },
-    ];
+      ],
+      [onArchive, onCancel, onCancelAndArchive, onEdit]
+    );
+
+    const columns = useMemo(
+      () => (readOnly ? COLUMNS : COLUMNS.concat(actions)),
+      [actions, readOnly]
+    );
 
     return (
       <EuiInMemoryTable
+        data-test-subj="mw-table"
         css={tableCss}
         itemId="id"
         loading={loading || isLoadingFinish || isLoadingArchive || isLoadingFinishAndArchive}
         tableCaption="Maintenance Windows List"
         items={items}
-        columns={columns.concat(actions)}
+        columns={columns}
         pagination={true}
         sorting={sorting}
         rowProps={rowProps}
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/index.test.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.test.tsx
new file mode 100644
index 00000000000000..31efde4db13783
--- /dev/null
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.test.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import type { Capabilities } from '@kbn/core-capabilities-common';
+import { AppMockRenderer, createAppMockRenderer } from '../../lib/test_utils';
+import { useFindMaintenanceWindows } from '../../hooks/use_find_maintenance_windows';
+import { MaintenanceWindowsPage } from '.';
+import { MAINTENANCE_WINDOW_FEATURE_ID } from '../../../common';
+
+jest.mock('../../hooks/use_find_maintenance_windows', () => ({
+  useFindMaintenanceWindows: jest.fn(),
+}));
+
+describe('Maintenance windows page', () => {
+  let appMockRenderer: AppMockRenderer;
+  let license = licensingMock.createLicense({
+    license: { type: 'platinum' },
+  });
+  let capabilities: Capabilities = {
+    [MAINTENANCE_WINDOW_FEATURE_ID]: {
+      show: true,
+      save: true,
+    },
+    navLinks: {},
+    management: {},
+    catalogue: {},
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (useFindMaintenanceWindows as jest.Mock).mockReturnValue({
+      isLoading: false,
+      maintenanceWindows: [],
+      refetch: jest.fn(),
+    });
+    license = licensingMock.createLicense({
+      license: { type: 'platinum' },
+    });
+    capabilities = {
+      maintenanceWindow: {
+        show: true,
+        save: true,
+      },
+      navLinks: {},
+      management: {},
+      catalogue: {},
+    };
+    appMockRenderer = createAppMockRenderer({ capabilities, license });
+  });
+
+  test('show license prompt', () => {
+    license = licensingMock.createLicense({
+      license: { type: 'gold' },
+    });
+    appMockRenderer = createAppMockRenderer({ capabilities, license });
+    const result = appMockRenderer.render(<MaintenanceWindowsPage />);
+    expect(result.queryByTestId('mw-license-prompt')).toBeInTheDocument();
+  });
+
+  test('show empty prompt', () => {
+    const result = appMockRenderer.render(<MaintenanceWindowsPage />);
+    expect(result.queryByTestId('mw-empty-prompt')).toBeInTheDocument();
+    expect(appMockRenderer.mocked.setBadge).not.toBeCalled();
+  });
+
+  test('show table in read only', () => {
+    capabilities = {
+      ...capabilities,
+      [MAINTENANCE_WINDOW_FEATURE_ID]: {
+        show: true,
+        save: false,
+      },
+    };
+    appMockRenderer = createAppMockRenderer({ capabilities, license });
+    const result = appMockRenderer.render(<MaintenanceWindowsPage />);
+    expect(result.queryByTestId('mw-table')).toBeInTheDocument();
+    expect(appMockRenderer.mocked.setBadge).toBeCalledTimes(1);
+  });
+});
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx
index ac6d0b5534b9a7..5eae620c5a3e5e 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import {
   EuiButton,
   EuiFlexGroup,
@@ -28,9 +28,14 @@ import { CenterJustifiedSpinner } from './components/center_justified_spinner';
 import { ExperimentalBadge } from './components/page_header';
 import { useLicense } from '../../hooks/use_license';
 import { LicensePrompt } from './components/license_prompt';
+import { MAINTENANCE_WINDOW_FEATURE_ID } from '../../../common';
 
 export const MaintenanceWindowsPage = React.memo(() => {
-  const { docLinks } = useKibana().services;
+  const {
+    application: { capabilities },
+    chrome,
+    docLinks,
+  } = useKibana().services;
   const { isAtLeastPlatinum } = useLicense();
 
   const { navigateToCreateMaintenanceWindow } = useCreateMaintenanceWindowNavigation();
@@ -44,10 +49,37 @@ export const MaintenanceWindowsPage = React.memo(() => {
   }, [navigateToCreateMaintenanceWindow]);
 
   const refreshData = useCallback(() => refetch(), [refetch]);
-
-  const showEmptyPrompt = !isLoading && maintenanceWindows.length === 0;
+  const showWindowMaintenance = capabilities[MAINTENANCE_WINDOW_FEATURE_ID].show;
+  const writeWindowMaintenance = capabilities[MAINTENANCE_WINDOW_FEATURE_ID].save;
+  const showEmptyPrompt =
+    !isLoading &&
+    maintenanceWindows.length === 0 &&
+    showWindowMaintenance &&
+    writeWindowMaintenance;
   const hasLicense = isAtLeastPlatinum();
 
+  const readOnly = showWindowMaintenance && !writeWindowMaintenance;
+
+  // if the user is read only then display the glasses badge in the global navigation header
+  const setBadge = useCallback(() => {
+    if (readOnly) {
+      chrome.setBadge({
+        text: i18n.READ_ONLY_BADGE_TEXT,
+        tooltip: i18n.READ_ONLY_BADGE_TOOLTIP,
+        iconType: 'glasses',
+      });
+    }
+  }, [chrome, readOnly]);
+
+  useEffect(() => {
+    setBadge();
+
+    // remove the icon after the component unmounts
+    return () => {
+      chrome.setBadge();
+    };
+  }, [setBadge, chrome]);
+
   if (isLoading) {
     return <CenterJustifiedSpinner />;
   }
@@ -71,9 +103,14 @@ export const MaintenanceWindowsPage = React.memo(() => {
             <p>{i18n.MAINTENANCE_WINDOWS_DESCRIPTION}</p>
           </EuiText>
         </EuiPageHeaderSection>
-        {!showEmptyPrompt && hasLicense ? (
+        {!showEmptyPrompt && hasLicense && writeWindowMaintenance ? (
           <EuiPageHeaderSection>
-            <EuiButton onClick={handleClickCreate} iconType="plusInCircle" fill>
+            <EuiButton
+              data-test-subj="mw-create-button"
+              onClick={handleClickCreate}
+              iconType="plusInCircle"
+              fill
+            >
               {i18n.CREATE_NEW_BUTTON}
             </EuiButton>
           </EuiPageHeaderSection>
@@ -87,6 +124,7 @@ export const MaintenanceWindowsPage = React.memo(() => {
         <>
           <EuiSpacer size="xl" />
           <MaintenanceWindowsList
+            readOnly={readOnly}
             refreshData={refreshData}
             loading={isLoading}
             items={maintenanceWindows}
diff --git a/x-pack/plugins/alerting/public/pages/maintenance_windows/translations.ts b/x-pack/plugins/alerting/public/pages/maintenance_windows/translations.ts
index 7e0c2fa484f7ad..1ead43b2a3ba0b 100644
--- a/x-pack/plugins/alerting/public/pages/maintenance_windows/translations.ts
+++ b/x-pack/plugins/alerting/public/pages/maintenance_windows/translations.ts
@@ -20,6 +20,20 @@ export const MAINTENANCE_WINDOWS_DESCRIPTION = i18n.translate(
   }
 );
 
+export const READ_ONLY_BADGE_TEXT = i18n.translate(
+  'xpack.alerting.maintenanceWindows.badge.readOnly.text',
+  {
+    defaultMessage: 'Read only',
+  }
+);
+
+export const READ_ONLY_BADGE_TOOLTIP = i18n.translate(
+  'xpack.alerting.maintenanceWindows.badge.readOnly.tooltip',
+  {
+    defaultMessage: 'Unable to create or edit maintenance Windows',
+  }
+);
+
 export const CREATE_NEW_BUTTON = i18n.translate(
   'xpack.alerting.maintenanceWindows.createNewButton',
   {
@@ -572,7 +586,7 @@ export const UPCOMING = i18n.translate('xpack.alerting.maintenanceWindows.upcomi
 export const UPGRADE_TO_PLATINUM = i18n.translate(
   'xpack.alerting.maintenanceWindows.licenseCallout.updgradeToPlatinumTitle',
   {
-    defaultMessage: 'Maintenance Windows are a subscription feature.',
+    defaultMessage: 'Maintenance windows are a subscription feature',
   }
 );
 
diff --git a/x-pack/plugins/alerting/server/lib/convert_rule_ids_to_kuery_node.test.ts b/x-pack/plugins/alerting/server/lib/convert_rule_ids_to_kuery_node.test.ts
index 0c17c68d6162b0..258133dab6118a 100644
--- a/x-pack/plugins/alerting/server/lib/convert_rule_ids_to_kuery_node.test.ts
+++ b/x-pack/plugins/alerting/server/lib/convert_rule_ids_to_kuery_node.test.ts
@@ -61,6 +61,10 @@ describe('convertRuleIdsToKueryNode', () => {
   });
 
   test('should convert empty ids array correctly', () => {
-    expect(convertRuleIdsToKueryNode([])).toEqual(undefined);
+    expect(convertRuleIdsToKueryNode([])).toEqual({
+      arguments: [],
+      function: 'or',
+      type: 'function',
+    });
   });
 });
diff --git a/x-pack/plugins/alerting/server/maintenance_window_feature.ts b/x-pack/plugins/alerting/server/maintenance_window_feature.ts
index fd9af206c45443..a0bd117d47721f 100644
--- a/x-pack/plugins/alerting/server/maintenance_window_feature.ts
+++ b/x-pack/plugins/alerting/server/maintenance_window_feature.ts
@@ -17,12 +17,12 @@ import {
 export const maintenanceWindowFeature: KibanaFeatureConfig = {
   id: MAINTENANCE_WINDOW_FEATURE_ID,
   name: i18n.translate('xpack.alerting.feature.maintenanceWindowFeatureName', {
-    defaultMessage: 'Maintenance Window',
+    defaultMessage: 'Maintenance Windows',
   }),
   category: DEFAULT_APP_CATEGORIES.management,
   app: [],
   management: {
-    insightsAndAlerting: ['triggersActions'],
+    insightsAndAlerting: ['maintenanceWindows'],
   },
   privileges: {
     all: {
@@ -32,7 +32,7 @@ export const maintenanceWindowFeature: KibanaFeatureConfig = {
         MAINTENANCE_WINDOW_API_PRIVILEGES.WRITE_MAINTENANCE_WINDOW,
       ],
       management: {
-        insightsAndAlerting: ['triggersActions'],
+        insightsAndAlerting: ['maintenanceWindows'],
       },
       savedObject: {
         all: [MAINTENANCE_WINDOW_SAVED_OBJECT_TYPE],
@@ -44,7 +44,7 @@ export const maintenanceWindowFeature: KibanaFeatureConfig = {
       app: [],
       api: [MAINTENANCE_WINDOW_API_PRIVILEGES.READ_MAINTENANCE_WINDOW],
       management: {
-        insightsAndAlerting: ['triggersActions'],
+        insightsAndAlerting: ['maintenanceWindows'],
       },
       savedObject: {
         all: [],
diff --git a/x-pack/plugins/alerting/tsconfig.json b/x-pack/plugins/alerting/tsconfig.json
index 200b8e3c2a79e3..cdba5b7a4d8e6b 100644
--- a/x-pack/plugins/alerting/tsconfig.json
+++ b/x-pack/plugins/alerting/tsconfig.json
@@ -52,6 +52,7 @@
     "@kbn/doc-links",
     "@kbn/core-saved-objects-utils-server",
     "@kbn/core-ui-settings-common",
+    "@kbn/core-capabilities-common",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/apm/common/anomaly_detection/index.ts b/x-pack/plugins/apm/common/anomaly_detection/index.ts
index be80902b1d93be..23912461412e22 100644
--- a/x-pack/plugins/apm/common/anomaly_detection/index.ts
+++ b/x-pack/plugins/apm/common/anomaly_detection/index.ts
@@ -6,11 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  getSeverityType,
-  getSeverityColor as mlGetSeverityColor,
-} from '@kbn/ml-plugin/common';
-import { ANOMALY_SEVERITY } from '../ml_constants';
+import { getSeverityType } from '@kbn/ml-anomaly-utils/get_severity_type';
+import { getSeverityColor as mlGetSeverityColor } from '@kbn/ml-anomaly-utils/get_severity_color';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
 import { ServiceHealthStatus } from '../service_health_status';
 
 export interface ServiceAnomalyStats {
@@ -23,7 +21,7 @@ export interface ServiceAnomalyStats {
 
 export function getSeverity(score: number | undefined) {
   if (score === undefined) {
-    return ANOMALY_SEVERITY.UNKNOWN;
+    return ML_ANOMALY_SEVERITY.UNKNOWN;
   }
 
   return getSeverityType(score);
diff --git a/x-pack/plugins/apm/common/ml_constants.ts b/x-pack/plugins/apm/common/ml_constants.ts
deleted file mode 100644
index 7818299d9d883a..00000000000000
--- a/x-pack/plugins/apm/common/ml_constants.ts
+++ /dev/null
@@ -1,24 +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.
- */
-
-// copied from ml/common, to keep the bundle size small
-export enum ANOMALY_SEVERITY {
-  CRITICAL = 'critical',
-  MAJOR = 'major',
-  MINOR = 'minor',
-  WARNING = 'warning',
-  LOW = 'low',
-  UNKNOWN = 'unknown',
-}
-
-export enum ANOMALY_THRESHOLD {
-  CRITICAL = 75,
-  MAJOR = 50,
-  MINOR = 25,
-  WARNING = 3,
-  LOW = 0,
-}
diff --git a/x-pack/plugins/apm/common/rules/apm_rule_types.ts b/x-pack/plugins/apm/common/rules/apm_rule_types.ts
index d1009cebc70daa..2c5354f19a115f 100644
--- a/x-pack/plugins/apm/common/rules/apm_rule_types.ts
+++ b/x-pack/plugins/apm/common/rules/apm_rule_types.ts
@@ -14,7 +14,8 @@ import type {
 } from '@kbn/observability-plugin/common';
 import type { ActionGroup } from '@kbn/alerting-plugin/common';
 import { formatDurationFromTimeUnitChar } from '@kbn/observability-plugin/common';
-import { ANOMALY_SEVERITY, ANOMALY_THRESHOLD } from '../ml_constants';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 import {
   ERROR_GROUP_ID,
   SERVICE_ENVIRONMENT,
@@ -263,32 +264,32 @@ export const RULE_TYPES_CONFIG: Record<
 
 export const ANOMALY_ALERT_SEVERITY_TYPES = [
   {
-    type: ANOMALY_SEVERITY.CRITICAL,
+    type: ML_ANOMALY_SEVERITY.CRITICAL,
     label: i18n.translate('xpack.apm.alerts.anomalySeverity.criticalLabel', {
       defaultMessage: 'critical',
     }),
-    threshold: ANOMALY_THRESHOLD.CRITICAL,
+    threshold: ML_ANOMALY_THRESHOLD.CRITICAL,
   },
   {
-    type: ANOMALY_SEVERITY.MAJOR,
+    type: ML_ANOMALY_SEVERITY.MAJOR,
     label: i18n.translate('xpack.apm.alerts.anomalySeverity.majorLabel', {
       defaultMessage: 'major',
     }),
-    threshold: ANOMALY_THRESHOLD.MAJOR,
+    threshold: ML_ANOMALY_THRESHOLD.MAJOR,
   },
   {
-    type: ANOMALY_SEVERITY.MINOR,
+    type: ML_ANOMALY_SEVERITY.MINOR,
     label: i18n.translate('xpack.apm.alerts.anomalySeverity.minor', {
       defaultMessage: 'minor',
     }),
-    threshold: ANOMALY_THRESHOLD.MINOR,
+    threshold: ML_ANOMALY_THRESHOLD.MINOR,
   },
   {
-    type: ANOMALY_SEVERITY.WARNING,
+    type: ML_ANOMALY_SEVERITY.WARNING,
     label: i18n.translate('xpack.apm.alerts.anomalySeverity.warningLabel', {
       defaultMessage: 'warning',
     }),
-    threshold: ANOMALY_THRESHOLD.WARNING,
+    threshold: ML_ANOMALY_THRESHOLD.WARNING,
   },
 ] as const;
 
diff --git a/x-pack/plugins/apm/common/rules/schema.ts b/x-pack/plugins/apm/common/rules/schema.ts
index 656f6efbe4b25d..889324326bbd6e 100644
--- a/x-pack/plugins/apm/common/rules/schema.ts
+++ b/x-pack/plugins/apm/common/rules/schema.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { ANOMALY_SEVERITY } from '../ml_constants';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
 import { AggregationType, ApmRuleType } from './apm_rule_types';
 
 export const errorCountParamsSchema = schema.object({
@@ -42,10 +42,10 @@ export const anomalyParamsSchema = schema.object({
   windowUnit: schema.string(),
   environment: schema.string(),
   anomalySeverityType: schema.oneOf([
-    schema.literal(ANOMALY_SEVERITY.CRITICAL),
-    schema.literal(ANOMALY_SEVERITY.MAJOR),
-    schema.literal(ANOMALY_SEVERITY.MINOR),
-    schema.literal(ANOMALY_SEVERITY.WARNING),
+    schema.literal(ML_ANOMALY_SEVERITY.CRITICAL),
+    schema.literal(ML_ANOMALY_SEVERITY.MAJOR),
+    schema.literal(ML_ANOMALY_SEVERITY.MINOR),
+    schema.literal(ML_ANOMALY_SEVERITY.WARNING),
   ]),
 });
 
diff --git a/x-pack/plugins/apm/common/service_health_status.ts b/x-pack/plugins/apm/common/service_health_status.ts
index a58ae8cb04125e..77964d78c74500 100644
--- a/x-pack/plugins/apm/common/service_health_status.ts
+++ b/x-pack/plugins/apm/common/service_health_status.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { EuiTheme } from '@kbn/kibana-react-plugin/common';
-import { ANOMALY_SEVERITY } from './ml_constants';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
 
 export enum ServiceHealthStatus {
   healthy = 'healthy',
@@ -19,21 +19,21 @@ export enum ServiceHealthStatus {
 export function getServiceHealthStatus({
   severity,
 }: {
-  severity: ANOMALY_SEVERITY;
+  severity: ML_ANOMALY_SEVERITY;
 }) {
   switch (severity) {
-    case ANOMALY_SEVERITY.CRITICAL:
-    case ANOMALY_SEVERITY.MAJOR:
+    case ML_ANOMALY_SEVERITY.CRITICAL:
+    case ML_ANOMALY_SEVERITY.MAJOR:
       return ServiceHealthStatus.critical;
 
-    case ANOMALY_SEVERITY.MINOR:
-    case ANOMALY_SEVERITY.WARNING:
+    case ML_ANOMALY_SEVERITY.MINOR:
+    case ML_ANOMALY_SEVERITY.WARNING:
       return ServiceHealthStatus.warning;
 
-    case ANOMALY_SEVERITY.LOW:
+    case ML_ANOMALY_SEVERITY.LOW:
       return ServiceHealthStatus.healthy;
 
-    case ANOMALY_SEVERITY.UNKNOWN:
+    case ML_ANOMALY_SEVERITY.UNKNOWN:
       return ServiceHealthStatus.unknown;
   }
 }
diff --git a/x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md b/x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md
new file mode 100644
index 00000000000000..46d9f4c6df72a3
--- /dev/null
+++ b/x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md
@@ -0,0 +1,103 @@
+## Summary
+
+8.7 introduced Overflow Buckets for Metrics. The below setup would enable generating the overflow buckets for the metrics indices.
+
+### Pre-requisites
+
+- Install golang and set go path properly
+
+- Run Elasticsearch locally
+  ```
+  yarn es snapshot
+  ```
+- Run Kibana locally
+  ```
+  yarn start
+  ```
+- Git Clone APM Server locally
+  ```
+  git clone git@github.com:[USER]/apm-server.git
+  ```
+- Modify `apm-server.yml` accordingly
+  ```
+  ## Add this to the bottom of the file
+  apm-server.aggregation:
+  service_transactions:
+    max_groups: 2
+  transactions:
+    max_groups: 2
+  
+  ## Uncomment the following lines under `output.elasticsearch:`
+  username: "elastic"
+  password: "changeme"
+  protocol: "http" // This is by default set to HTTPS, change it to http
+  ```
+- Run APM Server locally
+  ```
+  ./apm-server -c apm-server.yml -e -d "*"
+  ```
+  
+### Steps to generate data
+
+- Copy paste the below script in a file called `tx_max_group.go`
+  This file is responsible for generating 3 transactions per service.
+  ```
+  package main
+
+  import (
+    "fmt"
+    "time"
+    "go.elastic.co/apm/v2"
+  )
+  
+  func main() {
+    tracer := apm.DefaultTracer()
+    once(tracer, "test1")
+    once(tracer, "test2")
+    once(tracer, "test3")
+    tracer.Flush(nil)
+  }
+  
+  func once(tracer *apm.Tracer, name string) {
+    tx := tracer.StartTransaction(name, "type")
+    defer tx.End()
+  
+    span := tx.StartSpanOptions(name, "type", apm.SpanOptions{})
+    time.Sleep(time.Millisecond * 1)
+  
+    span.Outcome = "success"
+    span.Context.SetDestinationService(apm.DestinationServiceSpanContext{
+      Resource: fmt.Sprintf("dest_resource"),
+    })
+    span.End()
+  }
+  ```
+  
+- Now create a Bash Script file, name it anything - e.g., `service_max_group.sh`
+  This file will generate services and then transactions for each service using the go script above.
+  ```
+  #!/usr/bin/env bash
+
+  echo "Starting script"
+  
+  go build -o tx_max_group tx_max_group.go || exit 1
+  
+  for i in {1..10100}
+  do
+  export ELASTIC_APM_SERVICE_NAME="service-$i"
+  ./tx_max_group
+  done
+  
+  echo "Ending script"
+  ```
+
+- Run `sh service_max_group` to generate the data
+
+This would start generating events to APM Server. Now open Service Inventory Page on Kibana to observe the `_other` bucket.
+
+## Known Issues
+
+- APM Server is unable to use Fleet API to generate APM Indices. Due to this, when starting the APM Server, you will see errors like unable to find Metrics Indices. To fix this, run one of the Synthtrace Scenario files which would create the required indices.
+  ```
+  node scripts/synthtrace mobile.ts --clean
+  ```
\ No newline at end of file
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/read_only_user/navigation.cy.ts b/x-pack/plugins/apm/ftr_e2e/cypress/e2e/read_only_user/navigation.cy.ts
new file mode 100644
index 00000000000000..0b060bcafdbf28
--- /dev/null
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/e2e/read_only_user/navigation.cy.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import url from 'url';
+import { synthtrace } from '../../../synthtrace';
+import { opbeans } from '../../fixtures/synthtrace/opbeans';
+
+const start = '2021-10-10T00:00:00.000Z';
+const end = '2021-10-10T00:15:00.000Z';
+
+const serviceOverview = url.format({
+  pathname: '/app/apm/services/opbeans-java/overview',
+  query: {
+    comparisonEnabled: 'true',
+    environment: 'ENVIRONMENT_ALL',
+    rangeFrom: start,
+    rangeTo: end,
+    offset: '1d',
+  },
+});
+
+describe('When navigating between pages', () => {
+  before(() => {
+    synthtrace.index(
+      opbeans({
+        from: new Date(start).getTime(),
+        to: new Date(end).getTime(),
+      })
+    );
+  });
+
+  after(() => {
+    synthtrace.clean();
+  });
+
+  beforeEach(() => {
+    cy.loginAsViewerUser();
+  });
+
+  it('should only load certain resources once', () => {
+    cy.intercept('**/internal/apm/has_data').as('hasDataRequest');
+    cy.intercept('**/internal/apm/services/opbeans-java/metadata/icons**').as(
+      'serviceIconsRequest'
+    );
+    cy.intercept('**/apm/fleet/has_apm_policies').as('apmPoliciesRequest');
+
+    // Overview page
+    cy.visitKibana(serviceOverview);
+    cy.get('.euiTab-isSelected').should('have.text', 'Overview');
+
+    // it should load resources once
+    cy.get('@hasDataRequest.all').should('have.length', 1);
+    cy.get('@serviceIconsRequest.all').should('have.length', 1);
+    cy.get('@apmPoliciesRequest.all').should('have.length', 1);
+
+    // Navigate to errors page
+    cy.contains('.euiTab', 'Errors').click();
+    cy.get('.euiTab-isSelected').should('have.text', 'Errors');
+
+    // page have loaded correctly
+    cy.get('.euiLoadingChart').should('not.exist');
+    cy.get('[data-test-subj="errorDistribution"]').should('exist');
+
+    // it should not load resources again
+    cy.get('@hasDataRequest.all').should('have.length', 1);
+    cy.get('@serviceIconsRequest.all').should('have.length', 1);
+    cy.get('@apmPoliciesRequest.all').should('have.length', 1);
+  });
+});
diff --git a/x-pack/plugins/apm/public/application/routes/index.tsx b/x-pack/plugins/apm/public/application/routes/index.tsx
deleted file mode 100644
index 8ae6e5efad7476..00000000000000
--- a/x-pack/plugins/apm/public/application/routes/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { RouteComponentProps, RouteProps } from 'react-router-dom';
-
-export type BreadcrumbTitle<T = {}> =
-  | string
-  | ((props: RouteComponentProps<T>) => string)
-  | null;
-
-export interface APMRouteDefinition<T = any> extends RouteProps {
-  breadcrumb: BreadcrumbTitle<T>;
-}
diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.tsx b/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.tsx
index f95f117cedc5b9..b754e8fc766735 100644
--- a/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.tsx
@@ -125,7 +125,12 @@ export function ErrorCountRuleType(props: Props) {
     />,
     <EnvironmentField
       currentValue={params.environment}
-      onChange={(value) => setRuleParams('environment', value)}
+      onChange={(value) =>
+        setRuleParams(
+          'environment',
+          value !== '' ? value : ENVIRONMENT_ALL.value
+        )
+      }
       serviceName={params.serviceName}
     />,
     <ErrorGroupingKeyField
diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_anomaly_rule_type/index.tsx b/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_anomaly_rule_type/index.tsx
index ca583b802b0e85..983041f775990e 100644
--- a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_anomaly_rule_type/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_anomaly_rule_type/index.tsx
@@ -11,8 +11,8 @@ import React, { useEffect } from 'react';
 import { CoreStart } from '@kbn/core/public';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { TIME_UNITS } from '@kbn/triggers-actions-ui-plugin/public';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
 import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
-import { ANOMALY_SEVERITY } from '../../../../../common/ml_constants';
 import { createCallApmApi } from '../../../../services/rest/create_call_apm_api';
 import {
   EnvironmentField,
@@ -29,10 +29,10 @@ import {
 
 interface AlertParams {
   anomalySeverityType?:
-    | ANOMALY_SEVERITY.CRITICAL
-    | ANOMALY_SEVERITY.MAJOR
-    | ANOMALY_SEVERITY.MINOR
-    | ANOMALY_SEVERITY.WARNING;
+    | ML_ANOMALY_SEVERITY.CRITICAL
+    | ML_ANOMALY_SEVERITY.MAJOR
+    | ML_ANOMALY_SEVERITY.MINOR
+    | ML_ANOMALY_SEVERITY.WARNING;
   environment?: string;
   serviceName?: string;
   transactionType?: string;
@@ -63,7 +63,7 @@ export function TransactionDurationAnomalyRuleType(props: Props) {
     {
       windowSize: 30,
       windowUnit: TIME_UNITS.MINUTE,
-      anomalySeverityType: ANOMALY_SEVERITY.CRITICAL,
+      anomalySeverityType: ML_ANOMALY_SEVERITY.CRITICAL,
       environment: ENVIRONMENT_ALL.value,
     }
   );
diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_anomaly_rule_type/select_anomaly_severity.test.tsx b/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_anomaly_rule_type/select_anomaly_severity.test.tsx
index 49a936b5624959..aa84386d69c7ce 100644
--- a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_anomaly_rule_type/select_anomaly_severity.test.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_anomaly_rule_type/select_anomaly_severity.test.tsx
@@ -8,7 +8,7 @@
 import { render } from '@testing-library/react';
 import React, { ReactNode } from 'react';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import { ANOMALY_SEVERITY } from '../../../../../common/ml_constants';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
 import { SelectAnomalySeverity } from './select_anomaly_severity';
 
 function Wrapper({ children }: { children?: ReactNode }) {
@@ -20,7 +20,7 @@ describe('SelectAnomalySeverity', () => {
     const result = render(
       <SelectAnomalySeverity
         onChange={() => {}}
-        value={ANOMALY_SEVERITY.CRITICAL}
+        value={ML_ANOMALY_SEVERITY.CRITICAL}
       />,
       { wrapper: Wrapper }
     );
diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.tsx b/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.tsx
index ea1a5d8138f188..3e1108bc7685e6 100644
--- a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.tsx
@@ -183,7 +183,12 @@ export function TransactionDurationRuleType(props: Props) {
     />,
     <EnvironmentField
       currentValue={params.environment}
-      onChange={(value) => setRuleParams('environment', value)}
+      onChange={(value) =>
+        setRuleParams(
+          'environment',
+          value !== '' ? value : ENVIRONMENT_ALL.value
+        )
+      }
       serviceName={params.serviceName}
     />,
     <TransactionNameField
diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.tsx b/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.tsx
index 6f4f36b84778d7..e115043353b1fb 100644
--- a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.tsx
@@ -137,7 +137,12 @@ export function TransactionErrorRateRuleType(props: Props) {
     />,
     <EnvironmentField
       currentValue={params.environment}
-      onChange={(value) => setRuleParams('environment', value)}
+      onChange={(value) =>
+        setRuleParams(
+          'environment',
+          value !== '' ? value : ENVIRONMENT_ALL.value
+        )
+      }
       serviceName={params.serviceName}
     />,
     <TransactionNameField
diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
index 1e1ebde4b8e49c..b17667921ecdee 100644
--- a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { formatAlertEvaluationValue } from '@kbn/observability-plugin/public';
 import {
@@ -17,8 +17,9 @@ import {
   ALERT_RULE_UUID,
 } from '@kbn/rule-data-utils';
 import moment from 'moment';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { toMicroseconds as toMicrosecondsUtil } from '../../../../../common/utils/formatters';
 import { SERVICE_ENVIRONMENT } from '../../../../../common/es_fields/apm';
 import { ChartPointerEventContextProvider } from '../../../../context/chart_pointer_event/chart_pointer_event_context';
 import { TimeRangeMetadataContextProvider } from '../../../../context/time_range_metadata/time_range_metadata_context';
@@ -35,6 +36,9 @@ import {
   TRANSACTION_TYPE,
 } from './types';
 
+const toMicroseconds = (value?: number) =>
+  value ? toMicrosecondsUtil(value, 'milliseconds') : value;
+
 export function AlertDetailsAppSection({
   rule,
   alert,
@@ -64,7 +68,7 @@ export function AlertDetailsAppSection({
         ),
         value: formatAlertEvaluationValue(
           alert?.fields[ALERT_RULE_TYPE_ID],
-          alert?.fields[ALERT_EVALUATION_THRESHOLD]
+          toMicroseconds(alert?.fields[ALERT_EVALUATION_THRESHOLD])
         ),
       },
       {
@@ -92,7 +96,6 @@ export function AlertDetailsAppSection({
   const params = rule.params;
   const environment = alert.fields[SERVICE_ENVIRONMENT];
   const latencyAggregationType = getAggsTypeFromRule(params.aggregationType);
-  const [latencyMaxY, setLatencyMaxY] = useState(0);
 
   // duration is us, convert it to MS
   const alertDurationMS = alert.fields[ALERT_DURATION]! / 1000;
@@ -166,8 +169,8 @@ export function AlertDetailsAppSection({
               latencyAggregationType={latencyAggregationType}
               comparisonEnabled={comparisonEnabled}
               offset={offset}
-              setLatencyMaxY={setLatencyMaxY}
             />
+            <EuiSpacer size="s" />
             <EuiFlexGroup direction="row" gutterSize="s">
               <ThroughputChart
                 transactionType={transactionType}
@@ -177,7 +180,6 @@ export function AlertDetailsAppSection({
                 end={end}
                 comparisonChartTheme={comparisonChartTheme}
                 comparisonEnabled={comparisonEnabled}
-                latencyMaxY={latencyMaxY}
                 offset={offset}
                 timeZone={timeZone}
               />
diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart/latency_chart.tsx b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart/latency_chart.tsx
index 1add00e97120a7..d4688fc2b0bcc5 100644
--- a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart/latency_chart.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart/latency_chart.tsx
@@ -45,7 +45,6 @@ function LatencyChart({
   comparisonEnabled,
   offset,
   timeZone,
-  setLatencyMaxY,
 }: {
   alert: TopAlert;
   transactionType: string;
@@ -58,7 +57,6 @@ function LatencyChart({
   comparisonEnabled: boolean;
   offset: string;
   timeZone: string;
-  setLatencyMaxY: React.Dispatch<React.SetStateAction<number>>;
 }) {
   const preferred = usePreferredDataSourceAndBucketSize({
     start,
@@ -150,7 +148,6 @@ function LatencyChart({
     comparisonEnabled && isTimeComparison(offset) ? previousPeriod : undefined,
   ].filter(filterNil);
   const latencyMaxY = getMaxY(timeseriesLatency);
-  setLatencyMaxY(latencyMaxY);
   const latencyFormatter = getDurationFormatter(latencyMaxY);
   return (
     <EuiFlexItem>
diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx
index f9891eea5f13f7..7881a5004f9989 100644
--- a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx
+++ b/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx
@@ -17,16 +17,15 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { getDurationFormatter } from '@kbn/observability-plugin/common';
 import {
   ChartType,
   getTimeSeriesColor,
 } from '../../../shared/charts/helper/get_timeseries_color';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { TimeseriesChart } from '../../../shared/charts/timeseries_chart';
-import { getResponseTimeTickFormatter } from '../../../shared/charts/transaction_charts/helper';
 import { usePreferredDataSourceAndBucketSize } from '../../../../hooks/use_preferred_data_source_and_bucket_size';
 import { ApmDocumentType } from '../../../../../common/document_type';
+import { asExactTransactionRate } from '../../../../../common/utils/formatters';
 
 const INITIAL_STATE = {
   currentPeriod: [],
@@ -40,7 +39,6 @@ function ThroughputChart({
   end,
   comparisonChartTheme,
   comparisonEnabled,
-  latencyMaxY,
   offset,
   timeZone,
 }: {
@@ -51,7 +49,6 @@ function ThroughputChart({
   end: string;
   comparisonChartTheme: RecursivePartial<Theme>;
   comparisonEnabled: boolean;
-  latencyMaxY: number;
   offset: string;
   timeZone: string;
 }) {
@@ -118,8 +115,6 @@ function ThroughputChart({
       : []),
   ];
 
-  const latencyFormatter = getDurationFormatter(latencyMaxY);
-
   return (
     <EuiFlexItem>
       <EuiPanel hasBorder={true}>
@@ -154,7 +149,7 @@ function ThroughputChart({
           fetchStatus={statusThroughput}
           customTheme={comparisonChartTheme}
           timeseries={timeseriesThroughput}
-          yLabelFormat={getResponseTimeTickFormatter(latencyFormatter)}
+          yLabelFormat={asExactTransactionRate}
           timeZone={timeZone}
         />
       </EuiPanel>
diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/get_columns.tsx b/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/get_columns.tsx
index 18ac252011357b..9bea439931bed6 100644
--- a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/get_columns.tsx
+++ b/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/get_columns.tsx
@@ -33,13 +33,11 @@ type MobileDetailedStatisticsByField =
   APIReturnType<'GET /internal/apm/mobile-services/{serviceName}/detailed_statistics'>;
 
 export function getColumns({
-  agentName,
   detailedStatisticsLoading,
   detailedStatistics,
   comparisonEnabled,
   offset,
 }: {
-  agentName?: string;
   detailedStatisticsLoading: boolean;
   detailedStatistics: MobileDetailedStatisticsByField;
   comparisonEnabled?: boolean;
diff --git a/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx b/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx
index 3b7849ddacf30b..c825f4ac266a16 100644
--- a/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx
+++ b/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx
@@ -14,11 +14,11 @@ import { ApmPluginStartDeps } from '../../plugin';
 
 export function ApmErrorBoundary({ children }: { children?: React.ReactNode }) {
   const location = useLocation();
-  return <ErrorBoundary key={location.pathname}>{children}</ErrorBoundary>;
+  return <ErrorBoundary pathname={location.pathname}>{children}</ErrorBoundary>;
 }
 
 class ErrorBoundary extends React.Component<
-  { children?: React.ReactNode },
+  { children?: React.ReactNode; pathname: string },
   { error?: Error },
   {}
 > {
@@ -26,6 +26,15 @@ class ErrorBoundary extends React.Component<
     error: undefined,
   };
 
+  componentDidUpdate(prevProps: { pathname: string }) {
+    if (
+      this.props.pathname !== prevProps.pathname &&
+      this.state.error !== undefined
+    ) {
+      this.setState({ error: undefined });
+    }
+  }
+
   static getDerivedStateFromError(error: Error) {
     return { error };
   }
@@ -66,7 +75,6 @@ function ErrorWithTemplate({ error }: { error: Error }) {
   );
 }
 
-function DummyComponent({ error }: { error: Error }) {
+function DummyComponent({ error }: { error: Error }): any {
   throw error;
-  return <div />;
 }
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx b/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
index 8d16de3f013763..b238d924be98e4 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx
@@ -8,12 +8,10 @@
 import { i18n } from '@kbn/i18n';
 import { rgba } from 'polished';
 import { EuiTheme } from '@kbn/kibana-react-plugin/common';
-import { getSeverity } from '@kbn/ml-plugin/public';
+import { getSeverity } from '@kbn/ml-anomaly-utils/get_severity';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 import { getSeverityColor } from '../../../../../common/anomaly_detection';
-import {
-  ANOMALY_SEVERITY,
-  ANOMALY_THRESHOLD,
-} from '../../../../../common/ml_constants';
 import { ServiceAnomalyTimeseries } from '../../../../../common/anomaly_detection/service_anomaly_timeseries';
 import { APMChartSpec } from '../../../../../typings/timeseries';
 
@@ -61,10 +59,13 @@ export function getChartAnomalyTimeseries({
   ];
 
   const severities = [
-    { severity: ANOMALY_SEVERITY.MAJOR, threshold: ANOMALY_THRESHOLD.MAJOR },
     {
-      severity: ANOMALY_SEVERITY.CRITICAL,
-      threshold: ANOMALY_THRESHOLD.CRITICAL,
+      severity: ML_ANOMALY_SEVERITY.MAJOR,
+      threshold: ML_ANOMALY_THRESHOLD.MAJOR,
+    },
+    {
+      severity: ML_ANOMALY_SEVERITY.CRITICAL,
+      threshold: ML_ANOMALY_THRESHOLD.CRITICAL,
     },
   ];
 
diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts b/x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts
index 875dce26c40fcf..ca504ec6b353b7 100644
--- a/x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts
+++ b/x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { registerAnomalyRuleType } from './register_anomaly_rule_type';
-import { ANOMALY_SEVERITY } from '../../../../../common/ml_constants';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
 import { MlPluginSetup } from '@kbn/ml-plugin/server';
 import * as GetServiceAnomalies from '../../../service_map/get_service_anomalies';
 import { createRuleTypeMocks } from '../../test_utils';
@@ -24,7 +24,7 @@ describe('Transaction duration anomaly alert', () => {
         ml: undefined,
       });
 
-      const params = { anomalySeverityType: ANOMALY_SEVERITY.MINOR };
+      const params = { anomalySeverityType: ML_ANOMALY_SEVERITY.MINOR };
 
       await executor({ params });
 
@@ -52,7 +52,7 @@ describe('Transaction duration anomaly alert', () => {
         ml,
       });
 
-      const params = { anomalySeverityType: ANOMALY_SEVERITY.MINOR };
+      const params = { anomalySeverityType: ML_ANOMALY_SEVERITY.MINOR };
 
       await executor({ params });
       expect(
@@ -103,7 +103,7 @@ describe('Transaction duration anomaly alert', () => {
         ml,
       });
 
-      const params = { anomalySeverityType: ANOMALY_SEVERITY.MINOR };
+      const params = { anomalySeverityType: ML_ANOMALY_SEVERITY.MINOR };
 
       await executor({ params });
 
@@ -180,7 +180,7 @@ describe('Transaction duration anomaly alert', () => {
       });
 
       const params = {
-        anomalySeverityType: ANOMALY_SEVERITY.MINOR,
+        anomalySeverityType: ML_ANOMALY_SEVERITY.MINOR,
         windowSize: 5,
         windowUnit: 'm',
       };
diff --git a/x-pack/plugins/apm/server/routes/metrics/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/routes/metrics/__snapshots__/queries.test.ts.snap
index 9648e4f8d8ec5c..44e4c6335ec7c9 100644
--- a/x-pack/plugins/apm/server/routes/metrics/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/routes/metrics/__snapshots__/queries.test.ts.snap
@@ -332,8 +332,27 @@ Object {
             },
           },
           Object {
-            "exists": Object {
-              "field": "system.process.cgroup.memory.mem.usage.bytes",
+            "bool": Object {
+              "filter": Array [
+                Object {
+                  "exists": Object {
+                    "field": "system.process.cgroup.memory.mem.usage.bytes",
+                  },
+                },
+              ],
+              "minimum_should_match": 1,
+              "should": Array [
+                Object {
+                  "exists": Object {
+                    "field": "system.process.cgroup.memory.mem.limit.bytes",
+                  },
+                },
+                Object {
+                  "exists": Object {
+                    "field": "system.memory.total",
+                  },
+                },
+              ],
             },
           },
         ],
@@ -869,8 +888,27 @@ Object {
             },
           },
           Object {
-            "exists": Object {
-              "field": "system.process.cgroup.memory.mem.usage.bytes",
+            "bool": Object {
+              "filter": Array [
+                Object {
+                  "exists": Object {
+                    "field": "system.process.cgroup.memory.mem.usage.bytes",
+                  },
+                },
+              ],
+              "minimum_should_match": 1,
+              "should": Array [
+                Object {
+                  "exists": Object {
+                    "field": "system.process.cgroup.memory.mem.limit.bytes",
+                  },
+                },
+                Object {
+                  "exists": Object {
+                    "field": "system.memory.total",
+                  },
+                },
+              ],
             },
           },
         ],
@@ -1385,8 +1423,27 @@ Object {
             },
           },
           Object {
-            "exists": Object {
-              "field": "system.process.cgroup.memory.mem.usage.bytes",
+            "bool": Object {
+              "filter": Array [
+                Object {
+                  "exists": Object {
+                    "field": "system.process.cgroup.memory.mem.usage.bytes",
+                  },
+                },
+              ],
+              "minimum_should_match": 1,
+              "should": Array [
+                Object {
+                  "exists": Object {
+                    "field": "system.process.cgroup.memory.mem.limit.bytes",
+                  },
+                },
+                Object {
+                  "exists": Object {
+                    "field": "system.memory.total",
+                  },
+                },
+              ],
             },
           },
         ],
diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/shared/memory/index.ts b/x-pack/plugins/apm/server/routes/metrics/by_agent/shared/memory/index.ts
index 5c7993c4c9f2da..2afc82181cbfb7 100644
--- a/x-pack/plugins/apm/server/routes/metrics/by_agent/shared/memory/index.ts
+++ b/x-pack/plugins/apm/server/routes/metrics/by_agent/shared/memory/index.ts
@@ -47,6 +47,15 @@ const chartBase: ChartBase = {
   series,
 };
 
+export const systemMemoryFilter = {
+  bool: {
+    filter: [
+      { exists: { field: METRIC_SYSTEM_FREE_MEMORY } },
+      { exists: { field: METRIC_SYSTEM_TOTAL_MEMORY } },
+    ],
+  },
+};
+
 export const percentSystemMemoryUsedScript = {
   lang: 'painless',
   source: `
@@ -60,6 +69,17 @@ export const percentSystemMemoryUsedScript = {
   `,
 } as const;
 
+export const cgroupMemoryFilter = {
+  bool: {
+    filter: [{ exists: { field: METRIC_CGROUP_MEMORY_USAGE_BYTES } }],
+    should: [
+      { exists: { field: METRIC_CGROUP_MEMORY_LIMIT_BYTES } },
+      { exists: { field: METRIC_SYSTEM_TOTAL_MEMORY } },
+    ],
+    minimum_should_match: 1,
+  },
+};
+
 export const percentCgroupMemoryUsedScript = {
   lang: 'painless',
   source: `
@@ -147,7 +167,7 @@ export async function getMemoryChartData({
           memoryUsedMax: { max: { script: percentCgroupMemoryUsedScript } },
         },
         additionalFilters: [
-          { exists: { field: METRIC_CGROUP_MEMORY_USAGE_BYTES } },
+          cgroupMemoryFilter,
           ...termQuery(FAAS_ID, serverlessId),
         ],
         operationName: 'get_cgroup_memory_metrics_charts',
@@ -169,8 +189,7 @@ export async function getMemoryChartData({
             memoryUsedMax: { max: { script: percentSystemMemoryUsedScript } },
           },
           additionalFilters: [
-            { exists: { field: METRIC_SYSTEM_FREE_MEMORY } },
-            { exists: { field: METRIC_SYSTEM_TOTAL_MEMORY } },
+            systemMemoryFilter,
             ...termQuery(FAAS_ID, serverlessId),
           ],
           operationName: 'get_system_memory_metrics_charts',
diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_main_statistics_by_field.ts b/x-pack/plugins/apm/server/routes/mobile/get_mobile_main_statistics_by_field.ts
index a5783997e391bb..af345d52322bf9 100644
--- a/x-pack/plugins/apm/server/routes/mobile/get_mobile_main_statistics_by_field.ts
+++ b/x-pack/plugins/apm/server/routes/mobile/get_mobile_main_statistics_by_field.ts
@@ -40,10 +40,18 @@ export interface MobileMainStatisticsResponse {
     name: string | number;
     latency: number | null;
     throughput: number;
-    crashRate?: number;
+    crashRate: number;
   }>;
 }
 
+type MergedQueriesResponse = Array<{
+  name: string | number;
+  latency: number | null;
+  throughput: number;
+  sessions: number;
+  crashes?: number;
+}>;
+
 export async function getMobileMainStatisticsByField({
   kuery,
   apmEventClient,
@@ -55,7 +63,7 @@ export async function getMobileMainStatisticsByField({
 }: Props) {
   async function getMobileTransactionEventStatistics() {
     const response = await apmEventClient.search(
-      `get_mobile_main_statistics_by_field`,
+      `get_mobile_transaction_events_main_statistics_by_field`,
       {
         apm: {
           sources: [
@@ -90,6 +98,11 @@ export async function getMobileMainStatisticsByField({
                     field: TRANSACTION_DURATION,
                   },
                 },
+                sessions: {
+                  cardinality: {
+                    field: SESSION_ID,
+                  },
+                },
               },
             },
           },
@@ -110,66 +123,59 @@ export async function getMobileMainStatisticsByField({
             end,
             value: bucket.doc_count,
           }),
+          sessions: bucket.sessions.value,
         };
       }) ?? []
     );
   }
 
   async function getMobileErrorEventStatistics() {
-    const response = await apmEventClient.search(
-      `get_mobile_transaction_events_main_statistics_by_field`,
-      {
-        apm: {
-          sources: [
-            {
-              documentType: ApmDocumentType.ErrorEvent,
-              rollupInterval: RollupInterval.None,
-            },
-          ],
+    const response = await apmEventClient.search(`get_mobile_crashes`, {
+      apm: {
+        sources: [
+          {
+            documentType: ApmDocumentType.ErrorEvent,
+            rollupInterval: RollupInterval.None,
+          },
+        ],
+      },
+      body: {
+        track_total_hits: false,
+        size: 0,
+        query: {
+          bool: {
+            filter: [
+              ...termQuery(SERVICE_NAME, serviceName),
+              ...rangeQuery(start, end),
+              ...environmentQuery(environment),
+              ...kqlQuery(kuery),
+            ],
+          },
         },
-        body: {
-          track_total_hits: false,
-          size: 0,
-          query: {
-            bool: {
-              filter: [
-                ...termQuery(SERVICE_NAME, serviceName),
-                ...rangeQuery(start, end),
-                ...environmentQuery(environment),
-                ...kqlQuery(kuery),
-              ],
+        aggs: {
+          main_statistics: {
+            terms: {
+              field,
+              size: 1000,
             },
-          },
-          aggs: {
-            main_statistics: {
-              terms: {
-                field,
-                size: 1000,
-              },
-              aggs: {
-                sessions: {
-                  cardinality: {
-                    field: SESSION_ID,
-                  },
-                },
-                crashes: {
-                  filter: {
-                    term: {
-                      [ERROR_TYPE]: 'crash',
-                    },
+            aggs: {
+              crashes: {
+                filter: {
+                  term: {
+                    [ERROR_TYPE]: 'crash',
                   },
                 },
               },
             },
           },
         },
-      }
-    );
+      },
+    });
     return (
       response.aggregations?.main_statistics.buckets.map((bucket) => {
         return {
           name: bucket.key,
-          crashRate: bucket.crashes.doc_count / bucket.sessions.value ?? 0,
+          crashes: bucket.crashes.doc_count ?? 0,
         };
       }) ?? []
     );
@@ -180,7 +186,19 @@ export async function getMobileMainStatisticsByField({
     getMobileErrorEventStatistics(),
   ]);
 
-  const mainStatistics = merge(transactioEventStatistics, errorEventStatistics);
+  const mainStatisticsMerged: MergedQueriesResponse = merge(
+    transactioEventStatistics,
+    errorEventStatistics
+  );
+
+  const mainStatistics = mainStatisticsMerged.map((item) => {
+    return {
+      name: item.name,
+      latency: item.latency,
+      throughput: item.throughput,
+      crashRate: item.crashes ? item.crashes / item.sessions : 0,
+    };
+  });
 
   return { mainStatistics };
 }
diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
index 87963c19e6e083..d17811c8aea394 100644
--- a/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
+++ b/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts
@@ -9,10 +9,7 @@ import type { ESFilter } from '@kbn/es-types';
 import { rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '@kbn/observability-plugin/common';
 import {
-  METRIC_CGROUP_MEMORY_USAGE_BYTES,
   METRIC_SYSTEM_CPU_PERCENT,
-  METRIC_SYSTEM_FREE_MEMORY,
-  METRIC_SYSTEM_TOTAL_MEMORY,
   SERVICE_NAME,
   TRANSACTION_TYPE,
 } from '../../../common/es_fields/apm';
@@ -31,6 +28,8 @@ import { withApmSpan } from '../../utils/with_apm_span';
 import {
   percentCgroupMemoryUsedScript,
   percentSystemMemoryUsedScript,
+  systemMemoryFilter,
+  cgroupMemoryFilter,
 } from '../metrics/by_agent/shared/memory';
 import { APMEventClient } from '../../lib/helpers/create_es_client/create_apm_event_client';
 import { ApmDocumentType } from '../../../common/document_type';
@@ -358,19 +357,14 @@ function getMemoryStats({
     };
 
     let memoryUsage = await getMemoryUsage({
-      additionalFilters: [
-        { exists: { field: METRIC_CGROUP_MEMORY_USAGE_BYTES } },
-      ],
       script: percentCgroupMemoryUsedScript,
+      additionalFilters: [cgroupMemoryFilter],
     });
 
     if (!memoryUsage) {
       memoryUsage = await getMemoryUsage({
-        additionalFilters: [
-          { exists: { field: METRIC_SYSTEM_FREE_MEMORY } },
-          { exists: { field: METRIC_SYSTEM_TOTAL_MEMORY } },
-        ],
         script: percentSystemMemoryUsedScript,
+        additionalFilters: [systemMemoryFilter],
       });
     }
 
diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
index 7462b649a60194..6a5f57cfe9d2f6 100644
--- a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
+++ b/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts
@@ -9,10 +9,7 @@ import type { AggregationOptionsByType } from '@kbn/es-types';
 import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
 import { ProcessorEvent } from '@kbn/observability-plugin/common';
 import {
-  METRIC_CGROUP_MEMORY_USAGE_BYTES,
   METRIC_PROCESS_CPU_PERCENT,
-  METRIC_SYSTEM_FREE_MEMORY,
-  METRIC_SYSTEM_TOTAL_MEMORY,
   SERVICE_NAME,
   SERVICE_NODE_NAME,
 } from '../../../../common/es_fields/apm';
@@ -24,6 +21,8 @@ import { APMEventClient } from '../../../lib/helpers/create_es_client/create_apm
 import {
   percentCgroupMemoryUsedScript,
   percentSystemMemoryUsedScript,
+  systemMemoryFilter,
+  cgroupMemoryFilter,
 } from '../../metrics/by_agent/shared/memory';
 import { getOffsetInMs } from '../../../../common/utils/get_offset_in_ms';
 
@@ -82,19 +81,6 @@ export async function getServiceInstancesSystemMetricStatistics<
     numBuckets,
   });
 
-  const systemMemoryFilter = {
-    bool: {
-      filter: [
-        { exists: { field: METRIC_SYSTEM_FREE_MEMORY } },
-        { exists: { field: METRIC_SYSTEM_TOTAL_MEMORY } },
-      ],
-    },
-  };
-
-  const cgroupMemoryFilter = {
-    exists: { field: METRIC_CGROUP_MEMORY_USAGE_BYTES },
-  };
-
   const cpuUsageFilter = { exists: { field: METRIC_PROCESS_CPU_PERCENT } };
 
   function withTimeseries<TParams extends AggregationOptionsByType['avg']>(
diff --git a/x-pack/plugins/apm/tsconfig.json b/x-pack/plugins/apm/tsconfig.json
index cfa3bc4ac660e1..68452bf5e97f80 100644
--- a/x-pack/plugins/apm/tsconfig.json
+++ b/x-pack/plugins/apm/tsconfig.json
@@ -76,7 +76,6 @@
     "@kbn/babel-register",
     "@kbn/core-saved-objects-migration-server-internal",
     "@kbn/core-elasticsearch-server",
-    "@kbn/shared-ux-prompt-not-found",
     "@kbn/core-saved-objects-api-server",
     "@kbn/safer-lodash-set",
     "@kbn/shared-ux-router",
@@ -85,6 +84,8 @@
     "@kbn/logging-mocks",
     "@kbn/chart-icons",
     "@kbn/observability-shared-plugin",
+    "@kbn/ml-anomaly-utils",
+    "@kbn/shared-ux-prompt-not-found",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/asset_manager/common/types_api.ts b/x-pack/plugins/asset_manager/common/types_api.ts
index dbf470ac110de2..8ec68734af24c9 100644
--- a/x-pack/plugins/asset_manager/common/types_api.ts
+++ b/x-pack/plugins/asset_manager/common/types_api.ts
@@ -5,8 +5,16 @@
  * 2.0.
  */
 
+import { schema } from '@kbn/config-schema';
+
+export const assetTypeRT = schema.oneOf([
+  schema.literal('k8s.pod'),
+  schema.literal('k8s.cluster'),
+  schema.literal('k8s.node'),
+]);
+export type AssetType = typeof assetTypeRT.type;
+
 export type AssetKind = 'unknown' | 'node';
-export type AssetType = 'k8s.pod' | 'k8s.cluster' | 'k8s.node';
 export type AssetStatus =
   | 'CREATING'
   | 'ACTIVE'
@@ -52,6 +60,7 @@ export interface Asset extends ECSDocument {
   'asset.status'?: AssetStatus;
   'asset.parents'?: string | string[];
   'asset.children'?: string | string[];
+  'asset.references'?: string | string[];
   'asset.namespace'?: string;
 }
 
@@ -120,3 +129,15 @@ export interface AssetFilters {
   from?: string;
   to?: string;
 }
+
+export const relationRT = schema.oneOf([
+  schema.literal('ancestors'),
+  schema.literal('descendants'),
+  schema.literal('references'),
+]);
+
+export type Relation = typeof relationRT.type;
+export type RelationField = keyof Pick<
+  Asset,
+  'asset.children' | 'asset.parents' | 'asset.references'
+>;
diff --git a/x-pack/plugins/asset_manager/docs/index.md b/x-pack/plugins/asset_manager/docs/index.md
index 8ed01ac575c9f3..790beb87b4f7ef 100644
--- a/x-pack/plugins/asset_manager/docs/index.md
+++ b/x-pack/plugins/asset_manager/docs/index.md
@@ -78,7 +78,7 @@ _Notes:_
 <summary>Invalid request with type and ean both specified</summary>
 
 ```curl
-GET /assets?from=2023-03-25T17:44:44.000Z&type=k8s.pod&ean=k8s.pod:123
+GET kbn:/api/asset-manager/assets?from=2023-03-25T17:44:44.000Z&type=k8s.pod&ean=k8s.pod:123
 
 {
   "statusCode": 400,
@@ -94,7 +94,7 @@ GET /assets?from=2023-03-25T17:44:44.000Z&type=k8s.pod&ean=k8s.pod:123
 <summary>All assets JSON response</summary>
 
 ```curl
-GET /assets?from=2023-03-25T17:44:44.000Z&to=2023-03-25T18:44:44.000Z
+GET kbn:/api/asset-manager/assets?from=2023-03-25T17:44:44.000Z&to=2023-03-25T18:44:44.000Z
 
 {
   "results": [
@@ -273,7 +273,7 @@ GET /assets?from=2023-03-25T17:44:44.000Z&to=2023-03-25T18:44:44.000Z
 <summary>Assets by type JSON response</summary>
 
 ```curl
-GET /assets?from=2023-03-25T17:44:44.000Z&to=2023-03-25T18:44:44.000Z&type=k8s.pod
+GET kbn:/api/asset-manager/assets?from=2023-03-25T17:44:44.000Z&to=2023-03-25T18:44:44.000Z&type=k8s.pod
 
 {
   "results": [
@@ -378,7 +378,7 @@ GET /assets?from=2023-03-25T17:44:44.000Z&to=2023-03-25T18:44:44.000Z&type=k8s.p
 <summary>Assets by EAN JSON response</summary>
 
 ```curl
-GET /assets?from=2023-03-25T17:44:44.000Z&to=2023-03-25T18:44:44.000Z&ean=k8s.node:node-101&ean=k8s.pod:pod-6r1z
+GET kbn:/api/asset-manager/assets?from=2023-03-25T17:44:44.000Z&to=2023-03-25T18:44:44.000Z&ean=k8s.node:node-101&ean=k8s.pod:pod-6r1z
 
 {
   "results": [
@@ -427,7 +427,7 @@ Returns assets found in the two time ranges, split by what occurs in only either
 <summary>Request where comparison range is missing assets that are found in the baseline range</summary>
 
 ```curl
-GET /assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFrom=2022-02-07T01:00:00.000Z&bTo=2022-02-07T02:00:00.000Z
+GET kbn:/api/asset-manager/assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFrom=2022-02-07T01:00:00.000Z&bTo=2022-02-07T02:00:00.000Z
 
 {
   "onlyInA": [
@@ -589,7 +589,7 @@ GET /assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFr
 <summary>Request where baseline range is missing assets that are found in the comparison range</summary>
 
 ```curl
-GET /assets/diff?aFrom=2022-02-07T01:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFrom=2022-02-07T01:00:00.000Z&bTo=2022-02-07T03:00:00.000Z
+GET kbn:/api/asset-manager/assets/diff?aFrom=2022-02-07T01:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFrom=2022-02-07T01:00:00.000Z&bTo=2022-02-07T03:00:00.000Z
 
 {
   "onlyInA": [],
@@ -751,7 +751,7 @@ GET /assets/diff?aFrom=2022-02-07T01:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFr
 <summary>Request where each range is missing assets found in the other range</summary>
 
 ```curl
-GET /assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFrom=2022-02-07T01:00:00.000Z&bTo=2022-02-07T03:00:00.000Z
+GET kbn:/api/asset-manager/assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFrom=2022-02-07T01:00:00.000Z&bTo=2022-02-07T03:00:00.000Z
 
 {
   "onlyInA": [
@@ -934,7 +934,7 @@ GET /assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFr
 <summary>Request where each range is missing assets found in the other range, but restricted by type</summary>
 
 ```curl
-GET /assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFrom=2022-02-07T01:00:00.000Z&bTo=2022-02-07T03:00:00.000Z&type=k8s.pod
+GET kbn:/api/asset-manager/assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFrom=2022-02-07T01:00:00.000Z&bTo=2022-02-07T03:00:00.000Z&type=k8s.pod
 
 {
   "onlyInA": [
@@ -1038,6 +1038,326 @@ GET /assets/diff?aFrom=2022-02-07T00:00:00.000Z&aTo=2022-02-07T01:30:00.000Z&bFr
 
 </details>
 
+#### GET /assets/related
+
+Returns assets related to the provided ean. The relation can be one of ancestors, descendants or references.
+
+#### Request
+
+| Option | Type | Required? | Default | Description |
+| :--- | :--- | :--- | :--- | :--- |
+| relation | string | Yes | N/A | The type of related assets we're looking for. One of (ancestors|descendants|references) |
+| from | RangeDate | Yes | N/A | Starting point for date range to search for assets within |
+| to | RangeDate | No | "now" | End point for date range to search for assets |
+| ean | AssetEan | Yes | N/A | Single Elastic Asset Name representing the asset for which the related assets are being requested |
+| type | AssetType[] | No | all | Restrict results to one or more asset.type value |
+| maxDistance | number (1-5) | No | 1 | Maximum number of "hops" to search away from specified asset |
+
+#### Responses
+
+<details>
+
+<summary>Request looking for ancestors</summary>
+
+```curl
+GET kbn:/api/asset-manager/assets/related?ean=k8s.node:node-101&relation=ancestors&maxDistance=1&from=2023-04-18T13:10:13.111Z&to=2023-04-18T15:10:13.111Z
+{
+    "results": {
+        "primary": {
+            "@timestamp": "2023-04-18T14:10:13.111Z",
+            "asset.type": "k8s.node",
+            "asset.id": "node-101",
+            "asset.name": "k8s-node-101-aws",
+            "asset.ean": "k8s.node:node-101",
+            "asset.parents": [
+                "k8s.cluster:cluster-001"
+            ],
+            "orchestrator.type": "kubernetes",
+            "orchestrator.cluster.name": "Cluster 001 (AWS EKS)",
+            "orchestrator.cluster.id": "cluster-001",
+            "cloud.provider": "aws",
+            "cloud.region": "us-east-1",
+            "cloud.service.name": "eks"
+        },
+        "ancestors": [
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.cluster",
+                "asset.id": "cluster-001",
+                "asset.name": "Cluster 001 (AWS EKS)",
+                "asset.ean": "k8s.cluster:cluster-001",
+                "orchestrator.type": "kubernetes",
+                "orchestrator.cluster.name": "Cluster 001 (AWS EKS)",
+                "orchestrator.cluster.id": "cluster-001",
+                "cloud.provider": "aws",
+                "cloud.region": "us-east-1",
+                "cloud.service.name": "eks",
+                "distance": 1
+            }
+        ]
+    }
+}
+```
+
+</details>
+
+<details>
+
+<summary>Request looking for descendants</summary>
+
+```curl
+GET kbn:/api/asset-manager/assets/related?ean=k8s.cluster:cluster-001&relation=descendants&maxDistance=1&from=2023-04-18T13:10:13.111Z&to=2023-04-18T15:10:13.111Z
+
+{
+    "results": {
+        "primary": {
+            "@timestamp": "2023-04-18T14:10:13.111Z",
+            "asset.type": "k8s.cluster",
+            "asset.id": "cluster-001",
+            "asset.name": "Cluster 001 (AWS EKS)",
+            "asset.ean": "k8s.cluster:cluster-001",
+            "orchestrator.type": "kubernetes",
+            "orchestrator.cluster.name": "Cluster 001 (AWS EKS)",
+            "orchestrator.cluster.id": "cluster-001",
+            "cloud.provider": "aws",
+            "cloud.region": "us-east-1",
+            "cloud.service.name": "eks"
+        },
+        "descendants": [
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.node",
+                "asset.id": "node-101",
+                "asset.name": "k8s-node-101-aws",
+                "asset.ean": "k8s.node:node-101",
+                "asset.parents": [
+                    "k8s.cluster:cluster-001"
+                ],
+                "orchestrator.type": "kubernetes",
+                "orchestrator.cluster.name": "Cluster 001 (AWS EKS)",
+                "orchestrator.cluster.id": "cluster-001",
+                "cloud.provider": "aws",
+                "cloud.region": "us-east-1",
+                "cloud.service.name": "eks",
+                "distance": 1
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.node",
+                "asset.id": "node-102",
+                "asset.name": "k8s-node-102-aws",
+                "asset.ean": "k8s.node:node-102",
+                "asset.parents": [
+                    "k8s.cluster:cluster-001"
+                ],
+                "orchestrator.type": "kubernetes",
+                "orchestrator.cluster.name": "Cluster 001 (AWS EKS)",
+                "orchestrator.cluster.id": "cluster-001",
+                "cloud.provider": "aws",
+                "cloud.region": "us-east-1",
+                "cloud.service.name": "eks",
+                "distance": 1
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.node",
+                "asset.id": "node-103",
+                "asset.name": "k8s-node-103-aws",
+                "asset.ean": "k8s.node:node-103",
+                "asset.parents": [
+                    "k8s.cluster:cluster-001"
+                ],
+                "orchestrator.type": "kubernetes",
+                "orchestrator.cluster.name": "Cluster 001 (AWS EKS)",
+                "orchestrator.cluster.id": "cluster-001",
+                "cloud.provider": "aws",
+                "cloud.region": "us-east-1",
+                "cloud.service.name": "eks",
+                "distance": 1
+            }
+        ]
+    }
+}
+```
+
+</details>
+
+<details>
+
+<summary>Request looking for references</summary>
+
+```curl
+GET kbn:/api/asset-manager/assets/related?ean=k8s.pod:pod-200xrg1&relation=references&maxDistance=1&from=2023-04-18T13:10:13.111Z&to=2023-04-18T15:10:13.111Z
+
+{
+    "results": {
+        "primary": {
+            "@timestamp": "2023-04-18T14:10:13.111Z",
+            "asset.type": "k8s.pod",
+            "asset.id": "pod-200xrg1",
+            "asset.name": "k8s-pod-200xrg1-aws",
+            "asset.ean": "k8s.pod:pod-200xrg1",
+            "asset.parents": [
+                "k8s.node:node-101"
+            ],
+            "asset.references": [
+                "k8s.cluster:cluster-001"
+            ]
+        },
+        "references": [
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.cluster",
+                "asset.id": "cluster-001",
+                "asset.name": "Cluster 001 (AWS EKS)",
+                "asset.ean": "k8s.cluster:cluster-001",
+                "orchestrator.type": "kubernetes",
+                "orchestrator.cluster.name": "Cluster 001 (AWS EKS)",
+                "orchestrator.cluster.id": "cluster-001",
+                "cloud.provider": "aws",
+                "cloud.region": "us-east-1",
+                "cloud.service.name": "eks",
+                "distance": 1
+            }
+        ]
+    }
+}
+```
+
+</details>
+
+<details>
+
+<summary>Request with type filter and non-default maxDistance</summary>
+
+```curl
+GET kbn:/api/asset-manager/assets/related?ean=k8s.cluster:cluster-001&relation=descendants&maxDistance=2&from=2023-04-18T13:10:13.111Z&to=2023-04-18T15:10:13.111Z&type=k8s.pod
+
+{
+    "results": {
+        "primary": {
+            "@timestamp": "2023-04-18T14:10:13.111Z",
+            "asset.type": "k8s.cluster",
+            "asset.id": "cluster-001",
+            "asset.name": "Cluster 001 (AWS EKS)",
+            "asset.ean": "k8s.cluster:cluster-001",
+            "orchestrator.type": "kubernetes",
+            "orchestrator.cluster.name": "Cluster 001 (AWS EKS)",
+            "orchestrator.cluster.id": "cluster-001",
+            "cloud.provider": "aws",
+            "cloud.region": "us-east-1",
+            "cloud.service.name": "eks"
+        },
+        "descendants": [
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200xrg1",
+                "asset.name": "k8s-pod-200xrg1-aws",
+                "asset.ean": "k8s.pod:pod-200xrg1",
+                "asset.parents": [
+                    "k8s.node:node-101"
+                ],
+                "asset.references": [
+                    "k8s.cluster:cluster-001"
+                ],
+                "distance": 2
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200dfp2",
+                "asset.name": "k8s-pod-200dfp2-aws",
+                "asset.ean": "k8s.pod:pod-200dfp2",
+                "asset.parents": [
+                    "k8s.node:node-101"
+                ],
+                "distance": 2
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200wwc3",
+                "asset.name": "k8s-pod-200wwc3-aws",
+                "asset.ean": "k8s.pod:pod-200wwc3",
+                "asset.parents": [
+                    "k8s.node:node-101"
+                ],
+                "distance": 2
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200naq4",
+                "asset.name": "k8s-pod-200naq4-aws",
+                "asset.ean": "k8s.pod:pod-200naq4",
+                "asset.parents": [
+                    "k8s.node:node-102"
+                ],
+                "distance": 2
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200ohr5",
+                "asset.name": "k8s-pod-200ohr5-aws",
+                "asset.ean": "k8s.pod:pod-200ohr5",
+                "asset.parents": [
+                    "k8s.node:node-102"
+                ],
+                "distance": 2
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200yyx6",
+                "asset.name": "k8s-pod-200yyx6-aws",
+                "asset.ean": "k8s.pod:pod-200yyx6",
+                "asset.parents": [
+                    "k8s.node:node-103"
+                ],
+                "distance": 2
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200psd7",
+                "asset.name": "k8s-pod-200psd7-aws",
+                "asset.ean": "k8s.pod:pod-200psd7",
+                "asset.parents": [
+                    "k8s.node:node-103"
+                ],
+                "distance": 2
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200wmc8",
+                "asset.name": "k8s-pod-200wmc8-aws",
+                "asset.ean": "k8s.pod:pod-200wmc8",
+                "asset.parents": [
+                    "k8s.node:node-103"
+                ],
+                "distance": 2
+            },
+            {
+                "@timestamp": "2023-04-18T14:10:13.111Z",
+                "asset.type": "k8s.pod",
+                "asset.id": "pod-200ugg9",
+                "asset.name": "k8s-pod-200ugg9-aws",
+                "asset.ean": "k8s.pod:pod-200ugg9",
+                "asset.parents": [
+                    "k8s.node:node-103"
+                ],
+                "distance": 2
+            }
+        ]
+    }
+}
+```
+
+</details>
+
 #### GET /assets/sample
 
 Returns the list of pre-defined sample asset documents that would be indexed
diff --git a/x-pack/plugins/asset_manager/jest.config.js b/x-pack/plugins/asset_manager/jest.config.js
new file mode 100644
index 00000000000000..d54e474b86ff41
--- /dev/null
+++ b/x-pack/plugins/asset_manager/jest.config.js
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/x-pack/plugins/asset_manager'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/asset_manager',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: [
+    '<rootDir>/x-pack/plugins/asset_manager/{common,public,server}/**/*.{js,ts,tsx}',
+  ],
+};
diff --git a/x-pack/plugins/asset_manager/server/lib/errors.ts b/x-pack/plugins/asset_manager/server/lib/errors.ts
new file mode 100644
index 00000000000000..e0d341f87a9fd9
--- /dev/null
+++ b/x-pack/plugins/asset_manager/server/lib/errors.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.
+ */
+
+export class AssetNotFoundError extends Error {
+  constructor(ean: string) {
+    super(`Asset with ean (${ean}) not found in the provided time range`);
+    Object.setPrototypeOf(this, new.target.prototype);
+    this.name = 'AssetNotFoundError';
+  }
+}
diff --git a/x-pack/plugins/asset_manager/server/lib/get_all_related_assets.test.ts b/x-pack/plugins/asset_manager/server/lib/get_all_related_assets.test.ts
new file mode 100644
index 00000000000000..7eaa05dbd35bbf
--- /dev/null
+++ b/x-pack/plugins/asset_manager/server/lib/get_all_related_assets.test.ts
@@ -0,0 +1,529 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+jest.mock('./get_assets', () => ({ getAssets: jest.fn() }));
+jest.mock('./get_related_assets', () => ({ getRelatedAssets: jest.fn() }));
+
+import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
+import { v4 as uuid } from 'uuid';
+import { AssetWithoutTimestamp } from '../../common/types_api';
+import { getAssets } from './get_assets'; // Mocked
+import { getRelatedAssets } from './get_related_assets'; // Mocked
+import { getAllRelatedAssets } from './get_all_related_assets';
+
+const esClientMock = elasticsearchClientMock.createScopedClusterClient().asCurrentUser;
+
+describe('getAllRelatedAssets', () => {
+  beforeEach(() => {
+    (getAssets as jest.Mock).mockReset();
+    (getRelatedAssets as jest.Mock).mockReset();
+  });
+
+  it('throws if it cannot find the primary asset', async () => {
+    const primaryAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-which-does-not-exist',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    // Mock that we cannot find the primary
+    (getAssets as jest.Mock).mockResolvedValueOnce([]);
+    // Ensure maxDistance is respected
+    (getAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+    (getRelatedAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAsset['asset.ean'],
+        relation: 'ancestors',
+        from: new Date().toISOString(),
+        maxDistance: 1,
+        size: 10,
+      })
+    ).rejects.toThrow(
+      `Asset with ean (${primaryAsset['asset.ean']}) not found in the provided time range`
+    );
+  });
+
+  it('returns only the primary if it does not have any ancestors', async () => {
+    const primaryAssetWithoutParents: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [],
+    };
+
+    (getAssets as jest.Mock).mockResolvedValueOnce([primaryAssetWithoutParents]);
+    // Distance 1
+    (getRelatedAssets as jest.Mock).mockResolvedValueOnce([]);
+    // Ensure maxDistance is respected
+    (getAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+    (getRelatedAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAssetWithoutParents['asset.ean'],
+        from: new Date().toISOString(),
+        relation: 'ancestors',
+        maxDistance: 1,
+        size: 10,
+      })
+    ).resolves.toStrictEqual({
+      primary: primaryAssetWithoutParents,
+      ancestors: [],
+    });
+  });
+
+  it('returns the primary and a directly referenced parent', async () => {
+    const parentAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    const primaryAssetWithDirectParent: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [parentAsset['asset.ean']],
+    };
+
+    // Primary
+    (getAssets as jest.Mock).mockResolvedValueOnce([primaryAssetWithDirectParent]);
+    // Distance 1
+    (getAssets as jest.Mock).mockResolvedValueOnce([parentAsset]);
+    (getRelatedAssets as jest.Mock).mockResolvedValueOnce([]);
+    // Ensure maxDistance is respected
+    (getAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+    (getRelatedAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAssetWithDirectParent['asset.ean'],
+        from: new Date().toISOString(),
+        relation: 'ancestors',
+        maxDistance: 1,
+        size: 10,
+      })
+    ).resolves.toStrictEqual({
+      primary: primaryAssetWithDirectParent,
+      ancestors: [
+        {
+          ...parentAsset,
+          distance: 1,
+        },
+      ],
+    });
+  });
+
+  it('returns the primary and an indirectly referenced parent', async () => {
+    const primaryAssetWithIndirectParent: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [],
+    };
+
+    const parentAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.children': [primaryAssetWithIndirectParent['asset.ean']],
+    };
+
+    // Primary
+    (getAssets as jest.Mock).mockResolvedValueOnce([primaryAssetWithIndirectParent]);
+    // Distance 1
+    (getAssets as jest.Mock).mockResolvedValueOnce([]);
+    (getRelatedAssets as jest.Mock).mockResolvedValueOnce([parentAsset]);
+    // Ensure maxDistance is respected
+    (getAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+    (getRelatedAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAssetWithIndirectParent['asset.ean'],
+        from: new Date().toISOString(),
+        relation: 'ancestors',
+        maxDistance: 1,
+        size: 10,
+      })
+    ).resolves.toStrictEqual({
+      primary: primaryAssetWithIndirectParent,
+      ancestors: [
+        {
+          ...parentAsset,
+          distance: 1,
+        },
+      ],
+    });
+  });
+
+  it('returns the primary and all distance 1 parents', async () => {
+    const directlyReferencedParent: AssetWithoutTimestamp = {
+      'asset.ean': 'directly-referenced-parent-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.children': [],
+    };
+
+    const primaryAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [directlyReferencedParent['asset.ean']],
+    };
+
+    const indirectlyReferencedParent: AssetWithoutTimestamp = {
+      'asset.ean': 'indirectly-referenced-parent-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.children': [primaryAsset['asset.ean']],
+    };
+
+    // Primary
+    (getAssets as jest.Mock).mockResolvedValueOnce([primaryAsset]);
+    // Distance 1
+    (getAssets as jest.Mock).mockResolvedValueOnce([directlyReferencedParent]);
+    (getRelatedAssets as jest.Mock).mockResolvedValueOnce([indirectlyReferencedParent]);
+    // Ensure maxDistance is respected
+    (getAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+    (getRelatedAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAsset['asset.ean'],
+        from: new Date().toISOString(),
+        relation: 'ancestors',
+        maxDistance: 1,
+        size: 10,
+      })
+    ).resolves.toStrictEqual({
+      primary: primaryAsset,
+      ancestors: [
+        {
+          ...directlyReferencedParent,
+          distance: 1,
+        },
+        {
+          ...indirectlyReferencedParent,
+          distance: 1,
+        },
+      ],
+    });
+  });
+
+  it('returns the primary and one parent even with a two way relation defined', async () => {
+    const parentAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    const primaryAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    primaryAsset['asset.parents'] = [parentAsset['asset.ean']];
+    parentAsset['asset.children'] = [primaryAsset['asset.ean']];
+
+    // Primary
+    (getAssets as jest.Mock).mockResolvedValueOnce([primaryAsset]);
+    // Distance 1
+    (getAssets as jest.Mock).mockResolvedValueOnce([parentAsset]);
+    // Code should filter out any directly referenced parent from the indirectly referenced parents query
+    (getRelatedAssets as jest.Mock).mockResolvedValueOnce([]);
+    // Ensure maxDistance is respected
+    (getAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+    (getRelatedAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAsset['asset.ean'],
+        from: new Date().toISOString(),
+        relation: 'ancestors',
+        maxDistance: 1,
+        size: 10,
+      })
+    ).resolves.toStrictEqual({
+      primary: primaryAsset,
+      ancestors: [
+        {
+          ...parentAsset,
+          distance: 1,
+        },
+      ],
+    });
+  });
+
+  it('returns relations from 5 jumps', async () => {
+    const distance6Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-5-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    const distance5Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-5-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance6Parent['asset.ean']],
+    };
+
+    const distance4Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-4-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance5Parent['asset.ean']],
+    };
+
+    const distance3Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-3-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance4Parent['asset.ean']],
+    };
+
+    const distance2Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-2-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance3Parent['asset.ean']],
+    };
+
+    const distance1Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-1-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance2Parent['asset.ean']],
+    };
+
+    const primaryAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance1Parent['asset.ean']],
+    };
+
+    // Only using directly referenced parents
+    (getRelatedAssets as jest.Mock).mockResolvedValue([]);
+
+    // Primary
+    (getAssets as jest.Mock).mockResolvedValueOnce([primaryAsset]);
+    // Distance 1
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance1Parent]);
+    // Distance 2
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance2Parent]);
+    // Distance 3
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance3Parent]);
+    // Distance 4
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance4Parent]);
+    // Distance 5
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance5Parent]);
+    // Should not exceed maxDistance
+    (getAssets as jest.Mock).mockRejectedValueOnce(new Error('Should respect maxDistance'));
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAsset['asset.ean'],
+        from: new Date().toISOString(),
+        relation: 'ancestors',
+        maxDistance: 5,
+        size: 10,
+      })
+    ).resolves.toStrictEqual({
+      primary: primaryAsset,
+      ancestors: [
+        {
+          ...distance1Parent,
+          distance: 1,
+        },
+        {
+          ...distance2Parent,
+          distance: 2,
+        },
+        {
+          ...distance3Parent,
+          distance: 3,
+        },
+        {
+          ...distance4Parent,
+          distance: 4,
+        },
+        {
+          ...distance5Parent,
+          distance: 5,
+        },
+      ],
+    });
+  });
+
+  it('returns relations from only 3 jumps if there are no more parents', async () => {
+    const distance3Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-3-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    const distance2Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-2-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance3Parent['asset.ean']],
+    };
+
+    const distance1Parent: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-1-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance2Parent['asset.ean']],
+    };
+
+    const primaryAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance1Parent['asset.ean']],
+    };
+
+    // Only using directly referenced parents
+    (getRelatedAssets as jest.Mock).mockResolvedValue([]);
+
+    // Primary
+    (getAssets as jest.Mock).mockResolvedValueOnce([primaryAsset]);
+    // Distance 1
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance1Parent]);
+    // Distance 2
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance2Parent]);
+    // Distance 3
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance3Parent]);
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAsset['asset.ean'],
+        from: new Date().toISOString(),
+        relation: 'ancestors',
+        maxDistance: 5,
+        size: 10,
+      })
+    ).resolves.toStrictEqual({
+      primary: primaryAsset,
+      ancestors: [
+        {
+          ...distance1Parent,
+          distance: 1,
+        },
+        {
+          ...distance2Parent,
+          distance: 2,
+        },
+        {
+          ...distance3Parent,
+          distance: 3,
+        },
+      ],
+    });
+  });
+
+  it('returns relations by distance even if there are multiple parents in each jump', async () => {
+    const distance2ParentA: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-2-ean-a',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    const distance2ParentB: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-2-ean-b',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    const distance2ParentC: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-2-ean-c',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    const distance2ParentD: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-2-ean-d',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+    };
+
+    const distance1ParentA: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-1-ean-a',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance2ParentA['asset.ean'], distance2ParentB['asset.ean']],
+    };
+
+    const distance1ParentB: AssetWithoutTimestamp = {
+      'asset.ean': 'parent-1-ean-b',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance2ParentC['asset.ean'], distance2ParentD['asset.ean']],
+    };
+
+    const primaryAsset: AssetWithoutTimestamp = {
+      'asset.ean': 'primary-ean',
+      'asset.type': 'k8s.pod',
+      'asset.id': uuid(),
+      'asset.parents': [distance1ParentA['asset.ean'], distance1ParentB['asset.ean']],
+    };
+
+    // Only using directly referenced parents
+    (getRelatedAssets as jest.Mock).mockResolvedValue([]);
+
+    // Primary
+    (getAssets as jest.Mock).mockResolvedValueOnce([primaryAsset]);
+    // Distance 1
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance1ParentA, distance1ParentB]);
+    // Distance 2 (the order matters)
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance2ParentA, distance2ParentB]);
+    (getAssets as jest.Mock).mockResolvedValueOnce([distance2ParentC, distance2ParentD]);
+
+    await expect(
+      getAllRelatedAssets(esClientMock, {
+        ean: primaryAsset['asset.ean'],
+        from: new Date().toISOString(),
+        relation: 'ancestors',
+        maxDistance: 5,
+        size: 10,
+      })
+    ).resolves.toStrictEqual({
+      primary: primaryAsset,
+      ancestors: [
+        {
+          ...distance1ParentA,
+          distance: 1,
+        },
+        {
+          ...distance1ParentB,
+          distance: 1,
+        },
+        {
+          ...distance2ParentA,
+          distance: 2,
+        },
+        {
+          ...distance2ParentB,
+          distance: 2,
+        },
+        {
+          ...distance2ParentC,
+          distance: 2,
+        },
+        {
+          ...distance2ParentD,
+          distance: 2,
+        },
+      ],
+    });
+  });
+});
diff --git a/x-pack/plugins/asset_manager/server/lib/get_all_related_assets.ts b/x-pack/plugins/asset_manager/server/lib/get_all_related_assets.ts
new file mode 100644
index 00000000000000..f297881e1aec69
--- /dev/null
+++ b/x-pack/plugins/asset_manager/server/lib/get_all_related_assets.ts
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ElasticsearchClient } from '@kbn/core/server';
+import { flatten, without } from 'lodash';
+import { Asset, AssetType, Relation, RelationField } from '../../common/types_api';
+import { getAssets } from './get_assets';
+import { getRelatedAssets } from './get_related_assets';
+import { AssetNotFoundError } from './errors';
+import { toArray } from './utils';
+
+interface GetAllRelatedAssetsOptions {
+  ean: string;
+  from: string;
+  to?: string;
+  relation: Relation;
+  type?: AssetType[];
+  maxDistance: number;
+  size: number;
+}
+
+export async function getAllRelatedAssets(
+  esClient: ElasticsearchClient,
+  options: GetAllRelatedAssetsOptions
+) {
+  // How to put size into this?
+  const { ean, from, to, relation, maxDistance, type = [] } = options;
+
+  const primary = await findPrimary(esClient, { ean, from, to });
+
+  let assetsToFetch = [primary];
+  let currentDistance = 1;
+  const relatedAssets = [];
+  while (currentDistance <= maxDistance) {
+    const queryOptions: FindRelatedAssetsOptions = {
+      relation,
+      from,
+      to,
+      visitedEans: [primary['asset.ean'], ...relatedAssets.map((asset) => asset['asset.ean'])],
+    };
+    // if we enforce the type filter before the last query we'll miss nodes with
+    // possible edges to the requested types
+    if (currentDistance === maxDistance && type.length) {
+      queryOptions.type = type;
+    }
+
+    const results = flatten(
+      await Promise.all(
+        assetsToFetch.map((asset) => findRelatedAssets(esClient, asset, queryOptions))
+      )
+    );
+
+    if (results.length === 0) {
+      break;
+    }
+
+    relatedAssets.push(...results.map(withDistance(currentDistance)));
+
+    assetsToFetch = results;
+    currentDistance++;
+  }
+
+  return {
+    primary,
+    [relation]: type.length
+      ? relatedAssets.filter((asset) => type.includes(asset['asset.type']))
+      : relatedAssets,
+  };
+}
+
+async function findPrimary(
+  esClient: ElasticsearchClient,
+  { ean, from, to }: Pick<GetAllRelatedAssetsOptions, 'ean' | 'from' | 'to'>
+): Promise<Asset> {
+  const primaryResults = await getAssets({
+    esClient,
+    size: 1,
+    filters: { ean, from, to },
+  });
+
+  if (primaryResults.length === 0) {
+    throw new AssetNotFoundError(ean);
+  }
+
+  if (primaryResults.length > 1) {
+    throw new Error(`Illegal state: Found more than one asset with the same ean (ean=${ean}).`);
+  }
+
+  return primaryResults[0];
+}
+
+type FindRelatedAssetsOptions = Pick<
+  GetAllRelatedAssetsOptions,
+  'relation' | 'type' | 'from' | 'to'
+> & { visitedEans: string[] };
+
+async function findRelatedAssets(
+  esClient: ElasticsearchClient,
+  primary: Asset,
+  { relation, from, to, type, visitedEans }: FindRelatedAssetsOptions
+): Promise<Asset[]> {
+  const relationField = relationToDirectField(relation);
+  const directlyRelatedEans = toArray(primary[relationField]);
+
+  let directlyRelatedAssets: Asset[] = [];
+  if (directlyRelatedEans.length) {
+    // get the directly related assets we haven't visited already
+    directlyRelatedAssets = await getAssets({
+      esClient,
+      filters: { ean: without(directlyRelatedEans, ...visitedEans), from, to, type },
+    });
+  }
+
+  const indirectlyRelatedAssets = await getRelatedAssets({
+    esClient,
+    ean: primary['asset.ean'],
+    excludeEans: visitedEans.concat(directlyRelatedEans),
+    relation,
+    from,
+    to,
+    type,
+  });
+
+  return [...directlyRelatedAssets, ...indirectlyRelatedAssets];
+}
+
+function relationToDirectField(relation: Relation): RelationField {
+  if (relation === 'ancestors') {
+    return 'asset.parents';
+  } else if (relation === 'descendants') {
+    return 'asset.children';
+  } else {
+    return 'asset.references';
+  }
+}
+
+function withDistance(
+  distance: number
+): (value: Asset, index: number, array: Asset[]) => Asset & { distance: number } {
+  return (asset: Asset) => ({ ...asset, distance });
+}
diff --git a/x-pack/plugins/asset_manager/server/lib/get_assets.ts b/x-pack/plugins/asset_manager/server/lib/get_assets.ts
index 90332544992534..6c9a06c342e8d4 100644
--- a/x-pack/plugins/asset_manager/server/lib/get_assets.ts
+++ b/x-pack/plugins/asset_manager/server/lib/get_assets.ts
@@ -23,6 +23,8 @@ export async function getAssets({
   size = 100,
   filters = {},
 }: GetAssetsOptions): Promise<Asset[]> {
+  // Maybe it makes the most sense to validate the filters here?
+
   const { from = 'now-24h', to = 'now' } = filters;
   const dsl: SearchRequest = {
     index: ASSETS_INDEX_PREFIX + '*',
@@ -62,7 +64,7 @@ export async function getAssets({
       });
     }
 
-    if (filters.type) {
+    if (filters.type?.length) {
       musts.push({
         terms: {
           ['asset.type']: Array.isArray(filters.type) ? filters.type : [filters.type],
diff --git a/x-pack/plugins/asset_manager/server/lib/get_related_assets.ts b/x-pack/plugins/asset_manager/server/lib/get_related_assets.ts
new file mode 100644
index 00000000000000..548fd55dd2aedb
--- /dev/null
+++ b/x-pack/plugins/asset_manager/server/lib/get_related_assets.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { QueryDslQueryContainer, SearchRequest } from '@elastic/elasticsearch/lib/api/types';
+import { debug } from '../../common/debug_log';
+import { Asset, AssetType, Relation, RelationField } from '../../common/types_api';
+import { ASSETS_INDEX_PREFIX } from '../constants';
+import { ElasticsearchAccessorOptions } from '../types';
+
+interface GetRelatedAssetsOptions extends ElasticsearchAccessorOptions {
+  size?: number;
+  ean: string;
+  excludeEans?: string[];
+  from?: string;
+  to?: string;
+  relation: Relation;
+  type?: AssetType[];
+}
+
+export async function getRelatedAssets({
+  esClient,
+  size = 100,
+  from = 'now-24h',
+  to = 'now',
+  ean,
+  excludeEans,
+  relation,
+  type,
+}: GetRelatedAssetsOptions): Promise<Asset[]> {
+  const relationField = relationToIndirectField(relation);
+  const must: QueryDslQueryContainer[] = [
+    {
+      terms: {
+        [relationField]: [ean],
+      },
+    },
+  ];
+
+  if (type?.length) {
+    must.push({
+      terms: {
+        ['asset.type']: type,
+      },
+    });
+  }
+
+  const mustNot: QueryDslQueryContainer[] =
+    excludeEans && excludeEans.length
+      ? [
+          {
+            terms: {
+              'asset.ean': excludeEans,
+            },
+          },
+        ]
+      : [];
+
+  const dsl: SearchRequest = {
+    index: ASSETS_INDEX_PREFIX + '*',
+    size,
+    query: {
+      bool: {
+        filter: [
+          {
+            range: {
+              '@timestamp': {
+                gte: from,
+                lte: to,
+              },
+            },
+          },
+        ],
+        must,
+        must_not: mustNot,
+      },
+    },
+    collapse: {
+      field: 'asset.ean',
+    },
+    sort: {
+      '@timestamp': {
+        order: 'desc',
+      },
+    },
+  };
+
+  debug('Performing Asset Query', '\n\n', JSON.stringify(dsl, null, 2));
+
+  const response = await esClient.search(dsl);
+  return response.hits.hits.map((hit) => hit._source as Asset);
+}
+
+function relationToIndirectField(relation: Relation): RelationField {
+  if (relation === 'ancestors') {
+    return 'asset.children';
+  } else if (relation === 'descendants') {
+    return 'asset.parents';
+  } else {
+    return 'asset.references';
+  }
+}
diff --git a/x-pack/plugins/asset_manager/server/lib/sample_assets.ts b/x-pack/plugins/asset_manager/server/lib/sample_assets.ts
index 7b08fa854de7b3..f49300e4663e6b 100644
--- a/x-pack/plugins/asset_manager/server/lib/sample_assets.ts
+++ b/x-pack/plugins/asset_manager/server/lib/sample_assets.ts
@@ -103,6 +103,7 @@ const sampleK8sPods: AssetWithoutTimestamp[] = [
     'asset.name': 'k8s-pod-200xrg1-aws',
     'asset.ean': 'k8s.pod:pod-200xrg1',
     'asset.parents': ['k8s.node:node-101'],
+    'asset.references': ['k8s.cluster:cluster-001'],
   },
   {
     'asset.type': 'k8s.pod',
@@ -162,8 +163,39 @@ const sampleK8sPods: AssetWithoutTimestamp[] = [
   },
 ];
 
+const sampleCircularReferences: AssetWithoutTimestamp[] = [
+  {
+    'asset.type': 'k8s.node',
+    'asset.id': 'node-203',
+    'asset.name': 'k8s-node-203-aws',
+    'asset.ean': 'k8s.node:node-203',
+    'orchestrator.type': 'kubernetes',
+    'orchestrator.cluster.name': 'Cluster 001 (AWS EKS)',
+    'orchestrator.cluster.id': 'cluster-001',
+    'cloud.provider': 'aws',
+    'cloud.region': 'us-east-1',
+    'cloud.service.name': 'eks',
+    'asset.references': ['k8s.pod:pod-203ugg9', 'k8s.pod:pod-203ugg5'],
+  },
+  {
+    'asset.type': 'k8s.pod',
+    'asset.id': 'pod-203ugg5',
+    'asset.name': 'k8s-pod-203ugg5-aws',
+    'asset.ean': 'k8s.pod:pod-203ugg5',
+    'asset.references': ['k8s.node:node-203'],
+  },
+  {
+    'asset.type': 'k8s.pod',
+    'asset.id': 'pod-203ugg9',
+    'asset.name': 'k8s-pod-203ugg9-aws',
+    'asset.ean': 'k8s.pod:pod-203ugg9',
+    'asset.references': ['k8s.node:node-203'],
+  },
+];
+
 export const sampleAssets: AssetWithoutTimestamp[] = [
   ...sampleK8sClusters,
   ...sampleK8sNodes,
   ...sampleK8sPods,
+  ...sampleCircularReferences,
 ];
diff --git a/x-pack/plugins/asset_manager/server/lib/utils.ts b/x-pack/plugins/asset_manager/server/lib/utils.ts
new file mode 100644
index 00000000000000..0e65ff60887bed
--- /dev/null
+++ b/x-pack/plugins/asset_manager/server/lib/utils.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export function toArray<T>(maybeArray: T | T[] | undefined): T[] {
+  if (!maybeArray) {
+    return [];
+  }
+  if (Array.isArray(maybeArray)) {
+    return maybeArray;
+  }
+  return [maybeArray];
+}
diff --git a/x-pack/plugins/asset_manager/server/routes/assets.ts b/x-pack/plugins/asset_manager/server/routes/assets.ts
index d1b4d839913e4a..525744131d945f 100644
--- a/x-pack/plugins/asset_manager/server/routes/assets.ts
+++ b/x-pack/plugins/asset_manager/server/routes/assets.ts
@@ -9,10 +9,14 @@ import { schema } from '@kbn/config-schema';
 import { RequestHandlerContext } from '@kbn/core/server';
 import { differenceBy, intersectionBy } from 'lodash';
 import { debug } from '../../common/debug_log';
+import { AssetType, assetTypeRT, relationRT } from '../../common/types_api';
 import { ASSET_MANAGER_API_BASE } from '../constants';
 import { getAssets } from '../lib/get_assets';
+import { getAllRelatedAssets } from '../lib/get_all_related_assets';
 import { SetupRouteOptions } from './types';
 import { getEsClientFromContext } from './utils';
+import { AssetNotFoundError } from '../lib/errors';
+import { toArray } from '../lib/utils';
 
 const assetType = schema.oneOf([
   schema.literal('k8s.pod'),
@@ -23,11 +27,29 @@ const assetType = schema.oneOf([
 const getAssetsQueryOptions = schema.object({
   from: schema.maybe(schema.string()),
   to: schema.maybe(schema.string()),
-  type: schema.maybe(schema.oneOf([schema.arrayOf(assetType), assetType])),
+  type: schema.maybe(schema.oneOf([schema.arrayOf(assetTypeRT), assetTypeRT])),
   ean: schema.maybe(schema.oneOf([schema.arrayOf(schema.string()), schema.string()])),
   size: schema.maybe(schema.number()),
 });
 
+const getAssetsDiffQueryOptions = schema.object({
+  aFrom: schema.string(),
+  aTo: schema.string(),
+  bFrom: schema.string(),
+  bTo: schema.string(),
+  type: schema.maybe(schema.oneOf([schema.arrayOf(assetType), assetType])),
+});
+
+const getRelatedAssetsQueryOptions = schema.object({
+  from: schema.string(), // ISO timestamp or ES datemath
+  to: schema.maybe(schema.string()), // ISO timestamp or ES datemath
+  ean: schema.string(),
+  relation: relationRT,
+  type: schema.maybe(schema.oneOf([assetTypeRT, schema.arrayOf(assetTypeRT)])),
+  maxDistance: schema.maybe(schema.number()),
+  size: schema.maybe(schema.number()),
+});
+
 export function assetsRoutes<T extends RequestHandlerContext>({ router }: SetupRouteOptions<T>) {
   // GET /assets
   router.get<unknown, typeof getAssetsQueryOptions.type, unknown>(
@@ -58,14 +80,51 @@ export function assetsRoutes<T extends RequestHandlerContext>({ router }: SetupR
     }
   );
 
+  // GET assets/related
+  router.get<unknown, typeof getRelatedAssetsQueryOptions.type, unknown>(
+    {
+      path: `${ASSET_MANAGER_API_BASE}/assets/related`,
+      validate: {
+        query: getRelatedAssetsQueryOptions,
+      },
+    },
+    async (context, req, res) => {
+      // Add references into sample data and write integration tests
+
+      const { from, to, ean, relation } = req.query || {};
+      const esClient = await getEsClientFromContext(context);
+
+      // What if maxDistance is below 1?
+      const maxDistance = req.query.maxDistance ? Math.min(req.query.maxDistance, 5) : 1; // Validate maxDistance not larger than 5
+      const size = req.query.size ? Math.min(req.query.size, 100) : 10; // Do we need pagination and sorting? Yes.
+      const type = toArray<AssetType>(req.query.type);
+      // Validate from and to to be ISO string only. Or use io-ts to coerce.
+
+      try {
+        return res.ok({
+          body: {
+            results: await getAllRelatedAssets(esClient, {
+              ean,
+              from,
+              to,
+              type,
+              maxDistance,
+              size,
+              relation,
+            }),
+          },
+        });
+      } catch (error: any) {
+        debug('error looking up asset records', error);
+        if (error instanceof AssetNotFoundError) {
+          return res.customError({ statusCode: 404, body: error.message });
+        }
+        return res.customError({ statusCode: 500, body: error.message });
+      }
+    }
+  );
+
   // GET /assets/diff
-  const getAssetsDiffQueryOptions = schema.object({
-    aFrom: schema.string(),
-    aTo: schema.string(),
-    bFrom: schema.string(),
-    bTo: schema.string(),
-    type: schema.maybe(schema.oneOf([schema.arrayOf(assetType), assetType])),
-  });
   router.get<unknown, typeof getAssetsDiffQueryOptions.type, unknown>(
     {
       path: `${ASSET_MANAGER_API_BASE}/assets/diff`,
@@ -74,7 +133,8 @@ export function assetsRoutes<T extends RequestHandlerContext>({ router }: SetupR
       },
     },
     async (context, req, res) => {
-      const { aFrom, aTo, bFrom, bTo, type } = req.query;
+      const { aFrom, aTo, bFrom, bTo } = req.query;
+      const type = toArray<AssetType>(req.query.type);
 
       if (new Date(aFrom) > new Date(aTo)) {
         return res.badRequest({
diff --git a/x-pack/plugins/asset_manager/tsconfig.json b/x-pack/plugins/asset_manager/tsconfig.json
index 931c71de198dd7..9f76a58f0d4224 100644
--- a/x-pack/plugins/asset_manager/tsconfig.json
+++ b/x-pack/plugins/asset_manager/tsconfig.json
@@ -15,5 +15,6 @@
     "@kbn/core",
     "@kbn/config-schema",
     "@kbn/core-http-server",
+    "@kbn/core-elasticsearch-client-server-mocks",
   ]
 }
diff --git a/x-pack/plugins/cases/common/api/cases/case.ts b/x-pack/plugins/cases/common/api/cases/case.ts
index 4eaf633fb98c7c..17319a71732e18 100644
--- a/x-pack/plugins/cases/common/api/cases/case.ts
+++ b/x-pack/plugins/cases/common/api/cases/case.ts
@@ -249,7 +249,7 @@ export const CasesByAlertIDRequestRt = rt.partial({
   owner: rt.union([rt.array(rt.string), rt.string]),
 });
 
-export const CaseResponseRt = rt.intersection([
+export const CaseRt = rt.intersection([
   CaseAttributesRt,
   rt.type({
     id: rt.string,
@@ -264,7 +264,7 @@ export const CaseResponseRt = rt.intersection([
 
 export const CaseResolveResponseRt = rt.intersection([
   rt.type({
-    case: CaseResponseRt,
+    case: CaseRt,
     outcome: rt.union([rt.literal('exactMatch'), rt.literal('aliasMatch'), rt.literal('conflict')]),
   }),
   rt.partial({
@@ -275,7 +275,7 @@ export const CaseResolveResponseRt = rt.intersection([
 
 export const CasesFindResponseRt = rt.intersection([
   rt.type({
-    cases: rt.array(CaseResponseRt),
+    cases: rt.array(CaseRt),
     page: rt.number,
     per_page: rt.number,
     total: rt.number,
@@ -292,7 +292,7 @@ export const CasePatchRequestRt = rt.intersection([
 ]);
 
 export const CasesPatchRequestRt = rt.type({ cases: rt.array(CasePatchRequestRt) });
-export const CasesResponseRt = rt.array(CaseResponseRt);
+export const CasesRt = rt.array(CaseRt);
 
 export const CasePushRequestParamsRt = rt.type({
   case_id: rt.string,
@@ -339,7 +339,7 @@ export const CasesBulkGetRequestRt = rt.intersection([
 ]);
 
 export const CasesBulkGetResponseRt = rt.type({
-  cases: CasesResponseRt,
+  cases: CasesRt,
   errors: rt.array(
     rt.type({
       error: rt.string,
@@ -353,9 +353,9 @@ export const CasesBulkGetResponseRt = rt.type({
 export type CaseAttributes = rt.TypeOf<typeof CaseAttributesRt>;
 
 export type CasePostRequest = rt.TypeOf<typeof CasePostRequestRt>;
-export type CaseResponse = rt.TypeOf<typeof CaseResponseRt>;
+export type Case = rt.TypeOf<typeof CaseRt>;
 export type CaseResolveResponse = rt.TypeOf<typeof CaseResolveResponseRt>;
-export type CasesResponse = rt.TypeOf<typeof CasesResponseRt>;
+export type Cases = rt.TypeOf<typeof CasesRt>;
 export type CasesFindRequest = rt.TypeOf<typeof CasesFindRequestRt>;
 export type CasesByAlertIDRequest = rt.TypeOf<typeof CasesByAlertIDRequestRt>;
 export type CasesFindResponse = rt.TypeOf<typeof CasesFindResponseRt>;
@@ -375,13 +375,15 @@ export type CasesByAlertId = rt.TypeOf<typeof CasesByAlertIdRt>;
 
 export type CasesBulkGetRequest = rt.TypeOf<typeof CasesBulkGetRequestRt>;
 export type CasesBulkGetResponse = rt.TypeOf<typeof CasesBulkGetResponseRt>;
-export type CasesBulkGetRequestCertainFields<
-  Field extends keyof CaseResponse = keyof CaseResponse
-> = Omit<CasesBulkGetRequest, 'fields'> & {
+export type CasesBulkGetRequestCertainFields<Field extends keyof Case = keyof Case> = Omit<
+  CasesBulkGetRequest,
+  'fields'
+> & {
   fields?: Field[];
 };
-export type CasesBulkGetResponseCertainFields<
-  Field extends keyof CaseResponse = keyof CaseResponse
-> = Omit<CasesBulkGetResponse, 'cases'> & {
-  cases: Array<Pick<CaseResponse, Field | 'id' | 'version' | 'owner'>>;
+export type CasesBulkGetResponseCertainFields<Field extends keyof Case = keyof Case> = Omit<
+  CasesBulkGetResponse,
+  'cases'
+> & {
+  cases: Array<Pick<Case, Field | 'id' | 'version' | 'owner'>>;
 };
diff --git a/x-pack/plugins/cases/common/api/cases/user_actions/operations/find.ts b/x-pack/plugins/cases/common/api/cases/user_actions/operations/find.ts
index dc4524e2bf3e94..ce107c73010c13 100644
--- a/x-pack/plugins/cases/common/api/cases/user_actions/operations/find.ts
+++ b/x-pack/plugins/cases/common/api/cases/user_actions/operations/find.ts
@@ -6,7 +6,7 @@
  */
 
 import * as rt from 'io-ts';
-import { CaseUserActionsResponseRt } from '../response';
+import { UserActionsRt } from '../response';
 import { ActionTypes } from '../common';
 import { NumberFromString } from '../../../saved_object';
 
@@ -36,7 +36,7 @@ export const UserActionFindRequestRt = rt.partial({
 export type UserActionFindRequest = rt.TypeOf<typeof UserActionFindRequestRt>;
 
 export const UserActionFindResponseRt = rt.type({
-  userActions: CaseUserActionsResponseRt,
+  userActions: UserActionsRt,
   page: rt.number,
   perPage: rt.number,
   total: rt.number,
diff --git a/x-pack/plugins/cases/common/api/cases/user_actions/response.ts b/x-pack/plugins/cases/common/api/cases/user_actions/response.ts
index 8f0ef5517db4f5..e4d1e681b15720 100644
--- a/x-pack/plugins/cases/common/api/cases/user_actions/response.ts
+++ b/x-pack/plugins/cases/common/api/cases/user_actions/response.ts
@@ -39,7 +39,7 @@ const CommonUserActionsRt = rt.union([
   AssigneesUserActionRt,
 ]);
 
-export const UserActionsRt = rt.union([
+const UserActionPayloadRt = rt.union([
   CommonUserActionsRt,
   CreateCaseUserActionRt,
   ConnectorUserActionRt,
@@ -55,7 +55,7 @@ const UserActionsWithoutConnectorIdRt = rt.union([
   DeleteCaseUserActionRt,
 ]);
 
-const CaseUserActionBasicRt = rt.intersection([UserActionsRt, UserActionCommonAttributesRt]);
+const CaseUserActionBasicRt = rt.intersection([UserActionPayloadRt, UserActionCommonAttributesRt]);
 const CaseUserActionBasicWithoutConnectorIdRt = rt.intersection([
   UserActionsWithoutConnectorIdRt,
   UserActionCommonAttributesRt,
@@ -69,38 +69,38 @@ const CaseUserActionDeprecatedResponseRt = rt.intersection([
 /**
  * This includes the comment_id but not the action_id or case_id
  */
-const CaseUserActionInjectedAttributesRt = rt.intersection([
-  CaseUserActionBasicRt,
-  CaseUserActionInjectedIdsRt,
-]);
+const UserActionAttributes = rt.intersection([CaseUserActionBasicRt, CaseUserActionInjectedIdsRt]);
 
-const CaseUserActionResponseRt = rt.intersection([
-  CaseUserActionInjectedAttributesRt,
+const UserActionRt = rt.intersection([
+  UserActionAttributes,
   rt.type({
     id: rt.string,
     version: rt.string,
   }),
 ]);
 
-const CaseUserActionAttributesRt = CaseUserActionBasicRt;
-export const CaseUserActionsResponseRt = rt.array(CaseUserActionResponseRt);
+export const UserActionsRt = rt.array(UserActionRt);
 export const CaseUserActionsDeprecatedResponseRt = rt.array(CaseUserActionDeprecatedResponseRt);
 export const CaseUserActionStatsResponseRt = CaseUserActionStatsRt;
 
-export type CaseUserActionAttributes = rt.TypeOf<typeof CaseUserActionAttributesRt>;
 export type CaseUserActionAttributesWithoutConnectorId = rt.TypeOf<
   typeof CaseUserActionBasicWithoutConnectorIdRt
 >;
 export type CaseUserActionStatsResponse = rt.TypeOf<typeof CaseUserActionStatsRt>;
-export type CaseUserActionsResponse = rt.TypeOf<typeof CaseUserActionsResponseRt>;
-export type CaseUserActionResponse = rt.TypeOf<typeof CaseUserActionResponseRt>;
+export type UserActions = rt.TypeOf<typeof UserActionsRt>;
+export type UserAction = rt.TypeOf<typeof UserActionRt>;
 export type CaseUserActionsDeprecatedResponse = rt.TypeOf<
   typeof CaseUserActionsDeprecatedResponseRt
 >;
 export type CaseUserActionDeprecatedResponse = rt.TypeOf<typeof CaseUserActionDeprecatedResponseRt>;
-export type CaseUserActionInjectedAttributes = rt.TypeOf<typeof CaseUserActionInjectedAttributesRt>;
+export type UserActionAttributes = rt.TypeOf<typeof UserActionAttributes>;
 
-export type UserAction = rt.TypeOf<typeof ActionsRt>;
+/**
+ * This defines the high level category for the user action. Whether the user add, removed, updated something
+ */
+export type ActionCategory = rt.TypeOf<typeof ActionsRt>;
+/**
+ * This defines the type of the user action, meaning what individual action was taken, for example changing the status,
+ * adding an assignee etc.
+ */
 export type UserActionTypes = ActionTypeValues;
-
-export type CaseUserAction = rt.TypeOf<typeof CaseUserActionBasicRt>;
diff --git a/x-pack/plugins/cases/common/api/saved_object.ts b/x-pack/plugins/cases/common/api/saved_object.ts
index 2ed6ec2acdfe46..44af143284bce0 100644
--- a/x-pack/plugins/cases/common/api/saved_object.ts
+++ b/x-pack/plugins/cases/common/api/saved_object.ts
@@ -68,5 +68,3 @@ export const SavedObjectFindOptionsRt = rt.partial({
    */
   sortOrder: rt.union([rt.literal('desc'), rt.literal('asc')]),
 });
-
-export type SavedObjectFindOptions = rt.TypeOf<typeof SavedObjectFindOptionsRt>;
diff --git a/x-pack/plugins/cases/common/index.ts b/x-pack/plugins/cases/common/index.ts
index d41de5543654d5..6483bba8ce4f26 100644
--- a/x-pack/plugins/cases/common/index.ts
+++ b/x-pack/plugins/cases/common/index.ts
@@ -38,13 +38,15 @@ export {
 } from './api';
 
 export type {
-  CaseResponse,
+  Case,
+  Cases,
   CasesBulkGetRequestCertainFields,
   CasesBulkGetResponseCertainFields,
 } from './api';
 
 export type {
-  Case,
+  CaseUI,
+  CasesUI,
   Ecs,
   CasesFeatures,
   CaseViewRefreshPropInterface,
diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts
index e9bfcd0682f5b9..c8a1e2172651f1 100644
--- a/x-pack/plugins/cases/common/ui/types.ts
+++ b/x-pack/plugins/cases/common/ui/types.ts
@@ -17,10 +17,10 @@ import type {
   CaseStatuses,
   User,
   ActionConnector,
-  CaseUserActionResponse,
+  UserAction,
   SingleCaseMetricsResponse,
   CommentResponse,
-  CaseResponse,
+  Case as CaseSnakeCase,
   UserActionFindResponse,
   FindTypeField as UserActionFindTypeField,
   CommentResponseAlertsType,
@@ -87,13 +87,13 @@ export type Comment = SnakeToCamelCase<CommentResponse>;
 export type AlertComment = SnakeToCamelCase<CommentResponseAlertsType>;
 export type ExternalReferenceComment = SnakeToCamelCase<CommentResponseExternalReferenceType>;
 export type PersistableComment = SnakeToCamelCase<CommentResponseTypePersistableState>;
-export type CaseUserActions = SnakeToCamelCase<CaseUserActionResponse>;
+export type UserActionUI = SnakeToCamelCase<UserAction>;
 export type FindCaseUserActions = Omit<SnakeToCamelCase<UserActionFindResponse>, 'userActions'> & {
-  userActions: CaseUserActions[];
+  userActions: UserActionUI[];
 };
 export type CaseUserActionsStats = SnakeToCamelCase<CaseUserActionStatsResponse>;
-export type Case = Omit<SnakeToCamelCase<CaseResponse>, 'comments'> & { comments: Comment[] };
-export type Cases = Omit<SnakeToCamelCase<CasesFindResponse>, 'cases'> & { cases: Case[] };
+export type CaseUI = Omit<SnakeToCamelCase<CaseSnakeCase>, 'comments'> & { comments: Comment[] };
+export type CasesUI = Omit<SnakeToCamelCase<CasesFindResponse>, 'cases'> & { cases: CaseUI[] };
 export type CasesStatus = SnakeToCamelCase<CasesStatusResponse>;
 export type CasesMetrics = SnakeToCamelCase<CasesMetricsResponse>;
 export type CaseUpdateRequest = SnakeToCamelCase<CasePatchRequest>;
@@ -101,7 +101,7 @@ export type CaseConnectors = SnakeToCamelCase<GetCaseConnectorsResponse>;
 export type CaseUsers = GetCaseUsersResponse;
 
 export interface ResolvedCase {
-  case: Case;
+  case: CaseUI;
   outcome: ResolvedSimpleSavedObject['outcome'];
   aliasTargetId?: ResolvedSimpleSavedObject['alias_target_id'];
   aliasPurpose?: ResolvedSimpleSavedObject['alias_purpose'];
@@ -191,7 +191,7 @@ export type UpdateKey = keyof Pick<
 export interface UpdateByKey {
   updateKey: UpdateKey;
   updateValue: CasePatchRequest[UpdateKey];
-  caseData: Case;
+  caseData: CaseUI;
   onSuccess?: () => void;
   onError?: () => void;
 }
diff --git a/x-pack/plugins/cases/public/api/decoders.ts b/x-pack/plugins/cases/public/api/decoders.ts
index 6402b2d56a3421..121595ccb04148 100644
--- a/x-pack/plugins/cases/public/api/decoders.ts
+++ b/x-pack/plugins/cases/public/api/decoders.ts
@@ -16,12 +16,12 @@ import type {
   CasesStatusResponse,
   CasesMetricsResponse,
   CasesBulkGetResponseCertainFields,
-  CaseResponse,
+  Case,
 } from '../../common/api';
 import {
   CasesFindResponseRt,
   CasesStatusResponseRt,
-  CasesResponseRt,
+  CasesRt,
   getTypeForCertainFieldsFromArray,
   CasesMetricsResponseRt,
 } from '../../common/api';
@@ -41,11 +41,11 @@ export const decodeCasesMetricsResponse = (metrics?: CasesMetricsResponse) =>
     fold(throwErrors(createToasterPlainError), identity)
   );
 
-export const decodeCasesBulkGetResponse = <Field extends keyof CaseResponse = keyof CaseResponse>(
+export const decodeCasesBulkGetResponse = <Field extends keyof Case = keyof Case>(
   res: CasesBulkGetResponseCertainFields<Field>,
   fields?: string[]
 ) => {
-  const typeToDecode = getTypeForCertainFieldsFromArray(CasesResponseRt, fields);
+  const typeToDecode = getTypeForCertainFieldsFromArray(CasesRt, fields);
   pipe(typeToDecode.decode(res.cases), fold(throwErrors(createToasterPlainError), identity));
 
   return res;
diff --git a/x-pack/plugins/cases/public/api/index.ts b/x-pack/plugins/cases/public/api/index.ts
index c89b1ff94f9e9c..9d30cd0b585570 100644
--- a/x-pack/plugins/cases/public/api/index.ts
+++ b/x-pack/plugins/cases/public/api/index.ts
@@ -6,7 +6,7 @@
  */
 
 import type { HttpStart } from '@kbn/core/public';
-import type { Cases, CasesStatus, CasesMetrics } from '../../common/ui';
+import type { CasesUI, CasesStatus, CasesMetrics } from '../../common/ui';
 import {
   CASE_FIND_URL,
   CASE_METRICS_URL,
@@ -14,7 +14,7 @@ import {
   INTERNAL_BULK_GET_CASES_URL,
 } from '../../common/constants';
 import type {
-  CaseResponse,
+  Case,
   CasesBulkGetRequestCertainFields,
   CasesBulkGetResponseCertainFields,
   CasesFindRequest,
@@ -41,7 +41,7 @@ export const getCases = async ({
   http,
   signal,
   query,
-}: HTTPService & { query: CasesFindRequest }): Promise<Cases> => {
+}: HTTPService & { query: CasesFindRequest }): Promise<CasesUI> => {
   const res = await http.get<CasesFindResponse>(CASE_FIND_URL, { query, signal });
   return convertAllCasesToCamel(decodeCasesFindResponse(res));
 };
@@ -68,7 +68,7 @@ export const getCasesMetrics = async ({
   return convertToCamelCase(decodeCasesMetricsResponse(res));
 };
 
-export const bulkGetCases = async <Field extends keyof CaseResponse = keyof CaseResponse>({
+export const bulkGetCases = async <Field extends keyof Case = keyof Case>({
   http,
   signal,
   params,
diff --git a/x-pack/plugins/cases/public/api/utils.ts b/x-pack/plugins/cases/public/api/utils.ts
index f7ce3bf0817d2e..4f2dde86dfec19 100644
--- a/x-pack/plugins/cases/public/api/utils.ts
+++ b/x-pack/plugins/cases/public/api/utils.ts
@@ -13,15 +13,15 @@ import {
 } from '../../common/utils/attachments';
 import type {
   CasesFindResponse,
-  CaseResponse,
-  CaseUserActionsResponse,
+  Case,
+  UserActions,
   CommentRequest,
   CommentResponse,
   CaseResolveResponse,
-  CasesResponse,
+  Cases,
 } from '../../common/api';
 import { isCommentUserAction } from '../../common/utils/user_actions';
-import type { Cases, Case, Comment, ResolvedCase } from '../containers/types';
+import type { CasesUI, CaseUI, Comment, ResolvedCase } from '../containers/types';
 
 export const convertArrayToCamelCase = (arrayOfSnakes: unknown[]): unknown[] =>
   arrayOfSnakes.reduce((acc: unknown[], value) => {
@@ -46,15 +46,15 @@ export const convertToCamelCase = <T, U extends {}>(obj: T): U =>
     return acc;
   }, {} as U);
 
-export const convertCaseToCamelCase = (theCase: CaseResponse): Case => {
+export const convertCaseToCamelCase = (theCase: Case): CaseUI => {
   const { comments, ...restCase } = theCase;
   return {
-    ...convertToCamelCase<CaseResponse, Case>(restCase),
+    ...convertToCamelCase<Case, CaseUI>(restCase),
     ...(comments != null ? { comments: convertAttachmentsToCamelCase(comments) } : {}),
   };
 };
 
-export const convertCasesToCamelCase = (cases: CasesResponse): Case[] =>
+export const convertCasesToCamelCase = (cases: Cases): CaseUI[] =>
   cases.map(convertCaseToCamelCase);
 
 export const convertCaseResolveToCamelCase = (res: CaseResolveResponse): ResolvedCase => {
@@ -81,7 +81,7 @@ export const convertAttachmentToCamelCase = (attachment: CommentRequest): Commen
   return convertToCamelCase<CommentRequest, Comment>(attachment);
 };
 
-export const convertUserActionsToCamelCase = (userActions: CaseUserActionsResponse) => {
+export const convertUserActionsToCamelCase = (userActions: UserActions) => {
   return userActions.map((userAction) => {
     if (isCommentUserAction(userAction)) {
       const userActionWithoutPayload = omit(userAction, 'payload.comment');
@@ -113,7 +113,7 @@ const convertAttachmentToCamelExceptProperty = (
   } as Comment;
 };
 
-export const convertAllCasesToCamel = (snakeCases: CasesFindResponse): Cases => ({
+export const convertAllCasesToCamel = (snakeCases: CasesFindResponse): CasesUI => ({
   cases: convertCasesToCamelCase(snakeCases.cases),
   countOpenCases: snakeCases.count_open_cases,
   countInProgressCases: snakeCases.count_in_progress_cases,
diff --git a/x-pack/plugins/cases/public/client/api/index.ts b/x-pack/plugins/cases/public/client/api/index.ts
index 09a172121d08cf..d040c3a8e7fb9e 100644
--- a/x-pack/plugins/cases/public/client/api/index.ts
+++ b/x-pack/plugins/cases/public/client/api/index.ts
@@ -14,7 +14,7 @@ import type {
   CasesMetricsRequest,
 } from '../../../common/api';
 import { getCasesFromAlertsUrl } from '../../../common/api';
-import type { Cases, CasesStatus, CasesMetrics } from '../../../common/ui';
+import type { CasesUI, CasesStatus, CasesMetrics } from '../../../common/ui';
 import { bulkGetCases, getCases, getCasesMetrics, getCasesStatus } from '../../api';
 import type { CasesUiStart } from '../../types';
 
@@ -26,7 +26,7 @@ export const createClientAPI = ({ http }: { http: HttpStart }): CasesUiStart['ap
     ): Promise<CasesByAlertId> =>
       http.get<CasesByAlertId>(getCasesFromAlertsUrl(alertId), { query }),
     cases: {
-      find: (query: CasesFindRequest, signal?: AbortSignal): Promise<Cases> =>
+      find: (query: CasesFindRequest, signal?: AbortSignal): Promise<CasesUI> =>
         getCases({ http, query, signal }),
       getCasesStatus: (query: CasesStatusRequest, signal?: AbortSignal): Promise<CasesStatus> =>
         getCasesStatus({ http, query, signal }),
diff --git a/x-pack/plugins/cases/public/client/attachment_framework/types.ts b/x-pack/plugins/cases/public/client/attachment_framework/types.ts
index 95a453b9d0a12b..793bcca8d15eb4 100644
--- a/x-pack/plugins/cases/public/client/attachment_framework/types.ts
+++ b/x-pack/plugins/cases/public/client/attachment_framework/types.ts
@@ -11,7 +11,7 @@ import type {
   CommentRequestExternalReferenceType,
   CommentRequestPersistableStateType,
 } from '../../../common/api';
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 
 export enum AttachmentActionType {
   BUTTON = 'button',
@@ -48,7 +48,7 @@ export interface AttachmentViewObject<Props = {}> {
 }
 
 export interface CommonAttachmentViewProps {
-  caseData: Pick<Case, 'id' | 'title'>;
+  caseData: Pick<CaseUI, 'id' | 'title'>;
 }
 
 export interface ExternalReferenceAttachmentViewProps extends CommonAttachmentViewProps {
diff --git a/x-pack/plugins/cases/public/common/use_cases_toast.tsx b/x-pack/plugins/cases/public/common/use_cases_toast.tsx
index 26027905f8f0ea..d123cc1bdd5e8b 100644
--- a/x-pack/plugins/cases/public/common/use_cases_toast.tsx
+++ b/x-pack/plugins/cases/public/common/use_cases_toast.tsx
@@ -11,7 +11,7 @@ import React from 'react';
 import styled from 'styled-components';
 import { toMountPoint } from '@kbn/kibana-react-plugin/public';
 import { isValidOwner } from '../../common/utils/owner';
-import type { Case } from '../../common';
+import type { CaseUI } from '../../common';
 import { CommentType } from '../../common';
 import { useKibana, useToasts } from './lib/kibana';
 import { generateCaseViewPath } from './navigation';
@@ -61,7 +61,7 @@ function getToastTitle({
   title,
   attachments,
 }: {
-  theCase: Case;
+  theCase: CaseUI;
   title?: string;
   attachments?: CaseAttachmentsWithoutOwner;
 }): string {
@@ -82,7 +82,7 @@ function getToastContent({
   content,
   attachments,
 }: {
-  theCase: Case;
+  theCase: CaseUI;
   content?: string;
   attachments?: CaseAttachmentsWithoutOwner;
 }): string | undefined {
@@ -131,7 +131,7 @@ export const useCasesToast = () => {
       title,
       content,
     }: {
-      theCase: Case;
+      theCase: CaseUI;
       attachments?: CaseAttachmentsWithoutOwner;
       title?: string;
       content?: string;
diff --git a/x-pack/plugins/cases/public/components/actions/assignees/edit_assignees_flyout.tsx b/x-pack/plugins/cases/public/components/actions/assignees/edit_assignees_flyout.tsx
index 42f4ef30ec5941..2d9ee31171e420 100644
--- a/x-pack/plugins/cases/public/components/actions/assignees/edit_assignees_flyout.tsx
+++ b/x-pack/plugins/cases/public/components/actions/assignees/edit_assignees_flyout.tsx
@@ -21,13 +21,13 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import { EditAssigneesSelectable } from './edit_assignees_selectable';
 import * as i18n from './translations';
 import type { ItemsSelectionState } from '../types';
 
 interface Props {
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   onClose: () => void;
   onSaveAssignees: (args: ItemsSelectionState) => void;
 }
diff --git a/x-pack/plugins/cases/public/components/actions/assignees/edit_assignees_selectable.tsx b/x-pack/plugins/cases/public/components/actions/assignees/edit_assignees_selectable.tsx
index afcbbd4e165f57..3630c7114c0095 100644
--- a/x-pack/plugins/cases/public/components/actions/assignees/edit_assignees_selectable.tsx
+++ b/x-pack/plugins/cases/public/components/actions/assignees/edit_assignees_selectable.tsx
@@ -27,7 +27,7 @@ import { getUserDisplayName } from '@kbn/user-profile-components';
 import { useBulkGetUserProfiles } from '../../../containers/user_profiles/use_bulk_get_user_profiles';
 import { useIsUserTyping } from '../../../common/use_is_user_typing';
 import { useSuggestUserProfiles } from '../../../containers/user_profiles/use_suggest_user_profiles';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import * as i18n from './translations';
 import { useItemsState } from '../use_items_state';
 import type { ItemSelectableOption, ItemsSelectionState } from '../types';
@@ -38,7 +38,7 @@ import { SmallUserAvatar } from '../../user_profiles/small_user_avatar';
 import { NoSelectedAssignees } from './no_selected_assignees';
 
 interface Props {
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   onChangeAssignees: (args: ItemsSelectionState) => void;
 }
 
diff --git a/x-pack/plugins/cases/public/components/actions/assignees/use_assignees_action.tsx b/x-pack/plugins/cases/public/components/actions/assignees/use_assignees_action.tsx
index f2b1cb6947c9b3..76e5d2239135e7 100644
--- a/x-pack/plugins/cases/public/components/actions/assignees/use_assignees_action.tsx
+++ b/x-pack/plugins/cases/public/components/actions/assignees/use_assignees_action.tsx
@@ -7,14 +7,14 @@
 
 import { EuiIcon } from '@elastic/eui';
 import React from 'react';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import type { UseActionProps } from '../types';
 import { useItemsAction } from '../use_items_action';
 import * as i18n from './translations';
 
 export const useAssigneesAction = ({ onAction, onActionSuccess, isDisabled }: UseActionProps) => {
   const { isFlyoutOpen, onFlyoutClosed, onSaveItems, openFlyout, isActionDisabled } =
-    useItemsAction<Case['assignees']>({
+    useItemsAction<CaseUI['assignees']>({
       fieldKey: 'assignees',
       isDisabled,
       onAction,
@@ -27,7 +27,7 @@ export const useAssigneesAction = ({ onAction, onActionSuccess, isDisabled }: Us
         })),
     });
 
-  const getAction = (selectedCases: Case[]) => {
+  const getAction = (selectedCases: CaseUI[]) => {
     return {
       name: i18n.EDIT_ASSIGNEES,
       onClick: () => openFlyout(selectedCases),
diff --git a/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.tsx b/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.tsx
index be2166ba5b2504..260726daa59502 100644
--- a/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.tsx
+++ b/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.tsx
@@ -10,13 +10,13 @@ import { EuiIcon, EuiTextColor } from '@elastic/eui';
 import * as i18n from '../../../common/translations';
 import { useCasesToast } from '../../../common/use_cases_toast';
 
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import type { UseCopyIDActionProps } from '../types';
 
 export const useCopyIDAction = ({ onActionSuccess }: UseCopyIDActionProps) => {
   const { showSuccessToast } = useCasesToast();
 
-  const getAction = (selectedCase: Case) => {
+  const getAction = (selectedCase: CaseUI) => {
     return {
       name: <EuiTextColor>{i18n.COPY_ID_ACTION_LABEL}</EuiTextColor>,
       onClick: () => {
diff --git a/x-pack/plugins/cases/public/components/actions/delete/use_delete_action.tsx b/x-pack/plugins/cases/public/components/actions/delete/use_delete_action.tsx
index 608af0e66444b6..52370742a66853 100644
--- a/x-pack/plugins/cases/public/components/actions/delete/use_delete_action.tsx
+++ b/x-pack/plugins/cases/public/components/actions/delete/use_delete_action.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useState } from 'react';
 import { EuiIcon, EuiTextColor, useEuiTheme } from '@elastic/eui';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import { useDeleteCases } from '../../../containers/use_delete_cases';
 
 import * as i18n from './translations';
@@ -21,13 +21,13 @@ export const useDeleteAction = ({ onAction, onActionSuccess, isDisabled }: UseAc
   const euiTheme = useEuiTheme();
   const { permissions } = useCasesContext();
   const [isModalVisible, setIsModalVisible] = useState<boolean>(false);
-  const [caseToBeDeleted, setCaseToBeDeleted] = useState<Case[]>([]);
+  const [caseToBeDeleted, setCaseToBeDeleted] = useState<CaseUI[]>([]);
   const canDelete = permissions.delete;
   const isActionDisabled = isDisabled || !canDelete;
 
   const onCloseModal = useCallback(() => setIsModalVisible(false), []);
   const openModal = useCallback(
-    (selectedCases: Case[]) => {
+    (selectedCases: CaseUI[]) => {
       onAction();
       setIsModalVisible(true);
       setCaseToBeDeleted(selectedCases);
@@ -50,7 +50,7 @@ export const useDeleteAction = ({ onAction, onActionSuccess, isDisabled }: UseAc
 
   const color = isActionDisabled ? euiTheme.euiTheme.colors.disabled : 'danger';
 
-  const getAction = (selectedCases: Case[]) => {
+  const getAction = (selectedCases: CaseUI[]) => {
     return {
       name: <EuiTextColor color={color}>{getDeleteActionTitle(selectedCases.length)}</EuiTextColor>,
       onClick: () => openModal(selectedCases),
diff --git a/x-pack/plugins/cases/public/components/actions/severity/use_severity_action.tsx b/x-pack/plugins/cases/public/components/actions/severity/use_severity_action.tsx
index 614bb0cbef77ca..d271f8891bfeb4 100644
--- a/x-pack/plugins/cases/public/components/actions/severity/use_severity_action.tsx
+++ b/x-pack/plugins/cases/public/components/actions/severity/use_severity_action.tsx
@@ -9,14 +9,14 @@ import { useCallback } from 'react';
 import type { EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
 import { CaseSeverity } from '../../../../common/api';
 import { useUpdateCases } from '../../../containers/use_bulk_update_case';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 
 import * as i18n from './translations';
 import type { UseActionProps } from '../types';
 import { useCasesContext } from '../../cases_context/use_cases_context';
 import { severities } from '../../severity/config';
 
-const getSeverityToasterMessage = (severity: CaseSeverity, cases: Case[]): string => {
+const getSeverityToasterMessage = (severity: CaseSeverity, cases: CaseUI[]): string => {
   const totalCases = cases.length;
   const caseTitle = totalCases === 1 ? cases[0].title : '';
 
@@ -39,7 +39,7 @@ interface UseSeverityActionProps extends UseActionProps {
   selectedSeverity?: CaseSeverity;
 }
 
-const shouldDisableSeverity = (cases: Case[], severity: CaseSeverity) =>
+const shouldDisableSeverity = (cases: CaseUI[], severity: CaseSeverity) =>
   cases.every((theCase) => theCase.severity === severity);
 
 export const useSeverityAction = ({
@@ -54,7 +54,7 @@ export const useSeverityAction = ({
   const isActionDisabled = isDisabled || !canUpdateSeverity;
 
   const handleUpdateCaseSeverity = useCallback(
-    (selectedCases: Case[], severity: CaseSeverity) => {
+    (selectedCases: CaseUI[], severity: CaseSeverity) => {
       onAction();
       const casesToUpdate = selectedCases.map((theCase) => ({
         severity,
@@ -76,7 +76,7 @@ export const useSeverityAction = ({
   const getSeverityIcon = (severity: CaseSeverity): string =>
     selectedSeverity && selectedSeverity === severity ? 'check' : 'empty';
 
-  const getActions = (selectedCases: Case[]): EuiContextMenuPanelItemDescriptor[] => {
+  const getActions = (selectedCases: CaseUI[]): EuiContextMenuPanelItemDescriptor[] => {
     return [
       {
         name: severities[CaseSeverity.LOW].label,
diff --git a/x-pack/plugins/cases/public/components/actions/status/use_status_action.tsx b/x-pack/plugins/cases/public/components/actions/status/use_status_action.tsx
index 6b9fe58c15105a..6c32d2cdbd8658 100644
--- a/x-pack/plugins/cases/public/components/actions/status/use_status_action.tsx
+++ b/x-pack/plugins/cases/public/components/actions/status/use_status_action.tsx
@@ -8,7 +8,7 @@
 import { useCallback } from 'react';
 import type { EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
 import { useUpdateCases } from '../../../containers/use_bulk_update_case';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import { CaseStatuses } from '../../../../common';
 
 import * as i18n from './translations';
@@ -16,7 +16,7 @@ import type { UseActionProps } from '../types';
 import { statuses } from '../../status';
 import { useCasesContext } from '../../cases_context/use_cases_context';
 
-const getStatusToasterMessage = (status: CaseStatuses, cases: Case[]): string => {
+const getStatusToasterMessage = (status: CaseStatuses, cases: CaseUI[]): string => {
   const totalCases = cases.length;
   const caseTitle = totalCases === 1 ? cases[0].title : '';
 
@@ -35,7 +35,7 @@ interface UseStatusActionProps extends UseActionProps {
   selectedStatus?: CaseStatuses;
 }
 
-const shouldDisableStatus = (cases: Case[], status: CaseStatuses) =>
+const shouldDisableStatus = (cases: CaseUI[], status: CaseStatuses) =>
   cases.every((theCase) => theCase.status === status);
 
 export const useStatusAction = ({
@@ -50,7 +50,7 @@ export const useStatusAction = ({
   const isActionDisabled = isDisabled || !canUpdateStatus;
 
   const handleUpdateCaseStatus = useCallback(
-    (selectedCases: Case[], status: CaseStatuses) => {
+    (selectedCases: CaseUI[], status: CaseStatuses) => {
       onAction();
       const casesToUpdate = selectedCases.map((theCase) => ({
         status,
@@ -72,7 +72,7 @@ export const useStatusAction = ({
   const getStatusIcon = (status: CaseStatuses): string =>
     selectedStatus && selectedStatus === status ? 'check' : 'empty';
 
-  const getActions = (selectedCases: Case[]): EuiContextMenuPanelItemDescriptor[] => {
+  const getActions = (selectedCases: CaseUI[]): EuiContextMenuPanelItemDescriptor[] => {
     return [
       {
         name: statuses[CaseStatuses.open].label,
diff --git a/x-pack/plugins/cases/public/components/actions/tags/edit_tags_flyout.tsx b/x-pack/plugins/cases/public/components/actions/tags/edit_tags_flyout.tsx
index babedee38611c8..6bf5853d5e6719 100644
--- a/x-pack/plugins/cases/public/components/actions/tags/edit_tags_flyout.tsx
+++ b/x-pack/plugins/cases/public/components/actions/tags/edit_tags_flyout.tsx
@@ -22,14 +22,14 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import { useGetTags } from '../../../containers/use_get_tags';
 import { EditTagsSelectable } from './edit_tags_selectable';
 import * as i18n from './translations';
 import type { ItemsSelectionState } from '../types';
 
 interface Props {
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   onClose: () => void;
   onSaveTags: (args: ItemsSelectionState) => void;
 }
diff --git a/x-pack/plugins/cases/public/components/actions/tags/edit_tags_selectable.tsx b/x-pack/plugins/cases/public/components/actions/tags/edit_tags_selectable.tsx
index 3bdbb60cac8e87..437c3c94b1915d 100644
--- a/x-pack/plugins/cases/public/components/actions/tags/edit_tags_selectable.tsx
+++ b/x-pack/plugins/cases/public/components/actions/tags/edit_tags_selectable.tsx
@@ -20,13 +20,13 @@ import {
 } from '@elastic/eui';
 
 import { isEmpty } from 'lodash';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import * as i18n from './translations';
 import { useItemsState } from '../use_items_state';
 import type { ItemSelectableOption, ItemsSelectionState } from '../types';
 
 interface Props {
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   tags: string[];
   isLoading: boolean;
   onChangeTags: (args: ItemsSelectionState) => void;
diff --git a/x-pack/plugins/cases/public/components/actions/tags/use_tags_action.tsx b/x-pack/plugins/cases/public/components/actions/tags/use_tags_action.tsx
index 2e4acd618b34f2..ff7d9dc078f39f 100644
--- a/x-pack/plugins/cases/public/components/actions/tags/use_tags_action.tsx
+++ b/x-pack/plugins/cases/public/components/actions/tags/use_tags_action.tsx
@@ -7,14 +7,14 @@
 
 import { EuiIcon } from '@elastic/eui';
 import React from 'react';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import type { UseActionProps } from '../types';
 import { useItemsAction } from '../use_items_action';
 import * as i18n from './translations';
 
 export const useTagsAction = ({ onAction, onActionSuccess, isDisabled }: UseActionProps) => {
   const { isFlyoutOpen, onFlyoutClosed, onSaveItems, openFlyout, isActionDisabled } =
-    useItemsAction<Case['tags']>({
+    useItemsAction<CaseUI['tags']>({
       fieldKey: 'tags',
       isDisabled,
       onAction,
@@ -24,7 +24,7 @@ export const useTagsAction = ({ onAction, onActionSuccess, isDisabled }: UseActi
       itemsTransformer: (items) => items,
     });
 
-  const getAction = (selectedCases: Case[]) => {
+  const getAction = (selectedCases: CaseUI[]) => {
     return {
       name: i18n.EDIT_TAGS,
       onClick: () => openFlyout(selectedCases),
diff --git a/x-pack/plugins/cases/public/components/actions/use_items_action.tsx b/x-pack/plugins/cases/public/components/actions/use_items_action.tsx
index 6ab5dce5f48ef4..464f14bbee11b1 100644
--- a/x-pack/plugins/cases/public/components/actions/use_items_action.tsx
+++ b/x-pack/plugins/cases/public/components/actions/use_items_action.tsx
@@ -9,14 +9,14 @@ import { useCallback, useState } from 'react';
 import { difference, isEqual } from 'lodash';
 import type { CaseUpdateRequest } from '../../../common/ui';
 import { useUpdateCases } from '../../containers/use_bulk_update_case';
-import type { Case } from '../../../common';
+import type { CaseUI } from '../../../common';
 import { useCasesContext } from '../cases_context/use_cases_context';
 import type { UseActionProps, ItemsSelectionState } from './types';
 
 type UseItemsActionProps<T> = UseActionProps & {
   fieldKey: 'tags' | 'assignees';
   successToasterTitle: (totalCases: number) => string;
-  fieldSelector: (theCase: Case) => string[];
+  fieldSelector: (theCase: CaseUI) => string[];
   itemsTransformer: (items: string[]) => T;
 };
 
@@ -32,13 +32,13 @@ export const useItemsAction = <T,>({
   const { mutate: updateCases } = useUpdateCases();
   const { permissions } = useCasesContext();
   const [isFlyoutOpen, setIsFlyoutOpen] = useState<boolean>(false);
-  const [selectedCasesToEdit, setSelectedCasesToEdit] = useState<Case[]>([]);
+  const [selectedCasesToEdit, setSelectedCasesToEdit] = useState<CaseUI[]>([]);
   const canUpdateStatus = permissions.update;
   const isActionDisabled = isDisabled || !canUpdateStatus;
 
   const onFlyoutClosed = useCallback(() => setIsFlyoutOpen(false), []);
   const openFlyout = useCallback(
-    (selectedCases: Case[]) => {
+    (selectedCases: CaseUI[]) => {
       onAction();
       setIsFlyoutOpen(true);
       setSelectedCasesToEdit(selectedCases);
diff --git a/x-pack/plugins/cases/public/components/actions/use_items_state.tsx b/x-pack/plugins/cases/public/components/actions/use_items_state.tsx
index bd5db49336b5ae..99ccf9b9e20555 100644
--- a/x-pack/plugins/cases/public/components/actions/use_items_state.tsx
+++ b/x-pack/plugins/cases/public/components/actions/use_items_state.tsx
@@ -8,14 +8,14 @@
 import type { EuiSelectableOption, IconType } from '@elastic/eui';
 import { assertNever } from '@elastic/eui';
 import { useCallback, useReducer, useMemo } from 'react';
-import type { Case } from '../../../common';
+import type { CaseUI } from '../../../common';
 import type { ItemSelectableOption, ItemsSelectionState } from './types';
 
 interface UseItemsStateProps {
   items: string[];
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   itemToSelectableOption: <T>(item: Payload[number]) => EuiSelectableOption<T>;
-  fieldSelector: (theCase: Case) => string[];
+  fieldSelector: (theCase: CaseUI) => string[];
   onChangeItems: (args: ItemsSelectionState) => void;
 }
 
@@ -153,7 +153,7 @@ const getInitialItemsState = ({
   fieldSelector,
 }: {
   items: string[];
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   fieldSelector: UseItemsStateProps['fieldSelector'];
 }): State => {
   const itemCounterMap = createItemsCounterMapping({ selectedCases, fieldSelector });
@@ -183,7 +183,7 @@ const createItemsCounterMapping = ({
   selectedCases,
   fieldSelector,
 }: {
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   fieldSelector: UseItemsStateProps['fieldSelector'];
 }) => {
   const counterMap = new Map<string, number>();
diff --git a/x-pack/plugins/cases/public/components/add_comment/index.tsx b/x-pack/plugins/cases/public/components/add_comment/index.tsx
index d75401841b6f5c..fceeef2d314120 100644
--- a/x-pack/plugins/cases/public/components/add_comment/index.tsx
+++ b/x-pack/plugins/cases/public/components/add_comment/index.tsx
@@ -25,7 +25,7 @@ import {
 } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import { CommentType } from '../../../common/api';
 import { useCreateAttachments } from '../../containers/use_create_attachments';
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import type { EuiMarkdownEditorRef } from '../markdown_editor';
 import { MarkdownEditorForm } from '../markdown_editor';
 import { getMarkdownEditorStorageKey } from '../markdown_editor/utils';
@@ -57,7 +57,7 @@ export interface AddCommentProps {
   id: string;
   caseId: string;
   onCommentSaving?: () => void;
-  onCommentPosted: (newCase: Case) => void;
+  onCommentPosted: (newCase: CaseUI) => void;
   showLoading?: boolean;
   statusActionButton: JSX.Element | null;
 }
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx
index 7666d518fe9b4c..f30fd33fd09959 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.tsx
@@ -11,7 +11,7 @@ import { EuiProgress } from '@elastic/eui';
 import { difference, head, isEmpty } from 'lodash/fp';
 import styled, { css } from 'styled-components';
 
-import type { Case, CaseStatusWithAllStatus, FilterOptions } from '../../../common/ui/types';
+import type { CaseUI, CaseStatusWithAllStatus, FilterOptions } from '../../../common/ui/types';
 import { SortFieldCase, StatusAll } from '../../../common/ui/types';
 import { CaseStatuses, caseStatuses } from '../../../common/api';
 import { OWNER_INFO } from '../../../common/constants';
@@ -64,7 +64,7 @@ const mapToReadableSolutionName = (solution: string): Solution => {
 export interface AllCasesListProps {
   hiddenStatuses?: CaseStatusWithAllStatus[];
   isSelectorView?: boolean;
-  onRowClick?: (theCase?: Case) => void;
+  onRowClick?: (theCase?: CaseUI) => void;
 }
 
 export const AllCasesList = React.memo<AllCasesListProps>(
@@ -84,7 +84,7 @@ export const AllCasesList = React.memo<AllCasesListProps>(
       isSelectorView,
       initialFilterOptions
     );
-    const [selectedCases, setSelectedCases] = useState<Case[]>([]);
+    const [selectedCases, setSelectedCases] = useState<CaseUI[]>([]);
 
     const { data = initialData, isFetching: isLoadingCases } = useGetCases({
       filterOptions,
@@ -224,7 +224,7 @@ export const AllCasesList = React.memo<AllCasesListProps>(
       [data, queryParams]
     );
 
-    const euiBasicTableSelectionProps = useMemo<EuiTableSelectionType<Case>>(
+    const euiBasicTableSelectionProps = useMemo<EuiTableSelectionType<CaseUI>>(
       () => ({
         onSelectionChange: setSelectedCases,
         initialSelected: selectedCases,
@@ -235,7 +235,7 @@ export const AllCasesList = React.memo<AllCasesListProps>(
     const isDataEmpty = useMemo(() => data.total === 0, [data]);
 
     const tableRowProps = useCallback(
-      (theCase: Case) => ({
+      (theCase: CaseUI) => ({
         'data-test-subj': `cases-table-row-${theCase.id}`,
       }),
       []
diff --git a/x-pack/plugins/cases/public/components/all_cases/assignees_column.tsx b/x-pack/plugins/cases/public/components/all_cases/assignees_column.tsx
index 8b5444f9a9d911..41e936a7021c0c 100644
--- a/x-pack/plugins/cases/public/components/all_cases/assignees_column.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/assignees_column.tsx
@@ -8,7 +8,7 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import type { UserProfileWithAvatar } from '@kbn/user-profile-components';
-import type { Case } from '../../../common/ui/types';
+import type { CaseUI } from '../../../common/ui/types';
 import { getEmptyTagValue } from '../empty_value';
 import { UserToolTip } from '../user_profiles/user_tooltip';
 import { useAssignees } from '../../containers/user_profiles/use_assignees';
@@ -19,7 +19,7 @@ import * as i18n from './translations';
 const COMPRESSED_AVATAR_LIMIT = 3;
 
 export interface AssigneesColumnProps {
-  assignees: Case['assignees'];
+  assignees: CaseUI['assignees'];
   userProfiles: Map<string, UserProfileWithAvatar>;
   compressedDisplayLimit?: number;
 }
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/all_cases_selector_modal.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/all_cases_selector_modal.tsx
index 6a9629699734b5..1aaf9c87cf2459 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/all_cases_selector_modal.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/all_cases_selector_modal.tsx
@@ -17,14 +17,14 @@ import {
 import styled from 'styled-components';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
-import type { Case, CaseStatusWithAllStatus } from '../../../../common/ui/types';
+import type { CaseUI, CaseStatusWithAllStatus } from '../../../../common/ui/types';
 import * as i18n from '../../../common/translations';
 import { AllCasesList } from '../all_cases_list';
 import { casesQueryClient } from '../../cases_context/query_client';
 
 export interface AllCasesSelectorModalProps {
   hiddenStatuses?: CaseStatusWithAllStatus[];
-  onRowClick?: (theCase?: Case) => void;
+  onRowClick?: (theCase?: CaseUI) => void;
   onClose?: () => void;
 }
 
@@ -46,7 +46,7 @@ export const AllCasesSelectorModal = React.memo<AllCasesSelectorModalProps>(
     }, [onClose]);
 
     const onClick = useCallback(
-      (theCase?: Case) => {
+      (theCase?: CaseUI) => {
         closeModal();
         if (onRowClick) {
           onRowClick(theCase);
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
index e98397d8bb37eb..a63fd6ceaef105 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.test.tsx
@@ -10,7 +10,7 @@ import { act, renderHook } from '@testing-library/react-hooks';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import AllCasesSelectorModal from '.';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import { CaseStatuses, StatusAll } from '../../../../common';
 import type { AppMockRenderer } from '../../../common/mock';
 import { allCasesPermissions, createAppMockRenderer } from '../../../common/mock';
@@ -144,7 +144,7 @@ describe('use cases add to existing case modal hook', () => {
 
   it('should call getAttachments with the case info', async () => {
     AllCasesSelectorModalMock.mockImplementation(({ onRowClick }) => {
-      onRowClick({ id: 'test' } as Case);
+      onRowClick({ id: 'test' } as CaseUI);
       return null;
     });
 
@@ -159,7 +159,7 @@ describe('use cases add to existing case modal hook', () => {
 
   it('should show a toaster info when no attachments are defined and noAttachmentsToaster is defined', async () => {
     AllCasesSelectorModalMock.mockImplementation(({ onRowClick }) => {
-      onRowClick({ id: 'test' } as Case);
+      onRowClick({ id: 'test' } as CaseUI);
       return null;
     });
 
@@ -182,7 +182,7 @@ describe('use cases add to existing case modal hook', () => {
 
   it('should show a toaster info when no attachments are defined and noAttachmentsToaster is not defined', async () => {
     AllCasesSelectorModalMock.mockImplementation(({ onRowClick }) => {
-      onRowClick({ id: 'test' } as Case);
+      onRowClick({ id: 'test' } as CaseUI);
       return null;
     });
 
@@ -213,7 +213,7 @@ describe('use cases add to existing case modal hook', () => {
     });
 
     AllCasesSelectorModalMock.mockImplementation(({ onRowClick }) => {
-      onRowClick({ id: 'test' } as Case);
+      onRowClick({ id: 'test' } as CaseUI);
       return null;
     });
 
@@ -244,7 +244,7 @@ describe('use cases add to existing case modal hook', () => {
     });
 
     AllCasesSelectorModalMock.mockImplementation(({ onRowClick }) => {
-      onRowClick({ id: 'test' } as Case);
+      onRowClick({ id: 'test' } as CaseUI);
       return null;
     });
 
@@ -295,7 +295,7 @@ describe('use cases add to existing case modal hook', () => {
 
     // simulate a case selected
     AllCasesSelectorModalMock.mockImplementation(({ onRowClick }) => {
-      onRowClick({ id: 'test' } as Case);
+      onRowClick({ id: 'test' } as CaseUI);
       return null;
     });
 
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
index ea2e0f200433e1..fb7a40d5725df1 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/use_cases_add_to_existing_case_modal.tsx
@@ -9,7 +9,7 @@ import { useCallback } from 'react';
 import { CaseStatuses, StatusAll } from '../../../../common';
 import type { AllCasesSelectorModalProps } from '.';
 import { useCasesToast } from '../../../common/use_cases_toast';
-import type { Case } from '../../../containers/types';
+import type { CaseUI } from '../../../containers/types';
 import { CasesContextStoreActionsList } from '../../cases_context/cases_context_reducer';
 import { useCasesContext } from '../../cases_context/use_cases_context';
 import { useCasesAddToNewCaseFlyout } from '../../create/flyout/use_cases_add_to_new_case_flyout';
@@ -27,13 +27,13 @@ export type AddToExistingCaseModalProps = Omit<AllCasesSelectorModalProps, 'onRo
     title?: string;
     content?: string;
   };
-  onSuccess?: (theCase: Case) => void;
+  onSuccess?: (theCase: CaseUI) => void;
 };
 
 export const useCasesAddToExistingCaseModal = (props: AddToExistingCaseModalProps = {}) => {
   const createNewCaseFlyout = useCasesAddToNewCaseFlyout({
     onClose: props.onClose,
-    onSuccess: (theCase?: Case) => {
+    onSuccess: (theCase?: CaseUI) => {
       if (props.onSuccess && theCase) {
         return props.onSuccess(theCase);
       }
@@ -60,8 +60,8 @@ export const useCasesAddToExistingCaseModal = (props: AddToExistingCaseModalProp
 
   const handleOnRowClick = useCallback(
     async (
-      theCase: Case | undefined,
-      getAttachments?: ({ theCase }: { theCase?: Case }) => CaseAttachmentsWithoutOwner
+      theCase: CaseUI | undefined,
+      getAttachments?: ({ theCase }: { theCase?: CaseUI }) => CaseAttachmentsWithoutOwner
     ) => {
       const attachments = getAttachments?.({ theCase }) ?? [];
       // when the case is undefined in the modal
@@ -121,14 +121,14 @@ export const useCasesAddToExistingCaseModal = (props: AddToExistingCaseModalProp
     ({
       getAttachments,
     }: {
-      getAttachments?: ({ theCase }: { theCase?: Case }) => CaseAttachmentsWithoutOwner;
+      getAttachments?: ({ theCase }: { theCase?: CaseUI }) => CaseAttachmentsWithoutOwner;
     } = {}) => {
       dispatch({
         type: CasesContextStoreActionsList.OPEN_ADD_TO_CASE_MODAL,
         payload: {
           ...props,
           hiddenStatuses: [CaseStatuses.closed, StatusAll],
-          onRowClick: (theCase?: Case) => {
+          onRowClick: (theCase?: CaseUI) => {
             handleOnRowClick(theCase, getAttachments);
           },
           onClose: () => {
diff --git a/x-pack/plugins/cases/public/components/all_cases/table.tsx b/x-pack/plugins/cases/public/components/all_cases/table.tsx
index 61fb081a0dd9a5..0aa9f78c5d0bf5 100644
--- a/x-pack/plugins/cases/public/components/all_cases/table.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/table.tsx
@@ -14,26 +14,26 @@ import styled from 'styled-components';
 
 import { CasesTableUtilityBar } from './utility_bar';
 import { LinkButton } from '../links';
-import type { Cases, Case } from '../../../common/ui/types';
+import type { CasesUI, CaseUI } from '../../../common/ui/types';
 import * as i18n from './translations';
 import { useCreateCaseNavigation } from '../../common/navigation';
 import { useCasesContext } from '../cases_context/use_cases_context';
 
 interface CasesTableProps {
-  columns: EuiBasicTableProps<Case>['columns'];
-  data: Cases;
+  columns: EuiBasicTableProps<CaseUI>['columns'];
+  data: CasesUI;
   goToCreateCase?: () => void;
   isCasesLoading: boolean;
   isCommentUpdating: boolean;
   isDataEmpty: boolean;
   isSelectorView?: boolean;
-  onChange: EuiBasicTableProps<Case>['onChange'];
+  onChange: EuiBasicTableProps<CaseUI>['onChange'];
   pagination: Pagination;
-  selectedCases: Case[];
-  selection: EuiTableSelectionType<Case>;
-  sorting: EuiBasicTableProps<Case>['sorting'];
+  selectedCases: CaseUI[];
+  selection: EuiTableSelectionType<CaseUI>;
+  sorting: EuiBasicTableProps<CaseUI>['sorting'];
   tableRef: MutableRefObject<EuiBasicTable | null>;
-  tableRowProps: EuiBasicTableProps<Case>['rowProps'];
+  tableRowProps: EuiBasicTableProps<CaseUI>['rowProps'];
   deselectCases: () => void;
 }
 
diff --git a/x-pack/plugins/cases/public/components/all_cases/translations.ts b/x-pack/plugins/cases/public/components/all_cases/translations.ts
index 80554bb44fb39e..12c16e1f6501dd 100644
--- a/x-pack/plugins/cases/public/components/all_cases/translations.ts
+++ b/x-pack/plugins/cases/public/components/all_cases/translations.ts
@@ -52,7 +52,7 @@ export const BULK_ACTIONS = i18n.translate('xpack.cases.caseTable.bulkActions',
 });
 
 export const EXTERNAL_INCIDENT = i18n.translate('xpack.cases.caseTable.snIncident', {
-  defaultMessage: 'External Incident',
+  defaultMessage: 'External incident',
 });
 
 export const SEVERITY = i18n.translate('xpack.cases.caseTable.severity', {
@@ -60,7 +60,7 @@ export const SEVERITY = i18n.translate('xpack.cases.caseTable.severity', {
 });
 
 export const INCIDENT_MANAGEMENT_SYSTEM = i18n.translate('xpack.cases.caseTable.incidentSystem', {
-  defaultMessage: 'Incident Management System',
+  defaultMessage: 'Incident management system',
 });
 
 export const SEARCH_PLACEHOLDER = i18n.translate('xpack.cases.caseTable.searchPlaceholder', {
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_actions.tsx b/x-pack/plugins/cases/public/components/all_cases/use_actions.tsx
index 88d94f65f900c1..ea43f79b4954ea 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_actions.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_actions.tsx
@@ -13,7 +13,7 @@ import type {
 } from '@elastic/eui';
 import { EuiButtonIcon, EuiContextMenu, EuiPopover } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import { useDeleteAction } from '../actions/delete/use_delete_action';
 import { ConfirmDeleteCaseModal } from '../confirm_delete_case';
 import { useStatusAction } from '../actions/status/use_status_action';
@@ -29,7 +29,7 @@ import { useAssigneesAction } from '../actions/assignees/use_assignees_action';
 import { EditAssigneesFlyout } from '../actions/assignees/edit_assignees_flyout';
 import { useCopyIDAction } from '../actions/copy_id/use_copy_id_action';
 
-const ActionColumnComponent: React.FC<{ theCase: Case; disableActions: boolean }> = ({
+const ActionColumnComponent: React.FC<{ theCase: CaseUI; disableActions: boolean }> = ({
   theCase,
   disableActions,
 }) => {
@@ -223,7 +223,7 @@ ActionColumnComponent.displayName = 'ActionColumnComponent';
 const ActionColumn = React.memo(ActionColumnComponent);
 
 interface UseBulkActionsReturnValue {
-  actions: EuiTableComputedColumnType<Case> | null;
+  actions: EuiTableComputedColumnType<CaseUI> | null;
 }
 
 interface UseBulkActionsProps {
@@ -239,7 +239,7 @@ export const useActions = ({ disableActions }: UseBulkActionsProps): UseBulkActi
       ? {
           name: i18n.ACTIONS,
           align: 'right',
-          render: (theCase: Case) => {
+          render: (theCase: CaseUI) => {
             return (
               <ActionColumn theCase={theCase} key={theCase.id} disableActions={disableActions} />
             );
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_bulk_actions.tsx b/x-pack/plugins/cases/public/components/all_cases/use_bulk_actions.tsx
index 1d7efd62736fb0..eadd3eb8840810 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_bulk_actions.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_bulk_actions.tsx
@@ -11,7 +11,7 @@ import type {
 } from '@elastic/eui';
 import React, { useMemo } from 'react';
 
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import { useDeleteAction } from '../actions/delete/use_delete_action';
 import { useSeverityAction } from '../actions/severity/use_severity_action';
 import { useStatusAction } from '../actions/status/use_status_action';
@@ -23,7 +23,7 @@ import { EditAssigneesFlyout } from '../actions/assignees/edit_assignees_flyout'
 import * as i18n from './translations';
 
 interface UseBulkActionsProps {
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   onAction: () => void;
   onActionSuccess: () => void;
 }
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
index 060ac64cafb086..f6cbe9113e5d68 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.test.tsx
@@ -99,7 +99,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -232,7 +232,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -316,7 +316,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -395,7 +395,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -479,7 +479,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
@@ -638,7 +638,7 @@ describe('useCasesColumns ', () => {
             "sortable": true,
           },
           Object {
-            "name": "External Incident",
+            "name": "External incident",
             "render": [Function],
             "width": undefined,
           },
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.tsx b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.tsx
index 1f267eca40a843..b2048893b1895a 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_cases_columns.tsx
@@ -28,7 +28,7 @@ import { Status } from '@kbn/cases-components';
 import type { UserProfileWithAvatar } from '@kbn/user-profile-components';
 import { euiStyled } from '@kbn/kibana-react-plugin/common';
 
-import type { Case } from '../../../common/ui/types';
+import type { CaseUI } from '../../../common/ui/types';
 import type { ActionConnector } from '../../../common/api';
 import { CaseStatuses, CaseSeverity } from '../../../common/api';
 import { OWNER_INFO } from '../../../common/constants';
@@ -47,9 +47,9 @@ import { useCasesFeatures } from '../../common/use_cases_features';
 import { AssigneesColumn } from './assignees_column';
 
 type CasesColumns =
-  | EuiTableActionsColumnType<Case>
-  | EuiTableComputedColumnType<Case>
-  | EuiTableFieldDataColumnType<Case>;
+  | EuiTableActionsColumnType<CaseUI>
+  | EuiTableComputedColumnType<CaseUI>
+  | EuiTableFieldDataColumnType<CaseUI>;
 
 const MediumShadeText = styled.p`
   color: ${({ theme }) => theme.eui.euiColorMediumShade};
@@ -80,7 +80,7 @@ export interface GetCasesColumn {
   userProfiles: Map<string, UserProfileWithAvatar>;
   isSelectorView: boolean;
   connectors?: ActionConnector[];
-  onRowClick?: (theCase: Case) => void;
+  onRowClick?: (theCase: CaseUI) => void;
   showSolutionColumn?: boolean;
   disableActions?: boolean;
 }
@@ -102,7 +102,7 @@ export const useCasesColumns = ({
   const { actions } = useActions({ disableActions });
 
   const assignCaseAction = useCallback(
-    async (theCase: Case) => {
+    async (theCase: CaseUI) => {
       if (onRowClick) {
         onRowClick(theCase);
       }
@@ -115,7 +115,7 @@ export const useCasesColumns = ({
       field: 'title',
       name: i18n.NAME,
       sortable: true,
-      render: (title: string, theCase: Case) => {
+      render: (title: string, theCase: CaseUI) => {
         if (theCase.id != null && theCase.title != null) {
           const caseDetailsLinkComponent = isSelectorView ? (
             theCase.title
@@ -145,7 +145,7 @@ export const useCasesColumns = ({
     columns.push({
       field: 'assignees',
       name: i18n.ASSIGNEES,
-      render: (assignees: Case['assignees']) => (
+      render: (assignees: CaseUI['assignees']) => (
         <AssigneesColumn assignees={assignees} userProfiles={userProfiles} />
       ),
       width: '180px',
@@ -156,7 +156,7 @@ export const useCasesColumns = ({
     columns.push({
       field: 'tags',
       name: i18n.TAGS,
-      render: (tags: Case['tags']) => {
+      render: (tags: CaseUI['tags']) => {
         if (tags != null && tags.length > 0) {
           const clampedBadges = (
             <LineClampedEuiBadgeGroup data-test-subj="case-table-column-tags">
@@ -207,7 +207,7 @@ export const useCasesColumns = ({
       align: RIGHT_ALIGNMENT,
       field: 'totalAlerts',
       name: ALERTS,
-      render: (totalAlerts: Case['totalAlerts']) =>
+      render: (totalAlerts: CaseUI['totalAlerts']) =>
         totalAlerts != null
           ? renderStringField(`${totalAlerts}`, `case-table-column-alertsCount`)
           : getEmptyTagValue(),
@@ -241,7 +241,7 @@ export const useCasesColumns = ({
       align: RIGHT_ALIGNMENT,
       field: 'totalComment',
       name: i18n.COMMENTS,
-      render: (totalComment: Case['totalComment']) =>
+      render: (totalComment: CaseUI['totalComment']) =>
         totalComment != null
           ? renderStringField(`${totalComment}`, `case-table-column-commentCount`)
           : getEmptyTagValue(),
@@ -253,7 +253,7 @@ export const useCasesColumns = ({
       field: 'closedAt',
       name: i18n.CLOSED_ON,
       sortable: true,
-      render: (closedAt: Case['closedAt']) => {
+      render: (closedAt: CaseUI['closedAt']) => {
         if (closedAt != null) {
           return (
             <span data-test-subj={`case-table-column-closedAt`}>
@@ -269,7 +269,7 @@ export const useCasesColumns = ({
       field: 'createdAt',
       name: i18n.CREATED_ON,
       sortable: true,
-      render: (createdAt: Case['createdAt']) => {
+      render: (createdAt: CaseUI['createdAt']) => {
         if (createdAt != null) {
           return (
             <span data-test-subj={`case-table-column-createdAt`}>
@@ -287,7 +287,7 @@ export const useCasesColumns = ({
       field: 'updatedAt',
       name: i18n.UPDATED_ON,
       sortable: true,
-      render: (updatedAt: Case['updatedAt']) => {
+      render: (updatedAt: CaseUI['updatedAt']) => {
         if (updatedAt != null) {
           return (
             <span data-test-subj="case-table-column-updatedAt">
@@ -304,7 +304,7 @@ export const useCasesColumns = ({
     columns.push(
       {
         name: i18n.EXTERNAL_INCIDENT,
-        render: (theCase: Case) => {
+        render: (theCase: CaseUI) => {
           if (theCase.id != null) {
             return <ExternalServiceColumn theCase={theCase} connectors={connectors} />;
           }
@@ -316,7 +316,7 @@ export const useCasesColumns = ({
         field: 'status',
         name: i18n.STATUS,
         sortable: true,
-        render: (status: Case['status']) => {
+        render: (status: CaseUI['status']) => {
           if (status != null) {
             return <Status status={status} />;
           }
@@ -330,7 +330,7 @@ export const useCasesColumns = ({
     field: 'severity',
     name: i18n.SEVERITY,
     sortable: true,
-    render: (severity: Case['severity']) => {
+    render: (severity: CaseUI['severity']) => {
       if (severity != null) {
         const severityData = severities[severity ?? CaseSeverity.LOW];
         return (
@@ -349,7 +349,7 @@ export const useCasesColumns = ({
   if (isSelectorView) {
     columns.push({
       align: RIGHT_ALIGNMENT,
-      render: (theCase: Case) => {
+      render: (theCase: CaseUI) => {
         if (theCase.id != null) {
           return (
             <EuiButton
@@ -376,7 +376,7 @@ export const useCasesColumns = ({
 };
 
 interface Props {
-  theCase: Case;
+  theCase: CaseUI;
   connectors: ActionConnector[];
 }
 
diff --git a/x-pack/plugins/cases/public/components/all_cases/utility_bar.tsx b/x-pack/plugins/cases/public/components/all_cases/utility_bar.tsx
index a2b28c47e2ce8e..50065a23121314 100644
--- a/x-pack/plugins/cases/public/components/all_cases/utility_bar.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/utility_bar.tsx
@@ -17,7 +17,7 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import * as i18n from './translations';
-import type { Case } from '../../../common/ui/types';
+import type { CaseUI } from '../../../common/ui/types';
 import { useRefreshCases } from './use_on_refresh_cases';
 import { useBulkActions } from './use_bulk_actions';
 import { useCasesContext } from '../cases_context/use_cases_context';
@@ -25,7 +25,7 @@ import { useCasesContext } from '../cases_context/use_cases_context';
 interface Props {
   isSelectorView?: boolean;
   totalCases: number;
-  selectedCases: Case[];
+  selectedCases: CaseUI[];
   deselectCases: () => void;
 }
 
diff --git a/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx b/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx
index b80cd5c2dbe749..b6d9248839f3ca 100644
--- a/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx
+++ b/x-pack/plugins/cases/public/components/case_action_bar/actions.tsx
@@ -12,15 +12,15 @@ import * as i18n from '../case_view/translations';
 import { useDeleteCases } from '../../containers/use_delete_cases';
 import { ConfirmDeleteCaseModal } from '../confirm_delete_case';
 import { PropertyActions } from '../property_actions';
-import type { Case } from '../../../common/ui/types';
+import type { CaseUI } from '../../../common/ui/types';
 import { useAllCasesNavigation } from '../../common/navigation';
 import { useCasesContext } from '../cases_context/use_cases_context';
 import { useCasesToast } from '../../common/use_cases_toast';
 import { AttachmentActionType } from '../../client/attachment_framework/types';
 
 interface CaseViewActions {
-  caseData: Case;
-  currentExternalIncident: Case['externalService'];
+  caseData: CaseUI;
+  currentExternalIncident: CaseUI['externalService'];
 }
 
 const ActionsComponent: React.FC<CaseViewActions> = ({ caseData, currentExternalIncident }) => {
diff --git a/x-pack/plugins/cases/public/components/case_action_bar/helpers.ts b/x-pack/plugins/cases/public/components/case_action_bar/helpers.ts
index 772bedd266dd83..2e1e176ff850a1 100644
--- a/x-pack/plugins/cases/public/components/case_action_bar/helpers.ts
+++ b/x-pack/plugins/cases/public/components/case_action_bar/helpers.ts
@@ -6,10 +6,10 @@
  */
 
 import { CaseStatuses } from '../../../common/api';
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import { statuses } from '../status';
 
-export const getStatusDate = (theCase: Case): string | null => {
+export const getStatusDate = (theCase: CaseUI): string | null => {
   if (theCase.status === CaseStatuses.open) {
     return theCase.createdAt;
   } else if (theCase.status === CaseStatuses['in-progress']) {
diff --git a/x-pack/plugins/cases/public/components/case_action_bar/index.tsx b/x-pack/plugins/cases/public/components/case_action_bar/index.tsx
index b8be843e8c659e..f412dd73715619 100644
--- a/x-pack/plugins/cases/public/components/case_action_bar/index.tsx
+++ b/x-pack/plugins/cases/public/components/case_action_bar/index.tsx
@@ -16,7 +16,7 @@ import {
   EuiFlexItem,
   EuiIconTip,
 } from '@elastic/eui';
-import type { Case } from '../../../common/ui/types';
+import type { CaseUI } from '../../../common/ui/types';
 import type { CaseStatuses } from '../../../common/api';
 import * as i18n from '../case_view/translations';
 import { Actions } from './actions';
@@ -44,7 +44,7 @@ const MyDescriptionList = styled(EuiDescriptionList)`
 `;
 
 export interface CaseActionBarProps {
-  caseData: Case;
+  caseData: CaseUI;
   isLoading: boolean;
   onUpdateField: (args: OnUpdateFields) => void;
 }
diff --git a/x-pack/plugins/cases/public/components/case_view/case_view_tabs.tsx b/x-pack/plugins/cases/public/components/case_view/case_view_tabs.tsx
index 630248bf79d523..b1e41d7c38b30d 100644
--- a/x-pack/plugins/cases/public/components/case_view/case_view_tabs.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/case_view_tabs.tsx
@@ -13,7 +13,7 @@ import { useCaseViewNavigation } from '../../common/navigation';
 import { useCasesContext } from '../cases_context/use_cases_context';
 import { EXPERIMENTAL_DESC, EXPERIMENTAL_LABEL } from '../header_page/translations';
 import { ACTIVITY_TAB, ALERTS_TAB, FILES_TAB } from './translations';
-import type { Case } from '../../../common';
+import type { CaseUI } from '../../../common';
 import { useGetCaseFileStats } from '../../containers/use_get_case_file_stats';
 
 const ExperimentalBadge = styled(EuiBetaBadge)`
@@ -49,7 +49,7 @@ const FilesTab = ({
 FilesTab.displayName = 'FilesTab';
 
 export interface CaseViewTabsProps {
-  caseData: Case;
+  caseData: CaseUI;
   activeTab: CASE_VIEW_PAGE_TABS;
 }
 
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.test.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.test.tsx
index 7386d8bcd7ea10..51c1ad17eaba69 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.test.tsx
@@ -21,7 +21,7 @@ import type { AppMockRenderer } from '../../../common/mock';
 import { createAppMockRenderer, noUpdateCasesPermissions } from '../../../common/mock';
 import { CaseViewActivity } from './case_view_activity';
 import { ConnectorTypes } from '../../../../common/api/connectors';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import { CASE_VIEW_PAGE_TABS } from '../../../../common/types';
 import type { CaseViewProps } from '../types';
 import { useFindCaseUserActions } from '../../../containers/use_find_case_user_actions';
@@ -54,7 +54,7 @@ jest.mock('../../../containers/use_get_case_users');
 
 (useGetTags as jest.Mock).mockReturnValue({ data: ['coke', 'pepsi'], refetch: jest.fn() });
 
-const caseData: Case = {
+const caseData: CaseUI = {
   ...basicCase,
   comments: [...basicCase.comments, alertComment],
   connector: {
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.tsx
index c4f387c6174173..b0774ccbefce57 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/components/case_view_activity.tsx
@@ -18,7 +18,7 @@ import { useGetCurrentUserProfile } from '../../../containers/user_profiles/use_
 import { useGetSupportedActionConnectors } from '../../../containers/configure/use_get_supported_action_connectors';
 import type { CaseSeverity } from '../../../../common/api';
 import type { CaseUsers, UseFetchAlertData } from '../../../../common/ui/types';
-import type { Case, CaseStatuses } from '../../../../common';
+import type { CaseUI, CaseStatuses } from '../../../../common';
 import { EditConnector } from '../../edit_connector';
 import type { CasesNavigation } from '../../links';
 import { StatusActionButton } from '../../status/button';
@@ -81,7 +81,7 @@ export const CaseViewActivity = ({
   useFetchAlertData,
 }: {
   ruleDetailsNavigation?: CasesNavigation<string | null | undefined, 'configurable'>;
-  caseData: Case;
+  caseData: CaseUI;
   actionsNavigation?: CasesNavigation<string, 'configurable'>;
   showAlertDetails?: (alertId: string, index: string) => void;
   useFetchAlertData: UseFetchAlertData;
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_alerts.test.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_alerts.test.tsx
index 54e5a0bc2febbc..6833df28046306 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/case_view_alerts.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/components/case_view_alerts.test.tsx
@@ -11,18 +11,18 @@ import { OBSERVABILITY_OWNER } from '../../../../common/constants';
 import { alertCommentWithIndices, basicCase } from '../../../containers/mock';
 import type { AppMockRenderer } from '../../../common/mock';
 import { createAppMockRenderer } from '../../../common/mock';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import { CaseViewAlerts } from './case_view_alerts';
 import * as api from '../../../containers/api';
 
 jest.mock('../../../containers/api');
 
-const caseData: Case = {
+const caseData: CaseUI = {
   ...basicCase,
   comments: [...basicCase.comments, alertCommentWithIndices],
 };
 
-describe('Case View Page activity tab', () => {
+describe('CaseUI View Page activity tab', () => {
   const getAlertsStateTableMock = jest.fn();
   let appMockRender: AppMockRenderer;
 
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_alerts.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_alerts.tsx
index 6b884325d3f730..e3393bf7f35446 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/case_view_alerts.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/components/case_view_alerts.tsx
@@ -10,7 +10,7 @@ import React, { useMemo } from 'react';
 import type { EuiFlyoutSize } from '@elastic/eui';
 import { EuiFlexItem, EuiFlexGroup, EuiProgress } from '@elastic/eui';
 import { SECURITY_SOLUTION_OWNER } from '../../../../common/constants';
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import { useKibana } from '../../../common/lib/kibana';
 import { getManualAlertIds, getRegistrationContextFromAlerts } from './helpers';
 import { useGetFeatureIds } from '../../../containers/use_get_feature_ids';
@@ -18,7 +18,7 @@ import { CaseViewAlertsEmpty } from './case_view_alerts_empty';
 import { CaseViewTabs } from '../case_view_tabs';
 import { CASE_VIEW_PAGE_TABS } from '../../../../common/types';
 interface CaseViewAlertsProps {
-  caseData: Case;
+  caseData: CaseUI;
 }
 export const CaseViewAlerts = ({ caseData }: CaseViewAlertsProps) => {
   const { triggersActionsUi } = useKibana().services;
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_files.test.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_files.test.tsx
index dc5b937bd87814..1480ab7fb43f19 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/case_view_files.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/components/case_view_files.test.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import type { Case } from '../../../../common';
+import type { CaseUI } from '../../../../common';
 import type { AppMockRenderer } from '../../../common/mock';
 
 import { createAppMockRenderer } from '../../../common/mock';
@@ -21,7 +21,7 @@ jest.mock('../../../containers/use_get_case_files');
 
 const useGetCaseFilesMock = useGetCaseFiles as jest.Mock;
 
-const caseData: Case = {
+const caseData: CaseUI = {
   ...basicCase,
   comments: [...basicCase.comments, alertCommentWithIndices],
 };
diff --git a/x-pack/plugins/cases/public/components/case_view/components/case_view_files.tsx b/x-pack/plugins/cases/public/components/case_view/components/case_view_files.tsx
index 54693acfa2390e..85cd4685a41fb1 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/case_view_files.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/components/case_view_files.tsx
@@ -12,7 +12,7 @@ import type { FileJSON } from '@kbn/shared-ux-file-types';
 
 import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 
-import type { Case } from '../../../../common/ui/types';
+import type { CaseUI } from '../../../../common/ui/types';
 import type { CaseFilesFilteringOptions } from '../../../containers/use_get_case_files';
 
 import { CASE_VIEW_PAGE_TABS } from '../../../../common/types';
@@ -22,7 +22,7 @@ import { CaseViewTabs } from '../case_view_tabs';
 import { FilesUtilityBar } from '../../files/files_utility_bar';
 
 interface CaseViewFilesProps {
-  caseData: Case;
+  caseData: CaseUI;
 }
 
 export const DEFAULT_CASE_FILES_FILTERING_OPTIONS = {
diff --git a/x-pack/plugins/cases/public/components/case_view/components/user_list.tsx b/x-pack/plugins/cases/public/components/case_view/components/user_list.tsx
index 47bd0ac3750a96..96b4c80c723f93 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/user_list.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/components/user_list.tsx
@@ -22,7 +22,7 @@ import styled, { css } from 'styled-components';
 
 import type { UserProfileWithAvatar } from '@kbn/user-profile-components';
 import { useCaseViewNavigation } from '../../../common/navigation';
-import type { Case } from '../../../containers/types';
+import type { CaseUI } from '../../../containers/types';
 import * as i18n from '../translations';
 import type { CaseUserWithProfileInfo, UserInfoWithAvatar } from '../../user_profiles/types';
 import { HoverableUserWithAvatar } from '../../user_profiles/hoverable_user_with_avatar';
@@ -30,7 +30,7 @@ import { convertToUserInfo } from '../../user_profiles/user_converter';
 import { getSortField } from '../../user_profiles/sort';
 
 interface UserListProps {
-  theCase: Case;
+  theCase: CaseUI;
   headline: string;
   loading?: boolean;
   users: CaseUserWithProfileInfo[];
diff --git a/x-pack/plugins/cases/public/components/case_view/mocks.ts b/x-pack/plugins/cases/public/components/case_view/mocks.ts
index 1f656ea42aa8c0..af335653a9a510 100644
--- a/x-pack/plugins/cases/public/components/case_view/mocks.ts
+++ b/x-pack/plugins/cases/public/components/case_view/mocks.ts
@@ -13,7 +13,7 @@ import {
   caseUserActions,
   getAlertUserAction,
 } from '../../containers/mock';
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import type { CaseViewProps } from './types';
 
 export const alertsHit = [
@@ -63,7 +63,7 @@ export const caseViewProps: CaseViewProps = {
   ],
 };
 
-export const caseData: Case = {
+export const caseData: CaseUI = {
   ...basicCase,
   comments: [...basicCase.comments, alertComment],
   connector: {
diff --git a/x-pack/plugins/cases/public/components/case_view/types.ts b/x-pack/plugins/cases/public/components/case_view/types.ts
index 0e6bf82c5fef95..0dba765f0d5cb9 100644
--- a/x-pack/plugins/cases/public/components/case_view/types.ts
+++ b/x-pack/plugins/cases/public/components/case_view/types.ts
@@ -7,7 +7,7 @@
 import type { MutableRefObject } from 'react';
 import type { CasesTimelineIntegration } from '../timeline_context';
 import type { CasesNavigation } from '../links';
-import type { CaseViewRefreshPropInterface, Case } from '../../../common';
+import type { CaseViewRefreshPropInterface, CaseUI } from '../../../common';
 import type { UseFetchAlertData } from '../../../common/ui';
 
 export interface CaseViewBaseProps {
@@ -30,12 +30,12 @@ export interface CaseViewProps extends CaseViewBaseProps {
 export interface CaseViewPageProps extends CaseViewBaseProps {
   caseId: string;
   fetchCase: () => void;
-  caseData: Case;
+  caseData: CaseUI;
 }
 
 export interface OnUpdateFields {
-  key: keyof Case;
-  value: Case[keyof Case];
+  key: keyof CaseUI;
+  value: CaseUI[keyof CaseUI];
   onSuccess?: () => void;
   onError?: () => void;
 }
diff --git a/x-pack/plugins/cases/public/components/case_view/use_on_update_field.ts b/x-pack/plugins/cases/public/components/case_view/use_on_update_field.ts
index d0fc6f98f0ce67..713c73d9b830c6 100644
--- a/x-pack/plugins/cases/public/components/case_view/use_on_update_field.ts
+++ b/x-pack/plugins/cases/public/components/case_view/use_on_update_field.ts
@@ -11,12 +11,12 @@ import deepEqual from 'fast-deep-equal';
 import type { CaseConnector } from '../../../common/api';
 import type { CaseAttributes } from '../../../common/api/cases/case';
 import type { CaseStatuses } from '../../../common/api/cases/status';
-import type { Case, UpdateByKey, UpdateKey } from '../../containers/types';
+import type { CaseUI, UpdateByKey, UpdateKey } from '../../containers/types';
 import { useUpdateCase } from '../../containers/use_update_case';
 import { getTypedPayload } from '../../containers/utils';
 import type { OnUpdateFields } from './types';
 
-export const useOnUpdateField = ({ caseData }: { caseData: Case }) => {
+export const useOnUpdateField = ({ caseData }: { caseData: CaseUI }) => {
   const { isLoading, updateKey: loadingKey, updateCaseProperty } = useUpdateCase();
 
   const onUpdateField = useCallback(
diff --git a/x-pack/plugins/cases/public/components/create/description.test.tsx b/x-pack/plugins/cases/public/components/create/description.test.tsx
index e7128572d29354..56ae139b5732bc 100644
--- a/x-pack/plugins/cases/public/components/create/description.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/description.test.tsx
@@ -17,8 +17,6 @@ import { schema } from './schema';
 import type { AppMockRenderer } from '../../common/mock';
 import { createAppMockRenderer } from '../../common/mock';
 
-jest.mock('../markdown_editor/plugins/lens/use_lens_draft_comment');
-
 describe('Description', () => {
   let globalForm: FormHook;
   let appMockRender: AppMockRenderer;
diff --git a/x-pack/plugins/cases/public/components/create/description.tsx b/x-pack/plugins/cases/public/components/create/description.tsx
index 48ae59f9e6e7ee..5c512e701c123b 100644
--- a/x-pack/plugins/cases/public/components/create/description.tsx
+++ b/x-pack/plugins/cases/public/components/create/description.tsx
@@ -5,14 +5,9 @@
  * 2.0.
  */
 
-import React, { memo, useEffect, useRef } from 'react';
-import {
-  UseField,
-  useFormContext,
-  useFormData,
-} from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+import React, { memo, useRef } from 'react';
+import { UseField, useFormData } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import { MarkdownEditorForm } from '../markdown_editor';
-import { useLensDraftComment } from '../markdown_editor/plugins/lens/use_lens_draft_comment';
 import { ID as LensPluginId } from '../markdown_editor/plugins/lens/constants';
 
 interface Props {
@@ -23,33 +18,10 @@ interface Props {
 export const fieldName = 'description';
 
 const DescriptionComponent: React.FC<Props> = ({ isLoading, draftStorageKey }) => {
-  const { draftComment, hasIncomingLensState, openLensModal, clearDraftComment } =
-    useLensDraftComment();
-  const { setFieldValue } = useFormContext();
   const [{ title, tags }] = useFormData({ watch: ['title', 'tags'] });
   const editorRef = useRef<Record<string, unknown>>();
   const disabledUiPlugins = [LensPluginId];
 
-  useEffect(() => {
-    if (draftComment?.commentId === fieldName && editorRef.current) {
-      setFieldValue(fieldName, draftComment.comment);
-
-      if (draftComment.caseTitle) {
-        setFieldValue('title', draftComment.caseTitle);
-      }
-
-      if (draftComment.caseTags && draftComment.caseTags.length > 0) {
-        setFieldValue('tags', draftComment.caseTags);
-      }
-
-      if (hasIncomingLensState) {
-        openLensModal({ editorRef: editorRef.current });
-      } else {
-        clearDraftComment();
-      }
-    }
-  }, [clearDraftComment, draftComment, hasIncomingLensState, openLensModal, setFieldValue]);
-
   return (
     <UseField
       path={fieldName}
diff --git a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
index 216d80a702dec7..66c83d5b968cbf 100644
--- a/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
+++ b/x-pack/plugins/cases/public/components/create/flyout/create_case_flyout.tsx
@@ -14,7 +14,7 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import { noop } from 'lodash';
 import type { CasePostRequest } from '../../../../common/api';
 import * as i18n from '../translations';
-import type { Case } from '../../../../common/ui/types';
+import type { CaseUI } from '../../../../common/ui/types';
 import { CreateCaseForm } from '../form';
 import type { UseCreateAttachments } from '../../../containers/use_create_attachments';
 import type { CaseAttachmentsWithoutOwner } from '../../../types';
@@ -22,11 +22,11 @@ import { casesQueryClient } from '../../cases_context/query_client';
 
 export interface CreateCaseFlyoutProps {
   afterCaseCreated?: (
-    theCase: Case,
+    theCase: CaseUI,
     createAttachments: UseCreateAttachments['createAttachments']
   ) => Promise<void>;
   onClose?: () => void;
-  onSuccess?: (theCase: Case) => void;
+  onSuccess?: (theCase: CaseUI) => void;
   attachments?: CaseAttachmentsWithoutOwner;
   headerContent?: React.ReactNode;
   initialValue?: Pick<CasePostRequest, 'title' | 'description'>;
diff --git a/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.tsx b/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.tsx
index a92046e8c99281..a8e234f9bb96aa 100644
--- a/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.tsx
+++ b/x-pack/plugins/cases/public/components/create/flyout/use_cases_add_to_new_case_flyout.tsx
@@ -9,7 +9,7 @@ import type React from 'react';
 import { useCallback } from 'react';
 import type { CaseAttachmentsWithoutOwner } from '../../../types';
 import { useCasesToast } from '../../../common/use_cases_toast';
-import type { Case } from '../../../containers/types';
+import type { CaseUI } from '../../../containers/types';
 import { CasesContextStoreActionsList } from '../../cases_context/cases_context_reducer';
 import { useCasesContext } from '../../cases_context/use_cases_context';
 import type { CreateCaseFlyoutProps } from './create_case_flyout';
@@ -46,7 +46,7 @@ export const useCasesAddToNewCaseFlyout = (props: AddToNewCaseFlyoutProps = {})
               return props.onClose();
             }
           },
-          onSuccess: async (theCase: Case) => {
+          onSuccess: async (theCase: CaseUI) => {
             if (theCase) {
               casesToasts.showSuccessAttach({
                 theCase,
diff --git a/x-pack/plugins/cases/public/components/create/form.tsx b/x-pack/plugins/cases/public/components/create/form.tsx
index 05dfef20636301..76344989ac0b2d 100644
--- a/x-pack/plugins/cases/public/components/create/form.tsx
+++ b/x-pack/plugins/cases/public/components/create/form.tsx
@@ -24,7 +24,7 @@ import { Connector } from './connector';
 import * as i18n from './translations';
 import { SyncAlertsToggle } from './sync_alerts_toggle';
 import type { ActionConnector, CasePostRequest } from '../../../common/api';
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import type { CasesTimelineIntegration } from '../timeline_context';
 import { CasesTimelineIntegrationProvider } from '../timeline_context';
 import { InsertTimeline } from '../insert_timeline';
@@ -69,9 +69,9 @@ export interface CreateCaseFormFieldsProps {
 }
 export interface CreateCaseFormProps extends Pick<Partial<CreateCaseFormFieldsProps>, 'withSteps'> {
   onCancel: () => void;
-  onSuccess: (theCase: Case) => void;
+  onSuccess: (theCase: CaseUI) => void;
   afterCaseCreated?: (
-    theCase: Case,
+    theCase: CaseUI,
     createAttachments: UseCreateAttachments['createAttachments']
   ) => Promise<void>;
   timelineIntegration?: CasesTimelineIntegration;
@@ -208,7 +208,7 @@ export const CreateCaseForm: React.FC<CreateCaseFormProps> = React.memo(
         onConfirmationCallback: handleOnConfirmationCallback,
       });
 
-    const handleOnSuccess = (theCase: Case): void => {
+    const handleOnSuccess = (theCase: CaseUI): void => {
       removeItemFromSessionStorage(draftStorageKey);
       return onSuccess(theCase);
     };
diff --git a/x-pack/plugins/cases/public/components/create/form_context.tsx b/x-pack/plugins/cases/public/components/create/form_context.tsx
index f3a78e8a1b9ca4..d62f8e155badf5 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.tsx
@@ -13,7 +13,7 @@ import { getNoneConnector, normalizeActionConnector } from '../configure_cases/u
 import { usePostCase } from '../../containers/use_post_case';
 import { usePostPushToService } from '../../containers/use_post_push_to_service';
 
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import type { CasePostRequest } from '../../../common/api';
 import { CaseSeverity, NONE_CONNECTOR_ID } from '../../../common/api';
 import type { UseCreateAttachments } from '../../containers/use_create_attachments';
@@ -39,11 +39,11 @@ const initialCaseValue: FormProps = {
 
 interface Props {
   afterCaseCreated?: (
-    theCase: Case,
+    theCase: CaseUI,
     createAttachments: UseCreateAttachments['createAttachments']
   ) => Promise<void>;
   children?: JSX.Element | JSX.Element[];
-  onSuccess?: (theCase: Case) => void;
+  onSuccess?: (theCase: CaseUI) => void;
   attachments?: CaseAttachmentsWithoutOwner;
   initialValue?: Pick<CasePostRequest, 'title' | 'description'>;
 }
diff --git a/x-pack/plugins/cases/public/components/description/index.tsx b/x-pack/plugins/cases/public/components/description/index.tsx
index 6ebbf8edd6f458..3574f21f87ce3f 100644
--- a/x-pack/plugins/cases/public/components/description/index.tsx
+++ b/x-pack/plugins/cases/public/components/description/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
 import { css } from '@emotion/react';
 import {
@@ -21,14 +21,19 @@ import { getMarkdownEditorStorageKey } from '../markdown_editor/utils';
 import * as i18n from '../user_actions/translations';
 import { useCasesContext } from '../cases_context/use_cases_context';
 import { useLensDraftComment } from '../markdown_editor/plugins/lens/use_lens_draft_comment';
+import type { EditableMarkdownRefObject, EuiMarkdownEditorRef } from '../markdown_editor';
 import { EditableMarkdown, ScrollableMarkdown } from '../markdown_editor';
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import type { OnUpdateFields } from '../case_view/types';
 import { schema } from './schema';
 
 const DESCRIPTION_ID = 'description';
+
+export interface DescriptionMarkdownRefObject extends EditableMarkdownRefObject {
+  editor: EuiMarkdownEditorRef | null;
+}
 export interface DescriptionProps {
-  caseData: Case;
+  caseData: CaseUI;
   isLoadingDescription: boolean;
   onUpdateField: ({ key, value, onSuccess, onError }: OnUpdateFields) => void;
 }
@@ -73,6 +78,13 @@ const getDraftDescription = (
   return sessionStorage.getItem(draftStorageKey);
 };
 
+const isCommentRef = (
+  ref: EditableMarkdownRefObject | null | undefined
+): ref is EditableMarkdownRefObject => {
+  const commentRef = ref as EditableMarkdownRefObject;
+  return commentRef?.setComment != null;
+};
+
 export const Description = ({
   caseData,
   onUpdateField,
@@ -82,6 +94,8 @@ export const Description = ({
   const [isEditable, setIsEditable] = useState<boolean>(false);
 
   const descriptionRef = useRef(null);
+  const descriptionMarkdownRef = useRef<DescriptionMarkdownRefObject | null>(null);
+
   const { euiTheme } = useEuiTheme();
   const { appId, permissions } = useCasesContext();
 
@@ -89,6 +103,7 @@ export const Description = ({
     clearDraftComment: clearLensDraftComment,
     draftComment: lensDraftComment,
     hasIncomingLensState,
+    openLensModal,
   } = useLensDraftComment();
 
   const handleOnChangeEditable = useCallback(() => {
@@ -117,6 +132,22 @@ export const Description = ({
     setIsEditable(true);
   }
 
+  useEffect(() => {
+    if (
+      isCommentRef(descriptionMarkdownRef.current) &&
+      descriptionMarkdownRef.current.editor?.textarea &&
+      lensDraftComment &&
+      lensDraftComment.commentId === DESCRIPTION_ID
+    ) {
+      descriptionMarkdownRef.current.setComment(lensDraftComment.comment);
+      if (hasIncomingLensState) {
+        openLensModal({ editorRef: descriptionMarkdownRef.current.editor });
+      } else {
+        clearLensDraftComment();
+      }
+    }
+  }, [clearLensDraftComment, lensDraftComment, hasIncomingLensState, openLensModal]);
+
   const hasUnsavedChanges =
     draftDescription && draftDescription !== caseData.description && !isLoadingDescription;
 
@@ -131,6 +162,7 @@ export const Description = ({
       editorRef={descriptionRef}
       fieldName="content"
       formSchema={schema}
+      ref={descriptionMarkdownRef}
     />
   ) : (
     <Panel hasShadow={false} hasBorder={true} data-test-subj="description">
diff --git a/x-pack/plugins/cases/public/components/edit_connector/index.tsx b/x-pack/plugins/cases/public/components/edit_connector/index.tsx
index 8a63c9d02ad266..fd2ca685b8854c 100644
--- a/x-pack/plugins/cases/public/components/edit_connector/index.tsx
+++ b/x-pack/plugins/cases/public/components/edit_connector/index.tsx
@@ -22,7 +22,7 @@ import { isEmpty, noop } from 'lodash/fp';
 
 import type { FieldConfig } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import { Form, UseField, useForm } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
-import type { Case, CaseConnectors } from '../../../common/ui/types';
+import type { CaseUI, CaseConnectors } from '../../../common/ui/types';
 import type { ActionConnector, CaseConnector, ConnectorTypeFields } from '../../../common/api';
 import { NONE_CONNECTOR_ID } from '../../../common/api';
 import { ConnectorSelector } from '../connector_selector/form';
@@ -37,7 +37,7 @@ import { PushCallouts } from './push_callouts';
 import { normalizeActionConnector, getNoneConnector } from '../configure_cases/utils';
 
 export interface EditConnectorProps {
-  caseData: Case;
+  caseData: CaseUI;
   caseConnectors: CaseConnectors;
   supportedActionConnectors: ActionConnector[];
   isLoading: boolean;
diff --git a/x-pack/plugins/cases/public/components/files/file_type.test.tsx b/x-pack/plugins/cases/public/components/files/file_type.test.tsx
index 8d4fd4c0eabdee..0fc01442487f4d 100644
--- a/x-pack/plugins/cases/public/components/files/file_type.test.tsx
+++ b/x-pack/plugins/cases/public/components/files/file_type.test.tsx
@@ -27,6 +27,7 @@ describe('getFileType', () => {
       icon: 'document',
       displayName: 'File Attachment Type',
       getAttachmentViewObject: expect.any(Function),
+      getAttachmentRemovalObject: expect.any(Function),
     });
   });
 
@@ -77,7 +78,7 @@ describe('getFileType', () => {
       expect(actions[0]).toStrictEqual({
         type: AttachmentActionType.CUSTOM,
         isPrimary: false,
-        label: 'Download File',
+        label: 'Download file',
         render: expect.any(Function),
       });
 
@@ -101,7 +102,7 @@ describe('getFileType', () => {
       expect(actions[1]).toStrictEqual({
         type: AttachmentActionType.CUSTOM,
         isPrimary: false,
-        label: 'Delete File',
+        label: 'Delete file',
         render: expect.any(Function),
       });
 
@@ -125,7 +126,7 @@ describe('getFileType', () => {
       expect(actions[1]).toStrictEqual({
         type: AttachmentActionType.CUSTOM,
         isPrimary: false,
-        label: 'Delete File',
+        label: 'Delete file',
         render: expect.any(Function),
       });
 
@@ -184,4 +185,11 @@ describe('getFileType', () => {
       );
     });
   });
+
+  describe('getFileAttachmentRemovalObject', () => {
+    it('event renders the right message', async () => {
+      // @ts-ignore
+      expect(fileType.getAttachmentRemovalObject().event).toBe('removed file');
+    });
+  });
 });
diff --git a/x-pack/plugins/cases/public/components/files/file_type.tsx b/x-pack/plugins/cases/public/components/files/file_type.tsx
index 271bf3008e70eb..f8b434d9848615 100644
--- a/x-pack/plugins/cases/public/components/files/file_type.tsx
+++ b/x-pack/plugins/cases/public/components/files/file_type.tsx
@@ -103,4 +103,5 @@ export const getFileType = (): ExternalReferenceAttachmentType => ({
   icon: 'document',
   displayName: 'File Attachment Type',
   getAttachmentViewObject: getFileAttachmentViewObject,
+  getAttachmentRemovalObject: () => ({ event: i18n.REMOVED_FILE }),
 });
diff --git a/x-pack/plugins/cases/public/components/files/translations.tsx b/x-pack/plugins/cases/public/components/files/translations.tsx
index 4023c5b18cea84..b500d140217f0e 100644
--- a/x-pack/plugins/cases/public/components/files/translations.tsx
+++ b/x-pack/plugins/cases/public/components/files/translations.tsx
@@ -12,7 +12,7 @@ export const ACTIONS = i18n.translate('xpack.cases.caseView.files.actions', {
 });
 
 export const ADD_FILE = i18n.translate('xpack.cases.caseView.files.addFile', {
-  defaultMessage: 'Add File',
+  defaultMessage: 'Add file',
 });
 
 export const CLOSE_MODAL = i18n.translate('xpack.cases.caseView.files.closeModal', {
@@ -20,15 +20,15 @@ export const CLOSE_MODAL = i18n.translate('xpack.cases.caseView.files.closeModal
 });
 
 export const DATE_ADDED = i18n.translate('xpack.cases.caseView.files.dateAdded', {
-  defaultMessage: 'Date Added',
+  defaultMessage: 'Date added',
 });
 
 export const DELETE_FILE = i18n.translate('xpack.cases.caseView.files.deleteFile', {
-  defaultMessage: 'Delete File',
+  defaultMessage: 'Delete file',
 });
 
 export const DOWNLOAD_FILE = i18n.translate('xpack.cases.caseView.files.downloadFile', {
-  defaultMessage: 'Download File',
+  defaultMessage: 'Download file',
 });
 
 export const FILES_TABLE = i18n.translate('xpack.cases.caseView.files.filesTable', {
@@ -113,3 +113,7 @@ export const DELETE = i18n.translate('xpack.cases.caseView.files.delete', {
 export const DELETE_FILE_TITLE = i18n.translate('xpack.cases.caseView.files.deleteThisFile', {
   defaultMessage: 'Delete this file?',
 });
+
+export const REMOVED_FILE = i18n.translate('xpack.cases.caseView.files.removedFile', {
+  defaultMessage: 'removed file',
+});
diff --git a/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx b/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
index 77070da0dbc571..0205fac1d4ec4b 100644
--- a/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
+++ b/x-pack/plugins/cases/public/components/files/use_files_table_columns.test.tsx
@@ -47,18 +47,18 @@ describe('useFilesTableColumns', () => {
           "data-test-subj": "cases-files-table-date-added",
           "dataType": "date",
           "field": "created",
-          "name": "Date Added",
+          "name": "Date added",
         },
         Object {
           "actions": Array [
             Object {
-              "description": "Download File",
+              "description": "Download file",
               "isPrimary": true,
               "name": "Download",
               "render": [Function],
             },
             Object {
-              "description": "Delete File",
+              "description": "Delete file",
               "isPrimary": true,
               "name": "Delete",
               "render": [Function],
diff --git a/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.tsx b/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.tsx
index 0418746eff912f..482c198d15d633 100644
--- a/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.tsx
+++ b/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.tsx
@@ -8,14 +8,14 @@
 import React, { memo } from 'react';
 import { EuiModal, EuiModalBody, EuiModalHeader, EuiModalHeaderTitle } from '@elastic/eui';
 
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import * as i18n from '../../common/translations';
 import { CreateCase } from '../create';
 
 export interface CreateCaseModalProps {
   isModalOpen: boolean;
   onCloseCaseModal: () => void;
-  onSuccess: (theCase: Case) => Promise<void>;
+  onSuccess: (theCase: CaseUI) => Promise<void>;
 }
 
 const CreateModalComponent: React.FC<CreateCaseModalProps> = ({
diff --git a/x-pack/plugins/cases/public/components/use_create_case_modal/index.tsx b/x-pack/plugins/cases/public/components/use_create_case_modal/index.tsx
index f640fd2b3df7ca..92a24b615e3830 100644
--- a/x-pack/plugins/cases/public/components/use_create_case_modal/index.tsx
+++ b/x-pack/plugins/cases/public/components/use_create_case_modal/index.tsx
@@ -6,11 +6,11 @@
  */
 
 import React, { useState, useCallback, useMemo } from 'react';
-import type { Case } from '../../../common/ui/types';
+import type { CaseUI } from '../../../common/ui/types';
 import { CreateCaseModal } from './create_case_modal';
 
 export interface UseCreateCaseModalProps {
-  onCaseCreated: (theCase: Case) => void;
+  onCaseCreated: (theCase: CaseUI) => void;
 }
 export interface UseCreateCaseModalReturnedValues {
   modal: JSX.Element;
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
index 9142a71ed7184b..71457cb49e089e 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/registered_attachments.tsx
@@ -50,10 +50,10 @@ type BuilderArgs<C, R> = Pick<
 /**
  * Provides a render function for attachment type
  */
-const getAttachmentRenderer = memoize((attachmentViewObject: AttachmentViewObject) => {
+const getAttachmentRenderer = memoize(() => {
   let AttachmentElement: React.ReactElement;
 
-  const renderCallback = (props: object) => {
+  const renderCallback = (attachmentViewObject: AttachmentViewObject, props: object) => {
     if (!attachmentViewObject.children) return;
 
     if (!AttachmentElement) {
@@ -120,7 +120,7 @@ export const createRegisteredAttachmentUserActionBuilder = <
 
     const attachmentViewObject = attachmentType.getAttachmentViewObject(props);
 
-    const renderer = getAttachmentRenderer(attachmentViewObject);
+    const renderer = getAttachmentRenderer();
     const actions = attachmentViewObject.getActions?.(props) ?? [];
     const [primaryActions, nonPrimaryActions] = partition(actions, 'isPrimary');
     const visiblePrimaryActions = primaryActions.slice(0, 2);
@@ -164,7 +164,7 @@ export const createRegisteredAttachmentUserActionBuilder = <
             />
           </UserActionContentToolbar>
         ),
-        children: renderer(props),
+        children: renderer(attachmentViewObject, props),
       },
     ];
   },
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
index 0c40f738c56b68..119ae2b9039b33 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/user.tsx
@@ -46,10 +46,17 @@ const MyEuiCommentFooter = styled(EuiText)`
   `}
 `;
 
-const hasDraftComment = (appId = '', caseId: string, commentId: string): boolean => {
-  const draftStorageKey = getMarkdownEditorStorageKey(appId, caseId, commentId);
+const hasDraftComment = (
+  applicationId = '',
+  caseId: string,
+  commentId: string,
+  comment: string
+): boolean => {
+  const draftStorageKey = getMarkdownEditorStorageKey(applicationId, caseId, commentId);
 
-  return Boolean(sessionStorage.getItem(draftStorageKey));
+  const sessionValue = sessionStorage.getItem(draftStorageKey);
+
+  return Boolean(sessionValue && sessionValue !== comment);
 };
 
 export const createUserAttachmentUserActionBuilder = ({
@@ -78,7 +85,8 @@ export const createUserAttachmentUserActionBuilder = ({
       className: classNames('userAction__comment', {
         outlined,
         isEdit,
-        draftFooter: !isEdit && !isLoading && hasDraftComment(appId, caseId, comment.id),
+        draftFooter:
+          !isEdit && !isLoading && hasDraftComment(appId, caseId, comment.id, comment.comment),
       }),
       children: (
         <>
@@ -95,7 +103,7 @@ export const createUserAttachmentUserActionBuilder = ({
               version: comment.version,
             })}
           />
-          {!isEdit && !isLoading && hasDraftComment(appId, caseId, comment.id) ? (
+          {!isEdit && !isLoading && hasDraftComment(appId, caseId, comment.id, comment.comment) ? (
             <MyEuiCommentFooter>
               <EuiText color="subdued" size="xs" data-test-subj="user-action-comment-unsaved-draft">
                 {i18n.UNSAVED_DRAFT_COMMENT}
diff --git a/x-pack/plugins/cases/public/components/user_actions/common.tsx b/x-pack/plugins/cases/public/components/user_actions/common.tsx
index 4d04f118bebe4d..800831b4cc9b21 100644
--- a/x-pack/plugins/cases/public/components/user_actions/common.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/common.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import type { EuiCommentProps } from '@elastic/eui';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import type { ConnectorUserAction, UserAction } from '../../../common/api';
+import type { ConnectorUserAction, ActionCategory } from '../../../common/api';
 import { Actions } from '../../../common/api';
 import { UserActionTimestamp } from './timestamp';
 import type { UserActionBuilder, UserActionBuilderArgs, UserActionResponse } from './types';
@@ -22,8 +22,10 @@ interface Props {
   handleOutlineComment: (id: string) => void;
 }
 
-const showMoveToReference = (action: UserAction, commentId: string | null): commentId is string =>
-  action === Actions.update && commentId != null;
+const showMoveToReference = (
+  action: ActionCategory,
+  commentId: string | null
+): commentId is string => action === Actions.update && commentId != null;
 
 const CommentListActions: React.FC<Props> = React.memo(({ userAction, handleOutlineComment }) => (
   <EuiFlexGroup responsive={false}>
diff --git a/x-pack/plugins/cases/public/components/user_actions/types.ts b/x-pack/plugins/cases/public/components/user_actions/types.ts
index 5146a97aba65bc..4e2660734052f1 100644
--- a/x-pack/plugins/cases/public/components/user_actions/types.ts
+++ b/x-pack/plugins/cases/public/components/user_actions/types.ts
@@ -10,9 +10,9 @@ import type { UserProfileWithAvatar } from '@kbn/user-profile-components';
 import type { SnakeToCamelCase } from '../../../common/types';
 import type { ActionTypes, UserActionWithResponse } from '../../../common/api';
 import type {
-  Case,
+  CaseUI,
   CaseConnectors,
-  CaseUserActions,
+  UserActionUI,
   Comment,
   UseFetchAlertData,
   CaseUserActionsStats,
@@ -31,7 +31,7 @@ export interface UserActionTreeProps {
   caseConnectors: CaseConnectors;
   userProfiles: Map<string, UserProfileWithAvatar>;
   currentUserProfile: CurrentUserProfile;
-  data: Case;
+  data: CaseUI;
   getRuleDetailsHref?: RuleDetailsNavigation['href'];
   actionsNavigation?: ActionsNavigation;
   onRuleDetailsClick?: RuleDetailsNavigation['onClick'];
@@ -48,13 +48,13 @@ export type SupportedUserActionTypes = keyof Omit<typeof ActionTypes, Unsupporte
 
 export interface UserActionBuilderArgs {
   appId?: string;
-  caseData: Case;
+  caseData: CaseUI;
   userProfiles: Map<string, UserProfileWithAvatar>;
   currentUserProfile: CurrentUserProfile;
   externalReferenceAttachmentTypeRegistry: ExternalReferenceAttachmentTypeRegistry;
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry;
   caseConnectors: CaseConnectors;
-  userAction: CaseUserActions;
+  userAction: UserActionUI;
   comments: Comment[];
   index: number;
   commentRefs: React.MutableRefObject<
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
index e19dbea584fc8e..1cd7d641acdc7d 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_handler.tsx
@@ -7,7 +7,7 @@
 
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useCaseViewParams } from '../../common/navigation';
-import type { Case } from '../../containers/types';
+import type { CaseUI } from '../../containers/types';
 import { useLensDraftComment } from '../markdown_editor/plugins/lens/use_lens_draft_comment';
 import { useUpdateComment } from '../../containers/use_update_comment';
 import type { AddCommentRefObject } from '../add_comment';
@@ -28,7 +28,7 @@ export type UseUserActionsHandler = Pick<
   | 'handleSaveComment'
   | 'handleManageQuote'
   | 'handleDeleteComment'
-> & { handleUpdate: (updatedCase: Case) => void };
+> & { handleUpdate: (updatedCase: CaseUI) => void };
 
 const isAddCommentRef = (
   ref: AddCommentRefObject | UserActionMarkdownRefObject | null | undefined
@@ -37,6 +37,13 @@ const isAddCommentRef = (
   return commentRef?.addQuote != null;
 };
 
+const isSetCommentRef = (
+  ref: AddCommentRefObject | UserActionMarkdownRefObject | null | undefined
+): ref is AddCommentRefObject => {
+  const commentRef = ref as UserActionMarkdownRefObject;
+  return commentRef?.setComment != null;
+};
+
 export const useUserActionsHandler = (): UseUserActionsHandler => {
   const { detailName: caseId } = useCaseViewParams();
   const { clearDraftComment, draftComment, hasIncomingLensState, openLensModal } =
@@ -122,7 +129,7 @@ export const useUserActionsHandler = (): UseUserActionsHandler => {
   );
 
   useEffect(() => {
-    if (draftComment?.commentId) {
+    if (draftComment?.commentId && draftComment?.commentId !== 'description') {
       setManageMarkdownEditIds((prevManageMarkdownEditIds) => {
         if (
           NEW_COMMENT_ID !== draftComment?.commentId &&
@@ -135,7 +142,7 @@ export const useUserActionsHandler = (): UseUserActionsHandler => {
 
       const ref = commentRefs?.current?.[draftComment.commentId];
 
-      if (isAddCommentRef(ref) && ref.editor?.textarea) {
+      if (isSetCommentRef(ref) && ref.editor?.textarea) {
         ref.setComment(draftComment.comment);
         if (hasIncomingLensState) {
           openLensModal({ editorRef: ref.editor });
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.tsx
index 800f1f94c4832e..32fc45aa433abb 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_last_page.tsx
@@ -7,7 +7,7 @@
 
 import { useMemo } from 'react';
 
-import type { CaseUserActions } from '../../containers/types';
+import type { UserActionUI } from '../../containers/types';
 import { useFindCaseUserActions } from '../../containers/use_find_case_user_actions';
 import type { UserActivityParams } from '../user_actions_activity_bar/types';
 
@@ -25,7 +25,7 @@ export const useLastPageUserActions = ({
   const { data: lastPageUserActionsData, isLoading: isLoadingLastPageUserActions } =
     useFindCaseUserActions(caseId, { ...userActivityQueryParams, page: lastPage }, lastPage > 1);
 
-  const lastPageUserActions = useMemo<CaseUserActions[]>(() => {
+  const lastPageUserActions = useMemo<UserActionUI[]>(() => {
     if (isLoadingLastPageUserActions || !lastPageUserActionsData) {
       return [];
     }
diff --git a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.tsx b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.tsx
index ec9b931af0ab2b..bdaaa68de0157d 100644
--- a/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/use_user_actions_pagination.tsx
@@ -8,7 +8,7 @@
 import { useMemo } from 'react';
 
 import { useInfiniteFindCaseUserActions } from '../../containers/use_infinite_find_case_user_actions';
-import type { CaseUserActions } from '../../containers/types';
+import type { UserActionUI } from '../../containers/types';
 import type { UserActivityParams } from '../user_actions_activity_bar/types';
 
 interface UserActionsPagination {
@@ -32,12 +32,12 @@ export const useUserActionsPagination = ({
 
   const showBottomList = lastPage > 1;
 
-  const infiniteCaseUserActions = useMemo<CaseUserActions[]>(() => {
+  const infiniteCaseUserActions = useMemo<UserActionUI[]>(() => {
     if (!caseInfiniteUserActionsData?.pages?.length || isLoadingInfiniteUserActions) {
       return [];
     }
 
-    const userActionsData: CaseUserActions[] = [];
+    const userActionsData: UserActionUI[] = [];
 
     caseInfiniteUserActionsData.pages.forEach((page) => userActionsData.push(...page.userActions));
 
diff --git a/x-pack/plugins/cases/public/components/user_actions/user_actions_list.tsx b/x-pack/plugins/cases/public/components/user_actions/user_actions_list.tsx
index 72d83717345485..1b4508291bfc7b 100644
--- a/x-pack/plugins/cases/public/components/user_actions/user_actions_list.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/user_actions_list.tsx
@@ -11,7 +11,7 @@ import { EuiCommentList } from '@elastic/eui';
 import React, { useMemo, useEffect, useState } from 'react';
 import styled from 'styled-components';
 
-import type { CaseUserActions } from '../../containers/types';
+import type { UserActionUI } from '../../containers/types';
 import type { UserActionBuilderArgs, UserActionTreeProps } from './types';
 import { isUserActionTypeSupported } from './helpers';
 import { useCasesContext } from '../cases_context/use_cases_context';
@@ -78,7 +78,7 @@ export type UserActionListProps = Omit<
   | 'statusActionButton'
 > &
   Pick<UserActionBuilderArgs, 'commentRefs' | 'handleManageQuote'> & {
-    caseUserActions: CaseUserActions[];
+    caseUserActions: UserActionUI[];
     loadingAlertData: boolean;
     manualAlertsData: Record<string, unknown>;
     bottomActions?: EuiCommentProps[];
diff --git a/x-pack/plugins/cases/public/containers/__mocks__/api.ts b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
index b29e45f6f101ed..19aea63bdb0bf6 100644
--- a/x-pack/plugins/cases/public/containers/__mocks__/api.ts
+++ b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
@@ -7,8 +7,8 @@
 
 import type {
   ActionLicense,
-  Cases,
-  Case,
+  CasesUI,
+  CaseUI,
   CasesStatus,
   FetchCasesProps,
   FindCaseUserActions,
@@ -53,7 +53,7 @@ export const getCase = async (
   caseId: string,
   includeComments: boolean = true,
   signal: AbortSignal
-): Promise<Case> => Promise.resolve(basicCase);
+): Promise<CaseUI> => Promise.resolve(basicCase);
 
 export const resolveCase = async (
   caseId: string,
@@ -101,9 +101,9 @@ export const getCases = async ({
     sortOrder: 'desc',
   },
   signal,
-}: FetchCasesProps): Promise<Cases> => Promise.resolve(allCases);
+}: FetchCasesProps): Promise<CasesUI> => Promise.resolve(allCases);
 
-export const postCase = async (newCase: CasePostRequest, signal: AbortSignal): Promise<Case> =>
+export const postCase = async (newCase: CasePostRequest, signal: AbortSignal): Promise<CaseUI> =>
   Promise.resolve(basicCasePost);
 
 export const patchCase = async (
@@ -111,18 +111,18 @@ export const patchCase = async (
   updatedCase: Pick<CasePatchRequest, 'description' | 'status' | 'tags' | 'title'>,
   version: string,
   signal: AbortSignal
-): Promise<Case[]> => Promise.resolve([basicCase]);
+): Promise<CaseUI[]> => Promise.resolve([basicCase]);
 
 export const updateCases = async (
   cases: CaseUpdateRequest[],
   signal: AbortSignal
-): Promise<Case[]> => Promise.resolve(allCases.cases);
+): Promise<CaseUI[]> => Promise.resolve(allCases.cases);
 
 export const createAttachments = async (
   newComment: CommentRequest,
   caseId: string,
   signal: AbortSignal
-): Promise<Case> => Promise.resolve(basicCase);
+): Promise<CaseUI> => Promise.resolve(basicCase);
 
 export const deleteComment = async (
   caseId: string,
@@ -136,7 +136,7 @@ export const patchComment = async (
   commentUpdate: string,
   version: string,
   signal: AbortSignal
-): Promise<Case> => Promise.resolve(basicCaseCommentPatch);
+): Promise<CaseUI> => Promise.resolve(basicCaseCommentPatch);
 
 export const deleteCases = async (caseIds: string[], signal: AbortSignal): Promise<boolean> =>
   Promise.resolve(true);
@@ -145,7 +145,7 @@ export const pushCase = async (
   caseId: string,
   connectorId: string,
   signal: AbortSignal
-): Promise<Case> => Promise.resolve(pushedCase);
+): Promise<CaseUI> => Promise.resolve(pushedCase);
 
 export const getActionLicense = async (signal: AbortSignal): Promise<ActionLicense[]> =>
   Promise.resolve(actionLicenses);
diff --git a/x-pack/plugins/cases/public/containers/api.ts b/x-pack/plugins/cases/public/containers/api.ts
index a45bfa3752c914..c804d1d34f60ce 100644
--- a/x-pack/plugins/cases/public/containers/api.ts
+++ b/x-pack/plugins/cases/public/containers/api.ts
@@ -9,7 +9,6 @@ import type { ValidFeatureId } from '@kbn/rule-data-utils';
 import { BASE_RAC_ALERTS_API_PATH } from '@kbn/rule-registry-plugin/common/constants';
 import type {
   CaseConnectors,
-  Cases,
   CaseUpdateRequest,
   FetchCasesProps,
   ResolvedCase,
@@ -17,15 +16,14 @@ import type {
   CaseUserActionTypeWithAll,
   CaseUserActionsStats,
   CaseUsers,
+  CasesUI,
 } from '../../common/ui/types';
 import { SeverityAll, SortFieldCase, StatusAll } from '../../common/ui/types';
 import type {
   BulkCreateCommentRequest,
   CasePatchRequest,
   CasePostRequest,
-  CaseResponse,
   CaseResolveResponse,
-  CasesResponse,
   UserActionFindResponse,
   CommentRequest,
   User,
@@ -33,6 +31,8 @@ import type {
   CasesFindResponse,
   GetCaseConnectorsResponse,
   CaseUserActionStatsResponse,
+  Case,
+  Cases,
 } from '../../common/api';
 import {
   CommentType,
@@ -69,10 +69,10 @@ import {
 
 import type {
   ActionLicense,
-  Case,
+  CaseUI,
   SingleCaseMetrics,
   SingleCaseMetricsFeature,
-  CaseUserActions,
+  UserActionUI,
 } from './types';
 
 import {
@@ -91,8 +91,8 @@ export const getCase = async (
   caseId: string,
   includeComments: boolean = true,
   signal: AbortSignal
-): Promise<Case> => {
-  const response = await KibanaServices.get().http.fetch<CaseResponse>(getCaseDetailsUrl(caseId), {
+): Promise<CaseUI> => {
+  const response = await KibanaServices.get().http.fetch<Case>(getCaseDetailsUrl(caseId), {
     method: 'GET',
     query: {
       includeComments,
@@ -186,7 +186,7 @@ export const findCaseUserActions = async (
     ...response,
     userActions: convertUserActionsToCamelCase(
       decodeCaseUserActionsResponse(response.userActions)
-    ) as CaseUserActions[],
+    ) as UserActionUI[],
   };
 };
 
@@ -223,7 +223,7 @@ export const getCases = async ({
     sortOrder: 'desc',
   },
   signal,
-}: FetchCasesProps): Promise<Cases> => {
+}: FetchCasesProps): Promise<CasesUI> => {
   const query = {
     ...(filterOptions.status !== StatusAll ? { status: filterOptions.status } : {}),
     ...(filterOptions.severity !== SeverityAll ? { severity: filterOptions.severity } : {}),
@@ -245,8 +245,8 @@ export const getCases = async ({
   return convertAllCasesToCamel(decodeCasesFindResponse(response));
 };
 
-export const postCase = async (newCase: CasePostRequest, signal: AbortSignal): Promise<Case> => {
-  const response = await KibanaServices.get().http.fetch<CaseResponse>(CASES_URL, {
+export const postCase = async (newCase: CasePostRequest, signal: AbortSignal): Promise<CaseUI> => {
+  const response = await KibanaServices.get().http.fetch<Case>(CASES_URL, {
     method: 'POST',
     body: JSON.stringify(newCase),
     signal,
@@ -262,8 +262,8 @@ export const patchCase = async (
   >,
   version: string,
   signal: AbortSignal
-): Promise<Case[]> => {
-  const response = await KibanaServices.get().http.fetch<CasesResponse>(CASES_URL, {
+): Promise<CaseUI[]> => {
+  const response = await KibanaServices.get().http.fetch<Cases>(CASES_URL, {
     method: 'PATCH',
     body: JSON.stringify({ cases: [{ ...updatedCase, id: caseId, version }] }),
     signal,
@@ -274,12 +274,12 @@ export const patchCase = async (
 export const updateCases = async (
   cases: CaseUpdateRequest[],
   signal: AbortSignal
-): Promise<Case[]> => {
+): Promise<CaseUI[]> => {
   if (cases.length === 0) {
     return [];
   }
 
-  const response = await KibanaServices.get().http.fetch<CasesResponse>(CASES_URL, {
+  const response = await KibanaServices.get().http.fetch<Cases>(CASES_URL, {
     method: 'PATCH',
     body: JSON.stringify({ cases }),
     signal,
@@ -292,15 +292,12 @@ export const postComment = async (
   newComment: CommentRequest,
   caseId: string,
   signal: AbortSignal
-): Promise<Case> => {
-  const response = await KibanaServices.get().http.fetch<CaseResponse>(
-    `${CASES_URL}/${caseId}/comments`,
-    {
-      method: 'POST',
-      body: JSON.stringify(newComment),
-      signal,
-    }
-  );
+): Promise<CaseUI> => {
+  const response = await KibanaServices.get().http.fetch<Case>(`${CASES_URL}/${caseId}/comments`, {
+    method: 'POST',
+    body: JSON.stringify(newComment),
+    signal,
+  });
   return convertCaseToCamelCase(decodeCaseResponse(response));
 };
 
@@ -318,8 +315,8 @@ export const patchComment = async ({
   version: string;
   signal: AbortSignal;
   owner: string;
-}): Promise<Case> => {
-  const response = await KibanaServices.get().http.fetch<CaseResponse>(getCaseCommentsUrl(caseId), {
+}): Promise<CaseUI> => {
+  const response = await KibanaServices.get().http.fetch<Case>(getCaseCommentsUrl(caseId), {
     method: 'PATCH',
     body: JSON.stringify({
       comment: commentUpdate,
@@ -342,7 +339,7 @@ export const deleteComment = async ({
   commentId: string;
   signal: AbortSignal;
 }): Promise<void> => {
-  await KibanaServices.get().http.fetch<CaseResponse>(getCaseCommentDeleteUrl(caseId, commentId), {
+  await KibanaServices.get().http.fetch<Case>(getCaseCommentDeleteUrl(caseId, commentId), {
     method: 'DELETE',
     signal,
   });
@@ -361,8 +358,8 @@ export const pushCase = async (
   caseId: string,
   connectorId: string,
   signal: AbortSignal
-): Promise<Case> => {
-  const response = await KibanaServices.get().http.fetch<CaseResponse>(
+): Promise<CaseUI> => {
+  const response = await KibanaServices.get().http.fetch<Case>(
     getCasePushUrl(caseId, connectorId),
     {
       method: 'POST',
@@ -390,8 +387,8 @@ export const createAttachments = async (
   attachments: BulkCreateCommentRequest,
   caseId: string,
   signal: AbortSignal
-): Promise<Case> => {
-  const response = await KibanaServices.get().http.fetch<CaseResponse>(
+): Promise<CaseUI> => {
+  const response = await KibanaServices.get().http.fetch<Case>(
     INTERNAL_BULK_CREATE_ATTACHMENTS_URL.replace('{case_id}', caseId),
     {
       method: 'POST',
diff --git a/x-pack/plugins/cases/public/containers/mock.ts b/x-pack/plugins/cases/public/containers/mock.ts
index a4192513d7becd..d35d001d41bc40 100644
--- a/x-pack/plugins/cases/public/containers/mock.ts
+++ b/x-pack/plugins/cases/public/containers/mock.ts
@@ -6,7 +6,7 @@
  */
 import type { FileJSON } from '@kbn/shared-ux-file-types';
 
-import type { ActionLicense, Cases, Case, CasesStatus, CaseUserActions, Comment } from './types';
+import type { ActionLicense, CasesUI, CaseUI, CasesStatus, UserActionUI, Comment } from './types';
 
 import type {
   ResolvedCase,
@@ -22,14 +22,14 @@ import type {
 } from '../../common/ui/types';
 import type {
   CaseConnector,
-  CaseResponse,
+  Case,
   CasesFindResponse,
-  CasesResponse,
+  Cases,
   CasesStatusResponse,
-  CaseUserActionResponse,
-  CaseUserActionsResponse,
-  CommentResponse,
   UserAction,
+  UserActions,
+  CommentResponse,
+  ActionCategory,
   UserActionTypes,
   UserActionWithResponse,
   CommentUserAction,
@@ -208,7 +208,7 @@ export const persistableStateAttachment: PersistableComment = {
   version: 'WzQ3LDFc',
 };
 
-export const basicCase: Case = {
+export const basicCase: CaseUI = {
   owner: SECURITY_SOLUTION_OWNER,
   closedAt: null,
   closedBy: null,
@@ -325,7 +325,7 @@ export const basicCaseMetrics: SingleCaseMetrics = {
   },
 };
 
-export const mockCase: Case = {
+export const mockCase: CaseUI = {
   owner: SECURITY_SOLUTION_OWNER,
   closedAt: null,
   closedBy: null,
@@ -357,7 +357,7 @@ export const mockCase: Case = {
   assignees: [],
 };
 
-export const basicCasePost: Case = {
+export const basicCasePost: CaseUI = {
   ...basicCase,
   updatedAt: null,
   updatedBy: null,
@@ -398,7 +398,7 @@ export const basicPush = {
   pushedBy: elasticUser,
 };
 
-export const pushedCase: Case = {
+export const pushedCase: CaseUI = {
   ...basicCase,
   connector: {
     id: pushConnectorId,
@@ -419,7 +419,7 @@ const basicAction = {
   type: 'title',
 };
 
-export const cases: Case[] = [
+export const cases: CaseUI[] = [
   basicCase,
   {
     ...pushedCase,
@@ -437,7 +437,7 @@ export const cases: Case[] = [
   caseWithRegisteredAttachments,
 ];
 
-export const allCases: Cases = {
+export const allCases: CasesUI = {
   cases,
   page: 1,
   perPage: 5,
@@ -515,7 +515,7 @@ export const persistableStateAttachmentSnake: CommentResponse = {
   version: 'WzQ3LDFc',
 };
 
-export const basicCaseSnake: CaseResponse = {
+export const basicCaseSnake: Case = {
   ...basicCase,
   status: CaseStatuses.open,
   closed_at: null,
@@ -529,7 +529,7 @@ export const basicCaseSnake: CaseResponse = {
   updated_at: basicUpdatedAt,
   updated_by: elasticUserSnake,
   owner: SECURITY_SOLUTION_OWNER,
-} as CaseResponse;
+} as Case;
 
 export const caseWithAlertsSnake = {
   ...basicCaseSnake,
@@ -583,7 +583,7 @@ export const pushedCaseSnake = {
   external_service: { ...basicPushSnake, connector_id: pushConnectorId },
 };
 
-export const casesSnake: CasesResponse = [
+export const casesSnake: Cases = [
   basicCaseSnake,
   {
     ...pushedCaseSnake,
@@ -611,9 +611,9 @@ export const allCasesSnake: CasesFindResponse = {
 
 export const getUserAction = (
   type: UserActionTypes,
-  action: UserAction,
+  action: ActionCategory,
   overrides?: Record<string, unknown>
-): CaseUserActions => {
+): UserActionUI => {
   const commonProperties = {
     ...basicAction,
     id: `${type}-${action}`,
@@ -738,27 +738,27 @@ export const getUserAction = (
       return {
         ...commonProperties,
         ...overrides,
-      } as CaseUserActions;
+      } as UserActionUI;
   }
 };
 
 export const getUserActionSnake = (
   type: UserActionTypes,
-  action: UserAction,
+  action: ActionCategory,
   overrides?: Record<string, unknown>
-): CaseUserActionResponse => {
+): UserAction => {
   return {
     ...covertToSnakeCase(getUserAction(type, action, overrides)),
-  } as unknown as CaseUserActionResponse;
+  } as unknown as UserAction;
 };
 
-export const caseUserActionsSnake: CaseUserActionsResponse = [
+export const caseUserActionsSnake: UserActions = [
   getUserActionSnake('description', Actions.create),
   getUserActionSnake('comment', Actions.create),
   getUserActionSnake('description', Actions.update),
 ];
 
-export const caseUserActionsWithRegisteredAttachmentsSnake: CaseUserActionsResponse = [
+export const caseUserActionsWithRegisteredAttachmentsSnake: UserActions = [
   getUserActionSnake('description', Actions.create),
   {
     created_at: basicCreatedAt,
@@ -858,13 +858,13 @@ export const getHostIsolationUserAction = (
   ...overrides,
 });
 
-export const caseUserActions: CaseUserActions[] = [
+export const caseUserActions: UserActionUI[] = [
   getUserAction('description', Actions.create),
   getUserAction('comment', Actions.create),
   getUserAction('description', Actions.update),
 ];
 
-export const caseUserActionsWithRegisteredAttachments: CaseUserActions[] = [
+export const caseUserActionsWithRegisteredAttachments: UserActionUI[] = [
   getUserAction('description', Actions.create),
   {
     createdAt: basicCreatedAt,
@@ -910,7 +910,7 @@ export const useGetCasesMockState = {
   isError: false,
 };
 
-export const basicCaseClosed: Case = {
+export const basicCaseClosed: CaseUI = {
   ...basicCase,
   closedAt: '2020-02-25T23:06:33.798Z',
   closedBy: elasticUser,
diff --git a/x-pack/plugins/cases/public/containers/use_create_attachments.tsx b/x-pack/plugins/cases/public/containers/use_create_attachments.tsx
index 074b85839c4d9d..38cb5de7ee5138 100644
--- a/x-pack/plugins/cases/public/containers/use_create_attachments.tsx
+++ b/x-pack/plugins/cases/public/containers/use_create_attachments.tsx
@@ -9,7 +9,7 @@ import { useReducer, useCallback, useRef, useEffect } from 'react';
 
 import { createAttachments } from './api';
 import * as i18n from './translations';
-import type { Case } from './types';
+import type { CaseUI } from './types';
 import { useToasts } from '../common/lib/kibana';
 import type { CaseAttachmentsWithoutOwner } from '../types';
 
@@ -45,7 +45,7 @@ export interface PostComment {
   caseId: string;
   caseOwner: string;
   data: CaseAttachmentsWithoutOwner;
-  updateCase?: (newCase: Case) => void;
+  updateCase?: (newCase: CaseUI) => void;
   throwOnError?: boolean;
 }
 export interface UseCreateAttachments extends NewCommentState {
diff --git a/x-pack/plugins/cases/public/containers/use_get_cases.tsx b/x-pack/plugins/cases/public/containers/use_get_cases.tsx
index b9f55cc77682f2..356534d60cc064 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases.tsx
@@ -8,7 +8,7 @@
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { casesQueriesKeys, DEFAULT_TABLE_ACTIVE_PAGE, DEFAULT_TABLE_LIMIT } from './constants';
-import type { Cases, FilterOptions, QueryParams } from './types';
+import type { CasesUI, FilterOptions, QueryParams } from './types';
 import { SortFieldCase, StatusAll, SeverityAll } from './types';
 import { useToasts } from '../common/lib/kibana';
 import * as i18n from './translations';
@@ -35,7 +35,7 @@ export const DEFAULT_QUERY_PARAMS: QueryParams = {
   sortOrder: 'desc',
 };
 
-export const initialData: Cases = {
+export const initialData: CasesUI = {
   cases: [],
   countClosedCases: 0,
   countInProgressCases: 0,
@@ -50,7 +50,7 @@ export const useGetCases = (
     queryParams?: Partial<QueryParams>;
     filterOptions?: Partial<FilterOptions>;
   } = {}
-): UseQueryResult<Cases> => {
+): UseQueryResult<CasesUI> => {
   const toasts = useToasts();
   return useQuery(
     casesQueriesKeys.cases(params),
diff --git a/x-pack/plugins/cases/public/containers/use_post_push_to_service.tsx b/x-pack/plugins/cases/public/containers/use_post_push_to_service.tsx
index d13500dcbc5fad..bda1c3bc37d549 100644
--- a/x-pack/plugins/cases/public/containers/use_post_push_to_service.tsx
+++ b/x-pack/plugins/cases/public/containers/use_post_push_to_service.tsx
@@ -10,7 +10,7 @@ import type { CaseConnector } from '../../common/api';
 
 import { pushCase } from './api';
 import * as i18n from './translations';
-import type { Case } from './types';
+import type { CaseUI } from './types';
 import { useToasts } from '../common/lib/kibana';
 
 interface PushToServiceState {
@@ -53,7 +53,7 @@ export interface UsePostPushToService extends PushToServiceState {
   pushCaseToExternalService: ({
     caseId,
     connector,
-  }: PushToServiceRequest) => Promise<Case | undefined>;
+  }: PushToServiceRequest) => Promise<CaseUI | undefined>;
 }
 
 export const usePostPushToService = (): UsePostPushToService => {
diff --git a/x-pack/plugins/cases/public/containers/utils.test.ts b/x-pack/plugins/cases/public/containers/utils.test.ts
index c87c81a02f8186..b7a0b17ec5ff0a 100644
--- a/x-pack/plugins/cases/public/containers/utils.test.ts
+++ b/x-pack/plugins/cases/public/containers/utils.test.ts
@@ -13,7 +13,7 @@ import {
   constructReportersFilter,
 } from './utils';
 
-import type { Case } from './types';
+import type { CaseUI } from './types';
 
 const caseBeforeUpdate = {
   comments: [
@@ -24,9 +24,9 @@ const caseBeforeUpdate = {
   settings: {
     syncAlerts: true,
   },
-} as Case;
+} as CaseUI;
 
-const caseAfterUpdate = { title: 'My case' } as Case;
+const caseAfterUpdate = { title: 'My case' } as CaseUI;
 
 describe('utils', () => {
   describe('valueToUpdateIsSettings', () => {
diff --git a/x-pack/plugins/cases/public/containers/utils.ts b/x-pack/plugins/cases/public/containers/utils.ts
index 733e5bd08de7a2..c1d89dc81595c8 100644
--- a/x-pack/plugins/cases/public/containers/utils.ts
+++ b/x-pack/plugins/cases/public/containers/utils.ts
@@ -13,30 +13,30 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import type { ToastInputFields } from '@kbn/core/public';
 import { NO_ASSIGNEES_FILTERING_KEYWORD } from '../../common/constants';
 import type {
-  CaseResponse,
-  CasesResponse,
   CasesConfigurationsResponse,
   CasesConfigureResponse,
-  CaseUserActionsResponse,
+  UserActions,
   CasePatchRequest,
   CaseResolveResponse,
   SingleCaseMetricsResponse,
   User,
   CaseUserActionStatsResponse,
+  Case,
+  Cases,
 } from '../../common/api';
 import {
-  CaseResponseRt,
-  CasesResponseRt,
+  CaseRt,
+  CasesRt,
   throwErrors,
   CaseConfigurationsResponseRt,
   CaseConfigureResponseRt,
-  CaseUserActionsResponseRt,
+  UserActionsRt,
   CommentType,
   CaseResolveResponseRt,
   SingleCaseMetricsResponseRt,
   CaseUserActionStatsResponseRt,
 } from '../../common/api';
-import type { Case, FilterOptions, UpdateByKey } from './types';
+import type { CaseUI, FilterOptions, UpdateByKey } from './types';
 import * as i18n from './translations';
 
 export const getTypedPayload = <T>(a: unknown): T => a as T;
@@ -49,8 +49,8 @@ export const covertToSnakeCase = (obj: Record<string, unknown>) =>
 
 export const createToasterPlainError = (message: string) => new ToasterError([message]);
 
-export const decodeCaseResponse = (respCase?: CaseResponse) =>
-  pipe(CaseResponseRt.decode(respCase), fold(throwErrors(createToasterPlainError), identity));
+export const decodeCaseResponse = (respCase?: Case) =>
+  pipe(CaseRt.decode(respCase), fold(throwErrors(createToasterPlainError), identity));
 
 export const decodeCaseResolveResponse = (respCase?: CaseResolveResponse) =>
   pipe(
@@ -64,8 +64,8 @@ export const decodeSingleCaseMetricsResponse = (respCase?: SingleCaseMetricsResp
     fold(throwErrors(createToasterPlainError), identity)
   );
 
-export const decodeCasesResponse = (respCase?: CasesResponse) =>
-  pipe(CasesResponseRt.decode(respCase), fold(throwErrors(createToasterPlainError), identity));
+export const decodeCasesResponse = (respCase?: Cases) =>
+  pipe(CasesRt.decode(respCase), fold(throwErrors(createToasterPlainError), identity));
 
 export const decodeCaseConfigurationsResponse = (respCase?: CasesConfigurationsResponse) => {
   return pipe(
@@ -80,11 +80,8 @@ export const decodeCaseConfigureResponse = (respCase?: CasesConfigureResponse) =
     fold(throwErrors(createToasterPlainError), identity)
   );
 
-export const decodeCaseUserActionsResponse = (respUserActions?: CaseUserActionsResponse) =>
-  pipe(
-    CaseUserActionsResponseRt.decode(respUserActions),
-    fold(throwErrors(createToasterPlainError), identity)
-  );
+export const decodeCaseUserActionsResponse = (respUserActions?: UserActions) =>
+  pipe(UserActionsRt.decode(respUserActions), fold(throwErrors(createToasterPlainError), identity));
 
 export const decodeCaseUserActionStatsResponse = (
   caseUserActionsStats: CaseUserActionStatsResponse
@@ -114,8 +111,8 @@ export class ToasterError extends Error {
   }
 }
 export const createUpdateSuccessToaster = (
-  caseBeforeUpdate: Case,
-  caseAfterUpdate: Case,
+  caseBeforeUpdate: CaseUI,
+  caseAfterUpdate: CaseUI,
   key: UpdateByKey['updateKey'],
   value: UpdateByKey['updateValue']
 ): ToastInputFields => {
diff --git a/x-pack/plugins/cases/public/types.ts b/x-pack/plugins/cases/public/types.ts
index 6b88c79abb6a30..be2275c8c0980e 100644
--- a/x-pack/plugins/cases/public/types.ts
+++ b/x-pack/plugins/cases/public/types.ts
@@ -25,7 +25,7 @@ import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import type { FilesSetup, FilesStart } from '@kbn/files-plugin/public';
 import type { SavedObjectsManagementPluginStart } from '@kbn/saved-objects-management-plugin/public';
 import type {
-  CaseResponse,
+  Case,
   CasesBulkGetRequestCertainFields,
   CasesBulkGetResponseCertainFields,
   CasesByAlertId,
@@ -48,7 +48,7 @@ import type { GetCasesProps } from './client/ui/get_cases';
 import type { GetAllCasesSelectorModalProps } from './client/ui/get_all_cases_selector_modal';
 import type { GetCreateCaseFlyoutProps } from './client/ui/get_create_case_flyout';
 import type { GetRecentCasesProps } from './client/ui/get_recent_cases';
-import type { Cases, CasesStatus, CasesMetrics } from '../common/ui';
+import type { CasesUI, CasesStatus, CasesMetrics } from '../common/ui';
 import type { GroupAlertsByRule } from './client/helpers/group_alerts_by_rule';
 import type { getUICapabilities } from './client/helpers/capabilities';
 import type { AttachmentFramework } from './client/attachment_framework/types';
@@ -103,10 +103,10 @@ export interface CasesUiStart {
   api: {
     getRelatedCases: (alertId: string, query: CasesByAlertIDRequest) => Promise<CasesByAlertId>;
     cases: {
-      find: (query: CasesFindRequest, signal?: AbortSignal) => Promise<Cases>;
+      find: (query: CasesFindRequest, signal?: AbortSignal) => Promise<CasesUI>;
       getCasesStatus: (query: CasesStatusRequest, signal?: AbortSignal) => Promise<CasesStatus>;
       getCasesMetrics: (query: CasesMetricsRequest, signal?: AbortSignal) => Promise<CasesMetrics>;
-      bulkGet: <Field extends keyof CaseResponse = keyof CaseResponse>(
+      bulkGet: <Field extends keyof Case = keyof Case>(
         params: CasesBulkGetRequestCertainFields<Field>,
         signal?: AbortSignal
       ) => Promise<CasesBulkGetResponseCertainFields<Field>>;
diff --git a/x-pack/plugins/cases/server/client/attachments/add.ts b/x-pack/plugins/cases/server/client/attachments/add.ts
index 920adca9dc1bf7..ae4d4aab68e1dd 100644
--- a/x-pack/plugins/cases/server/client/attachments/add.ts
+++ b/x-pack/plugins/cases/server/client/attachments/add.ts
@@ -12,7 +12,7 @@ import { identity } from 'fp-ts/lib/function';
 
 import { SavedObjectsUtils } from '@kbn/core/server';
 
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 import { CommentRequestRt, throwErrors } from '../../../common/api';
 
 import { CaseCommentModel } from '../../common/models';
@@ -29,10 +29,7 @@ import { validateRegisteredAttachments } from './validators';
  *
  * @ignore
  */
-export const addComment = async (
-  addArgs: AddArgs,
-  clientArgs: CasesClientArgs
-): Promise<CaseResponse> => {
+export const addComment = async (addArgs: AddArgs, clientArgs: CasesClientArgs): Promise<Case> => {
   const { comment, caseId } = addArgs;
   const query = pipe(
     CommentRequestRt.decode(comment),
diff --git a/x-pack/plugins/cases/server/client/attachments/bulk_create.ts b/x-pack/plugins/cases/server/client/attachments/bulk_create.ts
index 1213f9a373b7c5..e989410a7a3898 100644
--- a/x-pack/plugins/cases/server/client/attachments/bulk_create.ts
+++ b/x-pack/plugins/cases/server/client/attachments/bulk_create.ts
@@ -12,7 +12,7 @@ import { identity } from 'fp-ts/lib/function';
 
 import { SavedObjectsUtils } from '@kbn/core/server';
 
-import type { CaseResponse, CommentRequest } from '../../../common/api';
+import type { Case, CommentRequest } from '../../../common/api';
 import { BulkCreateCommentRequestRt, throwErrors } from '../../../common/api';
 
 import { CaseCommentModel } from '../../common/models';
@@ -33,7 +33,7 @@ import { validateRegisteredAttachments } from './validators';
 export const bulkCreate = async (
   args: BulkCreateArgs,
   clientArgs: CasesClientArgs
-): Promise<CaseResponse> => {
+): Promise<Case> => {
   const { attachments, caseId } = args;
 
   pipe(
diff --git a/x-pack/plugins/cases/server/client/attachments/client.ts b/x-pack/plugins/cases/server/client/attachments/client.ts
index 5b204a21929c22..e4244b32d1e7da 100644
--- a/x-pack/plugins/cases/server/client/attachments/client.ts
+++ b/x-pack/plugins/cases/server/client/attachments/client.ts
@@ -9,7 +9,7 @@ import type {
   AlertResponse,
   AllCommentsResponse,
   BulkGetAttachmentsResponse,
-  CaseResponse,
+  Case,
   CommentResponse,
   CommentsResponse,
 } from '../../../common/api';
@@ -45,8 +45,8 @@ export interface AttachmentsSubClient {
   /**
    * Adds an attachment to a case.
    */
-  add(params: AddArgs): Promise<CaseResponse>;
-  bulkCreate(params: BulkCreateArgs): Promise<CaseResponse>;
+  add(params: AddArgs): Promise<Case>;
+  bulkCreate(params: BulkCreateArgs): Promise<Case>;
   bulkGet(params: BulkGetArgs): Promise<BulkGetAttachmentsResponse>;
   /**
    * Deletes all attachments associated with a single case.
@@ -78,7 +78,7 @@ export interface AttachmentsSubClient {
    *
    * The request must include all fields for the attachment. Even the fields that are not changing.
    */
-  update(updateArgs: UpdateArgs): Promise<CaseResponse>;
+  update(updateArgs: UpdateArgs): Promise<Case>;
 }
 
 /**
diff --git a/x-pack/plugins/cases/server/client/attachments/update.ts b/x-pack/plugins/cases/server/client/attachments/update.ts
index 692e2f6b152041..213d4a86ea242a 100644
--- a/x-pack/plugins/cases/server/client/attachments/update.ts
+++ b/x-pack/plugins/cases/server/client/attachments/update.ts
@@ -10,7 +10,7 @@ import Boom from '@hapi/boom';
 import { CaseCommentModel } from '../../common/models';
 import { createCaseError } from '../../common/error';
 import { isCommentRequestTypeExternalReference } from '../../../common/utils/attachments';
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 import { CASE_SAVED_OBJECT } from '../../../common/constants';
 import type { CasesClientArgs } from '..';
 import { decodeCommentRequest } from '../utils';
@@ -25,7 +25,7 @@ import type { UpdateArgs } from './types';
 export async function update(
   { caseID, updateRequest: queryParams }: UpdateArgs,
   clientArgs: CasesClientArgs
-): Promise<CaseResponse> {
+): Promise<Case> {
   const {
     services: { attachmentService },
     logger,
diff --git a/x-pack/plugins/cases/server/client/cases/bulk_get.test.ts b/x-pack/plugins/cases/server/client/cases/bulk_get.test.ts
index 8628fa64056ad5..fd68bd7e8d36de 100644
--- a/x-pack/plugins/cases/server/client/cases/bulk_get.test.ts
+++ b/x-pack/plugins/cases/server/client/cases/bulk_get.test.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../common/api';
-import { getTypeProps, CaseResponseRt } from '../../../common/api';
+import type { Case } from '../../../common/api';
+import { getTypeProps, CaseRt } from '../../../common/api';
 import { mockCases } from '../../mocks';
 import { createCasesClientMockArgs } from '../mocks';
 import { bulkGet } from './bulk_get';
@@ -39,8 +39,8 @@ describe('bulkGet', () => {
       unauthorized: [],
     });
 
-    const typeProps = getTypeProps(CaseResponseRt) ?? {};
-    const validFields = Object.keys(typeProps) as Array<keyof CaseResponse>;
+    const typeProps = getTypeProps(CaseRt) ?? {};
+    const validFields = Object.keys(typeProps) as Array<keyof Case>;
 
     beforeEach(() => {
       jest.clearAllMocks();
diff --git a/x-pack/plugins/cases/server/client/cases/bulk_get.ts b/x-pack/plugins/cases/server/client/cases/bulk_get.ts
index 85952b84bef916..3c2542c244874f 100644
--- a/x-pack/plugins/cases/server/client/cases/bulk_get.ts
+++ b/x-pack/plugins/cases/server/client/cases/bulk_get.ts
@@ -16,31 +16,31 @@ import type {
   CasesBulkGetResponse,
   CasesBulkGetResponseCertainFields,
   CasesBulkGetRequestCertainFields,
-  CaseResponse,
+  Case,
   CaseAttributes,
 } from '../../../common/api';
 import {
   CasesBulkGetRequestRt,
-  CasesResponseRt,
+  CasesRt,
   excess,
   throwErrors,
   getTypeForCertainFieldsFromArray,
-  CaseResponseRt,
+  CaseRt,
 } from '../../../common/api';
 import { getTypeProps } from '../../../common/api/runtime_types';
 import { createCaseError } from '../../common/error';
 import { asArray, flattenCaseSavedObject } from '../../common/utils';
 import type { CasesClientArgs, SOWithErrors } from '../types';
 import { includeFieldsRequiredForAuthentication } from '../../authorization/utils';
-import type { CaseSavedObject } from '../../common/types';
 import { Operations } from '../../authorization';
+import type { CaseSavedObjectTransformed } from '../../common/types/case';
 
 type CaseSavedObjectWithErrors = SOWithErrors<CaseAttributes>;
 
 /**
  * Retrieves multiple cases by ids.
  */
-export const bulkGet = async <Field extends keyof CaseResponse = keyof CaseResponse>(
+export const bulkGet = async <Field extends keyof Case = keyof Case>(
   params: CasesBulkGetRequestCertainFields<Field>,
   clientArgs: CasesClientArgs
 ): Promise<CasesBulkGetResponseCertainFields<Field>> => {
@@ -66,7 +66,7 @@ export const bulkGet = async <Field extends keyof CaseResponse = keyof CaseRespo
     const [validCases, soBulkGetErrors] = partition(
       cases.saved_objects,
       (caseInfo) => caseInfo.error === undefined
-    ) as [CaseSavedObject[], CaseSavedObjectWithErrors];
+    ) as [CaseSavedObjectTransformed[], CaseSavedObjectWithErrors];
 
     const { authorized: authorizedCases, unauthorized: unauthorizedCases } =
       await authorization.getAndEnsureAuthorizedEntities({
@@ -103,7 +103,7 @@ export const bulkGet = async <Field extends keyof CaseResponse = keyof CaseRespo
       return pick(flattenedCase, [...fields, 'id', 'version']);
     });
 
-    const typeToEncode = getTypeForCertainFieldsFromArray(CasesResponseRt, fields);
+    const typeToEncode = getTypeForCertainFieldsFromArray(CasesRt, fields);
     const casesToReturn = typeToEncode.encode(flattenedCases);
 
     const errors = constructErrors(soBulkGetErrors, unauthorizedCases);
@@ -124,7 +124,7 @@ const throwErrorIfFieldsAreInvalid = (fields?: string[]) => {
     return;
   }
 
-  const typeProps = getTypeProps(CaseResponseRt) ?? {};
+  const typeProps = getTypeProps(CaseRt) ?? {};
   const validFields = Object.keys(typeProps);
 
   for (const field of fields) {
@@ -142,7 +142,7 @@ const throwErrorIfCaseIdsReachTheLimit = (ids: string[]) => {
 
 const constructErrors = (
   soBulkGetErrors: CaseSavedObjectWithErrors,
-  unauthorizedCases: CaseSavedObject[]
+  unauthorizedCases: CaseSavedObjectTransformed[]
 ): CasesBulkGetResponse['errors'] => {
   const errors: CasesBulkGetResponse['errors'] = [];
 
diff --git a/x-pack/plugins/cases/server/client/cases/client.ts b/x-pack/plugins/cases/server/client/cases/client.ts
index bf3253fda6558f..a014eeec56a6cd 100644
--- a/x-pack/plugins/cases/server/client/cases/client.ts
+++ b/x-pack/plugins/cases/server/client/cases/client.ts
@@ -13,7 +13,7 @@ import type {
   AllTagsFindRequest,
   AllReportersFindRequest,
   CasesByAlertId,
-  CaseResponse,
+  Case,
   CasesBulkGetRequestCertainFields,
   CasesBulkGetResponseCertainFields,
 } from '../../../common/api';
@@ -65,7 +65,7 @@ export interface CasesSubClient {
   /**
    * Retrieves multiple cases with the specified IDs.
    */
-  bulkGet<Field extends keyof CaseResponse = keyof CaseResponse>(
+  bulkGet<Field extends keyof Case = keyof Case>(
     params: CasesBulkGetRequestCertainFields<Field>
   ): Promise<CasesBulkGetResponseCertainFields<Field>>;
   /**
diff --git a/x-pack/plugins/cases/server/client/cases/create.ts b/x-pack/plugins/cases/server/client/cases/create.ts
index a8f9975fee39ff..1d1a687ee9998c 100644
--- a/x-pack/plugins/cases/server/client/cases/create.ts
+++ b/x-pack/plugins/cases/server/client/cases/create.ts
@@ -12,10 +12,10 @@ import { identity } from 'fp-ts/lib/function';
 
 import { SavedObjectsUtils } from '@kbn/core/server';
 
-import type { CaseResponse, CasePostRequest } from '../../../common/api';
+import type { Case, CasePostRequest } from '../../../common/api';
 import {
   throwErrors,
-  CaseResponseRt,
+  CaseRt,
   ActionTypes,
   CasePostRequestRt,
   excess,
@@ -35,10 +35,7 @@ import { LICENSING_CASE_ASSIGNMENT_FEATURE } from '../../common/constants';
  *
  * @ignore
  */
-export const create = async (
-  data: CasePostRequest,
-  clientArgs: CasesClientArgs
-): Promise<CaseResponse> => {
+export const create = async (data: CasePostRequest, clientArgs: CasesClientArgs): Promise<Case> => {
   const {
     services: { caseService, userActionService, licensingService, notificationService },
     user,
@@ -129,7 +126,7 @@ export const create = async (
       });
     }
 
-    return CaseResponseRt.encode(flattenedCase);
+    return CaseRt.encode(flattenedCase);
   } catch (error) {
     throw createCaseError({ message: `Failed to create case: ${error}`, error, logger });
   }
diff --git a/x-pack/plugins/cases/server/client/cases/find.test.ts b/x-pack/plugins/cases/server/client/cases/find.test.ts
index f23ad82df1fcff..bb0701647d8af1 100644
--- a/x-pack/plugins/cases/server/client/cases/find.test.ts
+++ b/x-pack/plugins/cases/server/client/cases/find.test.ts
@@ -6,7 +6,7 @@
  */
 import { v1 as uuidv1 } from 'uuid';
 
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 
 import { flattenCaseSavedObject } from '../../common/utils';
 import { mockCases } from '../../mocks';
@@ -16,7 +16,7 @@ import { find } from './find';
 describe('find', () => {
   describe('constructSearch', () => {
     const clientArgs = createCasesClientMockArgs();
-    const casesMap = new Map<string, CaseResponse>(
+    const casesMap = new Map<string, Case>(
       mockCases.map((obj) => {
         return [obj.id, flattenCaseSavedObject({ savedObject: obj, totalComment: 2 })];
       })
diff --git a/x-pack/plugins/cases/server/client/cases/get.ts b/x-pack/plugins/cases/server/client/cases/get.ts
index 669efc96c960c0..88668f04f7f36c 100644
--- a/x-pack/plugins/cases/server/client/cases/get.ts
+++ b/x-pack/plugins/cases/server/client/cases/get.ts
@@ -11,7 +11,7 @@ import { identity } from 'fp-ts/lib/function';
 
 import type { SavedObjectsResolveResponse } from '@kbn/core/server';
 import type {
-  CaseResponse,
+  Case,
   CaseResolveResponse,
   User,
   AllTagsFindRequest,
@@ -22,7 +22,7 @@ import type {
   AttachmentTotals,
 } from '../../../common/api';
 import {
-  CaseResponseRt,
+  CaseRt,
   CaseResolveResponseRt,
   AllTagsFindRequestRt,
   excess,
@@ -37,7 +37,7 @@ import type { CasesClientArgs } from '..';
 import { Operations } from '../../authorization';
 import { combineAuthorizedAndOwnerFilter } from '../utils';
 import { CasesService } from '../../services';
-import type { CaseSavedObject } from '../../common/types';
+import type { CaseSavedObjectTransformed } from '../../common/types/case';
 
 /**
  * Parameters for finding cases IDs using an alert ID
@@ -173,7 +173,7 @@ export interface GetParams {
 export const get = async (
   { id, includeComments }: GetParams,
   clientArgs: CasesClientArgs
-): Promise<CaseResponse> => {
+): Promise<Case> => {
   const {
     services: { caseService },
     logger,
@@ -181,7 +181,7 @@ export const get = async (
   } = clientArgs;
 
   try {
-    const theCase: CaseSavedObject = await caseService.getCase({
+    const theCase: CaseSavedObjectTransformed = await caseService.getCase({
       id,
     });
 
@@ -191,7 +191,7 @@ export const get = async (
     });
 
     if (!includeComments) {
-      return CaseResponseRt.encode(
+      return CaseRt.encode(
         flattenCaseSavedObject({
           savedObject: theCase,
         })
@@ -206,7 +206,7 @@ export const get = async (
       },
     });
 
-    return CaseResponseRt.encode(
+    return CaseRt.encode(
       flattenCaseSavedObject({
         savedObject: theCase,
         comments: theComments.saved_objects,
diff --git a/x-pack/plugins/cases/server/client/cases/push.ts b/x-pack/plugins/cases/server/client/cases/push.ts
index 4f3ab74557278f..da30764c45e4b2 100644
--- a/x-pack/plugins/cases/server/client/cases/push.ts
+++ b/x-pack/plugins/cases/server/client/cases/push.ts
@@ -14,19 +14,13 @@ import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { asSavedObjectExecutionSource } from '@kbn/actions-plugin/server';
 import type {
   ActionConnector,
-  CaseResponse,
+  Case,
   ExternalServiceResponse,
   CasesConfigureAttributes,
   CommentRequestAlertType,
   CommentAttributes,
 } from '../../../common/api';
-import {
-  CaseResponseRt,
-  CaseStatuses,
-  ActionTypes,
-  OWNER_FIELD,
-  CommentType,
-} from '../../../common/api';
+import { CaseRt, CaseStatuses, ActionTypes, OWNER_FIELD, CommentType } from '../../../common/api';
 import { CASE_COMMENT_SAVED_OBJECT, CASE_SAVED_OBJECT } from '../../../common/constants';
 
 import { createIncident, getDurationInSeconds, getUserProfiles } from './utils';
@@ -103,7 +97,7 @@ export const push = async (
   clientArgs: CasesClientArgs,
   casesClient: CasesClient,
   casesClientInternal: CasesClientInternal
-): Promise<CaseResponse> => {
+): Promise<Case> => {
   const {
     unsecuredSavedObjectsClient,
     services: {
@@ -282,7 +276,7 @@ export const push = async (
 
     /* End of update case with push information */
 
-    return CaseResponseRt.encode(
+    return CaseRt.encode(
       flattenCaseSavedObject({
         savedObject: {
           ...myCase,
diff --git a/x-pack/plugins/cases/server/client/cases/update.ts b/x-pack/plugins/cases/server/client/cases/update.ts
index f1f13c6ed362a9..07423b49046850 100644
--- a/x-pack/plugins/cases/server/client/cases/update.ts
+++ b/x-pack/plugins/cases/server/client/cases/update.ts
@@ -25,15 +25,15 @@ import type {
   CaseAssignees,
   CaseAttributes,
   CasePatchRequest,
-  CaseResponse,
+  Case,
   CasesPatchRequest,
-  CasesResponse,
+  Cases,
   CommentAttributes,
   User,
 } from '../../../common/api';
 import {
   CasesPatchRequestRt,
-  CasesResponseRt,
+  CasesRt,
   CaseStatuses,
   CommentType,
   excess,
@@ -62,7 +62,7 @@ import { Operations } from '../../authorization';
 import { dedupAssignees, getClosedInfoForUpdate, getDurationForUpdate } from './utils';
 import { LICENSING_CASE_ASSIGNMENT_FEATURE } from '../../common/constants';
 import type { LicensingService } from '../../services/licensing';
-import type { CaseSavedObject } from '../../common/types';
+import type { CaseSavedObjectTransformed } from '../../common/types/case';
 
 /**
  * Throws an error if any of the requests attempt to update the owner of a case.
@@ -257,7 +257,7 @@ async function updateAlerts({
 }
 
 function partitionPatchRequest(
-  casesMap: Map<string, CaseSavedObject>,
+  casesMap: Map<string, CaseSavedObjectTransformed>,
   patchReqCases: CasePatchRequest[]
 ): {
   nonExistingCases: CasePatchRequest[];
@@ -292,7 +292,7 @@ function partitionPatchRequest(
 
 interface UpdateRequestWithOriginalCase {
   updateReq: CasePatchRequest;
-  originalCase: CaseSavedObject;
+  originalCase: CaseSavedObjectTransformed;
 }
 
 /**
@@ -303,7 +303,7 @@ interface UpdateRequestWithOriginalCase {
 export const update = async (
   cases: CasesPatchRequest,
   clientArgs: CasesClientArgs
-): Promise<CasesResponse> => {
+): Promise<Cases> => {
   const {
     services: {
       caseService,
@@ -335,7 +335,7 @@ export const update = async (
     const casesMap = myCases.saved_objects.reduce((acc, so) => {
       acc.set(so.id, so);
       return acc;
-    }, new Map<string, CaseSavedObject>());
+    }, new Map<string, CaseSavedObjectTransformed>());
 
     const { nonExistingCases, conflictedCases, casesToAuthorize } = partitionPatchRequest(
       casesMap,
@@ -442,7 +442,7 @@ export const update = async (
           savedObject: mergeOriginalSOWithUpdatedSO(originalCase, updatedCase),
         }),
       ];
-    }, [] as CaseResponse[]);
+    }, [] as Case[]);
 
     await userActionService.creator.bulkCreateUpdateCase({
       originalCases: myCases.saved_objects,
@@ -458,7 +458,7 @@ export const update = async (
 
     await notificationService.bulkNotifyAssignees(casesAndAssigneesToNotifyForAssignment);
 
-    return CasesResponseRt.encode(returnUpdatedCase);
+    return CasesRt.encode(returnUpdatedCase);
   } catch (error) {
     const idVersions = cases.cases.map((caseInfo) => ({
       id: caseInfo.id,
@@ -521,11 +521,11 @@ const patchCases = async ({
 
 const getCasesAndAssigneesToNotifyForAssignment = (
   updatedCases: SavedObjectsBulkUpdateResponse<CaseAttributes>,
-  casesMap: Map<string, CaseSavedObject>,
+  casesMap: Map<string, CaseSavedObjectTransformed>,
   user: CasesClientArgs['user']
 ) => {
   return updatedCases.saved_objects.reduce<
-    Array<{ assignees: CaseAssignees; theCase: CaseSavedObject }>
+    Array<{ assignees: CaseAssignees; theCase: CaseSavedObjectTransformed }>
   >((acc, updatedCase) => {
     const originalCaseSO = casesMap.get(updatedCase.id);
 
@@ -554,9 +554,9 @@ const getCasesAndAssigneesToNotifyForAssignment = (
 };
 
 const mergeOriginalSOWithUpdatedSO = (
-  originalSO: CaseSavedObject,
+  originalSO: CaseSavedObjectTransformed,
   updatedSO: SavedObjectsUpdateResponse<CaseAttributes>
-): CaseSavedObject => {
+): CaseSavedObjectTransformed => {
   return {
     ...originalSO,
     ...updatedSO,
diff --git a/x-pack/plugins/cases/server/client/cases/utils.ts b/x-pack/plugins/cases/server/client/cases/utils.ts
index 1288c2ecc48d7a..ecf5aaf4414479 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.ts
@@ -15,7 +15,7 @@ import { isPushedUserAction } from '../../../common/utils/user_actions';
 import type {
   ActionConnector,
   CaseFullExternalService,
-  CaseResponse,
+  Case,
   CommentResponse,
   User,
   CaseAttributes,
@@ -34,7 +34,7 @@ import { getCaseViewPath } from '../../common/utils';
 import * as i18n from './translations';
 
 interface CreateIncidentArgs {
-  theCase: CaseResponse;
+  theCase: Case;
   userActions: CaseUserActionsDeprecatedResponse;
   connector: ActionConnector;
   alerts: CasesClientGetAlertsResponse;
@@ -106,7 +106,7 @@ interface CountAlertsInfo {
 }
 
 const getAlertsInfo = (
-  comments: CaseResponse['comments']
+  comments: Case['comments']
 ): { totalAlerts: number; hasUnpushedAlertComments: boolean } => {
   const countingInfo = { totalComments: 0, pushed: 0, totalAlerts: 0 };
 
@@ -129,7 +129,7 @@ const getAlertsInfo = (
 };
 
 const addAlertMessage = (params: {
-  theCase: CaseResponse;
+  theCase: Case;
   externalServiceComments: ExternalServiceComment[];
   spaceId: string;
   publicBaseUrl?: IBasePath['publicBaseUrl'];
@@ -238,7 +238,7 @@ export const formatComments = ({
   userProfiles,
   publicBaseUrl,
 }: {
-  theCase: CaseResponse;
+  theCase: Case;
   latestPushInfo: LatestPushInfo;
   userActions: CaseUserActionsDeprecatedResponse;
   spaceId: string;
@@ -275,7 +275,7 @@ export const formatComments = ({
 };
 
 export const addKibanaInformationToDescription = (
-  theCase: CaseResponse,
+  theCase: Case,
   spaceId: string,
   userProfiles?: Map<string, UserProfile>,
   publicBaseUrl?: IBasePath['publicBaseUrl']
@@ -307,7 +307,7 @@ export const addKibanaInformationToDescription = (
 };
 
 const addKibanaInformationToComments = (
-  comments: CaseResponse['comments'] = [],
+  comments: Case['comments'] = [],
   userProfiles?: Map<string, UserProfile>
 ): ExternalServiceComment[] =>
   comments.map((theComment) => {
@@ -328,7 +328,7 @@ const addKibanaInformationToComments = (
   });
 
 export const getEntity = (
-  entity: { createdBy: CaseResponse['created_by']; updatedBy: CaseResponse['updated_by'] },
+  entity: { createdBy: Case['created_by']; updatedBy: Case['updated_by'] },
   userProfiles?: Map<string, UserProfile>
 ): string => {
   return (
diff --git a/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts b/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
index e8211662c18207..56c81a9a41d597 100644
--- a/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/actions/actions.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../../common/api';
+import type { Case } from '../../../../common/api';
 import { createCasesClientMock } from '../../mocks';
 import type { CasesClientArgs } from '../../types';
 import { loggingSystemMock } from '@kbn/core/server/mocks';
@@ -30,7 +30,7 @@ const constructorOptions = { caseId: 'test-id', casesClient: clientMock, clientA
 describe('Actions', () => {
   beforeAll(() => {
     getAuthorizationFilter.mockResolvedValue({});
-    clientMock.cases.get.mockResolvedValue({ id: '' } as unknown as CaseResponse);
+    clientMock.cases.get.mockResolvedValue({ id: '' } as unknown as Case);
   });
 
   beforeEach(() => {
diff --git a/x-pack/plugins/cases/server/client/metrics/alerts/count.test.ts b/x-pack/plugins/cases/server/client/metrics/alerts/count.test.ts
index 15209b16081940..9fa308f93049ee 100644
--- a/x-pack/plugins/cases/server/client/metrics/alerts/count.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/alerts/count.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../../common/api';
+import type { Case } from '../../../../common/api';
 import { createCasesClientMock } from '../../mocks';
 import type { CasesClientArgs } from '../../types';
 import { loggingSystemMock } from '@kbn/core/server/mocks';
@@ -32,7 +32,7 @@ const constructorOptions = { caseId: 'test-id', casesClient: clientMock, clientA
 describe('AlertsCount', () => {
   beforeAll(() => {
     getAuthorizationFilter.mockResolvedValue({});
-    clientMock.cases.get.mockResolvedValue({ id: 'test-id' } as unknown as CaseResponse);
+    clientMock.cases.get.mockResolvedValue({ id: 'test-id' } as unknown as Case);
   });
 
   beforeEach(() => {
diff --git a/x-pack/plugins/cases/server/client/metrics/all_cases/mttr.test.ts b/x-pack/plugins/cases/server/client/metrics/all_cases/mttr.test.ts
index a13346d2ecfab4..bff57ce82a176b 100644
--- a/x-pack/plugins/cases/server/client/metrics/all_cases/mttr.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/all_cases/mttr.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../../common/api';
+import type { Case } from '../../../../common/api';
 import { createCasesClientMock } from '../../mocks';
 import type { CasesClientArgs } from '../../types';
 import { loggingSystemMock } from '@kbn/core/server/mocks';
@@ -32,7 +32,7 @@ const constructorOptions = { casesClient: clientMock, clientArgs };
 describe('MTTR', () => {
   beforeAll(() => {
     getAuthorizationFilter.mockResolvedValue({});
-    clientMock.cases.get.mockResolvedValue({ id: '' } as unknown as CaseResponse);
+    clientMock.cases.get.mockResolvedValue({ id: '' } as unknown as Case);
   });
 
   beforeEach(() => {
diff --git a/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts b/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
index 1fabee2893e069..023b951dcbf98c 100644
--- a/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/get_case_metrics.test.ts
@@ -8,7 +8,7 @@
 import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import { getCaseMetrics } from './get_case_metrics';
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 import { CaseStatuses } from '../../../common/api';
 import type { CasesClientMock } from '../mocks';
 import { createCasesClientMock } from '../mocks';
@@ -21,7 +21,7 @@ import {
 } from '../../services/mocks';
 import { mockAlertsService } from './test_utils/alerts';
 import { createStatusChangeSavedObject } from './test_utils/lifespan';
-import type { CaseSavedObject } from '../../common/types';
+import type { CaseSavedObjectTransformed } from '../../common/types/case';
 
 describe('getCaseMetrics', () => {
   const inProgressStatusChangeTimestamp = new Date('2021-11-23T20:00:43Z');
@@ -164,7 +164,7 @@ function createMockClient() {
     return {
       created_at: '2021-11-23T19:59:43Z',
       closed_at: '2021-11-23T19:59:44Z',
-    } as unknown as CaseResponse;
+    } as unknown as Case;
   });
 
   client.attachments.getAllAlertsAttachToCase.mockImplementation(async () => {
@@ -191,7 +191,7 @@ function createMockClientArgs() {
       attributes: {
         owner: 'security',
       },
-    } as unknown as CaseSavedObject;
+    } as unknown as CaseSavedObjectTransformed;
   });
 
   const alertsService = mockAlertsService();
diff --git a/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts b/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
index 808b6f334e15f7..a36e9eb8a106bd 100644
--- a/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
+++ b/x-pack/plugins/cases/server/client/metrics/lifespan.test.ts
@@ -6,7 +6,7 @@
  */
 
 import type { SavedObject } from '@kbn/core/server';
-import type { CaseUserActionInjectedAttributes } from '../../../common/api';
+import type { UserActionAttributes } from '../../../common/api';
 import { CaseStatuses } from '../../../common/api';
 import { getStatusInfo } from './lifespan';
 import { createStatusChangeSavedObject } from './test_utils/lifespan';
@@ -120,7 +120,7 @@ describe('lifespan', () => {
         [
           {
             attributes: { payload: { hello: 1, status: CaseStatuses.closed }, type: 'status' },
-          } as unknown as SavedObject<CaseUserActionInjectedAttributes>,
+          } as unknown as SavedObject<UserActionAttributes>,
         ],
         new Date(0)
       );
@@ -133,7 +133,7 @@ describe('lifespan', () => {
         [
           {
             attributes: { payload: { status: CaseStatuses.closed }, type: 'awesome' },
-          } as unknown as SavedObject<CaseUserActionInjectedAttributes>,
+          } as unknown as SavedObject<UserActionAttributes>,
         ],
         new Date(0)
       );
@@ -149,7 +149,7 @@ describe('lifespan', () => {
               payload: { status: CaseStatuses.closed, created_at: 'blah' },
               type: 'status',
             },
-          } as unknown as SavedObject<CaseUserActionInjectedAttributes>,
+          } as unknown as SavedObject<UserActionAttributes>,
         ],
         new Date(0)
       );
diff --git a/x-pack/plugins/cases/server/client/metrics/lifespan.ts b/x-pack/plugins/cases/server/client/metrics/lifespan.ts
index a78e5397b7a131..7e564c99f7fbc1 100644
--- a/x-pack/plugins/cases/server/client/metrics/lifespan.ts
+++ b/x-pack/plugins/cases/server/client/metrics/lifespan.ts
@@ -7,7 +7,7 @@
 
 import type { SavedObject } from '@kbn/core/server';
 import type {
-  CaseUserActionInjectedAttributes,
+  UserActionAttributes,
   SingleCaseMetricsResponse,
   StatusInfo,
   StatusUserAction,
@@ -83,7 +83,7 @@ interface StatusCalculations {
 }
 
 export function getStatusInfo(
-  statusUserActions: Array<SavedObject<CaseUserActionInjectedAttributes>>,
+  statusUserActions: Array<SavedObject<UserActionAttributes>>,
   caseOpenTimestamp: Date
 ): StatusInfo {
   const accStatusInfo = statusUserActions.reduce<StatusCalculations>(
@@ -138,7 +138,7 @@ export function getStatusInfo(
 }
 
 function isValidStatusChangeUserAction(
-  attributes: CaseUserActionInjectedAttributes,
+  attributes: UserActionAttributes,
   newStatusChangeTimestamp: Date
 ): attributes is UserActionWithResponse<StatusUserAction> {
   return StatusUserActionRt.is(attributes) && isDateValid(newStatusChangeTimestamp);
diff --git a/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts b/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
index 62593e39e7d5cb..b54204003b8eed 100644
--- a/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
+++ b/x-pack/plugins/cases/server/client/metrics/test_utils/lifespan.ts
@@ -6,12 +6,12 @@
  */
 
 import type { SavedObject } from '@kbn/core/server';
-import type { CaseStatuses, CaseUserActionInjectedAttributes } from '../../../../common/api';
+import type { CaseStatuses, UserActionAttributes } from '../../../../common/api';
 
 export function createStatusChangeSavedObject(
   status: CaseStatuses,
   createdAt: Date
-): SavedObject<CaseUserActionInjectedAttributes> {
+): SavedObject<UserActionAttributes> {
   return {
     references: [],
     id: '',
diff --git a/x-pack/plugins/cases/server/client/typedoc_interfaces.ts b/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
index 7234efdf5d3559..f0fe44d4d44da2 100644
--- a/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
+++ b/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
@@ -17,15 +17,15 @@ import type {
   AllCommentsResponse,
   CasePostRequest,
   CaseResolveResponse,
-  CaseResponse,
+  Case,
   CasesConfigurePatch,
   CasesConfigureRequest,
   CasesConfigureResponse,
   CasesFindRequest,
   CasesFindResponse,
   CasesPatchRequest,
-  CasesResponse,
-  CaseUserActionsResponse,
+  Cases,
+  UserActions,
   CommentsResponse,
   CasesBulkGetResponse,
 } from '../../common/api';
@@ -38,9 +38,9 @@ import type {
 export interface ICasePostRequest extends CasePostRequest {}
 export interface ICasesFindRequest extends CasesFindRequest {}
 export interface ICasesPatchRequest extends CasesPatchRequest {}
-export interface ICaseResponse extends CaseResponse {}
+export interface ICaseResponse extends Case {}
 export interface ICaseResolveResponse extends CaseResolveResponse {}
-export interface ICasesResponse extends CasesResponse {}
+export interface ICasesResponse extends Cases {}
 export interface ICasesFindResponse extends CasesFindResponse {}
 export interface ICasesBulkGetResponse extends CasesBulkGetResponse {}
 
@@ -51,4 +51,4 @@ export interface ICasesConfigurePatch extends CasesConfigurePatch {}
 export interface ICommentsResponse extends CommentsResponse {}
 export interface IAllCommentsResponse extends AllCommentsResponse {}
 
-export interface ICaseUserActionsResponse extends CaseUserActionsResponse {}
+export interface ICaseUserActionsResponse extends UserActions {}
diff --git a/x-pack/plugins/cases/server/client/user_actions/connectors.ts b/x-pack/plugins/cases/server/client/user_actions/connectors.ts
index e6c7a9721a5a84..fad0d37540ce25 100644
--- a/x-pack/plugins/cases/server/client/user_actions/connectors.ts
+++ b/x-pack/plugins/cases/server/client/user_actions/connectors.ts
@@ -13,7 +13,7 @@ import type { SavedObject } from '@kbn/core-saved-objects-common';
 import type {
   GetCaseConnectorsResponse,
   CaseConnector,
-  CaseUserActionInjectedAttributes,
+  UserActionAttributes,
   CaseExternalServiceBasic,
   GetCaseConnectorsPushDetails,
 } from '../../../common/api';
@@ -75,7 +75,7 @@ const checkConnectorsAuthorization = async ({
   authorization,
 }: {
   connectors: CaseConnectorActivity[];
-  latestUserAction?: SavedObject<CaseUserActionInjectedAttributes>;
+  latestUserAction?: SavedObject<UserActionAttributes>;
   authorization: PublicMethodsOf<Authorization>;
 }) => {
   const entities: OwnerEntity[] = latestUserAction
@@ -127,7 +127,7 @@ const getConnectorsInfo = async ({
 }: {
   caseId: string;
   connectors: CaseConnectorActivity[];
-  latestUserAction?: SavedObject<CaseUserActionInjectedAttributes>;
+  latestUserAction?: SavedObject<UserActionAttributes>;
   actionsClient: PublicMethodsOf<ActionsClient>;
   userActionService: CaseUserActionService;
   logger: CasesClientArgs['logger'];
@@ -224,7 +224,7 @@ const getPushDetails = (activity: CaseConnectorActivity[]) => {
 };
 
 const getExternalServiceFromSavedObject = (
-  savedObject: SavedObject<CaseUserActionInjectedAttributes> | undefined
+  savedObject: SavedObject<UserActionAttributes> | undefined
 ): CaseExternalServiceBasic | undefined => {
   if (savedObject != null && isPushedUserAction(savedObject.attributes)) {
     return savedObject.attributes.payload.externalService;
@@ -248,7 +248,7 @@ const isDateValid = (date: Date): boolean => {
 };
 
 const getConnectorInfoFromSavedObject = (
-  savedObject: SavedObject<CaseUserActionInjectedAttributes> | undefined
+  savedObject: SavedObject<UserActionAttributes> | undefined
 ): CaseConnector | undefined => {
   if (
     savedObject != null &&
@@ -268,7 +268,7 @@ const createConnectorInfoResult = ({
   actionConnectors: ActionResult[];
   connectors: CaseConnectorActivity[];
   pushInfo: Map<string, EnrichedPushInfo>;
-  latestUserAction?: SavedObject<CaseUserActionInjectedAttributes>;
+  latestUserAction?: SavedObject<UserActionAttributes>;
 }) => {
   const results: GetCaseConnectorsResponse = {};
   const actionConnectorsMap = new Map(
diff --git a/x-pack/plugins/cases/server/client/user_actions/utils.ts b/x-pack/plugins/cases/server/client/user_actions/utils.ts
index 98df79b6e94ab9..bc2deb2b2caf6e 100644
--- a/x-pack/plugins/cases/server/client/user_actions/utils.ts
+++ b/x-pack/plugins/cases/server/client/user_actions/utils.ts
@@ -7,8 +7,8 @@
 
 import type { SavedObjectsFindResponse } from '@kbn/core-saved-objects-api-server';
 import type {
-  CaseUserActionInjectedAttributes,
-  CaseUserActionsResponse,
+  UserActionAttributes,
+  UserActions,
   CaseUserActionsDeprecatedResponse,
   CaseUserActionDeprecatedResponse,
 } from '../../../common/api';
@@ -20,6 +20,6 @@ export const extractAttributes = (
 };
 
 export const formatSavedObjects = (
-  response: SavedObjectsFindResponse<CaseUserActionInjectedAttributes>
-): CaseUserActionsResponse =>
+  response: SavedObjectsFindResponse<UserActionAttributes>
+): UserActions =>
   response.saved_objects.map((so) => ({ id: so.id, version: so.version ?? '', ...so.attributes }));
diff --git a/x-pack/plugins/cases/server/client/utils.test.ts b/x-pack/plugins/cases/server/client/utils.test.ts
index fb3e89b598b032..2b63f9c7321053 100644
--- a/x-pack/plugins/cases/server/client/utils.test.ts
+++ b/x-pack/plugins/cases/server/client/utils.test.ts
@@ -12,7 +12,6 @@ import { toElasticsearchQuery } from '@kbn/es-query';
 
 import { CaseStatuses } from '../../common';
 import { CaseSeverity } from '../../common/api';
-import { ESCaseSeverity, ESCaseStatus } from '../services/cases/types';
 import { createSavedObjectsSerializerMock } from './mocks';
 import {
   arraysDifference,
@@ -22,6 +21,7 @@ import {
   constructSearch,
   convertSortField,
 } from './utils';
+import { CasePersistedSeverity, CasePersistedStatus } from '../common/types/case';
 
 describe('utils', () => {
   describe('convertSortField', () => {
@@ -401,9 +401,9 @@ describe('utils', () => {
     });
 
     it.each([
-      [CaseStatuses.open, ESCaseStatus.OPEN],
-      [CaseStatuses['in-progress'], ESCaseStatus.IN_PROGRESS],
-      [CaseStatuses.closed, ESCaseStatus.CLOSED],
+      [CaseStatuses.open, CasePersistedStatus.OPEN],
+      [CaseStatuses['in-progress'], CasePersistedStatus.IN_PROGRESS],
+      [CaseStatuses.closed, CasePersistedStatus.CLOSED],
     ])('creates a filter for status "%s"', (status, expectedStatus) => {
       expect(constructQueryOptions({ status }).filter).toMatchInlineSnapshot(`
         Object {
@@ -426,10 +426,10 @@ describe('utils', () => {
     });
 
     it.each([
-      [CaseSeverity.LOW, ESCaseSeverity.LOW],
-      [CaseSeverity.MEDIUM, ESCaseSeverity.MEDIUM],
-      [CaseSeverity.HIGH, ESCaseSeverity.HIGH],
-      [CaseSeverity.CRITICAL, ESCaseSeverity.CRITICAL],
+      [CaseSeverity.LOW, CasePersistedSeverity.LOW],
+      [CaseSeverity.MEDIUM, CasePersistedSeverity.MEDIUM],
+      [CaseSeverity.HIGH, CasePersistedSeverity.HIGH],
+      [CaseSeverity.CRITICAL, CasePersistedSeverity.CRITICAL],
     ])('creates a filter for severity "%s"', (severity, expectedSeverity) => {
       expect(constructQueryOptions({ severity }).filter).toMatchInlineSnapshot(`
         Object {
diff --git a/x-pack/plugins/cases/server/common/constants.ts b/x-pack/plugins/cases/server/common/constants.ts
index 822907b83be39d..69c1f3e619c970 100644
--- a/x-pack/plugins/cases/server/common/constants.ts
+++ b/x-pack/plugins/cases/server/common/constants.ts
@@ -7,7 +7,7 @@
 
 import { CaseSeverity, CaseStatuses } from '../../common/api';
 import { CASE_COMMENT_SAVED_OBJECT, CASE_SAVED_OBJECT } from '../../common/constants';
-import { ESCaseSeverity, ESCaseStatus } from '../services/cases/types';
+import { CasePersistedSeverity, CasePersistedStatus } from './types/case';
 
 /**
  * The name of the saved object reference indicating the action connector ID. This is stored in the Saved Object reference
@@ -40,28 +40,28 @@ export const EXTERNAL_REFERENCE_REF_NAME = 'externalReferenceId';
  */
 export const LICENSING_CASE_ASSIGNMENT_FEATURE = 'Cases user assignment';
 
-export const SEVERITY_EXTERNAL_TO_ESMODEL: Record<CaseSeverity, ESCaseSeverity> = {
-  [CaseSeverity.LOW]: ESCaseSeverity.LOW,
-  [CaseSeverity.MEDIUM]: ESCaseSeverity.MEDIUM,
-  [CaseSeverity.HIGH]: ESCaseSeverity.HIGH,
-  [CaseSeverity.CRITICAL]: ESCaseSeverity.CRITICAL,
+export const SEVERITY_EXTERNAL_TO_ESMODEL: Record<CaseSeverity, CasePersistedSeverity> = {
+  [CaseSeverity.LOW]: CasePersistedSeverity.LOW,
+  [CaseSeverity.MEDIUM]: CasePersistedSeverity.MEDIUM,
+  [CaseSeverity.HIGH]: CasePersistedSeverity.HIGH,
+  [CaseSeverity.CRITICAL]: CasePersistedSeverity.CRITICAL,
 };
 
-export const SEVERITY_ESMODEL_TO_EXTERNAL: Record<ESCaseSeverity, CaseSeverity> = {
-  [ESCaseSeverity.LOW]: CaseSeverity.LOW,
-  [ESCaseSeverity.MEDIUM]: CaseSeverity.MEDIUM,
-  [ESCaseSeverity.HIGH]: CaseSeverity.HIGH,
-  [ESCaseSeverity.CRITICAL]: CaseSeverity.CRITICAL,
+export const SEVERITY_ESMODEL_TO_EXTERNAL: Record<CasePersistedSeverity, CaseSeverity> = {
+  [CasePersistedSeverity.LOW]: CaseSeverity.LOW,
+  [CasePersistedSeverity.MEDIUM]: CaseSeverity.MEDIUM,
+  [CasePersistedSeverity.HIGH]: CaseSeverity.HIGH,
+  [CasePersistedSeverity.CRITICAL]: CaseSeverity.CRITICAL,
 };
 
-export const STATUS_EXTERNAL_TO_ESMODEL: Record<CaseStatuses, ESCaseStatus> = {
-  [CaseStatuses.open]: ESCaseStatus.OPEN,
-  [CaseStatuses['in-progress']]: ESCaseStatus.IN_PROGRESS,
-  [CaseStatuses.closed]: ESCaseStatus.CLOSED,
+export const STATUS_EXTERNAL_TO_ESMODEL: Record<CaseStatuses, CasePersistedStatus> = {
+  [CaseStatuses.open]: CasePersistedStatus.OPEN,
+  [CaseStatuses['in-progress']]: CasePersistedStatus.IN_PROGRESS,
+  [CaseStatuses.closed]: CasePersistedStatus.CLOSED,
 };
 
-export const STATUS_ESMODEL_TO_EXTERNAL: Record<ESCaseStatus, CaseStatuses> = {
-  [ESCaseStatus.OPEN]: CaseStatuses.open,
-  [ESCaseStatus.IN_PROGRESS]: CaseStatuses['in-progress'],
-  [ESCaseStatus.CLOSED]: CaseStatuses.closed,
+export const STATUS_ESMODEL_TO_EXTERNAL: Record<CasePersistedStatus, CaseStatuses> = {
+  [CasePersistedStatus.OPEN]: CaseStatuses.open,
+  [CasePersistedStatus.IN_PROGRESS]: CaseStatuses['in-progress'],
+  [CasePersistedStatus.CLOSED]: CaseStatuses.closed,
 };
diff --git a/x-pack/plugins/cases/server/common/models/case_with_comments.ts b/x-pack/plugins/cases/server/common/models/case_with_comments.ts
index 2febbd22da77f3..93d4c04261f523 100644
--- a/x-pack/plugins/cases/server/common/models/case_with_comments.ts
+++ b/x-pack/plugins/cases/server/common/models/case_with_comments.ts
@@ -13,26 +13,21 @@ import type {
   SavedObjectsUpdateResponse,
 } from '@kbn/core/server';
 import type {
-  CaseResponse,
+  Case,
   CommentAttributes,
   CommentPatchRequest,
   CommentRequest,
   CommentRequestUserType,
   CommentRequestAlertType,
 } from '../../../common/api';
-import {
-  CaseResponseRt,
-  CaseStatuses,
-  CommentType,
-  ActionTypes,
-  Actions,
-} from '../../../common/api';
+import { CaseRt, CaseStatuses, CommentType, ActionTypes, Actions } from '../../../common/api';
 import { CASE_SAVED_OBJECT, MAX_DOCS_PER_PAGE } from '../../../common/constants';
 import type { CasesClientArgs } from '../../client';
 import type { RefreshSetting } from '../../services/types';
 import { createCaseError } from '../error';
 import { AttachmentLimitChecker } from '../limiter_checker';
-import type { AlertInfo, CaseSavedObject } from '../types';
+import type { AlertInfo } from '../types';
+import type { CaseSavedObjectTransformed } from '../types/case';
 import {
   countAlertsForID,
   flattenCommentSavedObjects,
@@ -51,9 +46,9 @@ type CommentRequestWithId = Array<{ id: string } & CommentRequest>;
  */
 export class CaseCommentModel {
   private readonly params: CaseCommentModelParams;
-  private readonly caseInfo: CaseSavedObject;
+  private readonly caseInfo: CaseSavedObjectTransformed;
 
-  private constructor(caseInfo: CaseSavedObject, params: CaseCommentModelParams) {
+  private constructor(caseInfo: CaseSavedObjectTransformed, params: CaseCommentModelParams) {
     this.caseInfo = caseInfo;
     this.params = params;
   }
@@ -69,7 +64,7 @@ export class CaseCommentModel {
     return new CaseCommentModel(savedObject, options);
   }
 
-  public get savedObject(): CaseSavedObject {
+  public get savedObject(): CaseSavedObjectTransformed {
     return this.caseInfo;
   }
 
@@ -179,7 +174,7 @@ export class CaseCommentModel {
     }
   }
 
-  private newObjectWithInfo(caseInfo: CaseSavedObject): CaseCommentModel {
+  private newObjectWithInfo(caseInfo: CaseSavedObjectTransformed): CaseCommentModel {
     return new CaseCommentModel(caseInfo, this.params);
   }
 
@@ -434,7 +429,7 @@ export class CaseCommentModel {
     };
   }
 
-  public async encodeWithComments(): Promise<CaseResponse> {
+  public async encodeWithComments(): Promise<Case> {
     try {
       const comments = await this.params.services.caseService.getAllCaseComments({
         id: this.caseInfo.id,
@@ -453,7 +448,7 @@ export class CaseCommentModel {
         ...this.formatForEncoding(comments.total),
       };
 
-      return CaseResponseRt.encode(caseResponse);
+      return CaseRt.encode(caseResponse);
     } catch (error) {
       throw createCaseError({
         message: `Failed encoding the commentable case, case id: ${this.caseInfo.id}: ${error}`,
diff --git a/x-pack/plugins/cases/server/common/types.ts b/x-pack/plugins/cases/server/common/types.ts
index 0f4d64f60dfa60..a622126f0b3059 100644
--- a/x-pack/plugins/cases/server/common/types.ts
+++ b/x-pack/plugins/cases/server/common/types.ts
@@ -5,14 +5,13 @@
  * 2.0.
  */
 
+import type { SavedObjectsFindOptions } from '@kbn/core-saved-objects-api-server';
 import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type { KueryNode } from '@kbn/es-query';
 import type {
-  CaseAttributes,
   CommentAttributes,
   CommentRequestExternalReferenceSOType,
   FileAttachmentMetadata,
-  SavedObjectFindOptions,
 } from '../../common/api';
 
 /**
@@ -23,12 +22,25 @@ export interface AlertInfo {
   index: string;
 }
 
-export type SavedObjectFindOptionsKueryNode = Omit<SavedObjectFindOptions, 'filter'> & {
+type FindOptions = Pick<
+  SavedObjectsFindOptions,
+  | 'defaultSearchOperator'
+  | 'hasReferenceOperator'
+  | 'perPage'
+  | 'hasReference'
+  | 'fields'
+  | 'page'
+  | 'search'
+  | 'searchFields'
+  | 'sortField'
+  | 'sortOrder'
+  | 'rootSearchFields'
+>;
+
+export type SavedObjectFindOptionsKueryNode = FindOptions & {
   filter?: KueryNode;
 };
 
-export type CaseSavedObject = SavedObject<CaseAttributes>;
-
 export type FileAttachmentRequest = Omit<
   CommentRequestExternalReferenceSOType,
   'externalReferenceMetadata'
diff --git a/x-pack/plugins/cases/server/common/types/attachments.ts b/x-pack/plugins/cases/server/common/types/attachments.ts
new file mode 100644
index 00000000000000..55b9990c5fb123
--- /dev/null
+++ b/x-pack/plugins/cases/server/common/types/attachments.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { JsonValue } from '@kbn/utility-types';
+import type { User } from './user';
+
+interface AttachmentCommonPersistedAttributes {
+  created_at: string;
+  created_by: User;
+  owner: string;
+  pushed_at: string | null;
+  pushed_by: User | null;
+  updated_at: string | null;
+  updated_by: User | null;
+}
+
+export interface AttachmentRequestAttributes {
+  type: string;
+  alertId?: string | string[];
+  index?: string | string[];
+  rule?: {
+    id: string | null;
+    name: string | null;
+  };
+  comment?: string;
+  actions?: {
+    targets: Array<{
+      hostname: string;
+      endpointId: string;
+    }>;
+    type: string;
+  };
+  externalReferenceMetadata?: Record<string, JsonValue> | null;
+  externalReferenceAttachmentTypeId?: string;
+  externalReferenceStorage?: {
+    type: string;
+    soType?: string;
+  };
+  persistableStateAttachmentState?: Record<string, JsonValue>;
+  persistableStateAttachmentTypeId?: string;
+}
+
+export type AttachmentPersistedAttributes = AttachmentRequestAttributes &
+  AttachmentCommonPersistedAttributes;
diff --git a/x-pack/plugins/cases/server/common/types/case.ts b/x-pack/plugins/cases/server/common/types/case.ts
new file mode 100644
index 00000000000000..8e425853964c0a
--- /dev/null
+++ b/x-pack/plugins/cases/server/common/types/case.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SavedObject } from '@kbn/core-saved-objects-server';
+import type { CaseAttributes } from '../../../common/api';
+import type { ConnectorPersisted } from './connectors';
+import type { ExternalServicePersisted } from './external_service';
+import type { User, UserProfile } from './user';
+
+export enum CasePersistedSeverity {
+  LOW = 0,
+  MEDIUM = 10,
+  HIGH = 20,
+  CRITICAL = 30,
+}
+
+export enum CasePersistedStatus {
+  OPEN = 0,
+  IN_PROGRESS = 10,
+  CLOSED = 20,
+}
+
+export interface CasePersistedAttributes {
+  assignees: UserProfile[];
+  closed_at: string | null;
+  closed_by: User | null;
+  created_at: string;
+  created_by: User;
+  connector: ConnectorPersisted;
+  description: string;
+  duration: number | null;
+  external_service: ExternalServicePersisted | null;
+  owner: string;
+  settings: { syncAlerts: boolean };
+  severity: CasePersistedSeverity;
+  status: CasePersistedStatus;
+  tags: string[];
+  title: string;
+  total_alerts: number;
+  total_comments: number;
+  updated_at: string | null;
+  updated_by: User | null;
+}
+
+export type CaseTransformedAttributes = CaseAttributes;
+
+export type CaseSavedObject = SavedObject<CasePersistedAttributes>;
+export type CaseSavedObjectTransformed = SavedObject<CaseTransformedAttributes>;
diff --git a/x-pack/plugins/cases/server/common/types/configure.ts b/x-pack/plugins/cases/server/common/types/configure.ts
new file mode 100644
index 00000000000000..0018d50b702b5f
--- /dev/null
+++ b/x-pack/plugins/cases/server/common/types/configure.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 { ConnectorPersisted } from './connectors';
+import type { User } from './user';
+
+export interface ConfigurePersistedAttributes {
+  connector: ConnectorPersisted;
+  closure_type: string;
+  owner: string;
+  created_at: string;
+  created_by: User;
+  updated_at: string | null;
+  updated_by: User | null;
+}
diff --git a/x-pack/plugins/lens/public/shared_components/field_picker/index.ts b/x-pack/plugins/cases/server/common/types/connector_mappings.ts
similarity index 60%
rename from x-pack/plugins/lens/public/shared_components/field_picker/index.ts
rename to x-pack/plugins/cases/server/common/types/connector_mappings.ts
index f434f885f44d4c..d4f20075745f2a 100644
--- a/x-pack/plugins/lens/public/shared_components/field_picker/index.ts
+++ b/x-pack/plugins/cases/server/common/types/connector_mappings.ts
@@ -5,6 +5,11 @@
  * 2.0.
  */
 
-export { FieldPicker } from './field_picker';
-export { TruncatedLabel } from './truncated_label';
-export type { FieldOptionValue, FieldOption } from './types';
+export interface ConnectorMappingsPersistedAttributes {
+  mappings: Array<{
+    action_type: string;
+    source: string;
+    target: string;
+  }>;
+  owner: string;
+}
diff --git a/x-pack/plugins/cases/server/common/types/connectors.ts b/x-pack/plugins/cases/server/common/types/connectors.ts
new file mode 100644
index 00000000000000..995130260f8cdd
--- /dev/null
+++ b/x-pack/plugins/cases/server/common/types/connectors.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export type ConnectorPersistedFields = Array<{
+  key: string;
+  value: unknown;
+}>;
+
+export interface ConnectorPersisted {
+  name: string;
+  type: string;
+  fields: ConnectorPersistedFields | null;
+}
diff --git a/x-pack/plugins/cases/server/common/types/external_service.ts b/x-pack/plugins/cases/server/common/types/external_service.ts
new file mode 100644
index 00000000000000..187e088114eedd
--- /dev/null
+++ b/x-pack/plugins/cases/server/common/types/external_service.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { User } from './user';
+
+export interface ExternalServicePersisted {
+  connector_name: string;
+  external_id: string;
+  external_title: string;
+  external_url: string;
+  pushed_at: string;
+  pushed_by: User;
+}
diff --git a/x-pack/plugins/cases/server/common/types/user.ts b/x-pack/plugins/cases/server/common/types/user.ts
new file mode 100644
index 00000000000000..fa32986ef8d979
--- /dev/null
+++ b/x-pack/plugins/cases/server/common/types/user.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export interface User {
+  email: string | null | undefined;
+  full_name: string | null | undefined;
+  username: string | null | undefined;
+  profile_uid?: string;
+}
+
+export interface UserProfile {
+  uid: string;
+}
diff --git a/x-pack/plugins/cases/server/common/types/user_actions.ts b/x-pack/plugins/cases/server/common/types/user_actions.ts
new file mode 100644
index 00000000000000..14823f159a408d
--- /dev/null
+++ b/x-pack/plugins/cases/server/common/types/user_actions.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SavedObject } from '@kbn/core/server';
+import type { UserActionAttributes } from '../../../common/api';
+import type { User } from './user';
+
+interface UserActionCommonPersistedAttributes {
+  action: string;
+  created_at: string;
+  created_by: User;
+  owner: string;
+}
+
+export interface UserActionPersistedAttributes extends UserActionCommonPersistedAttributes {
+  type: string;
+  payload: Record<string, unknown>;
+}
+
+export type UserActionTransformedAttributes = UserActionAttributes;
+export type UserActionSavedObjectTransformed = SavedObject<UserActionTransformedAttributes>;
diff --git a/x-pack/plugins/cases/server/common/utils.test.ts b/x-pack/plugins/cases/server/common/utils.test.ts
index 684fe426d7dc5c..c2ef8281a5887a 100644
--- a/x-pack/plugins/cases/server/common/utils.test.ts
+++ b/x-pack/plugins/cases/server/common/utils.test.ts
@@ -10,7 +10,7 @@ import { makeLensEmbeddableFactory } from '@kbn/lens-plugin/server/embeddable/ma
 import { OWNER_INFO, SECURITY_SOLUTION_OWNER } from '../../common/constants';
 import type {
   CaseConnector,
-  CaseResponse,
+  Case,
   CommentAttributes,
   CommentRequest,
   CommentRequestUserType,
@@ -256,7 +256,7 @@ describe('common utils', () => {
 
   describe('transformCases', () => {
     it('transforms correctly', () => {
-      const casesMap = new Map<string, CaseResponse>(
+      const casesMap = new Map<string, Case>(
         mockCases.map((obj) => {
           return [obj.id, flattenCaseSavedObject({ savedObject: obj, totalComment: 2 })];
         })
diff --git a/x-pack/plugins/cases/server/common/utils.ts b/x-pack/plugins/cases/server/common/utils.ts
index 8949e01aceca7b..b04c9fd5965031 100644
--- a/x-pack/plugins/cases/server/common/utils.ts
+++ b/x-pack/plugins/cases/server/common/utils.ts
@@ -24,18 +24,16 @@ import {
   OWNER_INFO,
 } from '../../common/constants';
 import type { CASE_VIEW_PAGE_TABS } from '../../common/types';
-import type { AlertInfo, CaseSavedObject, FileAttachmentRequest } from './types';
+import type { AlertInfo, FileAttachmentRequest } from './types';
 
 import type {
-  CaseAttributes,
   CasePostRequest,
-  CaseResponse,
+  Case,
   CasesFindResponse,
   CommentAttributes,
   CommentRequest,
   CommentRequestActionsType,
   CommentRequestAlertType,
-  CommentRequestExternalReferenceSOType,
   CommentRequestUserType,
   CommentResponse,
   CommentsResponse,
@@ -46,7 +44,6 @@ import {
   CaseStatuses,
   CommentType,
   ConnectorTypes,
-  ExternalReferenceStorageType,
   ExternalReferenceSORt,
   FileAttachmentMetadataRt,
 } from '../../common/api';
@@ -56,6 +53,7 @@ import {
   getLensVisualizations,
 } from '../../common/utils/markdown_plugins/utils';
 import { dedupAssignees } from '../client/cases/utils';
+import type { CaseSavedObjectTransformed, CaseTransformedAttributes } from './types/case';
 
 /**
  * Default sort field for querying saved objects.
@@ -73,7 +71,7 @@ export const transformNewCase = ({
 }: {
   user: User;
   newCase: CasePostRequest;
-}): CaseAttributes => ({
+}): CaseTransformedAttributes => ({
   ...newCase,
   duration: null,
   severity: newCase.severity ?? CaseSeverity.LOW,
@@ -97,7 +95,7 @@ export const transformCases = ({
   perPage,
   total,
 }: {
-  casesMap: Map<string, CaseResponse>;
+  casesMap: Map<string, Case>;
   countOpenCases: number;
   countInProgressCases: number;
   countClosedCases: number;
@@ -120,11 +118,11 @@ export const flattenCaseSavedObject = ({
   totalComment = comments.length,
   totalAlerts = 0,
 }: {
-  savedObject: CaseSavedObject;
+  savedObject: CaseSavedObjectTransformed;
   comments?: Array<SavedObject<CommentAttributes>>;
   totalComment?: number;
   totalAlerts?: number;
-}): CaseResponse => ({
+}): Case => ({
   id: savedObject.id,
   version: savedObject.version ?? '0',
   comments: flattenCommentSavedObjects(comments),
@@ -254,18 +252,6 @@ export const isCommentRequestTypeAlert = (
   return context.type === CommentType.alert;
 };
 
-/**
- * A type narrowing function for external reference so attachments.
- */
-export const isCommentRequestTypeExternalReferenceSO = (
-  context: Partial<CommentRequest>
-): context is CommentRequestExternalReferenceSOType => {
-  return (
-    context.type === CommentType.externalReference &&
-    context.externalReferenceStorage?.type === ExternalReferenceStorageType.savedObject
-  );
-};
-
 /**
  * A type narrowing function for file attachments.
  */
diff --git a/x-pack/plugins/cases/server/connectors/jira/format.test.ts b/x-pack/plugins/cases/server/connectors/jira/format.test.ts
index 7ddabdf5e2ff13..acca9c7886ec21 100644
--- a/x-pack/plugins/cases/server/connectors/jira/format.test.ts
+++ b/x-pack/plugins/cases/server/connectors/jira/format.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 import { format } from './format';
 
 describe('Jira formatter', () => {
   const theCase = {
     tags: ['tag'],
     connector: { fields: { priority: 'High', issueType: 'Task', parent: null } },
-  } as CaseResponse;
+  } as Case;
 
   it('it formats correctly', async () => {
     const res = await format(theCase, []);
@@ -20,7 +20,7 @@ describe('Jira formatter', () => {
   });
 
   it('it formats correctly when fields do not exist ', async () => {
-    const invalidFields = { tags: ['tag'], connector: { fields: null } } as CaseResponse;
+    const invalidFields = { tags: ['tag'], connector: { fields: null } } as Case;
     const res = await format(invalidFields, []);
     expect(res).toEqual({ priority: null, issueType: null, parent: null, labels: theCase.tags });
   });
diff --git a/x-pack/plugins/cases/server/connectors/resilient/format.test.ts b/x-pack/plugins/cases/server/connectors/resilient/format.test.ts
index cd850bd28fe378..29ab88e09c388a 100644
--- a/x-pack/plugins/cases/server/connectors/resilient/format.test.ts
+++ b/x-pack/plugins/cases/server/connectors/resilient/format.test.ts
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 import { format } from './format';
 
 describe('IBM Resilient formatter', () => {
   const theCase = {
     connector: { fields: { incidentTypes: ['2'], severityCode: '2' } },
-  } as CaseResponse;
+  } as Case;
 
   it('it formats correctly', async () => {
     const res = await format(theCase, []);
@@ -19,7 +19,7 @@ describe('IBM Resilient formatter', () => {
   });
 
   it('it formats correctly when fields do not exist ', async () => {
-    const invalidFields = { tags: ['a tag'], connector: { fields: null } } as CaseResponse;
+    const invalidFields = { tags: ['a tag'], connector: { fields: null } } as Case;
     const res = await format(invalidFields, []);
     expect(res).toEqual({ incidentTypes: null, severityCode: null });
   });
diff --git a/x-pack/plugins/cases/server/connectors/servicenow/itsm_format.test.ts b/x-pack/plugins/cases/server/connectors/servicenow/itsm_format.test.ts
index 8db9ba7df48595..0edec51ce4f486 100644
--- a/x-pack/plugins/cases/server/connectors/servicenow/itsm_format.test.ts
+++ b/x-pack/plugins/cases/server/connectors/servicenow/itsm_format.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 import { format } from './itsm_format';
 
 describe('ITSM formatter', () => {
@@ -14,7 +14,7 @@ describe('ITSM formatter', () => {
     connector: {
       fields: { severity: '2', urgency: '2', impact: '2', category: 'software', subcategory: 'os' },
     },
-  } as CaseResponse;
+  } as Case;
 
   it('it formats correctly', async () => {
     const res = await format(theCase, []);
@@ -26,7 +26,7 @@ describe('ITSM formatter', () => {
   });
 
   it('it formats correctly when fields do not exist ', async () => {
-    const invalidFields = { connector: { fields: null } } as CaseResponse;
+    const invalidFields = { connector: { fields: null } } as Case;
     const res = await format(invalidFields, []);
     expect(res).toEqual({
       severity: null,
diff --git a/x-pack/plugins/cases/server/connectors/servicenow/sir_format.test.ts b/x-pack/plugins/cases/server/connectors/servicenow/sir_format.test.ts
index 6697aad205b928..23d14ec6b2d75c 100644
--- a/x-pack/plugins/cases/server/connectors/servicenow/sir_format.test.ts
+++ b/x-pack/plugins/cases/server/connectors/servicenow/sir_format.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 import { format } from './sir_format';
 
 describe('SIR formatter', () => {
@@ -22,7 +22,7 @@ describe('SIR formatter', () => {
         priority: '2 - High',
       },
     },
-  } as CaseResponse;
+  } as Case;
 
   it('it formats correctly without alerts', async () => {
     const res = await format(theCase, []);
@@ -40,7 +40,7 @@ describe('SIR formatter', () => {
   });
 
   it('it formats correctly when fields do not exist ', async () => {
-    const invalidFields = { connector: { fields: null } } as CaseResponse;
+    const invalidFields = { connector: { fields: null } } as Case;
     const res = await format(invalidFields, []);
     expect(res).toEqual({
       dest_ip: [],
@@ -159,7 +159,7 @@ describe('SIR formatter', () => {
     const newCase = {
       ...theCase,
       connector: { fields: { ...theCase.connector.fields, destIp: false, malwareHash: false } },
-    } as CaseResponse;
+    } as Case;
 
     const res = await format(newCase, alerts);
     expect(res).toEqual({
diff --git a/x-pack/plugins/cases/server/connectors/swimlane/format.test.ts b/x-pack/plugins/cases/server/connectors/swimlane/format.test.ts
index d3500c5f9e18eb..116b0eef1027c7 100644
--- a/x-pack/plugins/cases/server/connectors/swimlane/format.test.ts
+++ b/x-pack/plugins/cases/server/connectors/swimlane/format.test.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '../../../common/api';
+import type { Case } from '../../../common/api';
 import { format } from './format';
 
 describe('Swimlane formatter', () => {
   const theCase = {
     id: 'case-id',
     connector: { fields: null },
-  } as CaseResponse;
+  } as Case;
 
   it('it formats correctly', async () => {
     const res = await format(theCase, []);
diff --git a/x-pack/plugins/cases/server/connectors/types.ts b/x-pack/plugins/cases/server/connectors/types.ts
index b4cb6af0ddde9f..c1f1480d359b19 100644
--- a/x-pack/plugins/cases/server/connectors/types.ts
+++ b/x-pack/plugins/cases/server/connectors/types.ts
@@ -6,7 +6,7 @@
  */
 
 import type { Logger } from '@kbn/core/server';
-import type { CaseResponse, ConnectorMappingsAttributes } from '../../common/api';
+import type { Case, ConnectorMappingsAttributes } from '../../common/api';
 import type { CasesClientGetAlertsResponse } from '../client/alerts/types';
 import type { CasesClientFactory } from '../client/factory';
 import type { RegisterActionType } from '../types';
@@ -21,7 +21,7 @@ export interface RegisterConnectorsArgs extends GetActionTypeParams {
 }
 
 export interface ICasesConnector<TExternalServiceParams = {}> {
-  format: (theCase: CaseResponse, alerts: CasesClientGetAlertsResponse) => TExternalServiceParams;
+  format: (theCase: Case, alerts: CasesClientGetAlertsResponse) => TExternalServiceParams;
   getMapping: () => ConnectorMappingsAttributes[];
 }
 
diff --git a/x-pack/plugins/cases/server/mocks.ts b/x-pack/plugins/cases/server/mocks.ts
index 823acef076fe3c..8cef503691bcbb 100644
--- a/x-pack/plugins/cases/server/mocks.ts
+++ b/x-pack/plugins/cases/server/mocks.ts
@@ -6,14 +6,14 @@
  */
 
 import type { SavedObject } from '@kbn/core/server';
-import type { CaseSavedObject } from './common/types';
 import type { CasePostRequest, CommentAttributes } from '../common/api';
 import { CaseSeverity, CaseStatuses, CommentType, ConnectorTypes } from '../common/api';
 import { SECURITY_SOLUTION_OWNER } from '../common/constants';
 import type { CasesStart } from './types';
 import { createCasesClientMock } from './client/mocks';
+import type { CaseSavedObjectTransformed } from './common/types/case';
 
-export const mockCases: CaseSavedObject[] = [
+export const mockCases: CaseSavedObjectTransformed[] = [
   {
     type: 'cases',
     id: 'mock-id-1',
diff --git a/x-pack/plugins/cases/server/saved_object_types/cases.ts b/x-pack/plugins/cases/server/saved_object_types/cases.ts
index 2a9492b6c755f7..a4f0cdc7b02de1 100644
--- a/x-pack/plugins/cases/server/saved_object_types/cases.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/cases.ts
@@ -14,7 +14,7 @@ import type {
   SavedObjectsType,
 } from '@kbn/core/server';
 import { CASE_SAVED_OBJECT } from '../../common/constants';
-import type { ESCaseAttributes } from '../services/cases/types';
+import type { CasePersistedAttributes } from '../common/types/case';
 import { handleExport } from './import_export/export';
 import { caseMigrations } from './migrations';
 
@@ -195,10 +195,10 @@ export const createCaseSavedObjectType = (
     importableAndExportable: true,
     defaultSearchField: 'title',
     icon: 'casesApp',
-    getTitle: (savedObject: SavedObject<ESCaseAttributes>) => savedObject.attributes.title,
+    getTitle: (savedObject: SavedObject<CasePersistedAttributes>) => savedObject.attributes.title,
     onExport: async (
       context: SavedObjectsExportTransformContext,
-      objects: Array<SavedObject<ESCaseAttributes>>
+      objects: Array<SavedObject<CasePersistedAttributes>>
     ) => handleExport({ context, objects, coreSetup, logger }),
   },
 });
diff --git a/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts b/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
index 0fe7b513859815..703036c2160585 100644
--- a/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/import_export/export.ts
@@ -25,7 +25,7 @@ import {
 } from '../../../common/constants';
 import { defaultSortField } from '../../common/utils';
 import { createCaseError } from '../../common/error';
-import type { ESCaseAttributes } from '../../services/cases/types';
+import type { CasePersistedAttributes } from '../../common/types/case';
 
 export async function handleExport({
   context,
@@ -34,13 +34,15 @@ export async function handleExport({
   logger,
 }: {
   context: SavedObjectsExportTransformContext;
-  objects: Array<SavedObject<ESCaseAttributes>>;
+  objects: Array<SavedObject<CasePersistedAttributes>>;
   coreSetup: CoreSetup;
   logger: Logger;
 }): Promise<
   Array<
     SavedObject<
-      ESCaseAttributes | CommentAttributesWithoutRefs | CaseUserActionAttributesWithoutConnectorId
+      | CasePersistedAttributes
+      | CommentAttributesWithoutRefs
+      | CaseUserActionAttributesWithoutConnectorId
     >
   >
 > {
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
index 5b2eb650806827..bb6c5f1130bda0 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.test.ts
@@ -9,8 +9,8 @@ import type { SavedObjectSanitizedDoc, SavedObjectUnsanitizedDoc } from '@kbn/co
 import type { CaseAttributes, CaseFullExternalService } from '../../../common/api';
 import { CaseSeverity, CaseStatuses, ConnectorTypes, NONE_CONNECTOR_ID } from '../../../common/api';
 import { CASE_SAVED_OBJECT } from '../../../common/constants';
+import { CasePersistedSeverity, CasePersistedStatus } from '../../common/types/case';
 import { getNoneCaseConnector } from '../../common/utils';
-import { ESCaseSeverity, ESCaseStatus } from '../../services/cases/types';
 import type { ESCaseConnectorWithId } from '../../services/test_utils';
 import { createExternalService } from '../../services/test_utils';
 import {
@@ -585,10 +585,10 @@ describe('case migrations', () => {
 
   describe('update severity', () => {
     it.each([
-      [CaseSeverity.LOW, ESCaseSeverity.LOW],
-      [CaseSeverity.MEDIUM, ESCaseSeverity.MEDIUM],
-      [CaseSeverity.HIGH, ESCaseSeverity.HIGH],
-      [CaseSeverity.CRITICAL, ESCaseSeverity.CRITICAL],
+      [CaseSeverity.LOW, CasePersistedSeverity.LOW],
+      [CaseSeverity.MEDIUM, CasePersistedSeverity.MEDIUM],
+      [CaseSeverity.HIGH, CasePersistedSeverity.HIGH],
+      [CaseSeverity.CRITICAL, CasePersistedSeverity.CRITICAL],
     ])(
       'migrates "%s" severity keyword value to matching short',
       (oldSeverityValue, expectedSeverityValue) => {
@@ -624,7 +624,7 @@ describe('case migrations', () => {
         ...doc,
         attributes: {
           ...doc.attributes,
-          severity: ESCaseSeverity.LOW,
+          severity: CasePersistedSeverity.LOW,
         },
         references: [],
       });
@@ -633,9 +633,9 @@ describe('case migrations', () => {
 
   describe('update status', () => {
     it.each([
-      [CaseStatuses.open, ESCaseStatus.OPEN],
-      [CaseStatuses['in-progress'], ESCaseStatus.IN_PROGRESS],
-      [CaseStatuses.closed, ESCaseStatus.CLOSED],
+      [CaseStatuses.open, CasePersistedStatus.OPEN],
+      [CaseStatuses['in-progress'], CasePersistedStatus.IN_PROGRESS],
+      [CaseStatuses.closed, CasePersistedStatus.CLOSED],
     ])(
       'migrates "%s" status keyword value to matching short',
       (oldStatusValue, expectedStatusValue) => {
@@ -671,7 +671,7 @@ describe('case migrations', () => {
         ...doc,
         attributes: {
           ...doc.attributes,
-          status: ESCaseStatus.OPEN,
+          status: CasePersistedStatus.OPEN,
         },
         references: [],
       });
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
index 38f91952f14699..6b78ab04d90ed9 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/cases.ts
@@ -11,7 +11,6 @@ import { cloneDeep, unset, flow } from 'lodash';
 import type { SavedObjectUnsanitizedDoc, SavedObjectSanitizedDoc } from '@kbn/core/server';
 import type { SanitizedCaseOwner } from '.';
 import { addOwnerToSO } from '.';
-import type { ESConnectorFields } from '../../services';
 import type { CaseAttributes } from '../../../common/api';
 import { CaseSeverity, ConnectorTypes } from '../../../common/api';
 
@@ -27,7 +26,8 @@ import {
 } from './user_actions/connector_id';
 import { CASE_TYPE_INDIVIDUAL } from './constants';
 import { pipeMigrations } from './utils';
-import { ESCaseSeverity, ESCaseStatus } from '../../services/cases/types';
+import type { ConnectorPersistedFields } from '../../common/types/connectors';
+import { CasePersistedSeverity, CasePersistedStatus } from '../../common/types/case';
 
 interface UnsanitizedCaseConnector {
   connector_id: string;
@@ -38,7 +38,7 @@ interface SanitizedCaseConnector {
     id: string;
     name: string | null;
     type: string | null;
-    fields: null | ESConnectorFields;
+    fields: null | ConnectorPersistedFields;
   };
 }
 
@@ -137,8 +137,11 @@ export const addAssignees = (
 
 export const convertSeverity = (
   doc: SavedObjectUnsanitizedDoc<CaseAttributes>
-): SavedObjectSanitizedDoc<Omit<CaseAttributes, 'severity'> & { severity: ESCaseSeverity }> => {
-  const severity = SEVERITY_EXTERNAL_TO_ESMODEL[doc.attributes.severity] ?? ESCaseSeverity.LOW;
+): SavedObjectSanitizedDoc<
+  Omit<CaseAttributes, 'severity'> & { severity: CasePersistedSeverity }
+> => {
+  const severity =
+    SEVERITY_EXTERNAL_TO_ESMODEL[doc.attributes.severity] ?? CasePersistedSeverity.LOW;
   return {
     ...doc,
     attributes: { ...doc.attributes, severity },
@@ -148,8 +151,8 @@ export const convertSeverity = (
 
 export const convertStatus = (
   doc: SavedObjectUnsanitizedDoc<CaseAttributes>
-): SavedObjectSanitizedDoc<Omit<CaseAttributes, 'status'> & { status: ESCaseStatus }> => {
-  const status = STATUS_EXTERNAL_TO_ESMODEL[doc.attributes?.status] ?? ESCaseStatus.OPEN;
+): SavedObjectSanitizedDoc<Omit<CaseAttributes, 'status'> & { status: CasePersistedStatus }> => {
+  const status = STATUS_EXTERNAL_TO_ESMODEL[doc.attributes?.status] ?? CasePersistedStatus.OPEN;
   return {
     ...doc,
     attributes: { ...doc.attributes, status },
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
index b3978b6e12ef6d..02afa01bf49c3d 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/comments.ts
@@ -17,7 +17,6 @@ import type {
 } from '@kbn/core/server';
 import { mergeSavedObjectMigrationMaps } from '@kbn/core/server';
 import type { LensServerPluginSetup } from '@kbn/lens-plugin/server';
-import type { CommentAttributes } from '../../../common/api';
 import { CommentType } from '../../../common/api';
 import type { LensMarkdownNode, MarkdownNode } from '../../../common/utils/markdown_plugins/utils';
 import {
@@ -32,6 +31,7 @@ import { GENERATED_ALERT, SUB_CASE_SAVED_OBJECT } from './constants';
 import type { PersistableStateAttachmentTypeRegistry } from '../../attachment_framework/persistable_state_registry';
 import { getAllPersistableAttachmentMigrations } from './get_all_persistable_attachment_migrations';
 import type { PersistableStateAttachmentState } from '../../attachment_framework/types';
+import type { AttachmentPersistedAttributes } from '../../common/types/attachments';
 
 interface UnsanitizedComment {
   comment: string;
@@ -71,7 +71,7 @@ export const createCommentsMigrations = (
 
   const persistableStateAttachmentMigrations = mapValues<
     MigrateFunctionsObject,
-    SavedObjectMigrationFn<CommentAttributes>
+    SavedObjectMigrationFn<AttachmentPersistedAttributes>
   >(
     getAllPersistableAttachmentMigrations(migrationDeps.persistableStateAttachmentTypeRegistry),
     migratePersistableStateAttachments
@@ -134,8 +134,10 @@ export const createCommentsMigrations = (
 };
 
 export const migratePersistableStateAttachments =
-  (migrate: MigrateFunction): SavedObjectMigrationFn<CommentAttributes, CommentAttributes> =>
-  (doc: SavedObjectUnsanitizedDoc<CommentAttributes>) => {
+  (
+    migrate: MigrateFunction
+  ): SavedObjectMigrationFn<AttachmentPersistedAttributes, AttachmentPersistedAttributes> =>
+  (doc: SavedObjectUnsanitizedDoc<AttachmentPersistedAttributes>) => {
     if (doc.attributes.type !== CommentType.persistableState) {
       return doc;
     }
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
index 9d46e90bca17f9..b4a3c962dabad6 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations/configuration.test.ts
@@ -13,9 +13,9 @@ import { CASE_CONFIGURE_SAVED_OBJECT, SECURITY_SOLUTION_OWNER } from '../../../c
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
 import { getNoneCaseConnector } from '../../common/utils';
 import type { ESCaseConnectorWithId } from '../../services/test_utils';
-import type { ESCasesConfigureAttributes } from '../../services/configure/types';
 import type { UnsanitizedConfigureConnector } from './configuration';
 import { createConnectorAttributeMigration, configureConnectorIdMigration } from './configuration';
+import type { ConfigurePersistedAttributes } from '../../common/types/configure';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 const create_7_14_0_configSchema = (connector?: ESCaseConnectorWithId) => ({
@@ -135,7 +135,7 @@ describe('configuration migrations', () => {
 
       const migratedConnector = configureConnectorIdMigration(
         configureSavedObject
-      ) as SavedObjectSanitizedDoc<ESCasesConfigureAttributes>;
+      ) as SavedObjectSanitizedDoc<ConfigurePersistedAttributes>;
 
       expect(migratedConnector.references.length).toBe(0);
       expect(migratedConnector.attributes.connector).not.toHaveProperty('id');
@@ -146,7 +146,7 @@ describe('configuration migrations', () => {
 
       const migratedConnector = configureConnectorIdMigration(
         configureSavedObject
-      ) as SavedObjectSanitizedDoc<ESCasesConfigureAttributes>;
+      ) as SavedObjectSanitizedDoc<ConfigurePersistedAttributes>;
 
       expect(migratedConnector.references.length).toBe(0);
       expect(migratedConnector.attributes.connector).toMatchInlineSnapshot(`
@@ -168,7 +168,7 @@ describe('configuration migrations', () => {
 
       const migratedConnector = configureConnectorIdMigration(
         configureSavedObject
-      ) as SavedObjectSanitizedDoc<ESCasesConfigureAttributes>;
+      ) as SavedObjectSanitizedDoc<ConfigurePersistedAttributes>;
 
       expect(migratedConnector.references).toEqual([
         { id: '123', type: ACTION_SAVED_OBJECT_TYPE, name: CONNECTOR_ID_REFERENCE_NAME },
@@ -181,7 +181,7 @@ describe('configuration migrations', () => {
 
       const migratedConnector = configureConnectorIdMigration(
         configureSavedObject
-      ) as SavedObjectSanitizedDoc<ESCasesConfigureAttributes>;
+      ) as SavedObjectSanitizedDoc<ConfigurePersistedAttributes>;
 
       expect(migratedConnector).toMatchInlineSnapshot(`
         Object {
diff --git a/x-pack/plugins/cases/server/services/attachments/index.ts b/x-pack/plugins/cases/server/services/attachments/index.ts
index bde31a375ec72f..e76b93ce0e5b9e 100644
--- a/x-pack/plugins/cases/server/services/attachments/index.ts
+++ b/x-pack/plugins/cases/server/services/attachments/index.ts
@@ -7,20 +7,14 @@
 
 import type {
   SavedObject,
-  SavedObjectReference,
   SavedObjectsBulkResponse,
   SavedObjectsBulkUpdateResponse,
   SavedObjectsFindResponse,
-  SavedObjectsUpdateOptions,
   SavedObjectsUpdateResponse,
 } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type {
-  CommentAttributes as AttachmentAttributes,
-  CommentAttributesWithoutRefs as AttachmentAttributesWithoutRefs,
-  CommentPatchAttributes as AttachmentPatchAttributes,
-} from '../../../common/api';
+import type { CommentAttributes as AttachmentAttributes } from '../../../common/api';
 import { CommentType } from '../../../common/api';
 import { CASE_COMMENT_SAVED_OBJECT, CASE_SAVED_OBJECT } from '../../../common/constants';
 import { buildFilter, combineFilters } from '../../client/utils';
@@ -32,50 +26,19 @@ import {
   injectAttachmentSOAttributesFromRefsForPatch,
 } from '../so_references';
 import type { SavedObjectFindOptionsKueryNode } from '../../common/types';
-import type { IndexRefresh } from '../types';
-import type { AttachedToCaseArgs, ServiceContext } from './types';
+import type {
+  AlertsAttachedToCaseArgs,
+  AttachmentsAttachedToCaseArgs,
+  BulkCreateAttachments,
+  BulkUpdateAttachmentArgs,
+  CountActionsAttachedToCaseArgs,
+  CreateAttachmentArgs,
+  DeleteAttachmentArgs,
+  ServiceContext,
+  UpdateAttachmentArgs,
+} from './types';
 import { AttachmentGetter } from './operations/get';
-
-type AlertsAttachedToCaseArgs = AttachedToCaseArgs;
-
-interface AttachmentsAttachedToCaseArgs extends AttachedToCaseArgs {
-  attachmentType: CommentType;
-  aggregations: Record<string, estypes.AggregationsAggregationContainer>;
-}
-
-interface CountActionsAttachedToCaseArgs extends AttachedToCaseArgs {
-  aggregations: Record<string, estypes.AggregationsAggregationContainer>;
-}
-
-interface DeleteAttachmentArgs extends IndexRefresh {
-  attachmentIds: string[];
-}
-
-interface CreateAttachmentArgs extends IndexRefresh {
-  attributes: AttachmentAttributes;
-  references: SavedObjectReference[];
-  id: string;
-}
-
-interface BulkCreateAttachments extends IndexRefresh {
-  attachments: Array<{
-    attributes: AttachmentAttributes;
-    references: SavedObjectReference[];
-    id: string;
-  }>;
-}
-
-interface UpdateArgs {
-  attachmentId: string;
-  updatedAttributes: AttachmentPatchAttributes;
-  options?: Omit<SavedObjectsUpdateOptions<AttachmentAttributes>, 'upsert'>;
-}
-
-export type UpdateAttachmentArgs = UpdateArgs;
-
-interface BulkUpdateAttachmentArgs extends IndexRefresh {
-  comments: UpdateArgs[];
-}
+import type { AttachmentPersistedAttributes } from '../../common/types/attachments';
 
 export class AttachmentService {
   private readonly _getter: AttachmentGetter;
@@ -136,10 +99,7 @@ export class AttachmentService {
 
       const combinedFilter = combineFilters([attachmentFilter, filter]);
 
-      const response = await this.context.unsecuredSavedObjectsClient.find<
-        AttachmentAttributes,
-        Agg
-      >({
+      const response = await this.context.unsecuredSavedObjectsClient.find<unknown, Agg>({
         type: CASE_COMMENT_SAVED_OBJECT,
         hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
         page: 1,
@@ -207,7 +167,7 @@ export class AttachmentService {
         );
 
       const attachment =
-        await this.context.unsecuredSavedObjectsClient.create<AttachmentAttributesWithoutRefs>(
+        await this.context.unsecuredSavedObjectsClient.create<AttachmentPersistedAttributes>(
           CASE_COMMENT_SAVED_OBJECT,
           extractedAttributes,
           {
@@ -234,7 +194,7 @@ export class AttachmentService {
     try {
       this.context.log.debug(`Attempting to bulk create attachments`);
       const res =
-        await this.context.unsecuredSavedObjectsClient.bulkCreate<AttachmentAttributesWithoutRefs>(
+        await this.context.unsecuredSavedObjectsClient.bulkCreate<AttachmentPersistedAttributes>(
           attachments.map((attachment) => {
             const { attributes: extractedAttributes, references: extractedReferences } =
               extractAttachmentSORefsFromAttributes(
@@ -288,7 +248,7 @@ export class AttachmentService {
       const shouldUpdateRefs = extractedReferences.length > 0 || didDeleteOperation;
 
       const res =
-        await this.context.unsecuredSavedObjectsClient.update<AttachmentAttributesWithoutRefs>(
+        await this.context.unsecuredSavedObjectsClient.update<AttachmentPersistedAttributes>(
           CASE_COMMENT_SAVED_OBJECT,
           attachmentId,
           extractedAttributes,
@@ -325,7 +285,7 @@ export class AttachmentService {
       );
 
       const res =
-        await this.context.unsecuredSavedObjectsClient.bulkUpdate<AttachmentAttributesWithoutRefs>(
+        await this.context.unsecuredSavedObjectsClient.bulkUpdate<AttachmentPersistedAttributes>(
           comments.map((c) => {
             const {
               attributes: extractedAttributes,
@@ -380,7 +340,7 @@ export class AttachmentService {
     try {
       this.context.log.debug(`Attempting to find comments`);
       const res =
-        await this.context.unsecuredSavedObjectsClient.find<AttachmentAttributesWithoutRefs>({
+        await this.context.unsecuredSavedObjectsClient.find<AttachmentPersistedAttributes>({
           sortField: defaultSortField,
           ...options,
           type: CASE_COMMENT_SAVED_OBJECT,
diff --git a/x-pack/plugins/cases/server/services/attachments/operations/get.ts b/x-pack/plugins/cases/server/services/attachments/operations/get.ts
index 3db7059b3977b7..4aa5c65ebdcc17 100644
--- a/x-pack/plugins/cases/server/services/attachments/operations/get.ts
+++ b/x-pack/plugins/cases/server/services/attachments/operations/get.ts
@@ -8,6 +8,7 @@
 import type { SavedObject } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { FILE_SO_TYPE } from '@kbn/files-plugin/common';
+import type { AttachmentPersistedAttributes } from '../../../common/types/attachments';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
@@ -19,13 +20,12 @@ import type {
   AttachmentTotals,
   AttributesTypeAlerts,
   CommentAttributes as AttachmentAttributes,
-  CommentAttributesWithoutRefs as AttachmentAttributesWithoutRefs,
-  CommentAttributes,
 } from '../../../../common/api';
 import { CommentType } from '../../../../common/api';
 import type {
-  AttachedToCaseArgs,
+  AlertIdsAggsResult,
   BulkOptionalAttributes,
+  GetAllAlertsAttachToCaseArgs,
   GetAttachmentArgs,
   ServiceContext,
 } from '../types';
@@ -37,29 +37,19 @@ import { partitionByCaseAssociation } from '../../../common/partitioning';
 import type { AttachmentSavedObject } from '../../../common/types';
 import { getCaseReferenceId } from '../../../common/references';
 
-type GetAllAlertsAttachToCaseArgs = AttachedToCaseArgs;
-
-interface AlertIdsAggsResult {
-  alertIds: {
-    buckets: Array<{
-      key: string;
-    }>;
-  };
-}
-
 export class AttachmentGetter {
   constructor(private readonly context: ServiceContext) {}
 
   public async bulkGet(
     attachmentIds: string[]
-  ): Promise<BulkOptionalAttributes<CommentAttributes>> {
+  ): Promise<BulkOptionalAttributes<AttachmentAttributes>> {
     try {
       this.context.log.debug(
         `Attempting to retrieve attachments with ids: ${attachmentIds.join()}`
       );
 
       const response =
-        await this.context.unsecuredSavedObjectsClient.bulkGet<AttachmentAttributesWithoutRefs>(
+        await this.context.unsecuredSavedObjectsClient.bulkGet<AttachmentPersistedAttributes>(
           attachmentIds.map((id) => ({ id, type: CASE_COMMENT_SAVED_OBJECT }))
         );
 
@@ -85,7 +75,9 @@ export class AttachmentGetter {
         `Attempting to retrieve attachments associated with cases: [${caseIds}]`
       );
 
-      const finder = this.context.unsecuredSavedObjectsClient.createPointInTimeFinder({
+      // We are intentionally not adding the type here because we only want to interact with the id and this function
+      // should not use the attributes
+      const finder = this.context.unsecuredSavedObjectsClient.createPointInTimeFinder<unknown>({
         type: CASE_COMMENT_SAVED_OBJECT,
         hasReference: caseIds.map((id) => ({ id, type: CASE_SAVED_OBJECT })),
         sortField: 'created_at',
@@ -133,18 +125,24 @@ export class AttachmentGetter {
       const combinedFilter = combineFilters([alertsFilter, filter]);
 
       const finder =
-        this.context.unsecuredSavedObjectsClient.createPointInTimeFinder<AttributesTypeAlerts>({
-          type: CASE_COMMENT_SAVED_OBJECT,
-          hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
-          sortField: 'created_at',
-          sortOrder: 'asc',
-          filter: combinedFilter,
-          perPage: MAX_DOCS_PER_PAGE,
-        });
+        this.context.unsecuredSavedObjectsClient.createPointInTimeFinder<AttachmentPersistedAttributes>(
+          {
+            type: CASE_COMMENT_SAVED_OBJECT,
+            hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
+            sortField: 'created_at',
+            sortOrder: 'asc',
+            filter: combinedFilter,
+            perPage: MAX_DOCS_PER_PAGE,
+          }
+        );
 
       let result: Array<SavedObject<AttributesTypeAlerts>> = [];
       for await (const userActionSavedObject of finder.find()) {
-        result = result.concat(userActionSavedObject.saved_objects);
+        result = result.concat(
+          // We need a cast here because to limited attachment type conflicts with the expected result even though they
+          // should be the same
+          userActionSavedObject.saved_objects as unknown as Array<SavedObject<AttributesTypeAlerts>>
+        );
       }
 
       return result;
@@ -197,11 +195,10 @@ export class AttachmentGetter {
   }: GetAttachmentArgs): Promise<SavedObject<AttachmentAttributes>> {
     try {
       this.context.log.debug(`Attempting to GET attachment ${attachmentId}`);
-      const res =
-        await this.context.unsecuredSavedObjectsClient.get<AttachmentAttributesWithoutRefs>(
-          CASE_COMMENT_SAVED_OBJECT,
-          attachmentId
-        );
+      const res = await this.context.unsecuredSavedObjectsClient.get<AttachmentPersistedAttributes>(
+        CASE_COMMENT_SAVED_OBJECT,
+        attachmentId
+      );
 
       return injectAttachmentSOAttributesFromRefs(
         res,
@@ -305,7 +302,7 @@ export class AttachmentGetter {
   }: {
     caseId: string;
     fileIds: string[];
-  }): Promise<Array<SavedObject<CommentAttributes>>> {
+  }): Promise<Array<SavedObject<AttachmentAttributes>>> {
     try {
       this.context.log.debug('Attempting to find file attachments');
 
@@ -324,7 +321,7 @@ export class AttachmentGetter {
        * to retrieve them all.
        */
       const finder =
-        this.context.unsecuredSavedObjectsClient.createPointInTimeFinder<AttachmentAttributesWithoutRefs>(
+        this.context.unsecuredSavedObjectsClient.createPointInTimeFinder<AttachmentPersistedAttributes>(
           {
             type: CASE_COMMENT_SAVED_OBJECT,
             hasReference: references,
@@ -334,7 +331,7 @@ export class AttachmentGetter {
           }
         );
 
-      const foundAttachments: Array<SavedObject<CommentAttributes>> = [];
+      const foundAttachments: Array<SavedObject<AttachmentAttributes>> = [];
 
       for await (const attachmentSavedObjects of finder.find()) {
         foundAttachments.push(
diff --git a/x-pack/plugins/cases/server/services/attachments/types.ts b/x-pack/plugins/cases/server/services/attachments/types.ts
index 554ba8afb049b9..dbf9075031d831 100644
--- a/x-pack/plugins/cases/server/services/attachments/types.ts
+++ b/x-pack/plugins/cases/server/services/attachments/types.ts
@@ -5,15 +5,24 @@
  * 2.0.
  */
 
+import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type {
   Logger,
   SavedObject,
+  SavedObjectReference,
   SavedObjectsBulkResponse,
   SavedObjectsClientContract,
+  SavedObjectsUpdateOptions,
 } from '@kbn/core/server';
 import type { KueryNode } from '@kbn/es-query';
+import type { CommentType } from '../../../common';
+import type {
+  CommentAttributes as AttachmentAttributes,
+  CommentPatchAttributes as AttachmentPatchAttributes,
+} from '../../../common/api';
 import type { PersistableStateAttachmentTypeRegistry } from '../../attachment_framework/persistable_state_registry';
 import type { PartialField } from '../../types';
+import type { IndexRefresh } from '../types';
 
 export interface ServiceContext {
   log: Logger;
@@ -36,3 +45,54 @@ export interface BulkOptionalAttributes<T>
   extends Omit<SavedObjectsBulkResponse<T>, 'saved_objects'> {
   saved_objects: Array<OptionalAttributes<T>>;
 }
+
+export type GetAllAlertsAttachToCaseArgs = AttachedToCaseArgs;
+
+export interface AlertIdsAggsResult {
+  alertIds: {
+    buckets: Array<{
+      key: string;
+    }>;
+  };
+}
+
+export type AlertsAttachedToCaseArgs = AttachedToCaseArgs;
+
+export interface AttachmentsAttachedToCaseArgs extends AttachedToCaseArgs {
+  attachmentType: CommentType;
+  aggregations: Record<string, estypes.AggregationsAggregationContainer>;
+}
+
+export interface CountActionsAttachedToCaseArgs extends AttachedToCaseArgs {
+  aggregations: Record<string, estypes.AggregationsAggregationContainer>;
+}
+
+export interface DeleteAttachmentArgs extends IndexRefresh {
+  attachmentIds: string[];
+}
+
+export interface CreateAttachmentArgs extends IndexRefresh {
+  attributes: AttachmentAttributes;
+  references: SavedObjectReference[];
+  id: string;
+}
+
+export interface BulkCreateAttachments extends IndexRefresh {
+  attachments: Array<{
+    attributes: AttachmentAttributes;
+    references: SavedObjectReference[];
+    id: string;
+  }>;
+}
+
+export interface UpdateArgs {
+  attachmentId: string;
+  updatedAttributes: AttachmentPatchAttributes;
+  options?: Omit<SavedObjectsUpdateOptions<AttachmentAttributes>, 'upsert'>;
+}
+
+export type UpdateAttachmentArgs = UpdateArgs;
+
+export interface BulkUpdateAttachmentArgs extends IndexRefresh {
+  comments: UpdateArgs[];
+}
diff --git a/x-pack/plugins/cases/server/services/cases/index.test.ts b/x-pack/plugins/cases/server/services/cases/index.test.ts
index c84d4df964157f..c0039529ffc916 100644
--- a/x-pack/plugins/cases/server/services/cases/index.test.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.test.ts
@@ -41,11 +41,10 @@ import {
   basicCaseFields,
   createSOFindResponse,
 } from '../test_utils';
-import type { ESCaseAttributes } from './types';
-import { ESCaseSeverity, ESCaseStatus } from './types';
 import { AttachmentService } from '../attachments';
 import { PersistableStateAttachmentTypeRegistry } from '../../attachment_framework/persistable_state_registry';
-import type { CaseSavedObject } from '../../common/types';
+import type { CaseSavedObjectTransformed, CasePersistedAttributes } from '../../common/types/case';
+import { CasePersistedSeverity, CasePersistedStatus } from '../../common/types/case';
 
 const createUpdateSOResponse = ({
   connector,
@@ -55,15 +54,15 @@ const createUpdateSOResponse = ({
 }: {
   connector?: ESCaseConnectorWithId;
   externalService?: CaseFullExternalService;
-  severity?: ESCaseSeverity;
-  status?: ESCaseStatus;
-} = {}): SavedObjectsUpdateResponse<ESCaseAttributes> => {
+  severity?: CasePersistedSeverity;
+  status?: CasePersistedStatus;
+} = {}): SavedObjectsUpdateResponse<CasePersistedAttributes> => {
   const references: SavedObjectReference[] = createSavedObjectReferences({
     connector,
     externalService,
   });
 
-  let attributes: Partial<ESCaseAttributes> = { total_alerts: -1, total_comments: -1 };
+  let attributes: Partial<CasePersistedAttributes> = { total_alerts: -1, total_comments: -1 };
 
   if (connector) {
     const { id, ...restConnector } = connector;
@@ -95,9 +94,9 @@ const createFindSO = (
   params: {
     connector?: ESCaseConnectorWithId;
     externalService?: CaseFullExternalService;
-    overrides?: Partial<ESCaseAttributes>;
+    overrides?: Partial<CasePersistedAttributes>;
   } = {}
-): SavedObjectsFindResult<ESCaseAttributes> => ({
+): SavedObjectsFindResult<CasePersistedAttributes> => ({
   ...createCaseSavedObjectResponse(params),
   score: 0,
 });
@@ -174,7 +173,7 @@ describe('CasesService', () => {
     describe('patch', () => {
       it('includes the passed in fields', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
@@ -185,14 +184,14 @@ describe('CasesService', () => {
             severity: CaseSeverity.CRITICAL,
             status: CaseStatuses['in-progress'],
           }),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         const {
           connector: ignoreConnector,
           external_service: ignoreExternalService,
           ...restUpdateAttributes
-        } = unsecuredSavedObjectsClient.update.mock.calls[0][2] as Partial<ESCaseAttributes>;
+        } = unsecuredSavedObjectsClient.update.mock.calls[0][2] as Partial<CasePersistedAttributes>;
         expect(restUpdateAttributes).toMatchInlineSnapshot(`
           Object {
             "assignees": Array [],
@@ -228,7 +227,7 @@ describe('CasesService', () => {
 
       it('transforms the connector.fields to an array of key/value pairs', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
@@ -237,11 +236,11 @@ describe('CasesService', () => {
             connector: createJiraConnector(),
             externalService: createExternalService(),
           }),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         const { connector } = unsecuredSavedObjectsClient.update.mock
-          .calls[0][2] as Partial<ESCaseAttributes>;
+          .calls[0][2] as Partial<CasePersistedAttributes>;
         expect(connector?.fields).toMatchInlineSnapshot(`
           Array [
             Object {
@@ -262,7 +261,7 @@ describe('CasesService', () => {
 
       it('preserves the connector fields but does not have the id', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
@@ -271,11 +270,11 @@ describe('CasesService', () => {
             connector: createJiraConnector(),
             externalService: createExternalService(),
           }),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         const { connector } = unsecuredSavedObjectsClient.update.mock
-          .calls[0][2] as Partial<ESCaseAttributes>;
+          .calls[0][2] as Partial<CasePersistedAttributes>;
         expect(connector).toMatchInlineSnapshot(`
           Object {
             "fields": Array [
@@ -300,17 +299,17 @@ describe('CasesService', () => {
 
       it('removes the connector id and adds it to the references', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({ connector: createJiraConnector() }),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         const updateAttributes = unsecuredSavedObjectsClient.update.mock
-          .calls[0][2] as Partial<ESCaseAttributes>;
+          .calls[0][2] as Partial<CasePersistedAttributes>;
         expect(updateAttributes.connector).not.toHaveProperty('id');
 
         const updateOptions = unsecuredSavedObjectsClient.update.mock
@@ -328,7 +327,7 @@ describe('CasesService', () => {
 
       it('removes the external_service connector_id and adds it to the references', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
@@ -337,11 +336,11 @@ describe('CasesService', () => {
             connector: getNoneCaseConnector(),
             externalService: createExternalService(),
           }),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         const updateAttributes = unsecuredSavedObjectsClient.update.mock
-          .calls[0][2] as Partial<ESCaseAttributes>;
+          .calls[0][2] as Partial<CasePersistedAttributes>;
         expect(updateAttributes.external_service).not.toHaveProperty('connector_id');
 
         const updateOptions = unsecuredSavedObjectsClient.update.mock
@@ -359,7 +358,7 @@ describe('CasesService', () => {
 
       it('builds references for external service connector id, case connector id, and includes the existing references', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
@@ -370,7 +369,7 @@ describe('CasesService', () => {
           }),
           originalCase: {
             references: [{ id: 'a', name: 'awesome', type: 'hello' }],
-          } as CaseSavedObject,
+          } as CaseSavedObjectTransformed,
         });
 
         const updateOptions = unsecuredSavedObjectsClient.update.mock
@@ -398,7 +397,7 @@ describe('CasesService', () => {
 
       it('builds references for connector_id and preserves the existing connector.id reference', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
@@ -408,7 +407,7 @@ describe('CasesService', () => {
             references: [
               { id: '1', name: CONNECTOR_ID_REFERENCE_NAME, type: ACTION_SAVED_OBJECT_TYPE },
             ],
-          } as CaseSavedObject,
+          } as CaseSavedObjectTransformed,
         });
 
         const updateOptions = unsecuredSavedObjectsClient.update.mock
@@ -431,7 +430,7 @@ describe('CasesService', () => {
 
       it('preserves the external_service fields except for the connector_id', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
@@ -440,11 +439,11 @@ describe('CasesService', () => {
             connector: getNoneCaseConnector(),
             externalService: createExternalService(),
           }),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         const updateAttributes = unsecuredSavedObjectsClient.update.mock
-          .calls[0][2] as Partial<ESCaseAttributes>;
+          .calls[0][2] as Partial<CasePersistedAttributes>;
         expect(updateAttributes.external_service).toMatchInlineSnapshot(`
           Object {
             "connector_name": ".jira",
@@ -463,13 +462,13 @@ describe('CasesService', () => {
 
       it('creates an empty updatedAttributes when there is no connector or external_service as input', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(unsecuredSavedObjectsClient.update.mock.calls[0][2]).toMatchInlineSnapshot(
@@ -482,13 +481,13 @@ describe('CasesService', () => {
 
       it('creates a updatedAttributes field with the none connector', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({ connector: getNoneCaseConnector() }),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(unsecuredSavedObjectsClient.update.mock.calls[0][2]).toMatchInlineSnapshot(`
@@ -503,49 +502,49 @@ describe('CasesService', () => {
       });
 
       it.each([
-        [CaseSeverity.LOW, ESCaseSeverity.LOW],
-        [CaseSeverity.MEDIUM, ESCaseSeverity.MEDIUM],
-        [CaseSeverity.HIGH, ESCaseSeverity.HIGH],
-        [CaseSeverity.CRITICAL, ESCaseSeverity.CRITICAL],
+        [CaseSeverity.LOW, CasePersistedSeverity.LOW],
+        [CaseSeverity.MEDIUM, CasePersistedSeverity.MEDIUM],
+        [CaseSeverity.HIGH, CasePersistedSeverity.HIGH],
+        [CaseSeverity.CRITICAL, CasePersistedSeverity.CRITICAL],
       ])(
         'properly converts "%s" severity to corresponding ES value on updating SO',
         async (patchParamsSeverity, expectedSeverity) => {
           unsecuredSavedObjectsClient.update.mockResolvedValue(
-            {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+            {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
           );
 
           await service.patchCase({
             caseId: '1',
             updatedAttributes: createCaseUpdateParams({ severity: patchParamsSeverity }),
-            originalCase: {} as CaseSavedObject,
+            originalCase: {} as CaseSavedObjectTransformed,
           });
 
           const patchAttributes = unsecuredSavedObjectsClient.update.mock
-            .calls[0][2] as ESCaseAttributes;
+            .calls[0][2] as CasePersistedAttributes;
 
           expect(patchAttributes.severity).toEqual(expectedSeverity);
         }
       );
 
       it.each([
-        [CaseStatuses.open, ESCaseStatus.OPEN],
-        [CaseStatuses['in-progress'], ESCaseStatus.IN_PROGRESS],
-        [CaseStatuses.closed, ESCaseStatus.CLOSED],
+        [CaseStatuses.open, CasePersistedStatus.OPEN],
+        [CaseStatuses['in-progress'], CasePersistedStatus.IN_PROGRESS],
+        [CaseStatuses.closed, CasePersistedStatus.CLOSED],
       ])(
         'properly converts "%s" status to corresponding ES value on updating SO',
         async (patchParamsStatus, expectedStatus) => {
           unsecuredSavedObjectsClient.update.mockResolvedValue(
-            {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+            {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
           );
 
           await service.patchCase({
             caseId: '1',
             updatedAttributes: createCaseUpdateParams({ status: patchParamsStatus }),
-            originalCase: {} as CaseSavedObject,
+            originalCase: {} as CaseSavedObjectTransformed,
           });
 
           const patchAttributes = unsecuredSavedObjectsClient.update.mock
-            .calls[0][2] as ESCaseAttributes;
+            .calls[0][2] as CasePersistedAttributes;
 
           expect(patchAttributes.status).toEqual(expectedStatus);
         }
@@ -571,7 +570,7 @@ describe('CasesService', () => {
                 connector: getNoneCaseConnector(),
                 severity: CaseSeverity.LOW,
               }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
             {
               caseId: '2',
@@ -579,7 +578,7 @@ describe('CasesService', () => {
                 connector: getNoneCaseConnector(),
                 severity: CaseSeverity.MEDIUM,
               }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
             {
               caseId: '3',
@@ -587,7 +586,7 @@ describe('CasesService', () => {
                 connector: getNoneCaseConnector(),
                 severity: CaseSeverity.HIGH,
               }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
             {
               caseId: '4',
@@ -595,18 +594,18 @@ describe('CasesService', () => {
                 connector: getNoneCaseConnector(),
                 severity: CaseSeverity.CRITICAL,
               }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
           ],
         });
 
         const patchResults = unsecuredSavedObjectsClient.bulkUpdate.mock
-          .calls[0][0] as unknown as Array<SavedObject<ESCaseAttributes>>;
+          .calls[0][0] as unknown as Array<SavedObject<CasePersistedAttributes>>;
 
-        expect(patchResults[0].attributes.severity).toEqual(ESCaseSeverity.LOW);
-        expect(patchResults[1].attributes.severity).toEqual(ESCaseSeverity.MEDIUM);
-        expect(patchResults[2].attributes.severity).toEqual(ESCaseSeverity.HIGH);
-        expect(patchResults[3].attributes.severity).toEqual(ESCaseSeverity.CRITICAL);
+        expect(patchResults[0].attributes.severity).toEqual(CasePersistedSeverity.LOW);
+        expect(patchResults[1].attributes.severity).toEqual(CasePersistedSeverity.MEDIUM);
+        expect(patchResults[2].attributes.severity).toEqual(CasePersistedSeverity.HIGH);
+        expect(patchResults[3].attributes.severity).toEqual(CasePersistedSeverity.CRITICAL);
       });
 
       it('properly converts status to corresponding ES value on bulk updating SO', async () => {
@@ -626,7 +625,7 @@ describe('CasesService', () => {
                 connector: getNoneCaseConnector(),
                 status: CaseStatuses.open,
               }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
             {
               caseId: '2',
@@ -634,7 +633,7 @@ describe('CasesService', () => {
                 connector: getNoneCaseConnector(),
                 status: CaseStatuses['in-progress'],
               }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
             {
               caseId: '3',
@@ -642,23 +641,25 @@ describe('CasesService', () => {
                 connector: getNoneCaseConnector(),
                 status: CaseStatuses.closed,
               }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
           ],
         });
 
         const patchResults = unsecuredSavedObjectsClient.bulkUpdate.mock
-          .calls[0][0] as unknown as Array<SavedObject<ESCaseAttributes>>;
+          .calls[0][0] as unknown as Array<SavedObject<CasePersistedAttributes>>;
 
-        expect(patchResults[0].attributes.status).toEqual(ESCaseStatus.OPEN);
-        expect(patchResults[1].attributes.status).toEqual(ESCaseStatus.IN_PROGRESS);
-        expect(patchResults[2].attributes.status).toEqual(ESCaseStatus.CLOSED);
+        expect(patchResults[0].attributes.status).toEqual(CasePersistedStatus.OPEN);
+        expect(patchResults[1].attributes.status).toEqual(CasePersistedStatus.IN_PROGRESS);
+        expect(patchResults[2].attributes.status).toEqual(CasePersistedStatus.CLOSED);
       });
     });
 
     describe('post', () => {
       it('creates a null external_service field when the attribute was null in the creation parameters', async () => {
-        unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+        unsecuredSavedObjectsClient.create.mockResolvedValue(
+          {} as SavedObject<CasePersistedAttributes>
+        );
 
         await service.postNewCase({
           attributes: createCasePostParams({ connector: createJiraConnector() }),
@@ -671,7 +672,9 @@ describe('CasesService', () => {
       });
 
       it('includes the creation attributes excluding the connector.id and connector_id', async () => {
-        unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+        unsecuredSavedObjectsClient.create.mockResolvedValue(
+          {} as SavedObject<CasePersistedAttributes>
+        );
 
         await service.postNewCase({
           attributes: createCasePostParams({
@@ -682,7 +685,7 @@ describe('CasesService', () => {
         });
 
         const creationAttributes = unsecuredSavedObjectsClient.create.mock
-          .calls[0][1] as ESCaseAttributes;
+          .calls[0][1] as CasePersistedAttributes;
         expect(creationAttributes.connector).not.toHaveProperty('id');
         expect(creationAttributes.external_service).not.toHaveProperty('connector_id');
         expect(creationAttributes).toMatchInlineSnapshot(`
@@ -769,7 +772,9 @@ describe('CasesService', () => {
       });
 
       it('includes default values for total_alerts and total_comments', async () => {
-        unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+        unsecuredSavedObjectsClient.create.mockResolvedValue(
+          {} as SavedObject<CasePersistedAttributes>
+        );
 
         await service.postNewCase({
           attributes: createCasePostParams({
@@ -779,14 +784,16 @@ describe('CasesService', () => {
         });
 
         const postAttributes = unsecuredSavedObjectsClient.create.mock
-          .calls[0][1] as ESCaseAttributes;
+          .calls[0][1] as CasePersistedAttributes;
 
         expect(postAttributes.total_alerts).toEqual(-1);
         expect(postAttributes.total_comments).toEqual(-1);
       });
 
       it('moves the connector.id and connector_id to the references', async () => {
-        unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+        unsecuredSavedObjectsClient.create.mockResolvedValue(
+          {} as SavedObject<CasePersistedAttributes>
+        );
 
         await service.postNewCase({
           attributes: createCasePostParams({
@@ -815,7 +822,9 @@ describe('CasesService', () => {
       });
 
       it('sets fields to an empty array when it is not included with the connector', async () => {
-        unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+        unsecuredSavedObjectsClient.create.mockResolvedValue(
+          {} as SavedObject<CasePersistedAttributes>
+        );
 
         await service.postNewCase({
           attributes: createCasePostParams({
@@ -831,7 +840,9 @@ describe('CasesService', () => {
       });
 
       it('does not create a reference for a none connector', async () => {
-        unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+        unsecuredSavedObjectsClient.create.mockResolvedValue(
+          {} as SavedObject<CasePersistedAttributes>
+        );
 
         await service.postNewCase({
           attributes: createCasePostParams({ connector: getNoneCaseConnector() }),
@@ -844,7 +855,9 @@ describe('CasesService', () => {
       });
 
       it('does not create a reference for an external_service field that is null', async () => {
-        unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+        unsecuredSavedObjectsClient.create.mockResolvedValue(
+          {} as SavedObject<CasePersistedAttributes>
+        );
 
         await service.postNewCase({
           attributes: createCasePostParams({ connector: getNoneCaseConnector() }),
@@ -857,14 +870,16 @@ describe('CasesService', () => {
       });
 
       it.each([
-        [CaseSeverity.LOW, ESCaseSeverity.LOW],
-        [CaseSeverity.MEDIUM, ESCaseSeverity.MEDIUM],
-        [CaseSeverity.HIGH, ESCaseSeverity.HIGH],
-        [CaseSeverity.CRITICAL, ESCaseSeverity.CRITICAL],
+        [CaseSeverity.LOW, CasePersistedSeverity.LOW],
+        [CaseSeverity.MEDIUM, CasePersistedSeverity.MEDIUM],
+        [CaseSeverity.HIGH, CasePersistedSeverity.HIGH],
+        [CaseSeverity.CRITICAL, CasePersistedSeverity.CRITICAL],
       ])(
         'properly converts "%s" severity to corresponding ES value on creating SO',
         async (postParamsSeverity, expectedSeverity) => {
-          unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+          unsecuredSavedObjectsClient.create.mockResolvedValue(
+            {} as SavedObject<CasePersistedAttributes>
+          );
 
           await service.postNewCase({
             attributes: createCasePostParams({
@@ -875,19 +890,21 @@ describe('CasesService', () => {
           });
 
           const postAttributes = unsecuredSavedObjectsClient.create.mock
-            .calls[0][1] as ESCaseAttributes;
+            .calls[0][1] as CasePersistedAttributes;
           expect(postAttributes.severity).toEqual(expectedSeverity);
         }
       );
 
       it.each([
-        [CaseStatuses.open, ESCaseStatus.OPEN],
-        [CaseStatuses['in-progress'], ESCaseStatus.IN_PROGRESS],
-        [CaseStatuses.closed, ESCaseStatus.CLOSED],
+        [CaseStatuses.open, CasePersistedStatus.OPEN],
+        [CaseStatuses['in-progress'], CasePersistedStatus.IN_PROGRESS],
+        [CaseStatuses.closed, CasePersistedStatus.CLOSED],
       ])(
         'properly converts "%s" status to corresponding ES value on creating SO',
         async (postParamsStatus, expectedStatus) => {
-          unsecuredSavedObjectsClient.create.mockResolvedValue({} as SavedObject<ESCaseAttributes>);
+          unsecuredSavedObjectsClient.create.mockResolvedValue(
+            {} as SavedObject<CasePersistedAttributes>
+          );
 
           await service.postNewCase({
             attributes: createCasePostParams({
@@ -898,7 +915,7 @@ describe('CasesService', () => {
           });
 
           const postAttributes = unsecuredSavedObjectsClient.create.mock
-            .calls[0][1] as ESCaseAttributes;
+            .calls[0][1] as CasePersistedAttributes;
           expect(postAttributes.status).toEqual(expectedStatus);
         }
       );
@@ -929,7 +946,7 @@ describe('CasesService', () => {
                 connector: createJiraConnector(),
                 externalService: createExternalService(),
               }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
           ],
         });
@@ -970,10 +987,16 @@ describe('CasesService', () => {
       it('properly converts the severity field to the corresponding external value in the bulkPatch response', async () => {
         unsecuredSavedObjectsClient.bulkUpdate.mockResolvedValue({
           saved_objects: [
-            createCaseSavedObjectResponse({ overrides: { severity: ESCaseSeverity.LOW } }),
-            createCaseSavedObjectResponse({ overrides: { severity: ESCaseSeverity.MEDIUM } }),
-            createCaseSavedObjectResponse({ overrides: { severity: ESCaseSeverity.HIGH } }),
-            createCaseSavedObjectResponse({ overrides: { severity: ESCaseSeverity.CRITICAL } }),
+            createCaseSavedObjectResponse({ overrides: { severity: CasePersistedSeverity.LOW } }),
+            createCaseSavedObjectResponse({
+              overrides: { severity: CasePersistedSeverity.MEDIUM },
+            }),
+            createCaseSavedObjectResponse({
+              overrides: { severity: CasePersistedSeverity.HIGH },
+            }),
+            createCaseSavedObjectResponse({
+              overrides: { severity: CasePersistedSeverity.CRITICAL },
+            }),
           ],
         });
 
@@ -982,7 +1005,7 @@ describe('CasesService', () => {
             {
               caseId: '1',
               updatedAttributes: createCasePostParams({ connector: getNoneCaseConnector() }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
           ],
         });
@@ -995,9 +1018,11 @@ describe('CasesService', () => {
       it('properly converts the status field to the corresponding external value in the bulkPatch response', async () => {
         unsecuredSavedObjectsClient.bulkUpdate.mockResolvedValue({
           saved_objects: [
-            createCaseSavedObjectResponse({ overrides: { status: ESCaseStatus.OPEN } }),
-            createCaseSavedObjectResponse({ overrides: { status: ESCaseStatus.IN_PROGRESS } }),
-            createCaseSavedObjectResponse({ overrides: { status: ESCaseStatus.CLOSED } }),
+            createCaseSavedObjectResponse({ overrides: { status: CasePersistedStatus.OPEN } }),
+            createCaseSavedObjectResponse({
+              overrides: { status: CasePersistedStatus.IN_PROGRESS },
+            }),
+            createCaseSavedObjectResponse({ overrides: { status: CasePersistedStatus.CLOSED } }),
           ],
         });
 
@@ -1006,7 +1031,7 @@ describe('CasesService', () => {
             {
               caseId: '1',
               updatedAttributes: createCasePostParams({ connector: getNoneCaseConnector() }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
           ],
         });
@@ -1029,7 +1054,7 @@ describe('CasesService', () => {
             {
               caseId: '1',
               updatedAttributes: createCasePostParams({ connector: getNoneCaseConnector() }),
-              originalCase: {} as CaseSavedObject,
+              originalCase: {} as CaseSavedObjectTransformed,
             },
           ],
         });
@@ -1052,7 +1077,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res.attributes).toMatchInlineSnapshot(`
@@ -1076,7 +1101,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res.attributes).toMatchInlineSnapshot(`
@@ -1093,7 +1118,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res.attributes).toMatchInlineSnapshot(`Object {}`);
@@ -1102,13 +1127,13 @@ describe('CasesService', () => {
 
       it('returns an undefined connector if it is not returned by the update', async () => {
         unsecuredSavedObjectsClient.update.mockResolvedValue(
-          {} as SavedObjectsUpdateResponse<ESCaseAttributes>
+          {} as SavedObjectsUpdateResponse<CasePersistedAttributes>
         );
 
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res).toMatchInlineSnapshot(`
@@ -1120,7 +1145,7 @@ describe('CasesService', () => {
 
       it('returns the default none connector when it cannot find the reference', async () => {
         const { name, type, fields } = createESJiraConnector();
-        const returnValue: SavedObjectsUpdateResponse<ESCaseAttributes> = {
+        const returnValue: SavedObjectsUpdateResponse<CasePersistedAttributes> = {
           type: CASE_SAVED_OBJECT,
           id: '1',
           attributes: {
@@ -1139,7 +1164,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res.attributes.connector).toMatchInlineSnapshot(`
@@ -1154,7 +1179,7 @@ describe('CasesService', () => {
 
       it('returns none external service connector when it cannot find the reference', async () => {
         const { connector_id: id, ...restExternalConnector } = createExternalService()!;
-        const returnValue: SavedObjectsUpdateResponse<ESCaseAttributes> = {
+        const returnValue: SavedObjectsUpdateResponse<CasePersistedAttributes> = {
           type: CASE_SAVED_OBJECT,
           id: '1',
           attributes: {
@@ -1169,7 +1194,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res.attributes.external_service?.connector_id).toBe('none');
@@ -1177,7 +1202,7 @@ describe('CasesService', () => {
 
       it('returns the saved object fields when it cannot find the reference for connector_id', async () => {
         const { connector_id: id, ...restExternalConnector } = createExternalService()!;
-        const returnValue: SavedObjectsUpdateResponse<ESCaseAttributes> = {
+        const returnValue: SavedObjectsUpdateResponse<CasePersistedAttributes> = {
           type: CASE_SAVED_OBJECT,
           id: '1',
           attributes: {
@@ -1192,7 +1217,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res).toMatchInlineSnapshot(`
@@ -1228,7 +1253,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res.attributes.connector).toMatchInlineSnapshot(`
@@ -1254,7 +1279,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res.attributes.external_service).toMatchInlineSnapshot(`
@@ -1276,10 +1301,10 @@ describe('CasesService', () => {
       });
 
       it.each([
-        [ESCaseSeverity.LOW, CaseSeverity.LOW],
-        [ESCaseSeverity.MEDIUM, CaseSeverity.MEDIUM],
-        [ESCaseSeverity.HIGH, CaseSeverity.HIGH],
-        [ESCaseSeverity.CRITICAL, CaseSeverity.CRITICAL],
+        [CasePersistedSeverity.LOW, CaseSeverity.LOW],
+        [CasePersistedSeverity.MEDIUM, CaseSeverity.MEDIUM],
+        [CasePersistedSeverity.HIGH, CaseSeverity.HIGH],
+        [CasePersistedSeverity.CRITICAL, CaseSeverity.CRITICAL],
       ])(
         'properly converts "%s" severity to corresponding external value in the patch response',
         async (internalSeverityValue, expectedSeverity) => {
@@ -1290,7 +1315,7 @@ describe('CasesService', () => {
           const res = await service.patchCase({
             caseId: '1',
             updatedAttributes: createCaseUpdateParams({}),
-            originalCase: {} as CaseSavedObject,
+            originalCase: {} as CaseSavedObjectTransformed,
           });
 
           expect(res.attributes.severity).toEqual(expectedSeverity);
@@ -1298,9 +1323,9 @@ describe('CasesService', () => {
       );
 
       it.each([
-        [ESCaseStatus.OPEN, CaseStatuses.open],
-        [ESCaseStatus.IN_PROGRESS, CaseStatuses['in-progress']],
-        [ESCaseStatus.CLOSED, CaseStatuses.closed],
+        [CasePersistedStatus.OPEN, CaseStatuses.open],
+        [CasePersistedStatus.IN_PROGRESS, CaseStatuses['in-progress']],
+        [CasePersistedStatus.CLOSED, CaseStatuses.closed],
       ])(
         'properly converts "%s" status to corresponding external value in the patch response',
         async (internalStatusValue, expectedStatus) => {
@@ -1311,7 +1336,7 @@ describe('CasesService', () => {
           const res = await service.patchCase({
             caseId: '1',
             updatedAttributes: createCaseUpdateParams({}),
-            originalCase: {} as CaseSavedObject,
+            originalCase: {} as CaseSavedObjectTransformed,
           });
 
           expect(res.attributes.status).toEqual(expectedStatus);
@@ -1324,7 +1349,7 @@ describe('CasesService', () => {
         const res = await service.patchCase({
           caseId: '1',
           updatedAttributes: createCaseUpdateParams({}),
-          originalCase: {} as CaseSavedObject,
+          originalCase: {} as CaseSavedObjectTransformed,
         });
 
         expect(res.attributes).not.toHaveProperty('total_alerts');
@@ -1351,10 +1376,10 @@ describe('CasesService', () => {
       });
 
       it.each([
-        [ESCaseSeverity.LOW, CaseSeverity.LOW],
-        [ESCaseSeverity.MEDIUM, CaseSeverity.MEDIUM],
-        [ESCaseSeverity.HIGH, CaseSeverity.HIGH],
-        [ESCaseSeverity.CRITICAL, CaseSeverity.CRITICAL],
+        [CasePersistedSeverity.LOW, CaseSeverity.LOW],
+        [CasePersistedSeverity.MEDIUM, CaseSeverity.MEDIUM],
+        [CasePersistedSeverity.HIGH, CaseSeverity.HIGH],
+        [CasePersistedSeverity.CRITICAL, CaseSeverity.CRITICAL],
       ])(
         'properly converts "%s" severity to corresponding external value in the post response',
         async (internalSeverityValue, expectedSeverity) => {
@@ -1372,9 +1397,9 @@ describe('CasesService', () => {
       );
 
       it.each([
-        [ESCaseStatus.OPEN, CaseStatuses.open],
-        [ESCaseStatus.IN_PROGRESS, CaseStatuses['in-progress']],
-        [ESCaseStatus.CLOSED, CaseStatuses.closed],
+        [CasePersistedStatus.OPEN, CaseStatuses.open],
+        [CasePersistedStatus.IN_PROGRESS, CaseStatuses['in-progress']],
+        [CasePersistedStatus.CLOSED, CaseStatuses.closed],
       ])(
         'properly converts "%s" status to corresponding external value in the post response',
         async (internalStatusValue, expectedStatus) => {
@@ -1444,10 +1469,10 @@ describe('CasesService', () => {
       });
 
       it.each([
-        [ESCaseSeverity.LOW, CaseSeverity.LOW],
-        [ESCaseSeverity.MEDIUM, CaseSeverity.MEDIUM],
-        [ESCaseSeverity.HIGH, CaseSeverity.HIGH],
-        [ESCaseSeverity.CRITICAL, CaseSeverity.CRITICAL],
+        [CasePersistedSeverity.LOW, CaseSeverity.LOW],
+        [CasePersistedSeverity.MEDIUM, CaseSeverity.MEDIUM],
+        [CasePersistedSeverity.HIGH, CaseSeverity.HIGH],
+        [CasePersistedSeverity.CRITICAL, CaseSeverity.CRITICAL],
       ])(
         'includes the properly converted "%s" severity field in the result',
         async (severity, expectedSeverity) => {
@@ -1463,9 +1488,9 @@ describe('CasesService', () => {
       );
 
       it.each([
-        [ESCaseStatus.OPEN, CaseStatuses.open],
-        [ESCaseStatus.IN_PROGRESS, CaseStatuses['in-progress']],
-        [ESCaseStatus.CLOSED, CaseStatuses.closed],
+        [CasePersistedStatus.OPEN, CaseStatuses.open],
+        [CasePersistedStatus.IN_PROGRESS, CaseStatuses['in-progress']],
+        [CasePersistedStatus.CLOSED, CaseStatuses.closed],
       ])(
         'includes the properly converted "%s" status field in the result',
         async (status, expectedStatus) => {
@@ -1523,16 +1548,16 @@ describe('CasesService', () => {
         unsecuredSavedObjectsClient.bulkGet.mockResolvedValue({
           saved_objects: [
             createCaseSavedObjectResponse({
-              overrides: { severity: ESCaseSeverity.LOW },
+              overrides: { severity: CasePersistedSeverity.LOW },
             }),
             createCaseSavedObjectResponse({
-              overrides: { severity: ESCaseSeverity.MEDIUM },
+              overrides: { severity: CasePersistedSeverity.MEDIUM },
             }),
             createCaseSavedObjectResponse({
-              overrides: { severity: ESCaseSeverity.HIGH },
+              overrides: { severity: CasePersistedSeverity.HIGH },
             }),
             createCaseSavedObjectResponse({
-              overrides: { severity: ESCaseSeverity.CRITICAL },
+              overrides: { severity: CasePersistedSeverity.CRITICAL },
             }),
           ],
         });
@@ -1548,13 +1573,13 @@ describe('CasesService', () => {
         unsecuredSavedObjectsClient.bulkGet.mockResolvedValue({
           saved_objects: [
             createCaseSavedObjectResponse({
-              overrides: { status: ESCaseStatus.OPEN },
+              overrides: { status: CasePersistedStatus.OPEN },
             }),
             createCaseSavedObjectResponse({
-              overrides: { status: ESCaseStatus.IN_PROGRESS },
+              overrides: { status: CasePersistedStatus.IN_PROGRESS },
             }),
             createCaseSavedObjectResponse({
-              overrides: { status: ESCaseStatus.CLOSED },
+              overrides: { status: CasePersistedStatus.CLOSED },
             }),
           ],
         });
@@ -1652,7 +1677,7 @@ describe('CasesService', () => {
               type: ACTION_SAVED_OBJECT_TYPE,
             },
           ],
-        } as unknown as SavedObject<ESCaseAttributes>);
+        } as unknown as SavedObject<CasePersistedAttributes>);
         const res = await service.getCase({ id: 'a' });
 
         expect(res.attributes.connector).toMatchInlineSnapshot(`
@@ -1670,7 +1695,7 @@ describe('CasesService', () => {
       it('returns a null external_services when it is already null', async () => {
         unsecuredSavedObjectsClient.get.mockResolvedValue({
           attributes: { external_service: null },
-        } as SavedObject<ESCaseAttributes>);
+        } as SavedObject<CasePersistedAttributes>);
         const res = await service.getCase({ id: 'a' });
 
         expect(res.attributes.connector).toMatchInlineSnapshot(`
@@ -1686,16 +1711,16 @@ describe('CasesService', () => {
       });
 
       it.each([
-        [ESCaseSeverity.LOW, CaseSeverity.LOW],
-        [ESCaseSeverity.MEDIUM, CaseSeverity.MEDIUM],
-        [ESCaseSeverity.HIGH, CaseSeverity.HIGH],
-        [ESCaseSeverity.CRITICAL, CaseSeverity.CRITICAL],
+        [CasePersistedSeverity.LOW, CaseSeverity.LOW],
+        [CasePersistedSeverity.MEDIUM, CaseSeverity.MEDIUM],
+        [CasePersistedSeverity.HIGH, CaseSeverity.HIGH],
+        [CasePersistedSeverity.CRITICAL, CaseSeverity.CRITICAL],
       ])(
         'includes the properly converted "%s" severity field in the result',
         async (internalSeverityValue, expectedSeverity) => {
           unsecuredSavedObjectsClient.get.mockResolvedValue({
             attributes: { severity: internalSeverityValue },
-          } as SavedObject<ESCaseAttributes>);
+          } as SavedObject<CasePersistedAttributes>);
 
           const res = await service.getCase({ id: 'a' });
 
@@ -1704,15 +1729,15 @@ describe('CasesService', () => {
       );
 
       it.each([
-        [ESCaseStatus.OPEN, CaseStatuses.open],
-        [ESCaseStatus.IN_PROGRESS, CaseStatuses['in-progress']],
-        [ESCaseStatus.CLOSED, CaseStatuses.closed],
+        [CasePersistedStatus.OPEN, CaseStatuses.open],
+        [CasePersistedStatus.IN_PROGRESS, CaseStatuses['in-progress']],
+        [CasePersistedStatus.CLOSED, CaseStatuses.closed],
       ])(
         'includes the properly converted "%s" status field in the result',
         async (internalStatusValue, expectedStatus) => {
           unsecuredSavedObjectsClient.get.mockResolvedValue({
             attributes: { status: internalStatusValue },
-          } as SavedObject<ESCaseAttributes>);
+          } as SavedObject<CasePersistedAttributes>);
 
           const res = await service.getCase({ id: 'a' });
 
@@ -1726,7 +1751,7 @@ describe('CasesService', () => {
             total_alerts: -1,
             total_comments: -1,
           },
-        } as unknown as SavedObject<ESCaseAttributes>);
+        } as unknown as SavedObject<CasePersistedAttributes>);
 
         const res = await service.getCase({ id: 'a' });
         expect(res.attributes).not.toHaveProperty('total_alerts');
@@ -1760,7 +1785,7 @@ describe('CasesService', () => {
         page: 1,
         per_page: 1,
         aggregations: { myAggregation: { value: 0 } },
-      } as SavedObjectsFindResponse<ESCaseAttributes>);
+      } as SavedObjectsFindResponse<CasePersistedAttributes>);
 
       const res = await service.executeAggregations({ aggregationBuilders });
       expect(res).toEqual({ myAggregation: { value: 0 } });
@@ -1773,7 +1798,7 @@ describe('CasesService', () => {
         page: 1,
         per_page: 1,
         aggregations: { myAggregation: { value: 0 } },
-      } as SavedObjectsFindResponse<ESCaseAttributes>);
+      } as SavedObjectsFindResponse<CasePersistedAttributes>);
 
       await service.executeAggregations({ aggregationBuilders, options: { perPage: 20 } });
       expect(unsecuredSavedObjectsClient.find.mock.calls[0][0]).toMatchInlineSnapshot(`
diff --git a/x-pack/plugins/cases/server/services/cases/index.ts b/x-pack/plugins/cases/server/services/cases/index.ts
index bc694a44d93ebd..93c6d610d55390 100644
--- a/x-pack/plugins/cases/server/services/cases/index.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.ts
@@ -20,7 +20,6 @@ import type {
 } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { KueryNode } from '@kbn/es-query';
 import { nodeBuilder } from '@kbn/es-query';
 
 import {
@@ -28,16 +27,9 @@ import {
   CASE_SAVED_OBJECT,
   MAX_DOCS_PER_PAGE,
 } from '../../../common/constants';
-import type {
-  CaseResponse,
-  CasesFindRequest,
-  CommentAttributes,
-  User,
-  CaseAttributes,
-  CaseStatuses,
-} from '../../../common/api';
+import type { Case, CommentAttributes, User, CaseStatuses } from '../../../common/api';
 import { caseStatuses } from '../../../common/api';
-import type { CaseSavedObject, SavedObjectFindOptionsKueryNode } from '../../common/types';
+import type { SavedObjectFindOptionsKueryNode } from '../../common/types';
 import { defaultSortField, flattenCaseSavedObject } from '../../common/utils';
 import { DEFAULT_PAGE, DEFAULT_PER_PAGE } from '../../routes/api';
 import { combineFilters } from '../../client/utils';
@@ -50,88 +42,30 @@ import {
   transformBulkResponseToExternalModel,
   transformFindResponseToExternalModel,
 } from './transform';
-import type { ESCaseAttributes } from './types';
-import { ESCaseStatus } from './types';
 import type { AttachmentService } from '../attachments';
 import type { AggregationBuilder, AggregationResponse } from '../../client/metrics/types';
 import { createCaseError } from '../../common/error';
-import type { IndexRefresh } from '../types';
-
-interface GetCaseIdsByAlertIdArgs {
-  alertId: string;
-  filter?: KueryNode;
-}
-
-interface PushedArgs {
-  pushed_at: string;
-  pushed_by: User;
-}
-
-interface GetCaseArgs {
-  id: string;
-}
-
-interface DeleteCaseArgs extends GetCaseArgs, IndexRefresh {}
-
-interface GetCasesArgs {
-  caseIds: string[];
-  fields?: string[];
-}
-
-interface FindCommentsArgs {
-  id: string | string[];
-  options?: SavedObjectFindOptionsKueryNode;
-}
-
-interface FindCaseCommentsArgs {
-  id: string | string[];
-  options?: SavedObjectFindOptionsKueryNode;
-}
-
-interface PostCaseArgs extends IndexRefresh {
-  attributes: CaseAttributes;
-  id: string;
-}
-
-interface PatchCase extends IndexRefresh {
-  caseId: string;
-  updatedAttributes: Partial<CaseAttributes & PushedArgs>;
-  originalCase: CaseSavedObject;
-  version?: string;
-}
-type PatchCaseArgs = PatchCase;
-
-interface PatchCasesArgs extends IndexRefresh {
-  cases: Array<Omit<PatchCase, 'refresh'>>;
-}
-
-interface CasesMapWithPageInfo {
-  casesMap: Map<string, CaseResponse>;
-  page: number;
-  perPage: number;
-  total: number;
-}
-
-type FindCaseOptions = CasesFindRequest & SavedObjectFindOptionsKueryNode;
-
-interface GetTagsArgs {
-  unsecuredSavedObjectsClient: SavedObjectsClientContract;
-  filter?: KueryNode;
-}
-
-interface GetReportersArgs {
-  unsecuredSavedObjectsClient: SavedObjectsClientContract;
-  filter?: KueryNode;
-}
-
-interface GetCaseIdsByAlertIdAggs {
-  references: {
-    doc_count: number;
-    caseIds: {
-      buckets: Array<{ key: string }>;
-    };
-  };
-}
+import type {
+  CasePersistedAttributes,
+  CaseSavedObjectTransformed,
+  CaseTransformedAttributes,
+} from '../../common/types/case';
+import { CasePersistedStatus } from '../../common/types/case';
+import type {
+  GetCaseIdsByAlertIdArgs,
+  GetCaseIdsByAlertIdAggs,
+  CasesMapWithPageInfo,
+  DeleteCaseArgs,
+  GetCaseArgs,
+  GetCasesArgs,
+  FindCommentsArgs,
+  FindCaseCommentsArgs,
+  GetReportersArgs,
+  GetTagsArgs,
+  PostCaseArgs,
+  PatchCaseArgs,
+  PatchCasesArgs,
+} from './types';
 
 export class CasesService {
   private readonly log: Logger;
@@ -174,7 +108,7 @@ export class CasesService {
     alertId,
     filter,
   }: GetCaseIdsByAlertIdArgs): Promise<
-    SavedObjectsFindResponse<CommentAttributes, GetCaseIdsByAlertIdAggs>
+    SavedObjectsFindResponse<{ owner: string }, GetCaseIdsByAlertIdAggs>
   > {
     try {
       this.log.debug(`Attempting to GET all cases for alert id ${alertId}`);
@@ -184,7 +118,7 @@ export class CasesService {
       ]);
 
       const response = await this.unsecuredSavedObjectsClient.find<
-        CommentAttributes,
+        { owner: string },
         GetCaseIdsByAlertIdAggs
       >({
         type: CASE_COMMENT_SAVED_OBJECT,
@@ -206,7 +140,7 @@ export class CasesService {
    * Extracts the case IDs from the alert aggregation
    */
   public static getCaseIDsFromAlertAggs(
-    result: SavedObjectsFindResponse<CommentAttributes, GetCaseIdsByAlertIdAggs>
+    result: SavedObjectsFindResponse<unknown, GetCaseIdsByAlertIdAggs>
   ): string[] {
     return result.aggregations?.references.caseIds.buckets.map((b) => b.key) ?? [];
   }
@@ -217,20 +151,20 @@ export class CasesService {
   public async findCasesGroupedByID({
     caseOptions,
   }: {
-    caseOptions: FindCaseOptions;
+    caseOptions: SavedObjectFindOptionsKueryNode;
   }): Promise<CasesMapWithPageInfo> {
     const cases = await this.findCases(caseOptions);
 
     const casesMap = cases.saved_objects.reduce((accMap, caseInfo) => {
       accMap.set(caseInfo.id, caseInfo);
       return accMap;
-    }, new Map<string, SavedObjectsFindResult<CaseAttributes>>());
+    }, new Map<string, SavedObjectsFindResult<CaseTransformedAttributes>>());
 
     const commentTotals = await this.attachmentService.getter.getCaseCommentStats({
       caseIds: Array.from(casesMap.keys()),
     });
 
-    const casesWithComments = new Map<string, CaseResponse>();
+    const casesWithComments = new Map<string, Case>();
     for (const [id, caseInfo] of casesMap.entries()) {
       const { alerts, userComments } = commentTotals.get(id) ?? { alerts: 0, userComments: 0 };
 
@@ -260,7 +194,7 @@ export class CasesService {
     [status in CaseStatuses]: number;
   }> {
     const cases = await this.unsecuredSavedObjectsClient.find<
-      ESCaseAttributes,
+      CasePersistedAttributes,
       {
         statuses: {
           buckets: Array<{
@@ -286,9 +220,9 @@ export class CasesService {
 
     const statusBuckets = CasesService.getStatusBuckets(cases.aggregations?.statuses.buckets);
     return {
-      open: statusBuckets?.get(ESCaseStatus.OPEN) ?? 0,
-      'in-progress': statusBuckets?.get(ESCaseStatus.IN_PROGRESS) ?? 0,
-      closed: statusBuckets?.get(ESCaseStatus.CLOSED) ?? 0,
+      open: statusBuckets?.get(CasePersistedStatus.OPEN) ?? 0,
+      'in-progress': statusBuckets?.get(CasePersistedStatus.IN_PROGRESS) ?? 0,
+      closed: statusBuckets?.get(CasePersistedStatus.CLOSED) ?? 0,
     };
   }
 
@@ -326,10 +260,10 @@ export class CasesService {
     }
   }
 
-  public async getCase({ id: caseId }: GetCaseArgs): Promise<CaseSavedObject> {
+  public async getCase({ id: caseId }: GetCaseArgs): Promise<CaseSavedObjectTransformed> {
     try {
       this.log.debug(`Attempting to GET case ${caseId}`);
-      const caseSavedObject = await this.unsecuredSavedObjectsClient.get<ESCaseAttributes>(
+      const caseSavedObject = await this.unsecuredSavedObjectsClient.get<CasePersistedAttributes>(
         CASE_SAVED_OBJECT,
         caseId
       );
@@ -342,13 +276,14 @@ export class CasesService {
 
   public async getResolveCase({
     id: caseId,
-  }: GetCaseArgs): Promise<SavedObjectsResolveResponse<CaseAttributes>> {
+  }: GetCaseArgs): Promise<SavedObjectsResolveResponse<CaseTransformedAttributes>> {
     try {
       this.log.debug(`Attempting to resolve case ${caseId}`);
-      const resolveCaseResult = await this.unsecuredSavedObjectsClient.resolve<ESCaseAttributes>(
-        CASE_SAVED_OBJECT,
-        caseId
-      );
+      const resolveCaseResult =
+        await this.unsecuredSavedObjectsClient.resolve<CasePersistedAttributes>(
+          CASE_SAVED_OBJECT,
+          caseId
+        );
       return {
         ...resolveCaseResult,
         saved_object: transformSavedObjectToExternalModel(resolveCaseResult.saved_object),
@@ -362,10 +297,10 @@ export class CasesService {
   public async getCases({
     caseIds,
     fields,
-  }: GetCasesArgs): Promise<SavedObjectsBulkResponse<CaseAttributes>> {
+  }: GetCasesArgs): Promise<SavedObjectsBulkResponse<CaseTransformedAttributes>> {
     try {
       this.log.debug(`Attempting to GET cases ${caseIds.join(', ')}`);
-      const cases = await this.unsecuredSavedObjectsClient.bulkGet<ESCaseAttributes>(
+      const cases = await this.unsecuredSavedObjectsClient.bulkGet<CasePersistedAttributes>(
         caseIds.map((caseId) => ({ type: CASE_SAVED_OBJECT, id: caseId, fields }))
       );
       return transformBulkResponseToExternalModel(cases);
@@ -377,14 +312,15 @@ export class CasesService {
 
   public async findCases(
     options?: SavedObjectFindOptionsKueryNode
-  ): Promise<SavedObjectsFindResponse<CaseAttributes>> {
+  ): Promise<SavedObjectsFindResponse<CaseTransformedAttributes>> {
     try {
       this.log.debug(`Attempting to find cases`);
-      const cases = await this.unsecuredSavedObjectsClient.find<ESCaseAttributes>({
+      const cases = await this.unsecuredSavedObjectsClient.find<CasePersistedAttributes>({
         sortField: defaultSortField,
         ...options,
         type: CASE_SAVED_OBJECT,
       });
+
       return transformFindResponseToExternalModel(cases);
     } catch (error) {
       this.log.error(`Error on find cases: ${error}`);
@@ -402,6 +338,8 @@ export class CasesService {
     }
   }
 
+  // TODO: This should probably be moved into the client since it is after the transform has
+  // occurred within the attachment service
   private async getAllComments({
     id,
     options,
@@ -431,6 +369,8 @@ export class CasesService {
     }
   }
 
+  // TODO: This should probably be moved into the client since it is after the transform has
+  // occurred within the attachment service
   /**
    * Default behavior is to retrieve all comments that adhere to a given filter (if one is included).
    * to override this pass in the either the page or perPage options.
@@ -471,7 +411,7 @@ export class CasesService {
       this.log.debug(`Attempting to GET all reporters`);
 
       const results = await this.unsecuredSavedObjectsClient.find<
-        ESCaseAttributes,
+        CasePersistedAttributes,
         {
           reporters: {
             buckets: Array<{
@@ -533,7 +473,7 @@ export class CasesService {
       this.log.debug(`Attempting to GET all cases`);
 
       const results = await this.unsecuredSavedObjectsClient.find<
-        ESCaseAttributes,
+        CasePersistedAttributes,
         { tags: { buckets: Array<{ key: string }> } }
       >({
         type: CASE_SAVED_OBJECT,
@@ -558,7 +498,11 @@ export class CasesService {
     }
   }
 
-  public async postNewCase({ attributes, id, refresh }: PostCaseArgs): Promise<CaseSavedObject> {
+  public async postNewCase({
+    attributes,
+    id,
+    refresh,
+  }: PostCaseArgs): Promise<CaseSavedObjectTransformed> {
     try {
       this.log.debug(`Attempting to POST a new case`);
       const transformedAttributes = transformAttributesToESModel(attributes);
@@ -566,7 +510,7 @@ export class CasesService {
       transformedAttributes.attributes.total_alerts = -1;
       transformedAttributes.attributes.total_comments = -1;
 
-      const createdCase = await this.unsecuredSavedObjectsClient.create<ESCaseAttributes>(
+      const createdCase = await this.unsecuredSavedObjectsClient.create<CasePersistedAttributes>(
         CASE_SAVED_OBJECT,
         transformedAttributes.attributes,
         { id, references: transformedAttributes.referenceHandler.build(), refresh }
@@ -585,12 +529,12 @@ export class CasesService {
     originalCase,
     version,
     refresh,
-  }: PatchCaseArgs): Promise<SavedObjectsUpdateResponse<CaseAttributes>> {
+  }: PatchCaseArgs): Promise<SavedObjectsUpdateResponse<CaseTransformedAttributes>> {
     try {
       this.log.debug(`Attempting to UPDATE case ${caseId}`);
       const transformedAttributes = transformAttributesToESModel(updatedAttributes);
 
-      const updatedCase = await this.unsecuredSavedObjectsClient.update<ESCaseAttributes>(
+      const updatedCase = await this.unsecuredSavedObjectsClient.update<CasePersistedAttributes>(
         CASE_SAVED_OBJECT,
         caseId,
         transformedAttributes.attributes,
@@ -611,7 +555,7 @@ export class CasesService {
   public async patchCases({
     cases,
     refresh,
-  }: PatchCasesArgs): Promise<SavedObjectsBulkUpdateResponse<CaseAttributes>> {
+  }: PatchCasesArgs): Promise<SavedObjectsBulkUpdateResponse<CaseTransformedAttributes>> {
     try {
       this.log.debug(`Attempting to UPDATE case ${cases.map((c) => c.caseId).join(', ')}`);
 
@@ -626,10 +570,10 @@ export class CasesService {
         };
       });
 
-      const updatedCases = await this.unsecuredSavedObjectsClient.bulkUpdate<ESCaseAttributes>(
-        bulkUpdate,
-        { refresh }
-      );
+      const updatedCases =
+        await this.unsecuredSavedObjectsClient.bulkUpdate<CasePersistedAttributes>(bulkUpdate, {
+          refresh,
+        });
 
       return transformUpdateResponsesToExternalModels(updatedCases);
     } catch (error) {
@@ -651,7 +595,7 @@ export class CasesService {
       }, {});
 
       const res = await this.unsecuredSavedObjectsClient.find<
-        ESCaseAttributes,
+        CasePersistedAttributes,
         AggregationResponse
       >({
         sortField: defaultSortField,
diff --git a/x-pack/plugins/cases/server/services/cases/transform.test.ts b/x-pack/plugins/cases/server/services/cases/transform.test.ts
index afd2de272bc421..1ba613e8c6d1ef 100644
--- a/x-pack/plugins/cases/server/services/cases/transform.test.ts
+++ b/x-pack/plugins/cases/server/services/cases/transform.test.ts
@@ -23,7 +23,7 @@ import {
   PUSH_CONNECTOR_ID_REFERENCE_NAME,
 } from '../../common/constants';
 import { getNoneCaseConnector } from '../../common/utils';
-import { ESCaseSeverity, ESCaseStatus } from './types';
+import { CasePersistedSeverity, CasePersistedStatus } from '../../common/types/case';
 
 describe('case transforms', () => {
   describe('transformUpdateResponseToExternalModel', () => {
@@ -200,10 +200,10 @@ describe('case transforms', () => {
     });
 
     it.each([
-      [ESCaseSeverity.LOW, CaseSeverity.LOW],
-      [ESCaseSeverity.MEDIUM, CaseSeverity.MEDIUM],
-      [ESCaseSeverity.HIGH, CaseSeverity.HIGH],
-      [ESCaseSeverity.CRITICAL, CaseSeverity.CRITICAL],
+      [CasePersistedSeverity.LOW, CaseSeverity.LOW],
+      [CasePersistedSeverity.MEDIUM, CaseSeverity.MEDIUM],
+      [CasePersistedSeverity.HIGH, CaseSeverity.HIGH],
+      [CasePersistedSeverity.CRITICAL, CaseSeverity.CRITICAL],
     ])(
       'properly converts "%s" severity to corresponding external value "%s"',
       (internalSeverityValue, expectedSeverityValue) => {
@@ -222,9 +222,9 @@ describe('case transforms', () => {
     );
 
     it.each([
-      [ESCaseStatus.OPEN, CaseStatuses.open],
-      [ESCaseStatus.IN_PROGRESS, CaseStatuses['in-progress']],
-      [ESCaseStatus.CLOSED, CaseStatuses.closed],
+      [CasePersistedStatus.OPEN, CaseStatuses.open],
+      [CasePersistedStatus.IN_PROGRESS, CaseStatuses['in-progress']],
+      [CasePersistedStatus.CLOSED, CaseStatuses.closed],
     ])(
       'properly converts "%s" status to corresponding ES Value "%s"',
       (internalStatusValue, expectedStatusValue) => {
@@ -387,10 +387,10 @@ describe('case transforms', () => {
     });
 
     it.each([
-      [CaseSeverity.LOW, ESCaseSeverity.LOW],
-      [CaseSeverity.MEDIUM, ESCaseSeverity.MEDIUM],
-      [CaseSeverity.HIGH, ESCaseSeverity.HIGH],
-      [CaseSeverity.CRITICAL, ESCaseSeverity.CRITICAL],
+      [CaseSeverity.LOW, CasePersistedSeverity.LOW],
+      [CaseSeverity.MEDIUM, CasePersistedSeverity.MEDIUM],
+      [CaseSeverity.HIGH, CasePersistedSeverity.HIGH],
+      [CaseSeverity.CRITICAL, CasePersistedSeverity.CRITICAL],
     ])(
       'properly converts "%s" severity to corresponding ES Value "%s"',
       (externalSeverityValue, expectedSeverityValue) => {
@@ -410,9 +410,9 @@ describe('case transforms', () => {
     });
 
     it.each([
-      [CaseStatuses.open, ESCaseStatus.OPEN],
-      [CaseStatuses['in-progress'], ESCaseStatus.IN_PROGRESS],
-      [CaseStatuses.closed, ESCaseStatus.CLOSED],
+      [CaseStatuses.open, CasePersistedStatus.OPEN],
+      [CaseStatuses['in-progress'], CasePersistedStatus.IN_PROGRESS],
+      [CaseStatuses.closed, CasePersistedStatus.CLOSED],
     ])(
       'properly converts "%s" status to corresponding ES Value "%s"',
       (externalStatusValue, expectedStatusValue) => {
@@ -501,10 +501,10 @@ describe('case transforms', () => {
     });
 
     it.each([
-      [ESCaseSeverity.LOW, CaseSeverity.LOW],
-      [ESCaseSeverity.MEDIUM, CaseSeverity.MEDIUM],
-      [ESCaseSeverity.HIGH, CaseSeverity.HIGH],
-      [ESCaseSeverity.CRITICAL, CaseSeverity.CRITICAL],
+      [CasePersistedSeverity.LOW, CaseSeverity.LOW],
+      [CasePersistedSeverity.MEDIUM, CaseSeverity.MEDIUM],
+      [CasePersistedSeverity.HIGH, CaseSeverity.HIGH],
+      [CasePersistedSeverity.CRITICAL, CaseSeverity.CRITICAL],
     ])(
       'properly converts "%s" severity to corresponding external value "%s"',
       (internalSeverityValue, expectedSeverityValue) => {
@@ -529,9 +529,9 @@ describe('case transforms', () => {
     });
 
     it.each([
-      [ESCaseStatus.OPEN, CaseStatuses.open],
-      [ESCaseStatus.IN_PROGRESS, CaseStatuses['in-progress']],
-      [ESCaseStatus.CLOSED, CaseStatuses.closed],
+      [CasePersistedStatus.OPEN, CaseStatuses.open],
+      [CasePersistedStatus.IN_PROGRESS, CaseStatuses['in-progress']],
+      [CasePersistedStatus.CLOSED, CaseStatuses.closed],
     ])(
       'properly converts "%s" status to corresponding external value "%s"',
       (internalStatusValue, expectedStatusValue) => {
diff --git a/x-pack/plugins/cases/server/services/cases/transform.ts b/x-pack/plugins/cases/server/services/cases/transform.ts
index 6adacf41f526ac..5b31bde8107c4d 100644
--- a/x-pack/plugins/cases/server/services/cases/transform.ts
+++ b/x-pack/plugins/cases/server/services/cases/transform.ts
@@ -16,7 +16,6 @@ import type {
   SavedObjectsUpdateResponse,
 } from '@kbn/core/server';
 import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
-import type { ESCaseAttributes, ExternalServicesWithoutConnectorId } from './types';
 import {
   CONNECTOR_ID_REFERENCE_NAME,
   PUSH_CONNECTOR_ID_REFERENCE_NAME,
@@ -25,7 +24,7 @@ import {
   STATUS_ESMODEL_TO_EXTERNAL,
   STATUS_EXTERNAL_TO_ESMODEL,
 } from '../../common/constants';
-import type { CaseAttributes, CaseFullExternalService } from '../../../common/api';
+import type { CaseFullExternalService } from '../../../common/api';
 import { CaseSeverity, CaseStatuses, NONE_CONNECTOR_ID } from '../../../common/api';
 import {
   findConnectorIdReference,
@@ -34,11 +33,12 @@ import {
   transformESConnectorToExternalModel,
 } from '../transform';
 import { ConnectorReferenceHandler } from '../connector_reference_handler';
-import type { CaseSavedObject } from '../../common/types';
+import type { CasePersistedAttributes, CaseTransformedAttributes } from '../../common/types/case';
+import type { ExternalServicePersisted } from '../../common/types/external_service';
 
 export function transformUpdateResponsesToExternalModels(
-  response: SavedObjectsBulkUpdateResponse<ESCaseAttributes>
-): SavedObjectsBulkUpdateResponse<CaseAttributes> {
+  response: SavedObjectsBulkUpdateResponse<CasePersistedAttributes>
+): SavedObjectsBulkUpdateResponse<CaseTransformedAttributes> {
   return {
     ...response,
     saved_objects: response.saved_objects.map((so) => ({
@@ -49,8 +49,8 @@ export function transformUpdateResponsesToExternalModels(
 }
 
 export function transformUpdateResponseToExternalModel(
-  updatedCase: SavedObjectsUpdateResponse<ESCaseAttributes>
-): SavedObjectsUpdateResponse<CaseAttributes> {
+  updatedCase: SavedObjectsUpdateResponse<CasePersistedAttributes>
+): SavedObjectsUpdateResponse<CaseTransformedAttributes> {
   const {
     connector,
     external_service,
@@ -64,7 +64,7 @@ export function transformUpdateResponseToExternalModel(
     ({
       total_alerts: -1,
       total_comments: -1,
-    } as ESCaseAttributes);
+    } as CasePersistedAttributes);
 
   const transformedConnector = transformESConnectorToExternalModel({
     // if the saved object had an error the attributes field will not exist
@@ -94,16 +94,16 @@ export function transformUpdateResponseToExternalModel(
   };
 }
 
-export function transformAttributesToESModel(caseAttributes: CaseAttributes): {
-  attributes: ESCaseAttributes;
+export function transformAttributesToESModel(caseAttributes: CaseTransformedAttributes): {
+  attributes: CasePersistedAttributes;
   referenceHandler: ConnectorReferenceHandler;
 };
-export function transformAttributesToESModel(caseAttributes: Partial<CaseAttributes>): {
-  attributes: Partial<ESCaseAttributes>;
+export function transformAttributesToESModel(caseAttributes: Partial<CaseTransformedAttributes>): {
+  attributes: Partial<CasePersistedAttributes>;
   referenceHandler: ConnectorReferenceHandler;
 };
-export function transformAttributesToESModel(caseAttributes: Partial<CaseAttributes>): {
-  attributes: Partial<ESCaseAttributes>;
+export function transformAttributesToESModel(caseAttributes: Partial<CaseTransformedAttributes>): {
+  attributes: Partial<CasePersistedAttributes>;
   referenceHandler: ConnectorReferenceHandler;
 } {
   const { connector, external_service, severity, status, ...restAttributes } = caseAttributes;
@@ -154,15 +154,15 @@ function buildReferenceHandler(
  * definition like this:
  *
  * export function transformArrayResponseToExternalModel(
- *  response: SavedObjectsBulkResponse<ESCaseAttributes> | SavedObjectsFindResponse<ESCaseAttributes>
- * ): SavedObjectsBulkResponse<CaseAttributes> | SavedObjectsFindResponse<CaseAttributes> {
+ *  response: SavedObjectsBulkResponse<CasePersistedAttributes> | SavedObjectsFindResponse<CasePersistedAttributes>
+ * ): SavedObjectsBulkResponse<CaseTransformedAttributes> | SavedObjectsFindResponse<CaseTransformedAttributes> {
  *
  * See this issue for more details: https://stackoverflow.com/questions/49510832/typescript-how-to-map-over-union-array-type
  */
 
 export function transformBulkResponseToExternalModel(
-  response: SavedObjectsBulkResponse<ESCaseAttributes>
-): SavedObjectsBulkResponse<CaseAttributes> {
+  response: SavedObjectsBulkResponse<CasePersistedAttributes>
+): SavedObjectsBulkResponse<CaseTransformedAttributes> {
   return {
     ...response,
     saved_objects: response.saved_objects.map((so) => ({
@@ -173,8 +173,8 @@ export function transformBulkResponseToExternalModel(
 }
 
 export function transformFindResponseToExternalModel(
-  response: SavedObjectsFindResponse<ESCaseAttributes>
-): SavedObjectsFindResponse<CaseAttributes> {
+  response: SavedObjectsFindResponse<CasePersistedAttributes>
+): SavedObjectsFindResponse<CaseTransformedAttributes> {
   return {
     ...response,
     saved_objects: response.saved_objects.map((so) => ({
@@ -185,8 +185,8 @@ export function transformFindResponseToExternalModel(
 }
 
 export function transformSavedObjectToExternalModel(
-  caseSavedObject: SavedObject<ESCaseAttributes>
-): CaseSavedObject {
+  caseSavedObject: SavedObject<CasePersistedAttributes>
+): SavedObject<CaseTransformedAttributes> {
   const connector = transformESConnectorOrUseDefault({
     // if the saved object had an error the attributes field will not exist
     connector: caseSavedObject.attributes?.connector,
@@ -209,7 +209,7 @@ export function transformSavedObjectToExternalModel(
     ({
       total_alerts: -1,
       total_comments: -1,
-    } as ESCaseAttributes);
+    } as CasePersistedAttributes);
 
   return {
     ...caseSavedObject,
@@ -226,7 +226,7 @@ export function transformSavedObjectToExternalModel(
 function transformESExternalService(
   // this type needs to match that of CaseFullExternalService except that it does not include the connector_id, see: x-pack/plugins/cases/common/api/cases/case.ts
   // that's why it can be null here
-  externalService: ExternalServicesWithoutConnectorId | null | undefined,
+  externalService: ExternalServicePersisted | null | undefined,
   references: SavedObjectReference[] | undefined
 ): CaseFullExternalService | null {
   const connectorIdRef = findConnectorIdReference(PUSH_CONNECTOR_ID_REFERENCE_NAME, references);
diff --git a/x-pack/plugins/cases/server/services/cases/types.ts b/x-pack/plugins/cases/server/services/cases/types.ts
index 5e831b7fd058f9..3a57fa3eea83a4 100644
--- a/x-pack/plugins/cases/server/services/cases/types.ts
+++ b/x-pack/plugins/cases/server/services/cases/types.ts
@@ -5,49 +5,88 @@
  * 2.0.
  */
 
-import type * as rt from 'io-ts';
-import type { CaseAttributes, CaseExternalServiceBasicRt } from '../../../common/api';
-import type { ESCaseConnector } from '..';
-
-/**
- * This type should only be used within the cases service and its helper functions (e.g. the transforms).
- *
- * The type represents how the external services portion of the object will be layed out when stored in ES. The external_service will have its
- * connector_id field removed and placed within the references field.
- */
-export type ExternalServicesWithoutConnectorId = Omit<
-  rt.TypeOf<typeof CaseExternalServiceBasicRt>,
-  'connector_id'
->;
-
-export enum ESCaseSeverity {
-  LOW = 0,
-  MEDIUM = 10,
-  HIGH = 20,
-  CRITICAL = 30,
-}
-
-export enum ESCaseStatus {
-  OPEN = 0,
-  IN_PROGRESS = 10,
-  CLOSED = 20,
-}
-
-/**
- * This type should only be used within the cases service and its helper functions (e.g. the transforms).
- *
- * The type represents how the Cases object will be layed out in ES.
- * 1 - It will not have connector.id or external_service.connector_id. Instead those fields will be transformed into the references field.
- * 2 - The Severity type is internally a number.
- */
-export type ESCaseAttributes = Omit<
-  CaseAttributes,
-  'connector' | 'external_service' | 'severity' | 'status'
-> & {
-  severity: ESCaseSeverity;
-  status: ESCaseStatus;
-  connector: ESCaseConnector;
-  external_service: ExternalServicesWithoutConnectorId | null;
-  total_alerts: number;
-  total_comments: number;
-};
+import type { KueryNode } from '@kbn/es-query';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
+import type { Case } from '../../../common/api';
+import type { IndexRefresh } from '../types';
+import type { User } from '../../common/types/user';
+import type {
+  CaseSavedObjectTransformed,
+  CaseTransformedAttributes,
+} from '../../common/types/case';
+import type { SavedObjectFindOptionsKueryNode } from '../../common/types';
+
+export interface GetCaseIdsByAlertIdArgs {
+  alertId: string;
+  filter?: KueryNode;
+}
+
+export interface PushedArgs {
+  pushed_at: string;
+  pushed_by: User;
+}
+
+export interface GetCaseArgs {
+  id: string;
+}
+
+export interface DeleteCaseArgs extends GetCaseArgs, IndexRefresh {}
+
+export interface GetCasesArgs {
+  caseIds: string[];
+  fields?: string[];
+}
+
+export interface FindCommentsArgs {
+  id: string | string[];
+  options?: SavedObjectFindOptionsKueryNode;
+}
+
+export interface FindCaseCommentsArgs {
+  id: string | string[];
+  options?: SavedObjectFindOptionsKueryNode;
+}
+
+export interface PostCaseArgs extends IndexRefresh {
+  attributes: CaseTransformedAttributes;
+  id: string;
+}
+
+export interface PatchCase extends IndexRefresh {
+  caseId: string;
+  updatedAttributes: Partial<CaseTransformedAttributes & PushedArgs>;
+  originalCase: CaseSavedObjectTransformed;
+  version?: string;
+}
+
+export type PatchCaseArgs = PatchCase;
+
+export interface PatchCasesArgs extends IndexRefresh {
+  cases: Array<Omit<PatchCase, 'refresh'>>;
+}
+
+export interface CasesMapWithPageInfo {
+  casesMap: Map<string, Case>;
+  page: number;
+  perPage: number;
+  total: number;
+}
+
+export interface GetTagsArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  filter?: KueryNode;
+}
+
+export interface GetReportersArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  filter?: KueryNode;
+}
+
+export interface GetCaseIdsByAlertIdAggs {
+  references: {
+    doc_count: number;
+    caseIds: {
+      buckets: Array<{ key: string }>;
+    };
+  };
+}
diff --git a/x-pack/plugins/cases/server/services/configure/index.test.ts b/x-pack/plugins/cases/server/services/configure/index.test.ts
index 6c65aaab708281..3fb25e2ff115ed 100644
--- a/x-pack/plugins/cases/server/services/configure/index.test.ts
+++ b/x-pack/plugins/cases/server/services/configure/index.test.ts
@@ -24,11 +24,11 @@ import type {
 import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import { loggerMock } from '@kbn/logging-mocks';
 import { CaseConfigureService } from '.';
-import type { ESCasesConfigureAttributes } from './types';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
 import { getNoneCaseConnector } from '../../common/utils';
 import type { ESCaseConnectorWithId } from '../test_utils';
 import { createESJiraConnector, createJiraConnector } from '../test_utils';
+import type { ConfigurePersistedAttributes } from '../../common/types/configure';
 
 const basicConfigFields = {
   closure_type: 'close-by-pushing' as const,
@@ -60,7 +60,7 @@ const createConfigPostParams = (connector: CaseConnector): CasesConfigureAttribu
 
 const createUpdateConfigSO = (
   connector?: ESCaseConnectorWithId
-): SavedObjectsUpdateResponse<ESCasesConfigureAttributes> => {
+): SavedObjectsUpdateResponse<ConfigurePersistedAttributes> => {
   const references: SavedObjectReference[] =
     connector && connector.id !== 'none'
       ? [
@@ -87,7 +87,7 @@ const createUpdateConfigSO = (
 
 const createConfigSO = (
   connector?: ESCaseConnectorWithId
-): SavedObject<ESCasesConfigureAttributes> => {
+): SavedObject<ConfigurePersistedAttributes> => {
   const references: SavedObjectReference[] = connector
     ? [
         {
@@ -119,17 +119,17 @@ const createConfigSO = (
 
 const createConfigSOPromise = (
   connector?: ESCaseConnectorWithId
-): Promise<SavedObject<ESCasesConfigureAttributes>> => Promise.resolve(createConfigSO(connector));
+): Promise<SavedObject<ConfigurePersistedAttributes>> => Promise.resolve(createConfigSO(connector));
 
 const createConfigFindSO = (
   connector?: ESCaseConnectorWithId
-): SavedObjectsFindResult<ESCasesConfigureAttributes> => ({
+): SavedObjectsFindResult<ConfigurePersistedAttributes> => ({
   ...createConfigSO(connector),
   score: 0,
 });
 
 const createSOFindResponse = (
-  savedObjects: Array<SavedObjectsFindResult<ESCasesConfigureAttributes>>
+  savedObjects: Array<SavedObjectsFindResult<ConfigurePersistedAttributes>>
 ) => ({
   saved_objects: savedObjects,
   total: savedObjects.length,
@@ -163,7 +163,7 @@ describe('CaseConfigureService', () => {
         });
 
         const { connector: ignoreConnector, ...restUpdateAttributes } = unsecuredSavedObjectsClient
-          .update.mock.calls[0][2] as Partial<ESCasesConfigureAttributes>;
+          .update.mock.calls[0][2] as Partial<ConfigurePersistedAttributes>;
 
         expect(restUpdateAttributes).toMatchInlineSnapshot(`
           Object {
@@ -198,7 +198,7 @@ describe('CaseConfigureService', () => {
         });
 
         const { connector } = unsecuredSavedObjectsClient.update.mock
-          .calls[0][2] as Partial<ESCasesConfigureAttributes>;
+          .calls[0][2] as Partial<ConfigurePersistedAttributes>;
 
         expect(connector?.fields).toMatchInlineSnapshot(`
           Array [
@@ -231,7 +231,7 @@ describe('CaseConfigureService', () => {
         });
 
         const { connector } = unsecuredSavedObjectsClient.update.mock
-          .calls[0][2] as Partial<ESCasesConfigureAttributes>;
+          .calls[0][2] as Partial<ConfigurePersistedAttributes>;
 
         expect(connector).toMatchInlineSnapshot(`
           Object {
@@ -269,7 +269,7 @@ describe('CaseConfigureService', () => {
         });
 
         const updateAttributes = unsecuredSavedObjectsClient.update.mock
-          .calls[0][2] as Partial<ESCasesConfigureAttributes>;
+          .calls[0][2] as Partial<ConfigurePersistedAttributes>;
 
         expect(updateAttributes.connector).not.toHaveProperty('id');
 
@@ -400,7 +400,7 @@ describe('CaseConfigureService', () => {
     describe('post', () => {
       it('includes the creation attributes excluding the connector.id field', async () => {
         unsecuredSavedObjectsClient.create.mockReturnValue(
-          Promise.resolve({} as SavedObject<ESCasesConfigureAttributes>)
+          Promise.resolve({} as SavedObject<ConfigurePersistedAttributes>)
         );
 
         await service.post({
@@ -410,7 +410,7 @@ describe('CaseConfigureService', () => {
         });
 
         const creationAttributes = unsecuredSavedObjectsClient.create.mock
-          .calls[0][1] as ESCasesConfigureAttributes;
+          .calls[0][1] as ConfigurePersistedAttributes;
         expect(creationAttributes.connector).not.toHaveProperty('id');
         expect(creationAttributes).toMatchInlineSnapshot(`
           Object {
@@ -452,7 +452,7 @@ describe('CaseConfigureService', () => {
 
       it('moves the connector.id to the references', async () => {
         unsecuredSavedObjectsClient.create.mockReturnValue(
-          Promise.resolve({} as SavedObject<ESCasesConfigureAttributes>)
+          Promise.resolve({} as SavedObject<ConfigurePersistedAttributes>)
         );
 
         await service.post({
@@ -478,7 +478,7 @@ describe('CaseConfigureService', () => {
 
       it('sets connector.fields to an empty array when it is not included', async () => {
         unsecuredSavedObjectsClient.create.mockReturnValue(
-          Promise.resolve({} as SavedObject<ESCasesConfigureAttributes>)
+          Promise.resolve({} as SavedObject<ConfigurePersistedAttributes>)
         );
 
         await service.post({
@@ -500,7 +500,7 @@ describe('CaseConfigureService', () => {
 
       it('does not create a reference for a none connector', async () => {
         unsecuredSavedObjectsClient.create.mockReturnValue(
-          Promise.resolve({} as SavedObject<ESCasesConfigureAttributes>)
+          Promise.resolve({} as SavedObject<ConfigurePersistedAttributes>)
         );
 
         await service.post({
@@ -545,7 +545,7 @@ describe('CaseConfigureService', () => {
 
       it('returns an undefined connector if it is not returned by the update', async () => {
         unsecuredSavedObjectsClient.update.mockReturnValue(
-          Promise.resolve({} as SavedObjectsUpdateResponse<ESCasesConfigureAttributes>)
+          Promise.resolve({} as SavedObjectsUpdateResponse<ConfigurePersistedAttributes>)
         );
 
         const res = await service.patch({
@@ -564,7 +564,7 @@ describe('CaseConfigureService', () => {
 
       it('returns the default none connector when it cannot find the reference', async () => {
         const { name, type, fields } = createESJiraConnector();
-        const returnValue: SavedObjectsUpdateResponse<ESCasesConfigureAttributes> = {
+        const returnValue: SavedObjectsUpdateResponse<ConfigurePersistedAttributes> = {
           type: CASE_CONFIGURE_SAVED_OBJECT,
           id: '1',
           attributes: {
@@ -707,7 +707,7 @@ describe('CaseConfigureService', () => {
                 type: ACTION_SAVED_OBJECT_TYPE,
               },
             ],
-          } as unknown as SavedObject<ESCasesConfigureAttributes>)
+          } as unknown as SavedObject<ConfigurePersistedAttributes>)
         );
         const res = await service.get({ unsecuredSavedObjectsClient, configurationId: '1' });
 
diff --git a/x-pack/plugins/cases/server/services/configure/index.ts b/x-pack/plugins/cases/server/services/configure/index.ts
index 8a63f1fcfce2ff..d424c96f006dcb 100644
--- a/x-pack/plugins/cases/server/services/configure/index.ts
+++ b/x-pack/plugins/cases/server/services/configure/index.ts
@@ -8,13 +8,11 @@
 import type {
   Logger,
   SavedObject,
-  SavedObjectsClientContract,
   SavedObjectsFindResponse,
   SavedObjectsUpdateResponse,
 } from '@kbn/core/server';
 
 import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
-import type { SavedObjectFindOptionsKueryNode } from '../../common/types';
 import { CONNECTOR_ID_REFERENCE_NAME } from '../../common/constants';
 import type { CasesConfigureAttributes, CasesConfigurePatch } from '../../../common/api';
 import { CASE_CONFIGURE_SAVED_OBJECT } from '../../../common/constants';
@@ -24,33 +22,14 @@ import {
   transformESConnectorOrUseDefault,
 } from '../transform';
 import { ConnectorReferenceHandler } from '../connector_reference_handler';
-import type { ESCasesConfigureAttributes } from './types';
-import type { IndexRefresh } from '../types';
-
-interface ClientArgs {
-  unsecuredSavedObjectsClient: SavedObjectsClientContract;
-}
-
-interface GetCaseConfigureArgs extends ClientArgs {
-  configurationId: string;
-}
-
-interface DeleteCaseConfigureArgs extends GetCaseConfigureArgs, IndexRefresh {}
-
-interface FindCaseConfigureArgs extends ClientArgs {
-  options?: SavedObjectFindOptionsKueryNode;
-}
-
-interface PostCaseConfigureArgs extends ClientArgs, IndexRefresh {
-  attributes: CasesConfigureAttributes;
-  id: string;
-}
-
-interface PatchCaseConfigureArgs extends ClientArgs, IndexRefresh {
-  configurationId: string;
-  updatedAttributes: Partial<CasesConfigureAttributes>;
-  originalConfiguration: SavedObject<CasesConfigureAttributes>;
-}
+import type {
+  DeleteCaseConfigureArgs,
+  FindCaseConfigureArgs,
+  GetCaseConfigureArgs,
+  PatchCaseConfigureArgs,
+  PostCaseConfigureArgs,
+} from './types';
+import type { ConfigurePersistedAttributes } from '../../common/types/configure';
 
 export class CaseConfigureService {
   constructor(private readonly log: Logger) {}
@@ -79,7 +58,7 @@ export class CaseConfigureService {
   }: GetCaseConfigureArgs): Promise<SavedObject<CasesConfigureAttributes>> {
     try {
       this.log.debug(`Attempting to GET case configuration ${configurationId}`);
-      const configuration = await unsecuredSavedObjectsClient.get<ESCasesConfigureAttributes>(
+      const configuration = await unsecuredSavedObjectsClient.get<ConfigurePersistedAttributes>(
         CASE_CONFIGURE_SAVED_OBJECT,
         configurationId
       );
@@ -98,7 +77,7 @@ export class CaseConfigureService {
     try {
       this.log.debug(`Attempting to find all case configuration`);
 
-      const findResp = await unsecuredSavedObjectsClient.find<ESCasesConfigureAttributes>({
+      const findResp = await unsecuredSavedObjectsClient.find<ConfigurePersistedAttributes>({
         ...options,
         // Get the latest configuration
         sortField: 'created_at',
@@ -122,7 +101,7 @@ export class CaseConfigureService {
     try {
       this.log.debug(`Attempting to POST a new case configuration`);
       const esConfigInfo = transformAttributesToESModel(attributes);
-      const createdConfig = await unsecuredSavedObjectsClient.create<ESCasesConfigureAttributes>(
+      const createdConfig = await unsecuredSavedObjectsClient.create<ConfigurePersistedAttributes>(
         CASE_CONFIGURE_SAVED_OBJECT,
         esConfigInfo.attributes,
         { id, references: esConfigInfo.referenceHandler.build(), refresh }
@@ -147,7 +126,7 @@ export class CaseConfigureService {
       const esUpdateInfo = transformAttributesToESModel(updatedAttributes);
 
       const updatedConfiguration =
-        await unsecuredSavedObjectsClient.update<ESCasesConfigureAttributes>(
+        await unsecuredSavedObjectsClient.update<ConfigurePersistedAttributes>(
           CASE_CONFIGURE_SAVED_OBJECT,
           configurationId,
           {
@@ -168,7 +147,7 @@ export class CaseConfigureService {
 }
 
 function transformUpdateResponseToExternalModel(
-  updatedConfiguration: SavedObjectsUpdateResponse<ESCasesConfigureAttributes>
+  updatedConfiguration: SavedObjectsUpdateResponse<ConfigurePersistedAttributes>
 ): SavedObjectsUpdateResponse<CasesConfigurePatch> {
   const { connector, ...restUpdatedAttributes } = updatedConfiguration.attributes ?? {};
 
@@ -178,10 +157,12 @@ function transformUpdateResponseToExternalModel(
     referenceName: CONNECTOR_ID_REFERENCE_NAME,
   });
 
+  const castedAttributesWithoutConnector = restUpdatedAttributes as CasesConfigurePatch;
+
   return {
     ...updatedConfiguration,
     attributes: {
-      ...restUpdatedAttributes,
+      ...castedAttributesWithoutConnector,
       // this will avoid setting connector to undefined, it won't include to field at all
       ...(transformedConnector && { connector: transformedConnector }),
     },
@@ -189,7 +170,7 @@ function transformUpdateResponseToExternalModel(
 }
 
 function transformToExternalModel(
-  configuration: SavedObject<ESCasesConfigureAttributes>
+  configuration: SavedObject<ConfigurePersistedAttributes>
 ): SavedObject<CasesConfigureAttributes> {
   const connector = transformESConnectorOrUseDefault({
     // if the saved object had an error the attributes field will not exist
@@ -198,17 +179,19 @@ function transformToExternalModel(
     referenceName: CONNECTOR_ID_REFERENCE_NAME,
   });
 
+  const castedAttributes = configuration.attributes as CasesConfigureAttributes;
+
   return {
     ...configuration,
     attributes: {
-      ...configuration.attributes,
+      ...castedAttributes,
       connector,
     },
   };
 }
 
 function transformFindResponseToExternalModel(
-  configurations: SavedObjectsFindResponse<ESCasesConfigureAttributes>
+  configurations: SavedObjectsFindResponse<ConfigurePersistedAttributes>
 ): SavedObjectsFindResponse<CasesConfigureAttributes> {
   return {
     ...configurations,
@@ -220,15 +203,15 @@ function transformFindResponseToExternalModel(
 }
 
 function transformAttributesToESModel(configuration: CasesConfigureAttributes): {
-  attributes: ESCasesConfigureAttributes;
+  attributes: ConfigurePersistedAttributes;
   referenceHandler: ConnectorReferenceHandler;
 };
 function transformAttributesToESModel(configuration: Partial<CasesConfigureAttributes>): {
-  attributes: Partial<ESCasesConfigureAttributes>;
+  attributes: Partial<ConfigurePersistedAttributes>;
   referenceHandler: ConnectorReferenceHandler;
 };
 function transformAttributesToESModel(configuration: Partial<CasesConfigureAttributes>): {
-  attributes: Partial<ESCasesConfigureAttributes>;
+  attributes: Partial<ConfigurePersistedAttributes>;
   referenceHandler: ConnectorReferenceHandler;
 } {
   const { connector, ...restWithoutConnector } = configuration;
diff --git a/x-pack/plugins/cases/server/services/configure/types.ts b/x-pack/plugins/cases/server/services/configure/types.ts
index 4e6ecc03955aee..2d47e32387a5cb 100644
--- a/x-pack/plugins/cases/server/services/configure/types.ts
+++ b/x-pack/plugins/cases/server/services/configure/types.ts
@@ -5,13 +5,32 @@
  * 2.0.
  */
 
+import type { SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
 import type { CasesConfigureAttributes } from '../../../common/api';
-import type { ESCaseConnector } from '..';
+import type { IndexRefresh } from '../types';
+import type { SavedObjectFindOptionsKueryNode } from '../../common/types';
 
-/**
- * This type should only be used within the configure service. It represents how the configure saved object will be layed
- * out in ES.
- */
-export type ESCasesConfigureAttributes = Omit<CasesConfigureAttributes, 'connector'> & {
-  connector: ESCaseConnector;
-};
+export interface ClientArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+}
+
+export interface GetCaseConfigureArgs extends ClientArgs {
+  configurationId: string;
+}
+
+export interface DeleteCaseConfigureArgs extends GetCaseConfigureArgs, IndexRefresh {}
+
+export interface FindCaseConfigureArgs extends ClientArgs {
+  options?: SavedObjectFindOptionsKueryNode;
+}
+
+export interface PostCaseConfigureArgs extends ClientArgs, IndexRefresh {
+  attributes: CasesConfigureAttributes;
+  id: string;
+}
+
+export interface PatchCaseConfigureArgs extends ClientArgs, IndexRefresh {
+  configurationId: string;
+  updatedAttributes: Partial<CasesConfigureAttributes>;
+  originalConfiguration: SavedObject<CasesConfigureAttributes>;
+}
diff --git a/x-pack/plugins/cases/server/services/connector_mappings/index.ts b/x-pack/plugins/cases/server/services/connector_mappings/index.ts
index 3f0c2d64260a7b..f5301337770d65 100644
--- a/x-pack/plugins/cases/server/services/connector_mappings/index.ts
+++ b/x-pack/plugins/cases/server/services/connector_mappings/index.ts
@@ -5,41 +5,38 @@
  * 2.0.
  */
 
-import type { Logger, SavedObjectReference, SavedObjectsClientContract } from '@kbn/core/server';
+import type {
+  Logger,
+  SavedObject,
+  SavedObjectsFindResponse,
+  SavedObjectsUpdateResponse,
+} from '@kbn/core/server';
 
 import { CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT } from '../../../common/constants';
+import type {
+  FindConnectorMappingsArgs,
+  PostConnectorMappingsArgs,
+  UpdateConnectorMappingsArgs,
+} from './types';
+import type { ConnectorMappingsPersistedAttributes } from '../../common/types/connector_mappings';
 import type { ConnectorMappings } from '../../../common/api';
-import type { SavedObjectFindOptionsKueryNode } from '../../common/types';
-import type { IndexRefresh } from '../types';
-
-interface ClientArgs {
-  unsecuredSavedObjectsClient: SavedObjectsClientContract;
-}
-interface FindConnectorMappingsArgs extends ClientArgs {
-  options?: SavedObjectFindOptionsKueryNode;
-}
-
-interface PostConnectorMappingsArgs extends ClientArgs, IndexRefresh {
-  attributes: ConnectorMappings;
-  references: SavedObjectReference[];
-}
-
-interface UpdateConnectorMappingsArgs extends ClientArgs, IndexRefresh {
-  mappingId: string;
-  attributes: Partial<ConnectorMappings>;
-  references: SavedObjectReference[];
-}
 
 export class ConnectorMappingsService {
   constructor(private readonly log: Logger) {}
 
-  public async find({ unsecuredSavedObjectsClient, options }: FindConnectorMappingsArgs) {
+  public async find({
+    unsecuredSavedObjectsClient,
+    options,
+  }: FindConnectorMappingsArgs): Promise<SavedObjectsFindResponse<ConnectorMappings>> {
     try {
       this.log.debug(`Attempting to find all connector mappings`);
-      return await unsecuredSavedObjectsClient.find<ConnectorMappings>({
-        ...options,
-        type: CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
-      });
+      const connectorMappings =
+        await unsecuredSavedObjectsClient.find<ConnectorMappingsPersistedAttributes>({
+          ...options,
+          type: CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
+        });
+
+      return connectorMappings as SavedObjectsFindResponse<ConnectorMappings>;
     } catch (error) {
       this.log.error(`Attempting to find all connector mappings: ${error}`);
       throw error;
@@ -51,17 +48,20 @@ export class ConnectorMappingsService {
     attributes,
     references,
     refresh,
-  }: PostConnectorMappingsArgs) {
+  }: PostConnectorMappingsArgs): Promise<SavedObject<ConnectorMappings>> {
     try {
       this.log.debug(`Attempting to POST a new connector mappings`);
-      return await unsecuredSavedObjectsClient.create<ConnectorMappings>(
-        CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
-        attributes,
-        {
-          references,
-          refresh,
-        }
-      );
+      const connectorMappings =
+        await unsecuredSavedObjectsClient.create<ConnectorMappingsPersistedAttributes>(
+          CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
+          attributes,
+          {
+            references,
+            refresh,
+          }
+        );
+
+      return connectorMappings as SavedObject<ConnectorMappings>;
     } catch (error) {
       this.log.error(`Error on POST a new connector mappings: ${error}`);
       throw error;
@@ -74,18 +74,21 @@ export class ConnectorMappingsService {
     attributes,
     references,
     refresh,
-  }: UpdateConnectorMappingsArgs) {
+  }: UpdateConnectorMappingsArgs): Promise<SavedObjectsUpdateResponse<ConnectorMappings>> {
     try {
       this.log.debug(`Attempting to UPDATE connector mappings ${mappingId}`);
-      return await unsecuredSavedObjectsClient.update<ConnectorMappings>(
-        CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
-        mappingId,
-        attributes,
-        {
-          references,
-          refresh,
-        }
-      );
+      const updatedMappings =
+        await unsecuredSavedObjectsClient.update<ConnectorMappingsPersistedAttributes>(
+          CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
+          mappingId,
+          attributes,
+          {
+            references,
+            refresh,
+          }
+        );
+
+      return updatedMappings as SavedObjectsUpdateResponse<ConnectorMappings>;
     } catch (error) {
       this.log.error(`Error on UPDATE connector mappings ${mappingId}: ${error}`);
       throw error;
diff --git a/x-pack/plugins/cases/server/services/connector_mappings/types.ts b/x-pack/plugins/cases/server/services/connector_mappings/types.ts
new file mode 100644
index 00000000000000..a82663dbdfdace
--- /dev/null
+++ b/x-pack/plugins/cases/server/services/connector_mappings/types.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SavedObjectReference, SavedObjectsClientContract } from '@kbn/core/server';
+
+import type { ConnectorMappings } from '../../../common/api';
+import type { SavedObjectFindOptionsKueryNode } from '../../common/types';
+import type { IndexRefresh } from '../types';
+
+export interface ClientArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+}
+export interface FindConnectorMappingsArgs extends ClientArgs {
+  options?: SavedObjectFindOptionsKueryNode;
+}
+
+export interface PostConnectorMappingsArgs extends ClientArgs, IndexRefresh {
+  attributes: ConnectorMappings;
+  references: SavedObjectReference[];
+}
+
+export interface UpdateConnectorMappingsArgs extends ClientArgs, IndexRefresh {
+  mappingId: string;
+  attributes: Partial<ConnectorMappings>;
+  references: SavedObjectReference[];
+}
diff --git a/x-pack/plugins/cases/server/services/index.ts b/x-pack/plugins/cases/server/services/index.ts
index e15584b6ced9ea..f1bfc940a36f18 100644
--- a/x-pack/plugins/cases/server/services/index.ts
+++ b/x-pack/plugins/cases/server/services/index.ts
@@ -6,7 +6,6 @@
  */
 
 import type { SavedObjectsClientContract } from '@kbn/core/server';
-import type { ConnectorTypes } from '../../common/api';
 
 export { CasesService } from './cases';
 export { CaseConfigureService } from './configure';
@@ -19,14 +18,3 @@ export { UserProfileService } from './user_profiles';
 export interface ClientArgs {
   unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }
-
-export type ESConnectorFields = Array<{
-  key: string;
-  value: unknown;
-}>;
-
-export interface ESCaseConnector {
-  name: string;
-  type: ConnectorTypes;
-  fields: ESConnectorFields | null;
-}
diff --git a/x-pack/plugins/cases/server/services/notifications/email_notification_service.ts b/x-pack/plugins/cases/server/services/notifications/email_notification_service.ts
index 2800a248b13947..8c8fd98e1a8489 100644
--- a/x-pack/plugins/cases/server/services/notifications/email_notification_service.ts
+++ b/x-pack/plugins/cases/server/services/notifications/email_notification_service.ts
@@ -11,7 +11,7 @@ import type { NotificationsPluginStart } from '@kbn/notifications-plugin/server'
 import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 import type { UserProfileUserInfo } from '@kbn/user-profile-components';
 import { CASE_SAVED_OBJECT, MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
-import type { CaseSavedObject } from '../../common/types';
+import type { CaseSavedObjectTransformed } from '../../common/types/case';
 import { getCaseViewPath } from '../../common/utils';
 import type { NotificationService, NotifyArgs } from './types';
 
@@ -46,12 +46,12 @@ export class EmailNotificationService implements NotificationService {
     this.publicBaseUrl = publicBaseUrl;
   }
 
-  private static getTitle(theCase: CaseSavedObject) {
+  private static getTitle(theCase: CaseSavedObjectTransformed) {
     return `[Elastic][Cases] ${theCase.attributes.title}`;
   }
 
   private static getMessage(
-    theCase: CaseSavedObject,
+    theCase: CaseSavedObjectTransformed,
     spaceId: string,
     publicBaseUrl?: IBasePath['publicBaseUrl']
   ) {
diff --git a/x-pack/plugins/cases/server/services/notifications/types.ts b/x-pack/plugins/cases/server/services/notifications/types.ts
index 0efc326cf78351..48909c00a77d70 100644
--- a/x-pack/plugins/cases/server/services/notifications/types.ts
+++ b/x-pack/plugins/cases/server/services/notifications/types.ts
@@ -6,11 +6,11 @@
  */
 
 import type { CaseAssignees } from '../../../common/api';
-import type { CaseSavedObject } from '../../common/types';
+import type { CaseSavedObjectTransformed } from '../../common/types/case';
 
 export interface NotifyArgs {
   assignees: CaseAssignees;
-  theCase: CaseSavedObject;
+  theCase: CaseSavedObjectTransformed;
 }
 
 export interface NotificationService {
diff --git a/x-pack/plugins/cases/server/services/so_references.ts b/x-pack/plugins/cases/server/services/so_references.ts
index f85c4cab1829d9..8a3cc747c752a5 100644
--- a/x-pack/plugins/cases/server/services/so_references.ts
+++ b/x-pack/plugins/cases/server/services/so_references.ts
@@ -5,15 +5,16 @@
  * 2.0.
  */
 
-import type { SavedObjectsUpdateResponse } from '@kbn/core/server';
-import type { SavedObject, SavedObjectReference } from '@kbn/core/types';
+import type {
+  SavedObjectsUpdateResponse,
+  SavedObject,
+  SavedObjectReference,
+} from '@kbn/core/server';
 import { isEqual, uniqWith } from 'lodash';
 import type {
   CommentAttributesNoSO,
-  CommentRequest,
   CommentAttributes,
   CommentPatchAttributes,
-  CommentAttributesWithoutRefs,
 } from '../../common/api';
 import type { PersistableStateAttachmentTypeRegistry } from '../attachment_framework/persistable_state_registry';
 import {
@@ -21,11 +22,17 @@ import {
   extractPersistableStateReferencesFromSO,
 } from '../attachment_framework/so_references';
 import { EXTERNAL_REFERENCE_REF_NAME } from '../common/constants';
-import { isCommentRequestTypeExternalReferenceSO } from '../common/utils';
+import type {
+  AttachmentPersistedAttributes,
+  AttachmentRequestAttributes,
+} from '../common/types/attachments';
+import { isCommentRequestTypeExternalReferenceSO } from './type_guards';
 import type { PartialField } from '../types';
 import { SOReferenceExtractor } from './so_reference_extractor';
 
-export const getAttachmentSOExtractor = (attachment: Partial<CommentRequest>) => {
+export const getAttachmentSOExtractor = (
+  attachment: Partial<AttachmentRequestAttributes>
+): SOReferenceExtractor => {
   const fieldsToExtract = [];
 
   if (isCommentRequestTypeExternalReferenceSO(attachment)) {
@@ -47,7 +54,7 @@ type OptionalAttributes<T> = PartialField<SavedObject<T>, 'attributes'>;
  * then the error field will be set and attributes will be undefined.
  */
 export const injectAttachmentAttributesAndHandleErrors = (
-  savedObject: OptionalAttributes<CommentAttributesWithoutRefs>,
+  savedObject: OptionalAttributes<AttachmentPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
 ): OptionalAttributes<CommentAttributes> => {
   if (!hasAttributes(savedObject)) {
@@ -64,9 +71,9 @@ const hasAttributes = <T>(savedObject: OptionalAttributes<T>): savedObject is Sa
 };
 
 export const injectAttachmentSOAttributesFromRefs = (
-  savedObject: SavedObject<CommentAttributesWithoutRefs>,
+  savedObject: SavedObject<AttachmentPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-) => {
+): SavedObject<CommentAttributes> => {
   const soExtractor = getAttachmentSOExtractor(savedObject.attributes);
   const so = soExtractor.populateFieldsFromReferences<CommentAttributes>(savedObject);
   const injectedAttributes = injectPersistableReferencesToSO(so.attributes, so.references, {
@@ -78,9 +85,9 @@ export const injectAttachmentSOAttributesFromRefs = (
 
 export const injectAttachmentSOAttributesFromRefsForPatch = (
   updatedAttributes: CommentPatchAttributes,
-  savedObject: SavedObjectsUpdateResponse<CommentAttributesWithoutRefs>,
+  savedObject: SavedObjectsUpdateResponse<AttachmentPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-) => {
+): SavedObjectsUpdateResponse<CommentAttributes> => {
   const soExtractor = getAttachmentSOExtractor(savedObject.attributes);
   const so = soExtractor.populateFieldsFromReferencesForPatch<CommentAttributes>({
     dataBeforeRequest: updatedAttributes,
@@ -101,11 +108,17 @@ export const injectAttachmentSOAttributesFromRefsForPatch = (
   } as SavedObjectsUpdateResponse<CommentAttributes>;
 };
 
+interface ExtractionResults {
+  attributes: AttachmentPersistedAttributes;
+  references: SavedObjectReference[];
+  didDeleteOperation: boolean;
+}
+
 export const extractAttachmentSORefsFromAttributes = (
   attributes: CommentAttributes | CommentPatchAttributes,
   references: SavedObjectReference[],
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-) => {
+): ExtractionResults => {
   const soExtractor = getAttachmentSOExtractor(attributes);
 
   const {
@@ -129,5 +142,5 @@ export const extractAttachmentSORefsFromAttributes = (
   };
 };
 
-export const getUniqueReferences = (references: SavedObjectReference[]) =>
+export const getUniqueReferences = (references: SavedObjectReference[]): SavedObjectReference[] =>
   uniqWith(references, isEqual);
diff --git a/x-pack/plugins/cases/server/services/test_utils.ts b/x-pack/plugins/cases/server/services/test_utils.ts
index d0108564d476ac..f0cfdbe6b18664 100644
--- a/x-pack/plugins/cases/server/services/test_utils.ts
+++ b/x-pack/plugins/cases/server/services/test_utils.ts
@@ -7,7 +7,6 @@
 
 import type { SavedObject, SavedObjectReference, SavedObjectsFindResult } from '@kbn/core/server';
 import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
-import type { ESConnectorFields } from '.';
 import { CONNECTOR_ID_REFERENCE_NAME, PUSH_CONNECTOR_ID_REFERENCE_NAME } from '../common/constants';
 import type {
   CaseAttributes,
@@ -17,9 +16,11 @@ import type {
 } from '../../common/api';
 import { CaseSeverity, CaseStatuses, ConnectorTypes, NONE_CONNECTOR_ID } from '../../common/api';
 import { CASE_SAVED_OBJECT, SECURITY_SOLUTION_OWNER } from '../../common/constants';
-import type { ESCaseAttributes, ExternalServicesWithoutConnectorId } from './cases/types';
-import { ESCaseSeverity, ESCaseStatus } from './cases/types';
 import { getNoneCaseConnector } from '../common/utils';
+import type { ConnectorPersistedFields } from '../common/types/connectors';
+import type { CasePersistedAttributes } from '../common/types/case';
+import { CasePersistedSeverity, CasePersistedStatus } from '../common/types/case';
+import type { ExternalServicePersisted } from '../common/types/external_service';
 
 /**
  * This is only a utility interface to help with constructing test cases. After the migration, the ES format will no longer
@@ -29,7 +30,7 @@ export interface ESCaseConnectorWithId {
   id: string;
   name: string;
   type: ConnectorTypes;
-  fields: ESConnectorFields | null;
+  fields: ConnectorPersistedFields | null;
 }
 
 /**
@@ -97,7 +98,7 @@ export const createExternalService = (
   ...overrides,
 });
 
-export const basicESCaseFields: ESCaseAttributes = {
+export const basicESCaseFields: CasePersistedAttributes = {
   closed_at: null,
   closed_by: null,
   created_at: '2019-11-25T21:54:48.952Z',
@@ -106,11 +107,11 @@ export const basicESCaseFields: ESCaseAttributes = {
     email: 'testemail@elastic.co',
     username: 'elastic',
   },
-  severity: ESCaseSeverity.LOW,
+  severity: CasePersistedSeverity.LOW,
   duration: null,
   description: 'This is a brand new case of a bad meanie defacing data',
   title: 'Super Bad Security Issue',
-  status: ESCaseStatus.OPEN,
+  status: CasePersistedStatus.OPEN,
   tags: ['defacement'],
   updated_at: '2019-11-25T21:54:48.952Z',
   updated_by: {
@@ -167,9 +168,9 @@ export const createCaseSavedObjectResponse = ({
 }: {
   connector?: ESCaseConnectorWithId;
   externalService?: CaseFullExternalService;
-  overrides?: Partial<ESCaseAttributes>;
+  overrides?: Partial<CasePersistedAttributes>;
   caseId?: string;
-} = {}): SavedObject<ESCaseAttributes> => {
+} = {}): SavedObject<CasePersistedAttributes> => {
   const references: SavedObjectReference[] = createSavedObjectReferences({
     connector,
     externalService,
@@ -181,7 +182,7 @@ export const createCaseSavedObjectResponse = ({
     fields: connector?.fields ?? null,
   };
 
-  let restExternalService: ExternalServicesWithoutConnectorId | null = null;
+  let restExternalService: ExternalServicePersisted | null = null;
   if (externalService !== null) {
     const { connector_id: ignored, ...rest } = externalService ?? {
       connector_name: '.jira',
diff --git a/x-pack/plugins/cases/server/services/transform.ts b/x-pack/plugins/cases/server/services/transform.ts
index 50d5192610d4f6..1229ec1fd6c62f 100644
--- a/x-pack/plugins/cases/server/services/transform.ts
+++ b/x-pack/plugins/cases/server/services/transform.ts
@@ -9,7 +9,7 @@ import type { SavedObjectReference } from '@kbn/core/server';
 import { ACTION_SAVED_OBJECT_TYPE } from '@kbn/actions-plugin/server';
 import type { CaseConnector, ConnectorTypeFields } from '../../common/api';
 import { getNoneCaseConnector } from '../common/utils';
-import type { ESCaseConnector, ESConnectorFields } from '.';
+import type { ConnectorPersistedFields, ConnectorPersisted } from '../common/types/connectors';
 
 export function findConnectorIdReference(
   name: string,
@@ -23,7 +23,7 @@ export function transformESConnectorToExternalModel({
   references,
   referenceName,
 }: {
-  connector?: ESCaseConnector;
+  connector?: ConnectorPersisted;
   references?: SavedObjectReference[];
   referenceName: string;
 }): CaseConnector | undefined {
@@ -32,7 +32,7 @@ export function transformESConnectorToExternalModel({
 }
 
 function transformConnectorFieldsToExternalModel(
-  connector?: ESCaseConnector,
+  connector?: ConnectorPersisted,
   connectorId?: string
 ): CaseConnector | undefined {
   if (!connector) {
@@ -72,7 +72,7 @@ export function transformESConnectorOrUseDefault({
   references,
   referenceName,
 }: {
-  connector?: ESCaseConnector;
+  connector?: ConnectorPersisted;
   references?: SavedObjectReference[];
   referenceName: string;
 }): CaseConnector {
@@ -82,12 +82,12 @@ export function transformESConnectorOrUseDefault({
   );
 }
 
-export function transformFieldsToESModel(connector: CaseConnector): ESConnectorFields {
+export function transformFieldsToESModel(connector: CaseConnector): ConnectorPersistedFields {
   if (!connector.fields) {
     return [];
   }
 
-  return Object.entries(connector.fields).reduce<ESConnectorFields>(
+  return Object.entries(connector.fields).reduce<ConnectorPersistedFields>(
     (acc, [key, value]) => [
       ...acc,
       {
diff --git a/x-pack/plugins/cases/server/services/type_guards.ts b/x-pack/plugins/cases/server/services/type_guards.ts
new file mode 100644
index 00000000000000..ec4c100b17585c
--- /dev/null
+++ b/x-pack/plugins/cases/server/services/type_guards.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CommentRequestExternalReferenceSOType } from '../../common/api';
+import { CommentType, ExternalReferenceStorageType } from '../../common/api';
+import type { AttachmentRequestAttributes } from '../common/types/attachments';
+
+/**
+ * A type narrowing function for external reference saved object attachments.
+ */
+export const isCommentRequestTypeExternalReferenceSO = (
+  context: Partial<AttachmentRequestAttributes>
+): context is CommentRequestExternalReferenceSOType => {
+  return (
+    context.type === CommentType.externalReference &&
+    context.externalReferenceStorage?.type === ExternalReferenceStorageType.savedObject
+  );
+};
diff --git a/x-pack/plugins/cases/server/services/user_actions/audit_logger.ts b/x-pack/plugins/cases/server/services/user_actions/audit_logger.ts
index af3599c11c67be..fc1d60684949df 100644
--- a/x-pack/plugins/cases/server/services/user_actions/audit_logger.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/audit_logger.ts
@@ -8,7 +8,7 @@
 import type { EcsEvent } from '@kbn/ecs';
 import type { AuditLogger } from '@kbn/security-plugin/server';
 import type { ArrayElement } from '@kbn/utility-types';
-import type { UserAction as Action } from '../../../common/api';
+import type { ActionCategory as Action } from '../../../common/api';
 import type { EventDetails } from './types';
 
 const actionsToEcsType: Record<Action, ArrayElement<EcsEvent['type']>> = {
diff --git a/x-pack/plugins/cases/server/services/user_actions/builders/assignees.ts b/x-pack/plugins/cases/server/services/user_actions/builders/assignees.ts
index ffd695e62df37d..9c21bf916758da 100644
--- a/x-pack/plugins/cases/server/services/user_actions/builders/assignees.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/builders/assignees.ts
@@ -6,7 +6,7 @@
  */
 
 import { CASE_SAVED_OBJECT } from '../../../../common/constants';
-import type { UserAction } from '../../../../common/api';
+import type { ActionCategory } from '../../../../common/api';
 import { ActionTypes, Actions } from '../../../../common/api';
 import { UserActionBuilder } from '../abstract_builder';
 import type { EventDetails, UserActionParameters, UserActionEvent } from '../types';
@@ -44,7 +44,7 @@ export class AssigneesUserActionBuilder extends UserActionBuilder {
   }
 }
 
-const getVerbMessage = (action: UserAction, uids: string[]) => {
+const getVerbMessage = (action: ActionCategory, uids: string[]) => {
   const uidText = `uids: [${uids}]`;
 
   switch (action) {
diff --git a/x-pack/plugins/cases/server/services/user_actions/builders/audit_logger_utils.ts b/x-pack/plugins/cases/server/services/user_actions/builders/audit_logger_utils.ts
index 4010c358ce6018..396301a648e420 100644
--- a/x-pack/plugins/cases/server/services/user_actions/builders/audit_logger_utils.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/builders/audit_logger_utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { UserAction as Action } from '../../../../common/api';
+import type { ActionCategory as Action } from '../../../../common/api';
 
 const actionsToVerbs: Record<Action, string> = {
   add: 'added',
diff --git a/x-pack/plugins/cases/server/services/user_actions/builders/tags.ts b/x-pack/plugins/cases/server/services/user_actions/builders/tags.ts
index 1a9066cbbf2248..5dc41971857611 100644
--- a/x-pack/plugins/cases/server/services/user_actions/builders/tags.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/builders/tags.ts
@@ -6,7 +6,7 @@
  */
 
 import { CASE_SAVED_OBJECT } from '../../../../common/constants';
-import type { UserAction } from '../../../../common/api';
+import type { ActionCategory } from '../../../../common/api';
 import { ActionTypes, Actions } from '../../../../common/api';
 import { UserActionBuilder } from '../abstract_builder';
 import type { EventDetails, UserActionParameters, UserActionEvent } from '../types';
@@ -45,7 +45,7 @@ export class TagsUserActionBuilder extends UserActionBuilder {
   }
 }
 
-const getPreposition = (action: UserAction): string => {
+const getPreposition = (action: ActionCategory): string => {
   switch (action) {
     case Actions.add:
       return 'to';
diff --git a/x-pack/plugins/cases/server/services/user_actions/index.ts b/x-pack/plugins/cases/server/services/user_actions/index.ts
index 252e3985a74836..521cee600469b8 100644
--- a/x-pack/plugins/cases/server/services/user_actions/index.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/index.ts
@@ -5,21 +5,11 @@
  * 2.0.
  */
 
-import type {
-  SavedObject,
-  SavedObjectReference,
-  SavedObjectsFindResponse,
-  SavedObjectsRawDoc,
-} from '@kbn/core/server';
+import type { SavedObjectsFindResponse, SavedObjectsRawDoc } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { KueryNode } from '@kbn/es-query';
-import type {
-  CaseUserActionAttributesWithoutConnectorId,
-  CaseUserActionDeprecatedResponse,
-  CaseUserActionInjectedAttributes,
-  User,
-} from '../../../common/api';
+import type { CaseUserActionDeprecatedResponse } from '../../../common/api';
 import { ActionTypes } from '../../../common/api';
 import {
   CASE_SAVED_OBJECT,
@@ -30,97 +20,25 @@ import { buildFilter, combineFilters } from '../../client/utils';
 import type {
   CaseConnectorActivity,
   CaseConnectorFields,
+  ConnectorActivityAggsResult,
+  ConnectorFieldsBeforePushAggsResult,
+  GetUsersResponse,
+  ParticipantsAggsResult,
   PushInfo,
   PushTimeFrameInfo,
   ServiceContext,
+  TimeFrameInfo,
+  TopHits,
+  UserActionsStatsAggsResult,
 } from './types';
 import { defaultSortField } from '../../common/utils';
 import { UserActionPersister } from './operations/create';
 import { UserActionFinder } from './operations/find';
 import { transformToExternalModel, legacyTransformFindResponseToExternalModel } from './transform';
-
-export interface UserActionItem {
-  attributes: CaseUserActionAttributesWithoutConnectorId;
-  references: SavedObjectReference[];
-}
-
-interface TopHits {
-  hits: {
-    total: number;
-    hits: SavedObjectsRawDoc[];
-  };
-}
-
-interface TimeFrameInfo {
-  mostRecent: TopHits;
-  oldest: TopHits;
-}
-
-interface ConnectorActivityAggsResult {
-  references: {
-    connectors: {
-      ids: {
-        buckets: Array<{
-          key: string;
-          reverse: {
-            connectorActivity: {
-              buckets: {
-                changeConnector: TimeFrameInfo;
-                createCase: TimeFrameInfo;
-                pushInfo: TimeFrameInfo;
-              };
-            };
-          };
-        }>;
-      };
-    };
-  };
-}
-
-interface ConnectorFieldsBeforePushAggsResult {
-  references: {
-    connectors: {
-      reverse: {
-        ids: {
-          buckets: Record<string, TimeFrameInfo>;
-        };
-      };
-    };
-  };
-}
-
-interface UserActionsStatsAggsResult {
-  total: number;
-  totals: {
-    buckets: Array<{
-      key: string;
-      doc_count: number;
-    }>;
-  };
-}
-
-interface ParticipantsAggsResult {
-  participants: {
-    buckets: Array<{
-      key: string;
-      docs: {
-        hits: {
-          hits: SavedObjectsRawDoc[];
-        };
-      };
-    }>;
-  };
-  assignees: {
-    buckets: Array<{
-      key: string;
-    }>;
-  };
-}
-
-interface GetUsersResponse {
-  participants: Array<{ id: string; owner: string; user: User }>;
-  assignedAndUnassignedUsers: Set<string>;
-}
+import type {
+  UserActionPersistedAttributes,
+  UserActionSavedObjectTransformed,
+} from '../../common/types/user_actions';
 
 export class CaseUserActionService {
   private readonly _creator: UserActionPersister;
@@ -160,7 +78,7 @@ export class CaseUserActionService {
       });
 
       const response = await this.context.unsecuredSavedObjectsClient.find<
-        CaseUserActionAttributesWithoutConnectorId,
+        UserActionPersistedAttributes,
         ConnectorFieldsBeforePushAggsResult
       >({
         type: CASE_USER_ACTION_SAVED_OBJECT,
@@ -286,7 +204,7 @@ export class CaseUserActionService {
       if (fields.mostRecent.hits.hits.length > 0) {
         const rawFieldsDoc = fields.mostRecent.hits.hits[0];
         const doc =
-          this.context.savedObjectsSerializer.rawToSavedObject<CaseUserActionAttributesWithoutConnectorId>(
+          this.context.savedObjectsSerializer.rawToSavedObject<UserActionPersistedAttributes>(
             rawFieldsDoc
           );
 
@@ -304,7 +222,7 @@ export class CaseUserActionService {
 
   public async getMostRecentUserAction(
     caseId: string
-  ): Promise<SavedObject<CaseUserActionInjectedAttributes> | undefined> {
+  ): Promise<UserActionSavedObjectTransformed | undefined> {
     try {
       this.context.log.debug(
         `Attempting to retrieve the most recent user action for case id: ${caseId}`
@@ -326,17 +244,15 @@ export class CaseUserActionService {
       });
 
       const userActions =
-        await this.context.unsecuredSavedObjectsClient.find<CaseUserActionAttributesWithoutConnectorId>(
-          {
-            type: CASE_USER_ACTION_SAVED_OBJECT,
-            hasReference: { type, id },
-            page: 1,
-            perPage: 1,
-            sortField: 'created_at',
-            sortOrder: 'desc',
-            filter: connectorsFilter,
-          }
-        );
+        await this.context.unsecuredSavedObjectsClient.find<UserActionPersistedAttributes>({
+          type: CASE_USER_ACTION_SAVED_OBJECT,
+          hasReference: { type, id },
+          page: 1,
+          perPage: 1,
+          sortField: 'created_at',
+          sortOrder: 'desc',
+          filter: connectorsFilter,
+        });
 
       if (userActions.saved_objects.length <= 0) {
         return;
@@ -366,7 +282,7 @@ export class CaseUserActionService {
       });
 
       const response = await this.context.unsecuredSavedObjectsClient.find<
-        CaseUserActionAttributesWithoutConnectorId,
+        UserActionPersistedAttributes,
         ConnectorActivityAggsResult
       >({
         type: CASE_USER_ACTION_SAVED_OBJECT,
@@ -411,10 +327,10 @@ export class CaseUserActionService {
         rawFieldsDoc = createCase.mostRecent.hits.hits[0];
       }
 
-      let fieldsDoc: SavedObject<CaseUserActionInjectedAttributes> | undefined;
+      let fieldsDoc: UserActionSavedObjectTransformed | undefined;
       if (rawFieldsDoc != null) {
         const doc =
-          this.context.savedObjectsSerializer.rawToSavedObject<CaseUserActionAttributesWithoutConnectorId>(
+          this.context.savedObjectsSerializer.rawToSavedObject<UserActionPersistedAttributes>(
             rawFieldsDoc
           );
 
@@ -452,14 +368,12 @@ export class CaseUserActionService {
     }
   }
 
-  private getTopHitsDoc(
-    topHits: TopHits
-  ): SavedObject<CaseUserActionInjectedAttributes> | undefined {
+  private getTopHitsDoc(topHits: TopHits): UserActionSavedObjectTransformed | undefined {
     if (topHits.hits.hits.length > 0) {
       const rawPushDoc = topHits.hits.hits[0];
 
       const doc =
-        this.context.savedObjectsSerializer.rawToSavedObject<CaseUserActionAttributesWithoutConnectorId>(
+        this.context.savedObjectsSerializer.rawToSavedObject<UserActionPersistedAttributes>(
           rawPushDoc
         );
 
@@ -568,16 +482,14 @@ export class CaseUserActionService {
       const type = CASE_SAVED_OBJECT;
 
       const userActions =
-        await this.context.unsecuredSavedObjectsClient.find<CaseUserActionAttributesWithoutConnectorId>(
-          {
-            type: CASE_USER_ACTION_SAVED_OBJECT,
-            hasReference: { type, id },
-            page: 1,
-            perPage: MAX_DOCS_PER_PAGE,
-            sortField: 'created_at',
-            sortOrder: 'asc',
-          }
-        );
+        await this.context.unsecuredSavedObjectsClient.find<UserActionPersistedAttributes>({
+          type: CASE_USER_ACTION_SAVED_OBJECT,
+          hasReference: { type, id },
+          page: 1,
+          perPage: MAX_DOCS_PER_PAGE,
+          sortField: 'created_at',
+          sortOrder: 'asc',
+        });
 
       return legacyTransformFindResponseToExternalModel(
         userActions,
@@ -595,6 +507,8 @@ export class CaseUserActionService {
         `Attempting to retrieve user actions associated with cases: [${caseIds}]`
       );
 
+      // We are intentionally not adding the type here because we only want to interact with the id and this function
+      // should not use the attributes
       const finder = this.context.unsecuredSavedObjectsClient.createPointInTimeFinder({
         type: CASE_USER_ACTION_SAVED_OBJECT,
         hasReference: caseIds.map((id) => ({ id, type: CASE_SAVED_OBJECT })),
@@ -640,7 +554,7 @@ export class CaseUserActionService {
       const combinedFilter = combineFilters([connectorsFilter, filter]);
 
       const response = await this.context.unsecuredSavedObjectsClient.find<
-        CaseUserActionAttributesWithoutConnectorId,
+        UserActionPersistedAttributes,
         { references: { connectors: { ids: { buckets: Array<{ key: string }> } } } }
       >({
         type: CASE_USER_ACTION_SAVED_OBJECT,
@@ -698,7 +612,7 @@ export class CaseUserActionService {
 
   public async getCaseUserActionStats({ caseId }: { caseId: string }) {
     const response = await this.context.unsecuredSavedObjectsClient.find<
-      CaseUserActionAttributesWithoutConnectorId,
+      UserActionPersistedAttributes,
       UserActionsStatsAggsResult
     >({
       type: CASE_USER_ACTION_SAVED_OBJECT,
@@ -742,7 +656,7 @@ export class CaseUserActionService {
 
   public async getUsers({ caseId }: { caseId: string }): Promise<GetUsersResponse> {
     const response = await this.context.unsecuredSavedObjectsClient.find<
-      CaseUserActionAttributesWithoutConnectorId,
+      UserActionPersistedAttributes,
       ParticipantsAggsResult
     >({
       type: CASE_USER_ACTION_SAVED_OBJECT,
@@ -762,9 +676,7 @@ export class CaseUserActionService {
     for (const bucket of participantsBuckets) {
       const rawDoc = bucket.docs.hits.hits[0];
       const user =
-        this.context.savedObjectsSerializer.rawToSavedObject<CaseUserActionAttributesWithoutConnectorId>(
-          rawDoc
-        );
+        this.context.savedObjectsSerializer.rawToSavedObject<UserActionPersistedAttributes>(rawDoc);
 
       /**
        * We are interested only for the created_by
diff --git a/x-pack/plugins/cases/server/services/user_actions/operations/create.ts b/x-pack/plugins/cases/server/services/user_actions/operations/create.ts
index ff58f9e6a52faf..d4b5c0d283630a 100644
--- a/x-pack/plugins/cases/server/services/user_actions/operations/create.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/operations/create.ts
@@ -5,81 +5,38 @@
  * 2.0.
  */
 
-import type {
-  SavedObject,
-  SavedObjectReference,
-  SavedObjectsBulkResponse,
-  SavedObjectsUpdateResponse,
-} from '@kbn/core/server';
+import type { SavedObject, SavedObjectsBulkResponse } from '@kbn/core/server';
 import { get, isEmpty } from 'lodash';
+import type { UserActionPersistedAttributes } from '../../../common/types/user_actions';
 import { CASE_SAVED_OBJECT, CASE_USER_ACTION_SAVED_OBJECT } from '../../../../common/constants';
-import type { CaseSavedObject } from '../../../common/types';
 import { arraysDifference } from '../../../client/utils';
 import { isUserActionType } from '../../../../common/utils/user_actions';
 import type {
   ActionTypeValues,
   CaseAssignees,
-  CaseAttributes,
   CaseUserProfile,
-  CommentRequest,
-  User,
-  UserAction as Action,
+  ActionCategory,
 } from '../../../../common/api';
 import { Actions, ActionTypes } from '../../../../common/api';
 import { BuilderFactory } from '../builder_factory';
 import type {
-  Attributes,
   BuilderParameters,
-  CommonArguments,
-  CreateUserAction,
+  BulkCreateAttachmentUserAction,
+  BulkCreateBulkUpdateCaseUserActions,
+  CommonUserActionArgs,
+  CreatePayloadFunction,
+  CreateUserActionClient,
+  CreateUserActionES,
+  GetUserActionItemByDifference,
+  PostCaseUserActionArgs,
   ServiceContext,
+  TypedUserActionDiffedItems,
   UserActionEvent,
-  UserActionParameters,
 } from '../types';
 import { isAssigneesArray, isStringArray } from '../type_guards';
 import type { IndexRefresh } from '../../types';
 import { UserActionAuditLogger } from '../audit_logger';
 
-type CommonUserActionArgs = CommonArguments;
-
-interface GetUserActionItemByDifference extends CommonUserActionArgs {
-  field: string;
-  originalValue: unknown;
-  newValue: unknown;
-}
-
-interface TypedUserActionDiffedItems<T> extends GetUserActionItemByDifference {
-  originalValue: T[];
-  newValue: T[];
-}
-
-type CreatePayloadFunction<Item, ActionType extends ActionTypeValues> = (
-  items: Item[]
-) => UserActionParameters<ActionType>['payload'];
-
-interface BulkCreateBulkUpdateCaseUserActions extends IndexRefresh {
-  originalCases: CaseSavedObject[];
-  updatedCases: Array<SavedObjectsUpdateResponse<CaseAttributes>>;
-  user: User;
-}
-
-interface BulkCreateAttachmentUserAction extends Omit<CommonUserActionArgs, 'owner'>, IndexRefresh {
-  attachments: Array<{ id: string; owner: string; attachment: CommentRequest }>;
-}
-
-type CreateUserActionClient<T extends keyof BuilderParameters> = CreateUserAction<T> &
-  CommonUserActionArgs &
-  IndexRefresh;
-
-interface CreateUserActionES<T> extends IndexRefresh {
-  attributes: T;
-  references: SavedObjectReference[];
-}
-
-interface PostCaseUserActionArgs extends IndexRefresh {
-  actions: UserActionEvent[];
-}
-
 export class UserActionPersister {
   private static readonly userActionFieldsAllowed: Set<string> = new Set(Object.keys(ActionTypes));
 
@@ -227,7 +184,7 @@ export class UserActionPersister {
   }: {
     commonArgs: CommonUserActionArgs;
     actionType: ActionType;
-    action: Action;
+    action: ActionCategory;
     createPayload: CreatePayloadFunction<Item, ActionType>;
     modifiedItems?: Item[] | null;
   }) {
@@ -335,7 +292,9 @@ export class UserActionPersister {
   private async bulkCreate({
     actions,
     refresh,
-  }: PostCaseUserActionArgs): Promise<SavedObjectsBulkResponse<Attributes> | undefined> {
+  }: PostCaseUserActionArgs): Promise<
+    SavedObjectsBulkResponse<UserActionPersistedAttributes> | undefined
+  > {
     if (isEmpty(actions)) {
       return;
     }
@@ -343,7 +302,7 @@ export class UserActionPersister {
     try {
       this.context.log.debug(`Attempting to POST a new case user action`);
 
-      return await this.context.unsecuredSavedObjectsClient.bulkCreate(
+      return await this.context.unsecuredSavedObjectsClient.bulkCreate<UserActionPersistedAttributes>(
         actions.map((action) => ({
           type: CASE_USER_ACTION_SAVED_OBJECT,
           ...action.parameters,
diff --git a/x-pack/plugins/cases/server/services/user_actions/operations/find.ts b/x-pack/plugins/cases/server/services/user_actions/operations/find.ts
index b04cb76f3022c8..c1b3a49ed6507f 100644
--- a/x-pack/plugins/cases/server/services/user_actions/operations/find.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/operations/find.ts
@@ -8,16 +8,9 @@
 import type { KueryNode } from '@kbn/es-query';
 import { fromKueryExpression } from '@kbn/es-query';
 import type { SavedObjectsFindResponse } from '@kbn/core-saved-objects-api-server';
-import type { SavedObject } from '@kbn/core-saved-objects-common';
 import { DEFAULT_PAGE, DEFAULT_PER_PAGE } from '../../../routes/api';
 import { defaultSortField } from '../../../common/utils';
-import type {
-  CaseUserActionAttributesWithoutConnectorId,
-  UserActionFindRequest,
-  ActionTypeValues,
-  FindTypeField,
-  CaseUserActionInjectedAttributes,
-} from '../../../../common/api';
+import type { ActionTypeValues, FindTypeField } from '../../../../common/api';
 import { Actions, ActionTypes, CommentType } from '../../../../common/api';
 import {
   CASE_SAVED_OBJECT,
@@ -25,14 +18,14 @@ import {
   MAX_DOCS_PER_PAGE,
 } from '../../../../common/constants';
 
-import type { ServiceContext } from '../types';
+import type { FindOptions, ServiceContext } from '../types';
 import { transformFindResponseToExternalModel, transformToExternalModel } from '../transform';
 import { buildFilter, combineFilters, NodeBuilderOperators } from '../../../client/utils';
-
-interface FindOptions extends UserActionFindRequest {
-  caseId: string;
-  filter?: KueryNode;
-}
+import type {
+  UserActionPersistedAttributes,
+  UserActionSavedObjectTransformed,
+  UserActionTransformedAttributes,
+} from '../../../common/types/user_actions';
 
 export class UserActionFinder {
   constructor(private readonly context: ServiceContext) {}
@@ -44,24 +37,22 @@ export class UserActionFinder {
     page,
     perPage,
     filter,
-  }: FindOptions): Promise<SavedObjectsFindResponse<CaseUserActionInjectedAttributes>> {
+  }: FindOptions): Promise<SavedObjectsFindResponse<UserActionTransformedAttributes>> {
     try {
       this.context.log.debug(`Attempting to find user actions for case id: ${caseId}`);
 
       const finalFilter = combineFilters([filter, UserActionFinder.buildFilter(types)]);
 
       const userActions =
-        await this.context.unsecuredSavedObjectsClient.find<CaseUserActionAttributesWithoutConnectorId>(
-          {
-            type: CASE_USER_ACTION_SAVED_OBJECT,
-            hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
-            page: page ?? DEFAULT_PAGE,
-            perPage: perPage ?? DEFAULT_PER_PAGE,
-            sortField: 'created_at',
-            sortOrder: sortOrder ?? 'asc',
-            filter: finalFilter,
-          }
-        );
+        await this.context.unsecuredSavedObjectsClient.find<UserActionPersistedAttributes>({
+          type: CASE_USER_ACTION_SAVED_OBJECT,
+          hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
+          page: page ?? DEFAULT_PAGE,
+          perPage: perPage ?? DEFAULT_PER_PAGE,
+          sortField: 'created_at',
+          sortOrder: sortOrder ?? 'asc',
+          filter: finalFilter,
+        });
 
       return transformFindResponseToExternalModel(
         userActions,
@@ -176,7 +167,7 @@ export class UserActionFinder {
   }: {
     caseId: string;
     filter?: KueryNode;
-  }): Promise<Array<SavedObject<CaseUserActionInjectedAttributes>>> {
+  }): Promise<UserActionSavedObjectTransformed[]> {
     try {
       this.context.log.debug('Attempting to find status changes');
 
@@ -197,7 +188,7 @@ export class UserActionFinder {
       const combinedFilters = combineFilters([updateActionFilter, statusChangeFilter, filter]);
 
       const finder =
-        this.context.unsecuredSavedObjectsClient.createPointInTimeFinder<CaseUserActionAttributesWithoutConnectorId>(
+        this.context.unsecuredSavedObjectsClient.createPointInTimeFinder<UserActionPersistedAttributes>(
           {
             type: CASE_USER_ACTION_SAVED_OBJECT,
             hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
@@ -208,7 +199,7 @@ export class UserActionFinder {
           }
         );
 
-      let userActions: Array<SavedObject<CaseUserActionInjectedAttributes>> = [];
+      let userActions: UserActionSavedObjectTransformed[] = [];
       for await (const findResults of finder.find()) {
         userActions = userActions.concat(
           findResults.saved_objects.map((so) =>
diff --git a/x-pack/plugins/cases/server/services/user_actions/test_utils.ts b/x-pack/plugins/cases/server/services/user_actions/test_utils.ts
index 49d47b13f8d044..b4dbb114fc2fe3 100644
--- a/x-pack/plugins/cases/server/services/user_actions/test_utils.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/test_utils.ts
@@ -21,7 +21,7 @@ import {
 import type {
   CaseUserActionAttributesWithoutConnectorId,
   ConnectorUserAction,
-  UserAction,
+  ActionCategory,
 } from '../../../common/api';
 import { CaseSeverity, CaseStatuses, Actions } from '../../../common/api';
 import {
@@ -76,7 +76,7 @@ export const createUserActionSO = ({
   type,
   references = [],
 }: {
-  action: UserAction;
+  action: ActionCategory;
   type?: string;
   payload?: Record<string, unknown>;
   attributesOverrides?: Partial<CaseUserActionAttributesWithoutConnectorId>;
diff --git a/x-pack/plugins/cases/server/services/user_actions/transform.ts b/x-pack/plugins/cases/server/services/user_actions/transform.ts
index 439e57eed386d1..fb0a17fc6a57b4 100644
--- a/x-pack/plugins/cases/server/services/user_actions/transform.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/transform.ts
@@ -14,12 +14,7 @@ import {
   isCreateCaseUserAction,
   isCommentUserAction,
 } from '../../../common/utils/user_actions';
-import type {
-  CaseUserActionAttributes,
-  CaseUserActionAttributesWithoutConnectorId,
-  CaseUserActionDeprecatedResponse,
-  CaseUserActionInjectedAttributes,
-} from '../../../common/api';
+import type { CaseUserActionDeprecatedResponse, UserActionAttributes } from '../../../common/api';
 import { NONE_CONNECTOR_ID } from '../../../common/api';
 import { CASE_SAVED_OBJECT, CASE_COMMENT_SAVED_OBJECT } from '../../../common/constants';
 import {
@@ -30,15 +25,20 @@ import {
   PUSH_CONNECTOR_ID_REFERENCE_NAME,
 } from '../../common/constants';
 import { findConnectorIdReference } from '../transform';
-import { isCommentRequestTypeExternalReferenceSO } from '../../common/utils';
+import { isCommentRequestTypeExternalReferenceSO } from '../type_guards';
 import type { PersistableStateAttachmentTypeRegistry } from '../../attachment_framework/persistable_state_registry';
 import { injectPersistableReferencesToSO } from '../../attachment_framework/so_references';
 import { findReferenceId } from '../../common/references';
+import type {
+  UserActionPersistedAttributes,
+  UserActionSavedObjectTransformed,
+  UserActionTransformedAttributes,
+} from '../../common/types/user_actions';
 
 export function transformFindResponseToExternalModel(
-  userActions: SavedObjectsFindResponse<CaseUserActionAttributesWithoutConnectorId>,
+  userActions: SavedObjectsFindResponse<UserActionPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): SavedObjectsFindResponse<CaseUserActionInjectedAttributes> {
+): SavedObjectsFindResponse<UserActionTransformedAttributes> {
   return {
     ...userActions,
     saved_objects: userActions.saved_objects.map((so) => ({
@@ -49,9 +49,9 @@ export function transformFindResponseToExternalModel(
 }
 
 export function transformToExternalModel(
-  userAction: SavedObject<CaseUserActionAttributesWithoutConnectorId>,
+  userAction: SavedObject<UserActionPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): SavedObject<CaseUserActionInjectedAttributes> {
+): UserActionSavedObjectTransformed {
   const { references } = userAction;
 
   const commentId =
@@ -64,7 +64,7 @@ export function transformToExternalModel(
       ...userAction.attributes,
       comment_id: commentId,
       payload,
-    } as CaseUserActionInjectedAttributes,
+    } as UserActionTransformedAttributes,
   };
 }
 
@@ -75,7 +75,7 @@ export function transformToExternalModel(
  * @deprecated remove when the getAllRoute is removed
  */
 export function legacyTransformFindResponseToExternalModel(
-  userActions: SavedObjectsFindResponse<CaseUserActionAttributesWithoutConnectorId>,
+  userActions: SavedObjectsFindResponse<UserActionPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
 ): SavedObjectsFindResponse<CaseUserActionDeprecatedResponse> {
   return {
@@ -91,7 +91,7 @@ export function legacyTransformFindResponseToExternalModel(
  * @deprecated remove when the getAll route is removed
  */
 function legacyTransformToExternalModel(
-  userAction: SavedObject<CaseUserActionAttributesWithoutConnectorId>,
+  userAction: SavedObject<UserActionPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
 ): SavedObject<CaseUserActionDeprecatedResponse> {
   const { references } = userAction;
@@ -114,9 +114,9 @@ function legacyTransformToExternalModel(
 }
 
 const addReferenceIdToPayload = (
-  userAction: SavedObject<CaseUserActionAttributesWithoutConnectorId>,
+  userAction: SavedObject<UserActionPersistedAttributes>,
   persistableStateAttachmentTypeRegistry: PersistableStateAttachmentTypeRegistry
-): CaseUserActionAttributes['payload'] => {
+): UserActionAttributes['payload'] => {
   const connectorId = getConnectorIdFromReferences(userAction);
   const userActionAttributes = userAction.attributes;
 
@@ -176,7 +176,7 @@ const addReferenceIdToPayload = (
 };
 
 function getConnectorIdFromReferences(
-  userAction: SavedObject<CaseUserActionAttributesWithoutConnectorId>
+  userAction: SavedObject<UserActionPersistedAttributes>
 ): string | null {
   const { references } = userAction;
 
diff --git a/x-pack/plugins/cases/server/services/user_actions/types.ts b/x-pack/plugins/cases/server/services/user_actions/types.ts
index 4d9813c42591d8..addea6ddfa7633 100644
--- a/x-pack/plugins/cases/server/services/user_actions/types.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/types.ts
@@ -10,24 +10,36 @@ import type {
   SavedObjectsClientContract,
   Logger,
   ISavedObjectsSerializer,
-  SavedObject,
+  SavedObjectsRawDoc,
+  SavedObjectsUpdateResponse,
 } from '@kbn/core/server';
+import type { KueryNode } from '@kbn/es-query';
 import type { AuditLogger } from '@kbn/security-plugin/server';
 import type { CaseAssignees } from '../../../common/api/cases/assignee';
 import type {
+  ActionTypeValues,
+  CaseAttributes,
   CasePostRequest,
   CaseSettings,
   CaseSeverity,
   CaseStatuses,
-  CaseUserActionInjectedAttributes,
+  CaseUserActionAttributesWithoutConnectorId,
+  CommentRequest,
   CommentUserAction,
   ConnectorUserAction,
   PushedUserAction,
   User,
-  UserAction,
+  ActionCategory,
+  UserActionFindRequest,
   UserActionTypes,
 } from '../../../common/api';
 import type { PersistableStateAttachmentTypeRegistry } from '../../attachment_framework/persistable_state_registry';
+import type {
+  UserActionPersistedAttributes,
+  UserActionSavedObjectTransformed,
+} from '../../common/types/user_actions';
+import type { IndexRefresh } from '../types';
+import type { CaseSavedObjectTransformed } from '../../common/types/case';
 
 export interface BuilderParameters {
   title: {
@@ -94,11 +106,11 @@ export interface CommonArguments {
   owner: string;
   attachmentId?: string;
   connectorId?: string;
-  action?: UserAction;
+  action?: ActionCategory;
 }
 
 export interface Attributes {
-  action: UserAction;
+  action: ActionCategory;
   created_at: string;
   created_by: User;
   owner: string;
@@ -107,13 +119,13 @@ export interface Attributes {
 }
 
 export interface SavedObjectParameters {
-  attributes: Attributes;
+  attributes: UserActionPersistedAttributes;
   references: SavedObjectReference[];
 }
 
 export interface EventDetails {
   getMessage: (storedUserActionId?: string) => string;
-  action: UserAction;
+  action: ActionCategory;
   descriptiveAction: string;
   savedObjectId: string;
   savedObjectType: string;
@@ -125,7 +137,7 @@ export interface UserActionEvent {
 }
 
 export type CommonBuilderArguments = CommonArguments & {
-  action: UserAction;
+  action: ActionCategory;
   type: UserActionTypes;
   value: unknown;
   valueKey: string;
@@ -144,19 +156,149 @@ export interface ServiceContext {
 }
 
 export interface PushTimeFrameInfo {
-  mostRecent: SavedObject<CaseUserActionInjectedAttributes>;
-  oldest: SavedObject<CaseUserActionInjectedAttributes>;
+  mostRecent: UserActionSavedObjectTransformed;
+  oldest: UserActionSavedObjectTransformed;
 }
 
 export interface CaseConnectorActivity {
   connectorId: string;
-  fields: SavedObject<CaseUserActionInjectedAttributes>;
+  fields: UserActionSavedObjectTransformed;
   push?: PushTimeFrameInfo;
 }
 
-export type CaseConnectorFields = Map<string, SavedObject<CaseUserActionInjectedAttributes>>;
+export type CaseConnectorFields = Map<string, UserActionSavedObjectTransformed>;
 
 export interface PushInfo {
   date: Date;
   connectorId: string;
 }
+
+export interface UserActionItem {
+  attributes: CaseUserActionAttributesWithoutConnectorId;
+  references: SavedObjectReference[];
+}
+
+export interface TopHits {
+  hits: {
+    total: number;
+    hits: SavedObjectsRawDoc[];
+  };
+}
+
+export interface TimeFrameInfo {
+  mostRecent: TopHits;
+  oldest: TopHits;
+}
+
+export interface ConnectorActivityAggsResult {
+  references: {
+    connectors: {
+      ids: {
+        buckets: Array<{
+          key: string;
+          reverse: {
+            connectorActivity: {
+              buckets: {
+                changeConnector: TimeFrameInfo;
+                createCase: TimeFrameInfo;
+                pushInfo: TimeFrameInfo;
+              };
+            };
+          };
+        }>;
+      };
+    };
+  };
+}
+
+export interface ConnectorFieldsBeforePushAggsResult {
+  references: {
+    connectors: {
+      reverse: {
+        ids: {
+          buckets: Record<string, TimeFrameInfo>;
+        };
+      };
+    };
+  };
+}
+
+export interface UserActionsStatsAggsResult {
+  total: number;
+  totals: {
+    buckets: Array<{
+      key: string;
+      doc_count: number;
+    }>;
+  };
+}
+
+export interface ParticipantsAggsResult {
+  participants: {
+    buckets: Array<{
+      key: string;
+      docs: {
+        hits: {
+          hits: SavedObjectsRawDoc[];
+        };
+      };
+    }>;
+  };
+  assignees: {
+    buckets: Array<{
+      key: string;
+    }>;
+  };
+}
+
+export interface GetUsersResponse {
+  participants: Array<{ id: string; owner: string; user: User }>;
+  assignedAndUnassignedUsers: Set<string>;
+}
+
+export interface FindOptions extends UserActionFindRequest {
+  caseId: string;
+  filter?: KueryNode;
+}
+
+export type CommonUserActionArgs = CommonArguments;
+
+export interface GetUserActionItemByDifference extends CommonUserActionArgs {
+  field: string;
+  originalValue: unknown;
+  newValue: unknown;
+}
+
+export interface TypedUserActionDiffedItems<T> extends GetUserActionItemByDifference {
+  originalValue: T[];
+  newValue: T[];
+}
+
+export type CreatePayloadFunction<Item, ActionType extends ActionTypeValues> = (
+  items: Item[]
+) => UserActionParameters<ActionType>['payload'];
+
+export interface BulkCreateBulkUpdateCaseUserActions extends IndexRefresh {
+  originalCases: CaseSavedObjectTransformed[];
+  updatedCases: Array<SavedObjectsUpdateResponse<CaseAttributes>>;
+  user: User;
+}
+
+export interface BulkCreateAttachmentUserAction
+  extends Omit<CommonUserActionArgs, 'owner'>,
+    IndexRefresh {
+  attachments: Array<{ id: string; owner: string; attachment: CommentRequest }>;
+}
+
+export type CreateUserActionClient<T extends keyof BuilderParameters> = CreateUserAction<T> &
+  CommonUserActionArgs &
+  IndexRefresh;
+
+export interface CreateUserActionES<T> extends IndexRefresh {
+  attributes: T;
+  references: SavedObjectReference[];
+}
+
+export interface PostCaseUserActionArgs extends IndexRefresh {
+  actions: UserActionEvent[];
+}
diff --git a/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts b/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
index b97235ff82247c..560997e8802be2 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/cases.test.ts
@@ -7,7 +7,7 @@
 
 import type { SavedObjectsFindResponse } from '@kbn/core/server';
 import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
-import { ESCaseStatus } from '../../services/cases/types';
+import { CasePersistedStatus } from '../../common/types/case';
 import type {
   AttachmentAggregationResult,
   AttachmentFrameworkAggsResult,
@@ -99,7 +99,7 @@ describe('getCasesTelemetryData', () => {
         status: {
           buckets: [
             {
-              key: ESCaseStatus.OPEN,
+              key: CasePersistedStatus.OPEN,
               doc_count: 2,
             },
           ],
diff --git a/x-pack/plugins/cases/server/telemetry/queries/cases.ts b/x-pack/plugins/cases/server/telemetry/queries/cases.ts
index 59576fa1f45c0f..abd1979d752e8b 100644
--- a/x-pack/plugins/cases/server/telemetry/queries/cases.ts
+++ b/x-pack/plugins/cases/server/telemetry/queries/cases.ts
@@ -14,8 +14,6 @@ import {
   CASE_USER_ACTION_SAVED_OBJECT,
   OWNERS,
 } from '../../../common/constants';
-import { ESCaseStatus } from '../../services/cases/types';
-import type { ESCaseAttributes } from '../../services/cases/types';
 import type {
   CollectTelemetryDataParams,
   CasesTelemetry,
@@ -37,12 +35,14 @@ import {
   getReferencesAggregationQuery,
   getSolutionValues,
 } from './utils';
+import type { CasePersistedAttributes } from '../../common/types/case';
+import { CasePersistedStatus } from '../../common/types/case';
 
 export const getLatestCasesDates = async ({
   savedObjectsClient,
 }: CollectTelemetryDataParams): Promise<LatestDates> => {
   const find = async (sortField: string) =>
-    savedObjectsClient.find<ESCaseAttributes>({
+    savedObjectsClient.find<CasePersistedAttributes>({
       page: 1,
       perPage: 1,
       sortField,
@@ -94,9 +94,12 @@ export const getCasesTelemetryData = async ({
         total: casesRes.total,
         ...getCountsFromBuckets(aggregationsBuckets.counts),
         status: {
-          open: findValueInBuckets(aggregationsBuckets.status, ESCaseStatus.OPEN),
-          inProgress: findValueInBuckets(aggregationsBuckets.status, ESCaseStatus.IN_PROGRESS),
-          closed: findValueInBuckets(aggregationsBuckets.status, ESCaseStatus.CLOSED),
+          open: findValueInBuckets(aggregationsBuckets.status, CasePersistedStatus.OPEN),
+          inProgress: findValueInBuckets(
+            aggregationsBuckets.status,
+            CasePersistedStatus.IN_PROGRESS
+          ),
+          closed: findValueInBuckets(aggregationsBuckets.status, CasePersistedStatus.CLOSED),
         },
         syncAlertsOn: findValueInBuckets(aggregationsBuckets.syncAlerts, 1),
         syncAlertsOff: findValueInBuckets(aggregationsBuckets.syncAlerts, 0),
diff --git a/x-pack/plugins/cloud_defend/public/components/control_general_view/index.tsx b/x-pack/plugins/cloud_defend/public/components/control_general_view/index.tsx
index 0a253b8c68a735..0c126de3b39ec6 100644
--- a/x-pack/plugins/cloud_defend/public/components/control_general_view/index.tsx
+++ b/x-pack/plugins/cloud_defend/public/components/control_general_view/index.tsx
@@ -338,8 +338,9 @@ export const ControlGeneralView = ({ policy, onChange, show }: ViewDeps) => {
       </EuiFlexItem>
 
       {selectors.map((selector, i) => {
-        const usedByResponse = !!responses.find((response) =>
-          response.match.includes(selector.name)
+        const usedByResponse = !!responses.find(
+          (response) =>
+            response.match.includes(selector.name) || response?.exclude?.includes(selector.name)
         );
 
         return (
diff --git a/x-pack/plugins/cloud_defend/public/components/control_general_view/translations.ts b/x-pack/plugins/cloud_defend/public/components/control_general_view/translations.ts
index d80ef8030ea6a9..1cb3d92150b6b2 100644
--- a/x-pack/plugins/cloud_defend/public/components/control_general_view/translations.ts
+++ b/x-pack/plugins/cloud_defend/public/components/control_general_view/translations.ts
@@ -156,6 +156,10 @@ export const errorValueRequired = i18n.translate('xpack.cloudDefend.errorValueRe
   defaultMessage: 'At least one value is required.',
 });
 
+export const errorActionRequired = i18n.translate('xpack.cloudDefend.errorActionRequired', {
+  defaultMessage: 'At least one action is required.',
+});
+
 export const getSelectorIconTooltip = (type: SelectorType) => {
   switch (type) {
     case 'process':
diff --git a/x-pack/plugins/cloud_defend/public/components/control_general_view_response/index.test.tsx b/x-pack/plugins/cloud_defend/public/components/control_general_view_response/index.test.tsx
index 24bfcbadc124f4..099ce4a1c2a2ed 100644
--- a/x-pack/plugins/cloud_defend/public/components/control_general_view_response/index.test.tsx
+++ b/x-pack/plugins/cloud_defend/public/components/control_general_view_response/index.test.tsx
@@ -206,4 +206,19 @@ describe('<ControlGeneralViewSelector />', () => {
     expect(onDuplicate.mock.calls).toHaveLength(1);
     expect(onDuplicate.mock.calls[0][0]).toEqual(mockResponse);
   });
+
+  it('shows an error if no actions specified', async () => {
+    const { getByTestId, getByText, rerender } = render(<WrappedComponent />);
+
+    const checkBox = getByTestId('cloud-defend-chkalertaction');
+    if (checkBox) {
+      userEvent.click(checkBox);
+    }
+
+    const updatedResponse = onChange.mock.calls[0][0];
+    rerender(<WrappedComponent response={updatedResponse} />);
+
+    expect(getByText(i18n.errorActionRequired)).toBeTruthy();
+    expect(updatedResponse.hasErrors).toBeTruthy();
+  });
 });
diff --git a/x-pack/plugins/cloud_defend/public/components/control_general_view_response/index.tsx b/x-pack/plugins/cloud_defend/public/components/control_general_view_response/index.tsx
index 88fed27c61455b..af037c70bd71a9 100644
--- a/x-pack/plugins/cloud_defend/public/components/control_general_view_response/index.tsx
+++ b/x-pack/plugins/cloud_defend/public/components/control_general_view_response/index.tsx
@@ -29,7 +29,12 @@ import {
 } from '@elastic/eui';
 import { useStyles } from './styles';
 import { useStyles as useSelectorStyles } from '../control_general_view_selector/styles';
-import { ControlGeneralViewResponseDeps, ResponseAction } from '../../types';
+import {
+  ControlGeneralViewResponseDeps,
+  ResponseAction,
+  Response,
+  ControlFormErrorMap,
+} from '../../types';
 import * as i18n from '../control_general_view/translations';
 import { getSelectorTypeIcon } from '../../common/utils';
 
@@ -59,6 +64,21 @@ export const ControlGeneralViewResponse = ({
   const [accordionState, setAccordionState] = useState<'open' | 'closed'>(
     responses.length - 1 === index ? 'open' : 'closed'
   );
+  const onResponseChange = useCallback(
+    (resp: Response, i: number) => {
+      const hasMatch = resp.match.length > 0;
+      const hasActions = resp.actions.length > 0;
+
+      if (!hasMatch || !hasActions) {
+        resp.hasErrors = true;
+      } else {
+        delete resp.hasErrors;
+      }
+
+      onChange(resp, i);
+    },
+    [onChange]
+  );
 
   const onTogglePopover = useCallback(() => {
     setPopoverOpen(!isPopoverOpen);
@@ -81,15 +101,10 @@ export const ControlGeneralViewResponse = ({
   const onChangeMatches = useCallback(
     (options) => {
       response.match = options.map((option: EuiComboBoxOptionOption) => option.value);
-      if (response.match.length === 0) {
-        response.hasErrors = true;
-      } else {
-        delete response.hasErrors; // keeps it out of the yaml.
-      }
 
-      onChange(response, index);
+      onResponseChange(response, index);
     },
-    [index, onChange, response]
+    [index, onResponseChange, response]
   );
 
   const onChangeExcludes = useCallback(
@@ -100,9 +115,9 @@ export const ControlGeneralViewResponse = ({
         delete response.exclude;
       }
 
-      onChange(response, index);
+      onResponseChange(response, index);
     },
-    [index, onChange, response]
+    [index, onResponseChange, response]
   );
 
   const selectorOptions = useMemo(() => {
@@ -142,8 +157,8 @@ export const ControlGeneralViewResponse = ({
   const onShowExclude = useCallback(() => {
     const updatedResponse = { ...response };
     updatedResponse.exclude = [];
-    onChange(updatedResponse, index);
-  }, [index, onChange, response]);
+    onResponseChange(updatedResponse, index);
+  }, [index, onResponseChange, response]);
 
   const logSelected = response.actions.includes('log');
   const alertSelected = response.actions.includes('alert');
@@ -170,20 +185,24 @@ export const ControlGeneralViewResponse = ({
         updatedResponse.actions.splice(actionIndex, 1);
       }
 
-      onChange(updatedResponse, index);
+      onResponseChange(updatedResponse, index);
     },
-    [index, onChange, response]
+    [index, onResponseChange, response]
   );
 
   const errors = useMemo(() => {
-    const errs: string[] = [];
+    const errs: ControlFormErrorMap = {};
 
     if (response.match.length === 0) {
-      errs.push(i18n.errorValueRequired);
+      errs.match = [i18n.errorValueRequired];
+    }
+
+    if (response.actions.length === 0) {
+      errs.actions = [i18n.errorActionRequired];
     }
 
     return errs;
-  }, [response.match.length]);
+  }, [response.actions.length, response.match.length]);
 
   const onToggleAccordion = useCallback((isOpen: boolean) => {
     setAccordionState(isOpen ? 'open' : 'closed');
@@ -205,6 +224,8 @@ export const ControlGeneralViewResponse = ({
     };
   }, [accordionState, response.match]);
 
+  const errorList = useMemo(() => Object.values(errors), [errors]);
+
   return (
     <EuiAccordion
       id={'response_' + index}
@@ -296,8 +317,8 @@ export const ControlGeneralViewResponse = ({
         </EuiFlexGroup>
       }
     >
-      <EuiForm component="form" fullWidth error={errors} isInvalid={errors.length > 0}>
-        <EuiFormRow label={i18n.matchSelectors} fullWidth isInvalid={errors.length > 0}>
+      <EuiForm component="form" fullWidth error={errorList} isInvalid={errorList.length > 0}>
+        <EuiFormRow label={i18n.matchSelectors} fullWidth isInvalid={!!errors.match}>
           <EuiComboBox
             aria-label={i18n.matchSelectors}
             fullWidth
@@ -333,7 +354,7 @@ export const ControlGeneralViewResponse = ({
           </EuiButtonEmpty>
         )}
         <EuiSpacer size="m" />
-        <EuiFormRow label={i18n.actions} fullWidth>
+        <EuiFormRow label={i18n.actions} fullWidth isInvalid={!!errors.actions}>
           <EuiFlexGroup direction="row" gutterSize="l">
             <EuiFlexItem grow={false}>
               <EuiCheckbox
diff --git a/x-pack/plugins/cloud_defend/public/components/control_yaml_view/index.tsx b/x-pack/plugins/cloud_defend/public/components/control_yaml_view/index.tsx
index 011ffd95ba4cd0..6f48203474f497 100644
--- a/x-pack/plugins/cloud_defend/public/components/control_yaml_view/index.tsx
+++ b/x-pack/plugins/cloud_defend/public/components/control_yaml_view/index.tsx
@@ -61,7 +61,11 @@ export const ControlYamlView = ({ policy, onChange, show }: ViewDeps) => {
     // validate responses
     responses.forEach((response) => {
       // for now we force 'alert' action if 'block' action added.
-      if (response.actions.includes('block') && !response.actions.includes('alert')) {
+      if (
+        response.actions &&
+        response.actions.includes('block') &&
+        !response.actions.includes('alert')
+      ) {
         errors.push(i18n.errorAlertActionRequired);
       }
     });
diff --git a/x-pack/plugins/cloud_integrations/cloud_chat/common/constants.ts b/x-pack/plugins/cloud_integrations/cloud_chat/common/constants.ts
index 33dd954b5756fb..b196959a582d37 100755
--- a/x-pack/plugins/cloud_integrations/cloud_chat/common/constants.ts
+++ b/x-pack/plugins/cloud_integrations/cloud_chat/common/constants.ts
@@ -6,4 +6,4 @@
  */
 
 export const GET_CHAT_USER_DATA_ROUTE_PATH = '/internal/cloud/chat_user';
-export const DEFAULT_TRIAL_BUFFER = 60;
+export const DEFAULT_TRIAL_BUFFER = 90;
diff --git a/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts b/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
index bccfe15835a63a..a130d1260d5c4c 100644
--- a/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
+++ b/x-pack/plugins/enterprise_search/common/connectors/native_connectors.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { DisplayType, FeatureName, NativeConnector } from '../types/connectors';
+import { DisplayType, FeatureName, FieldType, NativeConnector } from '../types/connectors';
 
 export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | undefined> = {
   mongodb: {
@@ -27,7 +27,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -47,7 +47,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -67,7 +67,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: true,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -87,7 +87,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -107,7 +107,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -127,7 +127,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'bool',
+        type: FieldType.BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -163,7 +163,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -183,7 +183,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'int',
+        type: FieldType.INTEGER,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -203,7 +203,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -223,7 +223,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: true,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -243,7 +243,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -263,7 +263,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'list',
+        type: FieldType.LIST,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -283,7 +283,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'bool',
+        type: FieldType.BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -303,7 +303,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: 'str',
+        type: FieldType.STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -323,7 +323,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: 'int',
+        type: FieldType.INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 50,
@@ -343,7 +343,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: 'int',
+        type: FieldType.INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
diff --git a/x-pack/plugins/enterprise_search/common/ml_inference_pipeline/index.ts b/x-pack/plugins/enterprise_search/common/ml_inference_pipeline/index.ts
index a51f7f022d9f9b..2aad66d425cc7e 100644
--- a/x-pack/plugins/enterprise_search/common/ml_inference_pipeline/index.ts
+++ b/x-pack/plugins/enterprise_search/common/ml_inference_pipeline/index.ts
@@ -30,6 +30,7 @@ import {
 export const TEXT_EXPANSION_TYPE = SUPPORTED_PYTORCH_TASKS.TEXT_EXPANSION;
 export const TEXT_EXPANSION_FRIENDLY_TYPE = 'ELSER';
 export const ML_INFERENCE_PREFIX = 'ml.inference.';
+export const ELSER_MODEL_ID = '.elser_model_1_SNAPSHOT';
 
 export interface MlInferencePipelineParams {
   description?: string;
diff --git a/x-pack/plugins/enterprise_search/common/types/connectors.ts b/x-pack/plugins/enterprise_search/common/types/connectors.ts
index 8093c80c36759a..53d46a2b373fde 100644
--- a/x-pack/plugins/enterprise_search/common/types/connectors.ts
+++ b/x-pack/plugins/enterprise_search/common/types/connectors.ts
@@ -25,6 +25,13 @@ export enum DisplayType {
   DROPDOWN = 'dropdown',
 }
 
+export enum FieldType {
+  STRING = 'str',
+  INTEGER = 'int',
+  LIST = 'list',
+  BOOLEAN = 'bool',
+}
+
 export interface ConnectorConfigProperties {
   default_value: string | number | boolean | null;
   depends_on: Dependency[];
@@ -35,6 +42,7 @@ export interface ConnectorConfigProperties {
   required: boolean;
   sensitive: boolean;
   tooltip: string;
+  type: FieldType;
   ui_restrictions: string[];
   value: string | number | boolean | null;
 }
diff --git a/x-pack/plugins/enterprise_search/cypress.env.json b/x-pack/plugins/enterprise_search/cypress.env.json
new file mode 100644
index 00000000000000..14b84557cc90c3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/cypress.env.json
@@ -0,0 +1,12 @@
+{
+  "mongo_test": {
+    "host": "",
+    "username": "",
+    "password": "",
+    "database": "",
+    "collection": ""
+  },
+  "crawler_test": {
+    "domain": ""
+  }
+}
diff --git a/x-pack/plugins/enterprise_search/cypress/e2e/content/basic_crawler.cy.ts b/x-pack/plugins/enterprise_search/cypress/e2e/content/basic_crawler.cy.ts
index 484aa6976072de..e1c3c1583c364f 100644
--- a/x-pack/plugins/enterprise_search/cypress/e2e/content/basic_crawler.cy.ts
+++ b/x-pack/plugins/enterprise_search/cypress/e2e/content/basic_crawler.cy.ts
@@ -7,9 +7,55 @@
 
 import { login } from '../../tasks/login';
 
+import { NEW_INDEX_CARD, CRAWLER_INDEX, INDEX_OVERVIEW, ROUTES, getIndexRoute } from './selectors';
+
 describe('Enterprise Search Crawler', () => {
   it('test', () => {
+    const envConfig = Cypress.env('crawler_test');
+    const indexName = 'cypress-crawler-' + Math.random();
+
     login();
-    cy.visit('/app/enterprise_search/content/search_indices/new_index');
+    cy.visit(ROUTES.NEW_INDEX);
+
+    // Crawler selected by default
+    cy.getBySel(NEW_INDEX_CARD.SELECT_CRAWLER).click();
+
+    // we are in correct route
+    cy.url().should('contain', ROUTES.NEW_INDEX);
+
+    cy.getBySel(CRAWLER_INDEX.CREATE_BUTTON).should('be.disabled');
+
+    // type new name
+    cy.getBySel(CRAWLER_INDEX.INDEX_NAME_INPUT).type(indexName);
+
+    // create index
+    cy.getBySel(CRAWLER_INDEX.CREATE_BUTTON).click();
+
+    // make sure we are in new index
+    cy.url().should('contain', getIndexRoute(indexName) + 'domain_management');
+
+    cy.getBySel(CRAWLER_INDEX.DOMAIN_MANAGEMENT.DOMAIN_INPUT).type(envConfig.domain);
+    cy.getBySel(CRAWLER_INDEX.DOMAIN_MANAGEMENT.DOMAIN_BUTTON).click();
+
+    cy.getBySel(CRAWLER_INDEX.DOMAIN_MANAGEMENT.SUBMIT_BUTTON).should('be.enabled');
+    cy.getBySel(CRAWLER_INDEX.DOMAIN_MANAGEMENT.SUBMIT_BUTTON).click();
+
+    cy.getBySel(CRAWLER_INDEX.CRAWL_DROPDOWN).should('be.enabled');
+    cy.getBySel(CRAWLER_INDEX.CRAWL_DROPDOWN).click();
+    cy.getBySel(CRAWLER_INDEX.CRAWL_ALL_DOMAINS).click();
+
+    // go to overview tab
+    cy.getBySel(INDEX_OVERVIEW.TABS.OVERVIEW).click();
+
+    // Page header has index name
+    cy.get('main header h1').should('contain.text', indexName);
+    // check Ingestion Type stat is Crawler
+    cy.getBySel(INDEX_OVERVIEW.STATS.INGESTION_TYPE).should('contain.text', 'Crawler');
+
+    cy.getBySel(INDEX_OVERVIEW.STATS.DOCUMENT_COUNT).should((el) => {
+      const text = el.text();
+      const count = parseInt(text.match(/[0-9]+/g), 10);
+      expect(count).to.gt(0);
+    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/cypress/e2e/content/new_index/mongo_connector.cy.ts b/x-pack/plugins/enterprise_search/cypress/e2e/content/new_index/mongo_connector.cy.ts
new file mode 100644
index 00000000000000..dd1fd0e4ccb436
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/cypress/e2e/content/new_index/mongo_connector.cy.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { login } from '../../../tasks/login';
+import {
+  CONNECTOR_INDEX,
+  getIndexRoute,
+  INDEX_OVERVIEW,
+  NEW_INDEX_CARD,
+  NEW_CONNECTOR_PAGE,
+  ROUTES,
+  SELECT_CONNECTOR,
+  SEARCH_INDICES,
+} from '../selectors';
+
+describe('Enterprise Search MongoDB connector', () => {
+  it('succesfully syncs documents with single sync', () => {
+    // Get configuration information from cypress.env.json
+    const mongoConfig = Cypress.env('mongo_test');
+    const indexName = 'cypress-mongodb-' + Math.random();
+    const baseUrl = Cypress.config().baseUrl;
+    login();
+
+    cy.visit(ROUTES.SEARCH_INDICES_OVERVIEW);
+    cy.getBySel(SEARCH_INDICES.CREATE_INDEX_BUTTON).click();
+
+    cy.url().should('eq', baseUrl + ROUTES.NEW_INDEX);
+
+    // select connector
+    cy.getBySel(NEW_INDEX_CARD.SELECT_CONNECTOR).click();
+
+    // we are in correct route
+    cy.url().should('contain', ROUTES.SELECT_CONNECTOR);
+
+    // Select MongoDB from the list
+    cy.get('#checkableCard-mongodb').should('not.be.selected');
+    cy.get('#checkableCard-mongodb-details')
+      .find('a')
+      .invoke('attr', 'href')
+      .should('include', 'connectors-mongodb.html');
+
+    cy.get('#checkableCard-mongodb').click();
+
+    cy.getBySel(SELECT_CONNECTOR.SELECT_AND_CONFIGURE_BUTTON).click();
+
+    // Connector URL, mongo selected
+    cy.url().should('contain', 'service_type=mongodb');
+
+    cy.getBySel(NEW_CONNECTOR_PAGE.INDEX_NAME_INPUT).type(indexName);
+
+    // create index
+    cy.getBySel(NEW_CONNECTOR_PAGE.CREATE_BUTTON).click();
+
+    // make sure we are in new index route
+    cy.url().should('contain', getIndexRoute(indexName) + 'configuration');
+
+    // Fill in connector configuration
+    cy.getBySel(CONNECTOR_INDEX.getConfigurationRow('host')).type(mongoConfig.host);
+    cy.getBySel(CONNECTOR_INDEX.getConfigurationRow('user')).type(mongoConfig.username);
+    cy.getBySel(CONNECTOR_INDEX.getConfigurationRow('password')).type(mongoConfig.password);
+    cy.getBySel(CONNECTOR_INDEX.getConfigurationRow('database')).type(mongoConfig.database);
+    cy.getBySel(CONNECTOR_INDEX.getConfigurationRow('collection')).type(mongoConfig.collection);
+    cy.getBySel(CONNECTOR_INDEX.SAVE_CONFIG).click();
+
+    // Wait until configuration is saved
+    cy.getBySel(CONNECTOR_INDEX.EDIT_CONFIG);
+    cy.getBySel(CONNECTOR_INDEX.SET_SCHEDULE_BUTTON).click();
+
+    // Scheduling Tab opened
+    cy.url().should('contain', getIndexRoute(indexName) + 'scheduling');
+
+    // Start one time sync
+    cy.getBySel(CONNECTOR_INDEX.HEADER_SYNC_MENU).click();
+    cy.getBySel(CONNECTOR_INDEX.HEADER_SYNC_MENU_START).click();
+
+    // go to overview tab
+    cy.getBySel(INDEX_OVERVIEW.TABS.OVERVIEW).click();
+
+    cy.getBySel(INDEX_OVERVIEW.STATS.INGESTION_TYPE).should('contain.text', 'Connector');
+    cy.getBySel(INDEX_OVERVIEW.STATS.CONNECTOR_TYPE).should('contain.text', 'MongoDB');
+    cy.getBySel(INDEX_OVERVIEW.STATS.INGESTION_STATUS).should('contain.text', 'Configured');
+    cy.getBySel(INDEX_OVERVIEW.STATS.INGESTION_STATUS).should('contain.text', 'Connected');
+
+    // Wait until document count > 0
+    cy.getBySel(INDEX_OVERVIEW.STATS.DOCUMENT_COUNT).should((el) => {
+      const text = el.text();
+      const count = parseInt(text.match(/[0-9]+/g), 10);
+      expect(count).to.gt(0);
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/cypress/e2e/content/selectors.ts b/x-pack/plugins/enterprise_search/cypress/e2e/content/selectors.ts
new file mode 100644
index 00000000000000..e6f1e2e45174df
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/cypress/e2e/content/selectors.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const ROUTES = {
+  CRAWLER_INDEX: '/app/enterprise_search/content/search_indices/new_index/crawler',
+  NEW_INDEX: '/app/enterprise_search/content/search_indices/new_index',
+  SEARCH_INDICES_OVERVIEW: '/app/enterprise_search/content/search_indices/',
+  SELECT_CONNECTOR: '/app/enterprise_search/content/search_indices/new_index/select_connector',
+};
+
+export const SEARCH_INDICES = {
+  CREATE_INDEX_BUTTON: 'entSearchContent-searchIndices-createButton',
+};
+
+export const SELECT_CONNECTOR = {
+  SELECT_AND_CONFIGURE_BUTTON: 'entSearchContent-connector-selectConnector-selectAndConfigure',
+};
+
+export const NEW_CONNECTOR_PAGE = {
+  CREATE_BUTTON: 'entSearchContent-connector-newIndex-createIndex',
+  INDEX_NAME_INPUT: 'entSearchContent-connector-newIndex-editName',
+};
+
+export const CONNECTOR_INDEX = {
+  EDIT_CONFIG: 'entSearchContent-connector-configuration-editConfiguration',
+  HEADER_SYNC_MENU: 'entSearchContent-connector-header-sync-menu',
+  HEADER_SYNC_MENU_START: 'entSearchContent-connector-header-sync-startSync',
+  SAVE_CONFIG: 'entSearchContent-connector-configuration-saveConfiguration',
+  SET_SCHEDULE_BUTTON: 'entSearchContent-connector-configuration-setScheduleAndSync',
+  getConfigurationRow: (rowkey: string) =>
+    `entSearchContent-connector-configuration-formrow-${rowkey}`,
+};
+
+export const NEW_INDEX_CARD = {
+  SELECT_CONNECTOR: 'entSearchContent-newIndexCard-button-connector',
+  SELECT_CRAWLER: 'entSearchContent-newIndexCard-button-crawler',
+};
+
+export const CRAWLER_INDEX = {
+  CRAWL_ALL_DOMAINS: 'entSearchContent-crawler-startCrawlMenu-crawlAllDomains',
+  CRAWL_DROPDOWN: 'entSearchContent-crawler-startCrawlMenu-menuButton',
+  CREATE_BUTTON: 'entSearchContent-crawler-newIndex-createIndex',
+  DOMAIN_MANAGEMENT: {
+    DOMAIN_BUTTON: 'entSearchContent-crawler-addDomainForm-validate-button',
+    DOMAIN_INPUT: 'entSearchContent-crawler-addDomainForm-validate-input',
+    SUBMIT_BUTTON: 'entSearchContent-crawler-addDomain-submitButton',
+  },
+  INDEX_NAME_INPUT: 'entSearchContent-crawler-newIndex-editName',
+};
+
+export const INDEX_OVERVIEW = {
+  STATS: {
+    CONNECTOR_TYPE: 'entSearchContent-indexOverview-totalStats-connectorType',
+    DOCUMENT_COUNT: 'entSearchContent-indexOverview-totalStats-documentCount',
+    INGESTION_STATUS: 'entSearchContent-indexOverview-connectorStats-ingestionStatus',
+    INGESTION_TYPE: 'entSearchContent-indexOverview-totalStats-ingestionType',
+  },
+  TABS: {
+    CRAWLER_SCHEDULER: 'entSearchContent-index-crawler-scheduler-tab',
+    OVERVIEW: 'entSearchContent-index-overview-tab',
+  },
+};
+
+export const getIndexRoute = (indexName: string) => {
+  return `/app/enterprise_search/content/search_indices/search-${indexName}/`;
+};
diff --git a/x-pack/plugins/enterprise_search/cypress/support/e2e.ts b/x-pack/plugins/enterprise_search/cypress/support/e2e.ts
index 1e2b130d599734..df0828bfa15cdc 100644
--- a/x-pack/plugins/enterprise_search/cypress/support/e2e.ts
+++ b/x-pack/plugins/enterprise_search/cypress/support/e2e.ts
@@ -29,9 +29,10 @@ declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Cypress {
     interface Chainable {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      findBySel(value: string, ...args: any[]): Chainable<any>;
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       getBySel(value: string, ...args: any[]): Chainable<any>;
-      getKibanaVersion(): Chainable<string>;
     }
   }
 }
@@ -41,7 +42,13 @@ function getBySel(selector: string, ...args: any[]) {
   return cy.get(`[data-test-subj="${selector}"]`, ...args);
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function findBySel(selector: string, ...args: any[]) {
+  return cy.find(`[data-test-subj="${selector}"]`, ...args);
+}
+
 Cypress.Commands.add('getBySel', getBySel);
+Cypress.Commands.add('findBySel', findBySel);
 
 Cypress.on('uncaught:exception', () => {
   return false;
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/hooks.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/hooks.mock.ts
index ce21fd08f180ad..77e40a9094d7cf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/hooks.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/hooks.mock.ts
@@ -36,8 +36,8 @@ export const mockAllActions = {
  */
 jest.mock('kea', () => ({
   ...(jest.requireActual('kea') as object),
-  useValues: jest.fn(() => ({ ...mockAllValues })),
   useActions: jest.fn(() => ({ ...mockAllActions })),
+  useValues: jest.fn(() => ({ ...mockAllValues })),
 }));
 
 /**
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
index 9c1b0575694c41..d79ebb3530ce28 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
@@ -35,6 +35,7 @@ export const mockKibanaValues = {
   guidedOnboarding: {},
   history: mockHistory,
   isCloud: false,
+  isSidebarEnabled: true,
   lens: {
     EmbeddableComponent: jest.fn(),
     stateHelperApi: jest.fn().mockResolvedValue({
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.tsx
index 35cf7afbd12432..19457083db2ccf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_explorer/analytics_collection_explorer_table.tsx
@@ -16,6 +16,7 @@ import {
   EuiFieldSearch,
   EuiFlexGroup,
   EuiHorizontalRule,
+  EuiI18nNumber,
   EuiSpacer,
   EuiTab,
   EuiTabs,
@@ -270,6 +271,7 @@ const tableSettings: {
     },
   },
 };
+const MAX_ITEMS = 10000;
 
 export const AnalyticsCollectionExplorerTable = () => {
   const { euiTheme } = useEuiTheme();
@@ -292,6 +294,8 @@ export const AnalyticsCollectionExplorerTable = () => {
   const handleTableChange = ({ sort, page }: Criteria<ExploreTableItem>) => {
     onTableChange({ page, sort });
   };
+  const startNumberItemsOnPage = pageSize * pageIndex + (items.length ? 1 : 0);
+  const endNumberItemsOnPage = pageSize * pageIndex + items.length;
 
   useEffect(() => {
     if (!selectedTable) {
@@ -335,19 +339,33 @@ export const AnalyticsCollectionExplorerTable = () => {
           <EuiSpacer size="xl" />
 
           <EuiText size="xs">
-            <FormattedMessage
-              id="xpack.enterpriseSearch.analytics.collectionsView.explorer.tableSummary"
-              defaultMessage="Showing {items} of {totalItemsCount}"
-              values={{
-                items: (
-                  <strong>
-                    {pageSize * pageIndex + Number(!!items.length)}-
-                    {pageSize * pageIndex + items.length}
-                  </strong>
-                ),
-                totalItemsCount,
-              }}
-            />
+            {totalItemsCount > MAX_ITEMS ? (
+              <FormattedMessage
+                id="xpack.enterpriseSearch.analytics.collectionsView.explorer.tableSummaryIndeterminate"
+                defaultMessage="Showing {items} of first {maxItemsCount} results"
+                values={{
+                  items: (
+                    <strong>
+                      {startNumberItemsOnPage}-{endNumberItemsOnPage}
+                    </strong>
+                  ),
+                  maxItemsCount: <EuiI18nNumber value={MAX_ITEMS} />,
+                }}
+              />
+            ) : (
+              <FormattedMessage
+                id="xpack.enterpriseSearch.analytics.collectionsView.explorer.tableSummary"
+                defaultMessage="Showing {items} of {totalItemsCount}"
+                values={{
+                  items: (
+                    <strong>
+                      {startNumberItemsOnPage}-{endNumberItemsOnPage}
+                    </strong>
+                  ),
+                  totalItemsCount,
+                }}
+              />
+            )}
           </EuiText>
 
           <EuiSpacer size="m" />
@@ -365,7 +383,7 @@ export const AnalyticsCollectionExplorerTable = () => {
               pageSize,
               pageSizeOptions: [10, 20, 50],
               showPerPageOptions: true,
-              totalItemCount: totalItemsCount,
+              totalItemCount: Math.min(totalItemsCount, MAX_ITEMS),
             }}
             onChange={handleTableChange}
           />
diff --git a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/analytics_collection_integrate_view.tsx b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/analytics_collection_integrate_view.tsx
index 2b69286d43f771..3c0ac7ab253176 100644
--- a/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/analytics_collection_integrate_view.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/analytics/components/analytics_collection_view/analytics_collection_integrate/analytics_collection_integrate_view.tsx
@@ -75,7 +75,7 @@ const CORSStep = (): EuiContainedStepProps => ({
 
           <EuiCodeBlock language="yaml" isCopyable>
             {`http.cors.allow-origin: "*"
-http.cors.enabled: true 
+http.cors.enabled: true
 http.cors.allow-credentials: true
 http.cors.allow-methods: OPTIONS, POST
 http.cors.allow-headers: X-Requested-With, X-Auth-Token, Content-Type, Content-Length, Authorization, Access-Control-Allow-Headers, Accept`}
@@ -272,7 +272,7 @@ export const AnalyticsCollectionIntegrateView: React.FC<AnalyticsCollectionInteg
           'xpack.enterpriseSearch.analytics.collectionsView.integration.description',
           {
             defaultMessage:
-              'Easily install our tracker on your search application to receive in depth analytics data. No search applications required.',
+              'Easily install our tracker on your application or website to receive in-depth analytics data.',
           }
         ),
         rightSideItems: [],
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
index 1a4a58558dc5c0..0f864125659fa2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/search_indices.mock.ts
@@ -10,6 +10,7 @@ import { ENTERPRISE_SEARCH_CONNECTOR_CRAWLER_SERVICE_TYPE } from '../../../../co
 import {
   ConnectorStatus,
   DisplayType,
+  FieldType,
   FilteringPolicy,
   FilteringRuleRule,
   FilteringValidationState,
@@ -45,6 +46,7 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
           required: false,
           sensitive: false,
           tooltip: '',
+          type: FieldType.STRING,
           ui_restrictions: [],
           value: 'barbar',
         },
@@ -156,6 +158,7 @@ export const indices: ElasticsearchIndexWithIngestion[] = [
           required: false,
           sensitive: false,
           tooltip: '',
+          type: FieldType.STRING,
           ui_restrictions: [],
           value: 'barbar',
         },
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
index 3f9972d1545c54..4e2a0ceda0fbce 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/__mocks__/view_index.mock.ts
@@ -10,6 +10,7 @@ import { ENTERPRISE_SEARCH_CONNECTOR_CRAWLER_SERVICE_TYPE } from '../../../../co
 import {
   SyncStatus,
   ConnectorStatus,
+  FieldType,
   FilteringPolicy,
   FilteringRuleRule,
   FilteringValidationState,
@@ -55,6 +56,7 @@ export const connectorIndex: ConnectorViewIndex = {
         required: false,
         sensitive: false,
         tooltip: '',
+        type: FieldType.STRING,
         ui_restrictions: [],
         value: 'barbar',
       },
@@ -170,6 +172,7 @@ export const crawlerIndex: CrawlerViewIndex = {
         required: false,
         sensitive: false,
         tooltip: '',
+        type: FieldType.STRING,
         ui_restrictions: [],
         value: 'barbar',
       },
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/connector/convert_connector_api_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/connector/convert_connector_api_logic.test.ts
new file mode 100644
index 00000000000000..01691488470f10
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/connector/convert_connector_api_logic.test.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { mockHttpValues } from '../../../__mocks__/kea_logic';
+
+import { nextTick } from '@kbn/test-jest-helpers';
+
+import { convertConnector } from './convert_connector_api_logic';
+
+describe('ConvertConnectorApilogic', () => {
+  const { http } = mockHttpValues;
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  describe('convertConnector', () => {
+    it('calls correct api', async () => {
+      const promise = Promise.resolve('result');
+      http.put.mockReturnValue(promise);
+      const result = convertConnector({ connectorId: 'connectorId1' });
+      await nextTick();
+      expect(http.put).toHaveBeenCalledWith(
+        '/internal/enterprise_search/connectors/connectorId1/native',
+        { body: JSON.stringify({ is_native: false }) }
+      );
+      await expect(result).resolves.toEqual('result');
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/connector/convert_connector_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/connector/convert_connector_api_logic.ts
new file mode 100644
index 00000000000000..ba998c9dbce9d8
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/connector/convert_connector_api_logic.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createApiLogic } from '../../../shared/api_logic/create_api_logic';
+import { HttpLogic } from '../../../shared/http';
+
+export interface ConvertConnectorApiLogicArgs {
+  connectorId: string;
+}
+
+export interface ConvertConnectorApiLogicResponse {
+  updated: boolean;
+}
+
+export const convertConnector = async ({
+  connectorId,
+}: ConvertConnectorApiLogicArgs): Promise<ConvertConnectorApiLogicResponse> => {
+  const route = `/internal/enterprise_search/connectors/${connectorId}/native`;
+
+  return await HttpLogic.values.http.put<{ updated: boolean }>(route, {
+    body: JSON.stringify({ is_native: false }),
+  });
+};
+
+export const ConvertConnectorApiLogic = createApiLogic(
+  ['convert_connector_api_logic'],
+  convertConnector
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/create_text_expansion_model_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/create_text_expansion_model_api_logic.ts
new file mode 100644
index 00000000000000..643352e0a833e2
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/create_text_expansion_model_api_logic.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { ELSER_MODEL_ID } from '../../../../../../common/ml_inference_pipeline';
+import { Actions, createApiLogic } from '../../../../shared/api_logic/create_api_logic';
+import { HttpLogic } from '../../../../shared/http';
+
+export type CreateTextExpansionModelArgs = undefined;
+
+export interface CreateTextExpansionModelResponse {
+  deploymentState: string;
+  modelId: string;
+}
+
+export const createTextExpansionModel = async (): Promise<CreateTextExpansionModelResponse> => {
+  const route = `/internal/enterprise_search/ml/models/${ELSER_MODEL_ID}`;
+  return await HttpLogic.values.http.post<CreateTextExpansionModelResponse>(route, {
+    body: undefined,
+  });
+};
+
+export const CreateTextExpansionModelApiLogic = createApiLogic(
+  ['create_text_expansion_model_api_logic'],
+  createTextExpansionModel,
+  { showErrorFlash: false }
+);
+
+export type CreateTextExpansionModelApiLogicActions = Actions<
+  CreateTextExpansionModelArgs,
+  CreateTextExpansionModelResponse
+>;
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/fetch_text_expansion_model_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/fetch_text_expansion_model_api_logic.ts
new file mode 100644
index 00000000000000..03129c68ad3339
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/fetch_text_expansion_model_api_logic.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { ELSER_MODEL_ID } from '../../../../../../common/ml_inference_pipeline';
+import { Actions, createApiLogic } from '../../../../shared/api_logic/create_api_logic';
+import { HttpLogic } from '../../../../shared/http';
+
+export type FetchTextExpansionModelArgs = undefined;
+
+export interface FetchTextExpansionModelResponse {
+  deploymentState: string;
+  modelId: string;
+}
+
+export const fetchTextExpansionModelStatus = async () => {
+  return await HttpLogic.values.http.get<FetchTextExpansionModelResponse>(
+    `/internal/enterprise_search/ml/models/${ELSER_MODEL_ID}`
+  );
+};
+
+export const FetchTextExpansionModelApiLogic = createApiLogic(
+  ['fetch_text_expansion_model_api_logic'],
+  fetchTextExpansionModelStatus,
+  { showErrorFlash: false }
+);
+
+export type FetchTextExpansionModelApiLogicActions = Actions<
+  FetchTextExpansionModelArgs,
+  FetchTextExpansionModelResponse
+>;
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/start_text_expansion_model_api_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/start_text_expansion_model_api_logic.ts
new file mode 100644
index 00000000000000..d8e1116154b647
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/api/ml_models/text_expansion/start_text_expansion_model_api_logic.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { ELSER_MODEL_ID } from '../../../../../../common/ml_inference_pipeline';
+import { Actions, createApiLogic } from '../../../../shared/api_logic/create_api_logic';
+import { HttpLogic } from '../../../../shared/http';
+
+export type StartTextExpansionModelArgs = undefined;
+
+export interface StartTextExpansionModelResponse {
+  deploymentState: string;
+  modelId: string;
+}
+
+export const startTextExpansionModel = async (): Promise<StartTextExpansionModelResponse> => {
+  const route = `/internal/enterprise_search/ml/models/${ELSER_MODEL_ID}/deploy`;
+  return await HttpLogic.values.http.post<StartTextExpansionModelResponse>(route, {
+    body: undefined,
+  });
+};
+
+export const StartTextExpansionModelApiLogic = createApiLogic(
+  ['start_text_expansion_model_api_logic'],
+  startTextExpansionModel,
+  { showErrorFlash: false }
+);
+
+export type StartTextExpansionModelApiLogicActions = Actions<
+  StartTextExpansionModelArgs,
+  StartTextExpansionModelResponse
+>;
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/engine_api_integration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/engine_api_integration.tsx
index 2fe691e262b64b..0d47f02e7475bc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/engine_api_integration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/engine_api_integration.tsx
@@ -19,7 +19,7 @@ import { EngineApiLogic } from './engine_api_logic';
 
 import { elasticsearchUrl } from './search_application_api';
 
-const SearchUISnippet = (esUrl: string, engineName: string, apiKey: string) => `6
+const SearchUISnippet = (esUrl: string, engineName: string, apiKey: string) => `
 import EnginesAPIConnector from "@elastic/search-ui-engines-connector";
 
 const connector = new EnginesAPIConnector({
@@ -74,7 +74,7 @@ export const EngineApiIntegrationStage: React.FC = () => {
         <p>
           {i18n.translate('xpack.enterpriseSearch.content.engine.api.step3.intro', {
             defaultMessage:
-              'Learn how to integrate with your search application with the language clients maintained by Elastic to help build your search experience.',
+              'Use the following code snippets to connect to your search application.',
           })}
         </p>
       </EuiText>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/engine_connect.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/engine_connect.tsx
index a6c29285f4f660..018470da694108 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/engine_connect.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/engine_connect.tsx
@@ -26,6 +26,8 @@ import { EngineViewLogic } from '../engine_view_logic';
 
 import { SearchApplicationAPI } from './search_application_api';
 
+import '../search_application_layout.scss';
+
 const pageTitle = i18n.translate(
   'xpack.enterpriseSearch.content.searchApplications.connect.pageTitle',
   {
@@ -68,6 +70,8 @@ export const EngineConnect: React.FC = () => {
         pageViewTelemetry={EngineViewTabs.CONNECT}
         isLoading={isLoadingEngine}
         pageHeader={{
+          bottomBorder: false,
+          className: 'searchApplicationHeaderBackgroundColor',
           pageTitle,
           rightSideItems: [],
         }}
@@ -84,6 +88,8 @@ export const EngineConnect: React.FC = () => {
       pageViewTelemetry={EngineViewTabs.CONNECT}
       isLoading={isLoadingEngine}
       pageHeader={{
+        bottomBorder: false,
+        className: 'searchApplicationHeaderBackgroundColor',
         pageTitle,
         rightSideItems: [],
         tabs: [
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/search_application_api.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/search_application_api.tsx
index 6934de4051bdb4..7e42fa80c11d7c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/search_application_api.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_connect/search_application_api.tsx
@@ -21,12 +21,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { ANALYTICS_PLUGIN } from '../../../../../../common/constants';
-import { COLLECTION_INTEGRATE_PATH } from '../../../../analytics/routes';
 import { CloudDetails, useCloudDetails } from '../../../../shared/cloud_details/cloud_details';
 import { decodeCloudId } from '../../../../shared/decode_cloud_id/decode_cloud_id';
 import { docLinks } from '../../../../shared/doc_links';
-import { generateEncodedPath } from '../../../../shared/encode_path_params';
 import { KibanaLogic } from '../../../../shared/kibana';
 
 import { EngineViewLogic } from '../engine_view_logic';
@@ -46,7 +43,6 @@ export const SearchApplicationAPI = () => {
   const { engineName } = useValues(EngineViewLogic);
   const { isGenerateModalOpen } = useValues(EngineApiLogic);
   const { openGenerateModal, closeGenerateModal } = useActions(EngineApiLogic);
-  const { navigateToUrl } = useValues(KibanaLogic);
   const cloudContext = useCloudDetails();
 
   const steps = [
@@ -153,48 +149,6 @@ export const SearchApplicationAPI = () => {
       }),
       children: <EngineApiIntegrationStage />,
     },
-    {
-      title: i18n.translate('xpack.enterpriseSearch.content.searchApplication.api.step4.title', {
-        defaultMessage: '(Optional) Power up your analytics',
-      }),
-      children: (
-        <>
-          <EuiText>
-            <p>
-              {i18n.translate('xpack.enterpriseSearch.content.searchApplication.api.step4.copy', {
-                defaultMessage:
-                  'Your search application provides basic analytics data as part of this installation. To receive more granular and custom metrics, integrate our Behavioral Analytics script on your platform.',
-              })}
-            </p>
-          </EuiText>
-          <EuiSpacer size="l" />
-          <EuiFlexGroup>
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                data-telemetry-id="entSearchContent-searchApplications-api-step4-learnHowLink"
-                onClick={() =>
-                  navigateToUrl(
-                    generateEncodedPath(`${ANALYTICS_PLUGIN.URL}${COLLECTION_INTEGRATE_PATH}`, {
-                      id: engineName,
-                    }),
-                    { shouldNotCreateHref: true }
-                  )
-                }
-                iconSide="left"
-                iconType="popout"
-              >
-                {i18n.translate(
-                  'xpack.enterpriseSearch.content.searchApplication.api.step4.learnHowLink',
-                  {
-                    defaultMessage: 'Learn how',
-                  }
-                )}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </>
-      ),
-    },
   ];
 
   return (
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx
index 5cd4895c3aa351..25818607f102f5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_search_preview/engine_search_preview.tsx
@@ -72,6 +72,7 @@ import {
   ResultsView,
   Sorting,
 } from './search_ui_components';
+import '../search_application_layout.scss';
 
 class InternalEngineTransporter implements Transporter {
   constructor(
@@ -313,6 +314,8 @@ export const EngineSearchPreview: React.FC = () => {
       pageViewTelemetry={EngineViewTabs.PREVIEW}
       isLoading={isLoadingEngine}
       pageHeader={{
+        bottomBorder: false,
+        className: 'searchApplicationHeaderBackgroundColor',
         pageTitle: (
           <FormattedMessage
             id="xpack.enterpriseSearch.content.engine.searchPreview.pageTitle"
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_view.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_view.tsx
index 6bbfe9b1de9673..0f83fecc902386 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_view.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/engine_view.tsx
@@ -55,6 +55,7 @@ export const EngineView: React.FC = () => {
         pageChrome={[engineName]}
         pageViewTelemetry={tabId}
         pageHeader={{
+          bottomBorder: false,
           pageTitle: engineName,
           rightSideItems: [],
         }}
@@ -91,6 +92,7 @@ export const EngineView: React.FC = () => {
             pageChrome={[engineName]}
             pageViewTelemetry={tabId}
             pageHeader={{
+              bottomBorder: false,
               pageTitle: engineName,
               rightSideItems: [],
             }}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/search_application_content.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/search_application_content.tsx
index 4bf79b31a14913..4fa39f2fa0cf2d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/search_application_content.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/search_application_content.tsx
@@ -30,6 +30,7 @@ import { EngineIndices } from './engine_indices';
 import { EngineIndicesLogic } from './engine_indices_logic';
 import { EngineSchema } from './engine_schema';
 import { EngineViewLogic } from './engine_view_logic';
+import './search_application_layout.scss';
 
 const pageTitle = i18n.translate(
   'xpack.enterpriseSearch.content.searchApplications.content.pageTitle',
@@ -78,6 +79,8 @@ export const SearchApplicationContent = () => {
         pageViewTelemetry={EngineViewTabs.CONTENT}
         isLoading={isLoadingEngine}
         pageHeader={{
+          bottomBorder: false,
+          className: 'searchApplicationHeaderBackgroundColor',
           pageTitle,
           rightSideItems: [],
         }}
@@ -103,6 +106,7 @@ export const SearchApplicationContent = () => {
       pageViewTelemetry={EngineViewTabs.CONTENT}
       isLoading={isLoadingEngine}
       pageHeader={{
+        bottomBorder: false,
         breadcrumbs: [
           {
             color: 'primary',
@@ -119,6 +123,7 @@ export const SearchApplicationContent = () => {
             ),
           },
         ],
+        className: 'searchApplicationHeaderBackgroundColor',
         pageTitle,
         rightSideItems: [
           <EuiButton
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/search_application_layout.scss b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/search_application_layout.scss
new file mode 100644
index 00000000000000..a1b0d51a7c02b8
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engine/search_application_layout.scss
@@ -0,0 +1,5 @@
+
+.searchApplicationHeaderBackgroundColor {
+  background-color: $euiColorLightestShade;
+
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.test.tsx
index 772bd039adc0a8..601b325f50aeb3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.test.tsx
@@ -146,7 +146,7 @@ describe('CreateEngineButton', () => {
 
       expect(popover).toHaveLength(1);
       expect(popover.text()).toMatch(
-        'This functionality is in technical preview and may be changed or removed completely in a future release.'
+        'This functionality may be changed or removed completely in a future release.'
       );
     });
   });
@@ -177,7 +177,7 @@ describe('CreateEngineButton', () => {
 
       expect(popover).toHaveLength(1);
       expect(popover.text()).toMatch(
-        'This functionality is in technical preview and may be changed or removed completely in a future release.'
+        'This functionality may be changed or removed completely in a future release.'
       );
     });
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.tsx
index 95d160798d1fe4..c47e35fb3fe9e6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/engines/engines_list.tsx
@@ -97,7 +97,7 @@ export const CreateEngineButton: React.FC<CreateEngineButtonProps> = ({ disabled
           <EuiText size="s">
             <FormattedMessage
               id="xpack.enterpriseSearch.content.searchApplications.createEngineTechnicalPreviewPopover.body"
-              defaultMessage="This functionality is in technical preview and may be changed or removed completely in a future release. Elastic will take a best effort approach to fix any issues, but features in technical preview are not subject to the support SLA of official GA features."
+              defaultMessage="This functionality may be changed or removed completely in a future release."
             />
           </EuiText>
         </EuiFlexGroup>
@@ -170,7 +170,7 @@ export const EnginesList: React.FC<ListProps> = ({ createEngineFlyoutOpen }) =>
           description: (
             <FormattedMessage
               id="xpack.enterpriseSearch.content.searchApplications.description"
-              defaultMessage="Search Applications help make your Elasticsearch data searchable for end users, with out-of-the-box relevance, analytics and personalization tools. To learn more, {documentationUrl}."
+              defaultMessage="Search Applications help make your Elasticsearch data easily searchable for end users. Create, build, and manage all your search applications here. To learn more, {documentationUrl}."
               values={{
                 documentationUrl: (
                   <EuiLink
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/engines_page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/engines_page_template.tsx
index 94f0d9ae56e7c8..ed0cd55b7549a5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/engines_page_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/layout/engines_page_template.tsx
@@ -23,6 +23,7 @@ export const EnterpriseSearchEnginesPageTemplate: React.FC<
   const navItems = useEnterpriseSearchEngineNav(engineName, pageTemplateProps.isEmptyState);
   return (
     <EnterpriseSearchPageTemplateWrapper
+      panelled
       {...pageTemplateProps}
       solutionNav={{
         items: navItems,
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_index_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_index_card.tsx
index 54e516c3a1f5eb..14451c07feadf5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_index_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_index_card.tsx
@@ -97,6 +97,7 @@ export const NewIndexCard: React.FC<NewIndexCardProps> = ({ onSelect, isSelected
 
   return (
     <EuiCard
+      data-test-subj="entSearch-content-newIndexCard-cardBody"
       hasBorder
       icon={<EuiIcon type={icon} size="xxl" />}
       title={title}
@@ -110,6 +111,7 @@ export const NewIndexCard: React.FC<NewIndexCardProps> = ({ onSelect, isSelected
             </>
           )}
           <EuiButton
+            data-test-subj={`entSearchContent-newIndexCard-button-${type}`}
             fullWidth
             onClick={onSelect}
             color={isSelected ? 'success' : 'primary'}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_template.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_template.tsx
index c7b65b28f0a991..c0242c8b6cfbb2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_template.tsx
@@ -136,6 +136,7 @@ export const NewSearchIndexTemplate: React.FC<Props> = ({
                   fullWidth
                 >
                   <EuiFieldText
+                    data-test-subj={`entSearchContent-${type}-newIndex-editName`}
                     data-telemetry-id={`entSearchContent-${type}-newIndex-editName`}
                     placeholder={i18n.translate(
                       'xpack.enterpriseSearch.content.newIndex.newSearchIndexTemplate.nameInputPlaceholder',
@@ -253,6 +254,7 @@ export const NewSearchIndexTemplate: React.FC<Props> = ({
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiButton
+              data-test-subj={`entSearchContent-${type}-newIndex-createIndex`}
               data-telemetry-id={`entSearchContent-${type}-newIndex-createIndex`}
               fill
               isDisabled={!rawName || buttonLoading || formInvalid || disabled}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/select_connector/select_connector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/select_connector/select_connector.tsx
index f5a910ebd89853..4dd1ecb4a922b7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/select_connector/select_connector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/select_connector/select_connector.tsx
@@ -117,6 +117,7 @@ export const SelectConnector: React.FC = () => {
             <EuiFlexItem grow={false}>
               <span>
                 <EuiButton
+                  data-test-subj="entSearchContent-connector-selectConnector-selectAndConfigure"
                   data-telemetry-id="entSearchContent-connector-selectConnector-selectAndConfigure"
                   disabled={!selectedConnector}
                   fill
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/header_actions/syncs_context_menu.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/header_actions/syncs_context_menu.tsx
index 9f48c2336826a3..5be394ee2708ff 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/header_actions/syncs_context_menu.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/components/header_actions/syncs_context_menu.tsx
@@ -75,7 +75,9 @@ export const SyncsContextMenu: React.FC = () => {
                 <EuiLoadingSpinner size="m" />
               </EuiFlexItem>
             )}
-            <EuiFlexItem>{getSyncButtonText()}</EuiFlexItem>
+            <EuiFlexItem data-test-subj={`entSearchContent-${ingestionMethod}-header-sync-menu`}>
+              {getSyncButtonText()}
+            </EuiFlexItem>
           </EuiFlexGroup>
         </EuiButton>
       }
@@ -90,6 +92,7 @@ export const SyncsContextMenu: React.FC = () => {
             ? []
             : [
                 <EuiContextMenuItem
+                  data-test-subj={`entSearchContent-${ingestionMethod}-header-sync-startSync`}
                   data-telemetry-id={`entSearchContent-${ingestionMethod}-header-sync-startSync`}
                   disabled={ingestionStatus === IngestionStatus.INCOMPLETE}
                   key="Sync"
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration.tsx
index 0abd1ba5b4afe6..7c2815eab946ef 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration.tsx
@@ -99,28 +99,10 @@ export const ConnectorConfiguration: React.FC = () => {
                 {
                   children: (
                     <>
-                      <EuiText size="s">
-                        {i18n.translate(
-                          'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph',
-                          {
-                            defaultMessage:
-                              'The connectors repository contains several connector client examples to help you utilize our framework for accelerated development against custom data sources.',
-                          }
-                        )}
-                      </EuiText>
-                      <EuiLink href="https://github.com/elastic/connectors" target="_blank">
-                        {i18n.translate(
-                          'xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label',
-                          {
-                            defaultMessage: 'Explore the connectors repository',
-                          }
-                        )}
-                      </EuiLink>
-                      <EuiSpacer />
                       <EuiText size="s">
                         <FormattedMessage
                           id="xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.secondParagraph"
-                          defaultMessage="The connectors repository contains several {link} to help you utilize our framework for accelerated development against custom data sources."
+                          defaultMessage="The connectors repository contains several {link}. Use our framework for accelerated development against custom data sources."
                           values={{
                             link: (
                               <EuiLink
@@ -266,7 +248,7 @@ export const ConnectorConfiguration: React.FC = () => {
                             'xpack.enterpriseSearch.content.indices.configurationConnector.scheduleSync.description',
                             {
                               defaultMessage:
-                                'Once your connectors are configured to your liking, don’t forget to set a recurring sync schedule to make sure your documents are indexed and relevant. You can also trigger a one-time sync without enabling a sync schedule.',
+                                'Once configured, set a recurring sync schedule to keep your documents in sync over time. You can also simply trigger a one-time sync.',
                             }
                           )}
                         </EuiText>
@@ -275,6 +257,7 @@ export const ConnectorConfiguration: React.FC = () => {
                         <EuiFlexGroup>
                           <EuiFlexItem grow={false}>
                             <EuiButtonTo
+                              data-test-subj="entSearchContent-connector-configuration-setScheduleAndSync"
                               data-telemetry-id="entSearchContent-connector-configuration-setScheduleAndSync"
                               to={`${generateEncodedPath(SEARCH_INDEX_TAB_PATH, {
                                 indexName,
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_config.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_config.tsx
index 3bf4d0ce82f84e..f192ad02e061d8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_config.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_config.tsx
@@ -51,6 +51,7 @@ export const ConnectorConfigurationConfig: React.FC = ({ children }) => {
                 <EuiFlexGroup>
                   <EuiFlexItem grow={false}>
                     <EuiButton
+                      data-test-subj="entSearchContent-connector-configuration-editConfiguration"
                       data-telemetry-id="entSearchContent-connector-overview-configuration-editConfiguration"
                       onClick={() => setIsEditing(!isEditing)}
                     >
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_field.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_field.tsx
index e154785a335316..df833d940c0689 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_field.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_field.tsx
@@ -12,7 +12,6 @@ import { useActions, useValues } from 'kea';
 import {
   EuiAccordion,
   EuiFieldText,
-  EuiFieldNumber,
   EuiFieldPassword,
   EuiRadioGroup,
   EuiSelect,
@@ -30,7 +29,6 @@ import {
   ConnectorConfigurationLogic,
   ConfigEntry,
   ensureStringType,
-  ensureNumberType,
   ensureBooleanType,
 } from './connector_configuration_logic';
 
@@ -44,7 +42,17 @@ export const ConnectorConfigurationField: React.FC<ConnectorConfigurationFieldPr
   const { status } = useValues(ConnectorConfigurationApiLogic);
   const { setLocalConfigEntry } = useActions(ConnectorConfigurationLogic);
 
-  const { key, display, label, options, required, sensitive, tooltip, value } = configEntry;
+  const {
+    key,
+    display,
+    is_valid: isValid,
+    label,
+    options,
+    required,
+    sensitive,
+    tooltip,
+    value,
+  } = configEntry;
 
   switch (display) {
     case DisplayType.DROPDOWN:
@@ -72,10 +80,11 @@ export const ConnectorConfigurationField: React.FC<ConnectorConfigurationFieldPr
 
     case DisplayType.NUMERIC:
       return (
-        <EuiFieldNumber
+        <EuiFieldText
           disabled={status === Status.LOADING}
           required={required}
-          value={ensureNumberType(value)}
+          value={ensureStringType(value)}
+          isInvalid={!isValid}
           onChange={(event) => {
             setLocalConfigEntry({ ...configEntry, value: event.target.value });
           }}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
index 2c40eb0beafa4f..0c9720a894c494 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_form.tsx
@@ -51,9 +51,11 @@ export const ConnectorConfigurationForm = () => {
           depends_on: dependencies,
           key,
           display,
+          is_valid: isValid,
           label,
           sensitive,
           tooltip,
+          validation_errors: validationErrors,
         } = configEntry;
         const helpText = defaultValue
           ? i18n.translate(
@@ -89,7 +91,14 @@ export const ConnectorConfigurationForm = () => {
             <>
               {topSpacing}
               <EuiPanel color="subdued" borderRadius="none">
-                <EuiFormRow label={rowLabel} key={key} helpText={helpText}>
+                <EuiFormRow
+                  label={rowLabel}
+                  key={key}
+                  helpText={helpText}
+                  error={validationErrors}
+                  isInvalid={!isValid}
+                  data-test-subj={`entSearchContent-connector-configuration-formrow-${key}`}
+                >
                   <ConnectorConfigurationField configEntry={configEntry} />
                 </EuiFormRow>
               </EuiPanel>
@@ -99,7 +108,14 @@ export const ConnectorConfigurationForm = () => {
         }
 
         return (
-          <EuiFormRow label={rowLabel} key={key} helpText={helpText}>
+          <EuiFormRow
+            label={rowLabel}
+            key={key}
+            helpText={helpText}
+            error={validationErrors}
+            isInvalid={!isValid}
+            data-test-subj={`entSearchContent-connector-configuration-formrow-${key}`}
+          >
             <ConnectorConfigurationField configEntry={configEntry} />
           </EuiFormRow>
         );
@@ -108,6 +124,7 @@ export const ConnectorConfigurationForm = () => {
         <EuiFlexGroup>
           <EuiFlexItem grow={false}>
             <EuiButton
+              data-test-subj="entSearchContent-connector-configuration-saveConfiguration"
               data-telemetry-id="entSearchContent-connector-configuration-saveConfiguration"
               type="submit"
               isLoading={status === Status.LOADING}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
index f87d73b882ecdd..2211f64645c35d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.test.ts
@@ -8,7 +8,7 @@
 import { LogicMounter } from '../../../../__mocks__/kea_logic';
 import { connectorIndex } from '../../../__mocks__/view_index.mock';
 
-import { ConnectorStatus, DisplayType } from '../../../../../../common/types/connectors';
+import { ConnectorStatus, DisplayType, FieldType } from '../../../../../../common/types/connectors';
 
 import { ConnectorConfigurationApiLogic } from '../../../api/connector/update_connector_configuration_api_logic';
 import { CachedFetchIndexApiLogic } from '../../../api/index/cached_fetch_index_api_logic';
@@ -61,6 +61,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: false,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'oldBar',
           },
@@ -80,6 +81,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: false,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'oldBar',
           },
@@ -89,6 +91,7 @@ describe('ConnectorConfigurationLogic', () => {
             default_value: '',
             depends_on: [],
             display: DisplayType.TEXTBOX,
+            is_valid: true,
             key: 'foo',
             label: 'newBar',
             options: [],
@@ -96,7 +99,9 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: false,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
+            validation_errors: [],
             value: 'oldBar',
           },
         ],
@@ -114,6 +119,7 @@ describe('ConnectorConfigurationLogic', () => {
           required: false,
           sensitive: false,
           tooltip: '',
+          type: FieldType.STRING,
           ui_restrictions: [],
           value: 'fourthBar',
         },
@@ -131,6 +137,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: false,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'fourthBar',
           },
@@ -140,6 +147,7 @@ describe('ConnectorConfigurationLogic', () => {
             default_value: '',
             depends_on: [],
             display: DisplayType.TEXTBOX,
+            is_valid: true,
             key: 'foo',
             label: 'thirdBar',
             options: [],
@@ -147,7 +155,9 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: false,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
+            validation_errors: [],
             value: 'fourthBar',
           },
         ],
@@ -166,6 +176,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: false,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'foofoo',
           },
@@ -179,6 +190,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'fourthBar',
           },
@@ -192,6 +204,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: ['advanced'],
             value: 'I am restricted',
           },
@@ -205,6 +218,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'I should appear (one dependency)',
           },
@@ -221,6 +235,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'I should appear (multiple dependencies)',
           },
@@ -234,6 +249,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'I should hide (one dependency)',
           },
@@ -250,6 +266,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'I should hide (multiple dependencies)',
           },
@@ -265,6 +282,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: false,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'foofoo',
           },
@@ -278,6 +296,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'fourthBar',
           },
@@ -291,6 +310,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: ['advanced'],
             value: 'I am restricted',
           },
@@ -304,6 +324,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'I should appear (one dependency)',
           },
@@ -320,6 +341,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'I should appear (multiple dependencies)',
           },
@@ -333,6 +355,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'I should hide (one dependency)',
           },
@@ -349,6 +372,7 @@ describe('ConnectorConfigurationLogic', () => {
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
             value: 'I should hide (multiple dependencies)',
           },
@@ -357,6 +381,7 @@ describe('ConnectorConfigurationLogic', () => {
           default_value: '',
           depends_on: [],
           display: DisplayType.TEXTBOX,
+          is_valid: true,
           key: 'bar',
           label: 'foo',
           options: [],
@@ -364,7 +389,9 @@ describe('ConnectorConfigurationLogic', () => {
           required: false,
           sensitive: false,
           tooltip: '',
+          type: FieldType.STRING,
           ui_restrictions: [],
+          validation_errors: [],
           value: 'fafa',
         });
         expect(ConnectorConfigurationLogic.values).toEqual({
@@ -380,6 +407,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: false,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'foofoo',
             },
@@ -393,6 +421,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'fourthBar',
             },
@@ -406,6 +435,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: ['advanced'],
               value: 'I am restricted',
             },
@@ -419,6 +449,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'I should appear (one dependency)',
             },
@@ -435,6 +466,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'I should appear (multiple dependencies)',
             },
@@ -448,6 +480,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'I should hide (one dependency)',
             },
@@ -464,6 +497,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'I should hide (multiple dependencies)',
             },
@@ -473,6 +507,7 @@ describe('ConnectorConfigurationLogic', () => {
               default_value: '',
               depends_on: [],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'bar',
               label: 'foo',
               options: [],
@@ -480,13 +515,16 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: false,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'foofoo',
             },
             {
               default_value: '',
               depends_on: [],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'password',
               label: 'thirdBar',
               options: [],
@@ -494,13 +532,16 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'fourthBar',
             },
             {
               default_value: '',
               depends_on: [{ field: 'bar', value: 'foofoo' }],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'shownDependent1',
               label: 'Shown Dependent',
               options: [],
@@ -508,7 +549,9 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'I should appear (one dependency)',
             },
             {
@@ -518,6 +561,7 @@ describe('ConnectorConfigurationLogic', () => {
                 { field: 'password', value: 'fourthBar' },
               ],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'shownDependent2',
               label: 'Shown Dependent 1',
               options: [],
@@ -525,7 +569,9 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'I should appear (multiple dependencies)',
             },
           ],
@@ -540,6 +586,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: false,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'fafa',
             },
@@ -553,6 +600,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'fourthBar',
             },
@@ -566,6 +614,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: ['advanced'],
               value: 'I am restricted',
             },
@@ -579,6 +628,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'I should appear (one dependency)',
             },
@@ -595,6 +645,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'I should appear (multiple dependencies)',
             },
@@ -608,6 +659,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'I should hide (one dependency)',
             },
@@ -624,6 +676,7 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
               value: 'I should hide (multiple dependencies)',
             },
@@ -633,6 +686,7 @@ describe('ConnectorConfigurationLogic', () => {
               default_value: '',
               depends_on: [],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'bar',
               label: 'foo',
               options: [],
@@ -640,13 +694,16 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: false,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'fafa',
             },
             {
               default_value: '',
               depends_on: [],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'password',
               label: 'thirdBar',
               options: [],
@@ -654,13 +711,16 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'fourthBar',
             },
             {
               default_value: '',
               depends_on: [{ field: 'bar', value: 'fafa' }],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'hiddenDependent1',
               label: 'Shown Dependent 2',
               options: [],
@@ -668,7 +728,9 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'I should hide (one dependency)',
             },
             {
@@ -678,6 +740,7 @@ describe('ConnectorConfigurationLogic', () => {
                 { field: 'password', value: 'fourthBar' },
               ],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'hiddenDependent2',
               label: 'Shown Dependent',
               options: [],
@@ -685,7 +748,9 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: true,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'I should hide (multiple dependencies)',
             },
           ],
@@ -703,6 +768,7 @@ describe('ConnectorConfigurationLogic', () => {
               default_value: '',
               depends_on: [],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'foo',
               label: 'bar',
               options: [],
@@ -710,7 +776,9 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: false,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'barbar',
             },
           ],
@@ -740,6 +808,7 @@ describe('ConnectorConfigurationLogic', () => {
               default_value: '',
               depends_on: [],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'foo',
               label: 'bar',
               options: [],
@@ -747,7 +816,9 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: false,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'barbar',
             },
           ],
@@ -762,6 +833,7 @@ describe('ConnectorConfigurationLogic', () => {
               default_value: '',
               depends_on: [],
               display: DisplayType.TEXTBOX,
+              is_valid: true,
               key: 'foo',
               label: 'bar',
               options: [],
@@ -769,7 +841,9 @@ describe('ConnectorConfigurationLogic', () => {
               required: false,
               sensitive: false,
               tooltip: '',
+              type: FieldType.STRING,
               ui_restrictions: [],
+              validation_errors: [],
               value: 'barbar',
             },
           ],
@@ -786,13 +860,16 @@ describe('ConnectorConfigurationLogic', () => {
             default_value: '',
             depends_on: [],
             display: DisplayType.TEXTBOX,
+            is_valid: true,
             label: 'bar',
             options: [],
             order: 1,
             required: false,
             sensitive: true,
             tooltip: '',
+            type: FieldType.STRING,
             ui_restrictions: [],
+            validation_errors: [],
             value: 'Barbara',
           },
         });
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
index 861ab90079229f..065fe42d5bb0b5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_configuration_logic.ts
@@ -7,12 +7,15 @@
 
 import { kea, MakeLogicType } from 'kea';
 
+import { i18n } from '@kbn/i18n';
+
 import {
   ConnectorConfiguration,
   ConnectorStatus,
   Dependency,
   DependencyLookup,
   DisplayType,
+  FieldType,
   SelectOption,
 } from '../../../../../../common/types/connectors';
 import { isNotNullish } from '../../../../../../common/utils/is_not_nullish';
@@ -59,6 +62,7 @@ export interface ConfigEntry {
   default_value: string | number | boolean | null;
   depends_on: Dependency[];
   display: DisplayType;
+  is_valid: boolean;
   key: string;
   label: string;
   options: SelectOption[];
@@ -66,7 +70,9 @@ export interface ConfigEntry {
   required: boolean;
   sensitive: boolean;
   tooltip: string;
+  type: FieldType;
   ui_restrictions: string[];
+  validation_errors: string[];
   value: string | number | boolean | null;
 }
 
@@ -86,7 +92,9 @@ function sortAndFilterConnectorConfiguration(config: ConnectorConfiguration): Co
     .map(
       (key) =>
         ({
+          is_valid: true,
           key,
+          validation_errors: [],
           ...config[key],
         } as ConfigEntry)
     )
@@ -119,13 +127,65 @@ function sortAndFilterConnectorConfiguration(config: ConnectorConfiguration): Co
   );
 }
 
+function validateConnectorConfiguration(config: ConfigEntry[]): ConfigEntry[] {
+  return config.map((configEntry) => {
+    const label = configEntry.label;
+
+    configEntry.validation_errors = [];
+
+    if (configEntry.type === FieldType.INTEGER && !validIntInput(configEntry.value)) {
+      configEntry.validation_errors.push(
+        i18n.translate(
+          'xpack.enterpriseSearch.content.indices.configurationConnector.config.invalidInteger',
+          {
+            defaultMessage: '{label} must be an integer.',
+            values: { label },
+          }
+        )
+      );
+    }
+
+    configEntry.is_valid = configEntry.validation_errors.length <= 0;
+
+    return configEntry;
+  });
+}
+
+function validIntInput(value: string | number | boolean | null): boolean {
+  // reject non integers (including x.0 floats), but don't validate if empty
+  return (value !== null || value !== '') &&
+    (isNaN(Number(value)) ||
+      !Number.isSafeInteger(value) ||
+      ensureStringType(value).indexOf('.') >= 0)
+    ? false
+    : true;
+}
+
+function ensureCorrectTyping(
+  type: FieldType,
+  value: string | number | boolean | null
+): string | number | boolean | null {
+  switch (type) {
+    case FieldType.INTEGER:
+      return validIntInput(value) ? ensureIntType(value) : value;
+    case FieldType.BOOLEAN:
+      return ensureBooleanType(value);
+    default:
+      return ensureStringType(value);
+  }
+}
+
 export function ensureStringType(value: string | number | boolean | null): string {
-  return String(value);
+  return value !== null ? String(value) : '';
 }
 
-export function ensureNumberType(value: string | number | boolean | null): number {
-  const numberValue = Number(value);
-  return isNaN(numberValue) ? 0 : numberValue;
+export function ensureIntType(value: string | number | boolean | null): number | null {
+  // int is null-safe to prevent empty values from becoming zeroes
+  if (value === null || value === '') {
+    return null;
+  }
+
+  return parseInt(String(value), 10);
 }
 
 export function ensureBooleanType(value: string | number | boolean | null): boolean {
@@ -265,6 +325,7 @@ export const ConnectorConfigurationLogic = kea<
             required,
             sensitive,
             tooltip,
+            type,
             // eslint-disable-next-line @typescript-eslint/naming-convention
             ui_restrictions,
             value,
@@ -281,8 +342,9 @@ export const ConnectorConfigurationLogic = kea<
             required,
             sensitive,
             tooltip,
+            type,
             ui_restrictions,
-            value,
+            value: ensureCorrectTyping(type, value),
           },
         }),
         setLocalConfigState: (_, { configState }) => configState,
@@ -303,7 +365,10 @@ export const ConnectorConfigurationLogic = kea<
     ],
     localConfigView: [
       () => [selectors.localConfigState],
-      (configState) => sortAndFilterConnectorConfiguration(configState),
+      (configState) => {
+        const config = sortAndFilterConnectorConfiguration(configState);
+        return validateConnectorConfiguration(config);
+      },
     ],
   }),
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_overview_panels.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_overview_panels.tsx
index c3afcbc46494d3..52b3c0881e15da 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_overview_panels.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/connector_overview_panels.tsx
@@ -48,6 +48,7 @@ export const ConnectorOverviewPanels: React.FC = () => {
       <EuiFlexItem grow={1}>
         <EuiPanel color="primary" hasShadow={false} paddingSize="l">
           <EuiStat
+            data-test-subj="entSearchContent-indexOverview-totalStats-documentCount"
             titleSize="m"
             description={i18n.translate(
               'xpack.enterpriseSearch.content.searchIndex.totalStats.documentCountCardLabel',
@@ -59,7 +60,10 @@ export const ConnectorOverviewPanels: React.FC = () => {
           />
         </EuiPanel>
       </EuiFlexItem>
-      <EuiFlexItem grow={1}>
+      <EuiFlexItem
+        grow={1}
+        data-test-subj="entSearchContent-indexOverview-connectorStats-ingestionStatus"
+      >
         {ingestionStatus === IngestionStatus.INCOMPLETE ? (
           <EuiLinkTo
             to={generateEncodedPath(SEARCH_INDEX_TAB_PATH, {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector.tsx
new file mode 100644
index 00000000000000..450565088e8424
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector.tsx
@@ -0,0 +1,115 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiTitle,
+  EuiSpacer,
+  EuiText,
+  EuiLink,
+  EuiButton,
+  EuiConfirmModal,
+} from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+
+import { CANCEL_BUTTON_LABEL } from '../../../../../shared/constants';
+
+import { docLinks } from '../../../../../shared/doc_links';
+
+import { ConvertConnectorLogic } from './convert_connector_logic';
+
+export const ConvertConnector: React.FC = () => {
+  const { convertConnector, hideModal, showModal } = useActions(ConvertConnectorLogic);
+  const { isLoading, isModalVisible } = useValues(ConvertConnectorLogic);
+
+  return (
+    <>
+      {isModalVisible && (
+        <EuiConfirmModal
+          onCancel={() => hideModal()}
+          onConfirm={() => convertConnector()}
+          title={i18n.translate(
+            'xpack.enterpriseSearch.content.engine.indices.convertInfexConfirm.title',
+            { defaultMessage: 'Sure you want to convert your connector?' }
+          )}
+          buttonColor="danger"
+          cancelButtonText={CANCEL_BUTTON_LABEL}
+          confirmButtonText={i18n.translate(
+            'xpack.enterpriseSearch.content.engine.indices.convertIndexConfirm.text',
+            {
+              defaultMessage: 'Yes',
+            }
+          )}
+          isLoading={isLoading}
+          defaultFocusedButton="confirm"
+          maxWidth
+        >
+          <EuiText>
+            <p>
+              {i18n.translate(
+                'xpack.enterpriseSearch.content.engine.indices.convertIndexConfirm.description',
+                {
+                  defaultMessage:
+                    "Once you convert a native connector to a self-managed connector client this can't be undone.",
+                }
+              )}
+            </p>
+          </EuiText>
+        </EuiConfirmModal>
+      )}
+      <EuiFlexGroup direction="row" alignItems="center" gutterSize="xs">
+        <EuiFlexItem grow={false}>
+          <EuiIcon type="wrench" />
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiTitle size="xxs">
+            <h4>
+              {i18n.translate(
+                'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.title',
+                {
+                  defaultMessage: 'Customize your connector',
+                }
+              )}
+            </h4>
+          </EuiTitle>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      <EuiText size="s">
+        <FormattedMessage
+          id="xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.description"
+          defaultMessage="Want to customize this native connector? Convert it to a {link}, to be self-managed on your own infrastructure."
+          values={{
+            link: (
+              <EuiLink href={docLinks.buildConnector} target="_blank">
+                {i18n.translate(
+                  'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.linkTitle',
+                  { defaultMessage: 'connector client' }
+                )}
+              </EuiLink>
+            ),
+          }}
+        />
+        <EuiSpacer size="s" />
+        <EuiButton onClick={() => showModal()}>
+          {i18n.translate(
+            'xpack.enterpriseSearch.content.indices.configurationConnector.nativeConnector.convertConnector.buttonTitle',
+            { defaultMessage: 'Convert connector' }
+          )}
+        </EuiButton>
+      </EuiText>
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector_logic.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector_logic.tsx
new file mode 100644
index 00000000000000..841f8cde106a27
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/convert_connector_logic.tsx
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { kea, MakeLogicType } from 'kea';
+
+import { Status } from '../../../../../../../common/types/api';
+import { Actions } from '../../../../../shared/api_logic/create_api_logic';
+import {
+  ConvertConnectorApiLogic,
+  ConvertConnectorApiLogicArgs,
+  ConvertConnectorApiLogicResponse,
+} from '../../../../api/connector/convert_connector_api_logic';
+import { IndexViewActions, IndexViewLogic } from '../../index_view_logic';
+
+interface ConvertConnectorValues {
+  connectorId: typeof IndexViewLogic.values.connectorId;
+  isLoading: boolean;
+  isModalVisible: boolean;
+  status: Status;
+}
+
+type ConvertConnectorActions = Pick<
+  Actions<ConvertConnectorApiLogicArgs, ConvertConnectorApiLogicResponse>,
+  'apiError' | 'apiSuccess' | 'makeRequest'
+> & {
+  convertConnector(): void;
+  fetchIndex(): IndexViewActions['fetchIndex'];
+  hideModal(): void;
+  showModal(): void;
+};
+
+export const ConvertConnectorLogic = kea<
+  MakeLogicType<ConvertConnectorValues, ConvertConnectorActions>
+>({
+  actions: {
+    convertConnector: () => true,
+    deleteDomain: () => true,
+    hideModal: () => true,
+    showModal: () => true,
+  },
+  connect: {
+    actions: [
+      ConvertConnectorApiLogic,
+      ['apiError', 'apiSuccess', 'makeRequest'],
+      IndexViewLogic,
+      ['fetchIndex'],
+    ],
+    values: [ConvertConnectorApiLogic, ['status'], IndexViewLogic, ['connectorId']],
+  },
+  listeners: ({ actions, values }) => ({
+    convertConnector: () => {
+      if (values.connectorId) {
+        actions.makeRequest({ connectorId: values.connectorId });
+      }
+    },
+  }),
+  path: ['enterprise_search', 'convert_connector_modal'],
+  reducers: {
+    isModalVisible: [
+      false,
+      {
+        apiError: () => false,
+        apiSuccess: () => false,
+        hideModal: () => false,
+        showModal: () => true,
+      },
+    ],
+  },
+  selectors: ({ selectors }) => ({
+    isLoading: [() => [selectors.status], (status: Status) => status === Status.LOADING],
+  }),
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_advanced_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_advanced_configuration.tsx
index 83f0a10db15386..2749f83703072b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_advanced_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_advanced_configuration.tsx
@@ -39,6 +39,7 @@ export const NativeConnectorAdvancedConfiguration: React.FC = () => {
         <EuiFlexGroup>
           <EuiFlexItem grow={false}>
             <EuiButtonTo
+              data-test-subj="entSearchContent-connector-configuration-setScheduleAndSync"
               data-telemetry-id="entSearchContent-connector-configuration-setScheduleAndSync"
               to={`${generateEncodedPath(SEARCH_INDEX_TAB_PATH, {
                 indexName,
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_configuration.tsx
index c4c4af581ef5a0..960bd61264ddf1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_configuration.tsx
@@ -31,6 +31,7 @@ import { IndexViewLogic } from '../../index_view_logic';
 import { ConnectorNameAndDescription } from '../connector_name_and_description/connector_name_and_description';
 import { NATIVE_CONNECTORS } from '../constants';
 
+import { ConvertConnector } from './convert_connector';
 import { NativeConnectorAdvancedConfiguration } from './native_connector_advanced_configuration';
 import { NativeConnectorConfigurationConfig } from './native_connector_configuration_config';
 import { ResearchConfiguration } from './research_configuration';
@@ -203,6 +204,11 @@ export const NativeConnectorConfiguration: React.FC = () => {
                 </EuiText>
               </EuiPanel>
             </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiPanel hasBorder hasShadow={false}>
+                <ConvertConnector />
+              </EuiPanel>
+            </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlexItem>
       </EuiFlexGroup>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector_total_stats.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector_total_stats.tsx
index d27375b9ce99d6..4150d409ed49d8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector_total_stats.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector_total_stats.tsx
@@ -36,8 +36,9 @@ export const ConnectorTotalStats: React.FC = () => {
     return <></>;
   }
 
-  const stats: EuiStatProps[] = [
+  const stats: EuiStatProps[] & { 'data-test-subj'?: string } = [
     {
+      'data-test-subj': 'entSearchContent-indexOverview-totalStats-ingestionType',
       description: i18n.translate(
         'xpack.enterpriseSearch.content.searchIndex.totalStats.ingestionTypeCardLabel',
         {
@@ -53,6 +54,7 @@ export const ConnectorTotalStats: React.FC = () => {
       ),
     },
     {
+      'data-test-subj': 'entSearchContent-indexOverview-totalStats-connectorType',
       description: i18n.translate('xpack.enterpriseSearch.connector.connectorTypePanel.title', {
         defaultMessage: 'Connector type',
       }),
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/edit_extraction_rule.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/edit_extraction_rule.tsx
index 87f26d7bac1478..fa69e05bd65fdf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/edit_extraction_rule.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/edit_extraction_rule.tsx
@@ -103,7 +103,7 @@ export const EditExtractionRule: React.FC<EditExtractionRuleProps> = ({
   saveRule,
 }) => {
   const { closeEditRuleFlyout, openEditRuleFlyout } = useActions(ExtractionRulesLogic);
-  const { fieldRuleFlyoutVisible, fieldRuleToEdit, fieldRuleToEditIndex, fieldRuleToEditIsNew } =
+  const { fieldRuleFlyoutVisible, fieldRuleToEdit, fieldRuleToEditIsNew } =
     useValues(ExtractionRulesLogic);
   const [urlToggle, setUrlToggle] = useState<UrlState>(UrlState.ALL);
   const { control, formState, getValues, handleSubmit, reset, setValue } =
@@ -437,6 +437,7 @@ export const EditExtractionRule: React.FC<EditExtractionRuleProps> = ({
             if (fieldRuleToEditIsNew) {
               appendRule(fieldRule);
             } else {
+              const fieldRuleToEditIndex = rulesFields.findIndex(({ id: ruleId }) => ruleId === id);
               updateRule(fieldRuleToEditIndex ?? 0, fieldRule);
             }
             closeEditRuleFlyout();
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/extraction_rules_logic.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/extraction_rules_logic.tsx
index 8c56f4c4d5f199..6ca86c9e308854 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/extraction_rules_logic.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/extraction_rules_logic.tsx
@@ -57,15 +57,12 @@ interface ExtractionRulesActions {
   hideDeleteModal: () => void;
   openEditRuleFlyout({
     fieldRule,
-    fieldRuleIndex,
     isNewRule,
   }: {
     fieldRule?: ExtractionRuleFieldRule;
-    fieldRuleIndex?: number;
     isNewRule: boolean;
   }): {
     fieldRule: ExtractionRuleFieldRule;
-    fieldRuleIndex?: number;
     isNewRule: boolean;
   };
   fetchDomainData: CrawlerDomainDetailActions['fetchDomainData'];
@@ -101,7 +98,6 @@ interface ExtractionRulesValues {
   fieldRuleFlyoutVisible: boolean;
   fieldRuleToDelete: { extractionRuleId?: string; fieldRuleIndex?: number };
   fieldRuleToEdit: ExtractionRuleFieldRule | null;
-  fieldRuleToEditIndex: number | null;
   fieldRuleToEditIsNew: boolean;
   indexName: string;
   isLoading: boolean;
@@ -289,13 +285,6 @@ export const ExtractionRulesLogic = kea<
         openEditRuleFlyout: (_, { fieldRule }) => fieldRule ?? null,
       },
     ],
-    fieldRuleToEditIndex: [
-      null,
-      {
-        closeEditRuleFlyout: () => null,
-        openEditRuleFlyout: (_, { fieldRuleIndex }) => fieldRuleIndex ?? null,
-      },
-    ],
     fieldRuleToEditIsNew: [
       true,
       {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/extraction_rules_table.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/extraction_rules_table.tsx
index 1a2e545dd4fe4b..d2ae9936bf2901 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/extraction_rules_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/crawler_domain_detail/extraction_rules/extraction_rules_table.tsx
@@ -66,7 +66,6 @@ export const ExtractionRulesTable: React.FC = () => {
               if (rule) {
                 openEditRuleFlyout({
                   fieldRule: rule,
-                  fieldRuleIndex: rule.index,
                   isNewRule: false,
                 });
               }
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/domain_management/add_domain/add_domain_form.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/domain_management/add_domain/add_domain_form.tsx
index 512a69030e3820..98d61a2a736624 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/domain_management/add_domain/add_domain_form.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/domain_management/add_domain/add_domain_form.tsx
@@ -66,11 +66,17 @@ export const AddDomainForm: React.FC = () => {
                   value={addDomainFormInputValue}
                   onChange={(e) => setAddDomainFormInputValue(e.target.value)}
                   fullWidth
+                  data-test-subj="entSearchContent-crawler-addDomainForm-validate-input"
                 />
               </EuiFormControlLayout>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <EuiButton type="submit" fill disabled={addDomainFormInputValue.length === 0}>
+              <EuiButton
+                type="submit"
+                fill
+                disabled={addDomainFormInputValue.length === 0}
+                data-test-subj="entSearchContent-crawler-addDomainForm-validate-button"
+              >
                 {i18n.translate(
                   'xpack.enterpriseSearch.crawler.addDomainForm.validateButtonLabel',
                   {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/domain_management/add_domain/add_domain_form_submit_button.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/domain_management/add_domain/add_domain_form_submit_button.tsx
index 8ba831017df868..8e9d4486476736 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/domain_management/add_domain/add_domain_form_submit_button.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler/domain_management/add_domain/add_domain_form_submit_button.tsx
@@ -21,7 +21,13 @@ export const AddDomainFormSubmitButton: React.FC = () => {
   const { allowSubmit } = useValues(AddDomainLogic);
 
   return (
-    <EuiButton fill type="button" disabled={!allowSubmit} onClick={submitNewDomain}>
+    <EuiButton
+      fill
+      type="button"
+      disabled={!allowSubmit}
+      onClick={submitNewDomain}
+      data-test-subj="entSearchContent-crawler-addDomain-submitButton"
+    >
       {i18n.translate('xpack.enterpriseSearch.crawler.addDomainForm.submitButtonLabel', {
         defaultMessage: 'Add domain',
       })}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler_total_stats.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler_total_stats.tsx
index 7825e93328dc89..8bf7b407d591bf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler_total_stats.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/crawler_total_stats.tsx
@@ -29,8 +29,9 @@ export const CrawlerTotalStats: React.FC = () => {
   const documentCount = indexData?.count ?? 0;
   const hideStats = isLoading || isError;
 
-  const stats: EuiStatProps[] = [
+  const stats: EuiStatProps[] & { 'data-test-subj'?: string } = [
     {
+      'data-test-subj': 'entSearchContent-indexOverview-totalStats-ingestionType',
       description: i18n.translate(
         'xpack.enterpriseSearch.content.searchIndex.totalStats.ingestionTypeCardLabel',
         {
@@ -56,6 +57,7 @@ export const CrawlerTotalStats: React.FC = () => {
       title: domains.length,
     },
     {
+      'data-test-subj': 'entSearchContent-indexOverview-totalStats-documentCount',
       description: i18n.translate(
         'xpack.enterpriseSearch.content.searchIndex.totalStats.documentCountCardLabel',
         {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.tsx
index 700fe4fc2983cd..4ee18025e5c414 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/inference_pipeline_card.tsx
@@ -167,6 +167,12 @@ export const InferencePipelineCard: React.FC<InferencePipeline> = (pipeline) =>
                       )}
                     >
                       <EuiButtonIcon
+                        aria-label={i18n.translate(
+                          'xpack.enterpriseSearch.inferencePipelineCard.modelState.notDeployed.fixLink',
+                          {
+                            defaultMessage: 'Fix issue in Trained Models',
+                          }
+                        )}
                         data-telemetry-id={`entSearchContent-${ingestionMethod}-pipelines-inferencePipeline-fixIssueInTrainedModels`}
                         href={http.basePath.prepend(ML_MANAGE_TRAINED_MODELS_PATH)}
                         display="base"
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.test.tsx
new file mode 100644
index 00000000000000..9480f4b1a0ce51
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.test.tsx
@@ -0,0 +1,185 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiButton } from '@elastic/eui';
+
+import { HttpError } from '../../../../../../../common/types/api';
+
+import {
+  TextExpansionCallOut,
+  DeployModel,
+  ModelDeploymentInProgress,
+  ModelDeployed,
+  TextExpansionDismissButton,
+  ModelStarted,
+} from './text_expansion_callout';
+
+import { TextExpansionErrors } from './text_expansion_errors';
+
+jest.mock('./text_expansion_callout_data', () => ({
+  useTextExpansionCallOutData: jest.fn(() => ({
+    dismiss: jest.fn(),
+    isCreateButtonDisabled: false,
+    isDismissable: false,
+    isStartButtonDisabled: false,
+    show: true,
+  })),
+}));
+
+const DEFAULT_VALUES = {
+  startTextExpansionModelError: undefined,
+  isCreateButtonDisabled: false,
+  isModelDownloadInProgress: false,
+  isModelDownloaded: false,
+  isModelStarted: false,
+  isStartButtonDisabled: false,
+};
+
+describe('TextExpansionCallOut', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setMockValues(DEFAULT_VALUES);
+  });
+  it('renders error panel instead of normal panel if there are some errors', () => {
+    setMockValues({
+      ...DEFAULT_VALUES,
+      startTextExpansionModelError: {
+        body: {
+          error: 'some-error',
+          message: 'some-error-message',
+          statusCode: 500,
+        },
+      } as HttpError,
+    });
+
+    const wrapper = shallow(<TextExpansionCallOut />);
+    expect(wrapper.find(TextExpansionErrors).length).toBe(1);
+  });
+  it('renders panel with deployment instructions if the model is not deployed', () => {
+    const wrapper = shallow(<TextExpansionCallOut />);
+    expect(wrapper.find(DeployModel).length).toBe(1);
+  });
+  it('renders panel with deployment in progress status if the model is being deployed', () => {
+    setMockValues({
+      ...DEFAULT_VALUES,
+      isModelDownloadInProgress: true,
+    });
+
+    const wrapper = shallow(<TextExpansionCallOut />);
+    expect(wrapper.find(ModelDeploymentInProgress).length).toBe(1);
+  });
+  it('renders panel with deployment in progress status if the model has been deployed', () => {
+    setMockValues({
+      ...DEFAULT_VALUES,
+      isModelDownloaded: true,
+    });
+
+    const wrapper = shallow(<TextExpansionCallOut />);
+    expect(wrapper.find(ModelDeployed).length).toBe(1);
+  });
+  it('renders panel with deployment in progress status if the model has been started', () => {
+    setMockValues({
+      ...DEFAULT_VALUES,
+      isModelStarted: true,
+    });
+
+    const wrapper = shallow(<TextExpansionCallOut />);
+    expect(wrapper.find(ModelStarted).length).toBe(1);
+  });
+
+  describe('DeployModel', () => {
+    it('renders deploy button', () => {
+      const wrapper = shallow(
+        <DeployModel dismiss={() => {}} isCreateButtonDisabled={false} isDismissable={false} />
+      );
+      expect(wrapper.find(EuiButton).length).toBe(1);
+      const button = wrapper.find(EuiButton);
+      expect(button.prop('disabled')).toBe(false);
+    });
+    it('renders disabled deploy button if it is set to disabled', () => {
+      const wrapper = shallow(
+        <DeployModel dismiss={() => {}} isCreateButtonDisabled isDismissable={false} />
+      );
+      expect(wrapper.find(EuiButton).length).toBe(1);
+      const button = wrapper.find(EuiButton);
+      expect(button.prop('disabled')).toBe(true);
+    });
+    it('renders dismiss button if it is set to dismissable', () => {
+      const wrapper = shallow(
+        <DeployModel dismiss={() => {}} isCreateButtonDisabled={false} isDismissable />
+      );
+      expect(wrapper.find(TextExpansionDismissButton).length).toBe(1);
+    });
+    it('does not render dismiss button if it is set to non-dismissable', () => {
+      const wrapper = shallow(
+        <DeployModel dismiss={() => {}} isCreateButtonDisabled={false} isDismissable={false} />
+      );
+      expect(wrapper.find(TextExpansionDismissButton).length).toBe(0);
+    });
+  });
+
+  describe('ModelDeploymentInProgress', () => {
+    it('renders dismiss button if it is set to dismissable', () => {
+      const wrapper = shallow(<ModelDeploymentInProgress dismiss={() => {}} isDismissable />);
+      expect(wrapper.find(TextExpansionDismissButton).length).toBe(1);
+    });
+    it('does not render dismiss button if it is set to non-dismissable', () => {
+      const wrapper = shallow(
+        <ModelDeploymentInProgress dismiss={() => {}} isDismissable={false} />
+      );
+      expect(wrapper.find(TextExpansionDismissButton).length).toBe(0);
+    });
+  });
+
+  describe('ModelDeployed', () => {
+    it('renders start button', () => {
+      const wrapper = shallow(
+        <ModelDeployed dismiss={() => {}} isDismissable={false} isStartButtonDisabled={false} />
+      );
+      expect(wrapper.find(EuiButton).length).toBe(1);
+      const button = wrapper.find(EuiButton);
+      expect(button.prop('disabled')).toBe(false);
+    });
+    it('renders disabled start button if it is set to disabled', () => {
+      const wrapper = shallow(
+        <ModelDeployed dismiss={() => {}} isDismissable={false} isStartButtonDisabled />
+      );
+      expect(wrapper.find(EuiButton).length).toBe(1);
+      const button = wrapper.find(EuiButton);
+      expect(button.prop('disabled')).toBe(true);
+    });
+    it('renders dismiss button if it is set to dismissable', () => {
+      const wrapper = shallow(
+        <ModelDeployed dismiss={() => {}} isDismissable isStartButtonDisabled={false} />
+      );
+      expect(wrapper.find(TextExpansionDismissButton).length).toBe(1);
+    });
+    it('does not render dismiss button if it is set to non-dismissable', () => {
+      const wrapper = shallow(
+        <ModelDeployed dismiss={() => {}} isDismissable={false} isStartButtonDisabled={false} />
+      );
+      expect(wrapper.find(TextExpansionDismissButton).length).toBe(0);
+    });
+  });
+
+  describe('ModelStarted', () => {
+    it('renders dismiss button if it is set to dismissable', () => {
+      const wrapper = shallow(<ModelStarted dismiss={() => {}} isDismissable />);
+      expect(wrapper.find(TextExpansionDismissButton).length).toBe(1);
+    });
+    it('does not render dismiss button if it is set to non-dismissable', () => {
+      const wrapper = shallow(<ModelStarted dismiss={() => {}} isDismissable={false} />);
+      expect(wrapper.find(TextExpansionDismissButton).length).toBe(0);
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.tsx
index a6784afecabd04..a72a328188c6f4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout.tsx
@@ -5,132 +5,368 @@
  * 2.0.
  */
 
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React from 'react';
 
-import { useValues } from 'kea';
+import { useActions, useValues } from 'kea';
 
 import {
   EuiBadge,
+  EuiButton,
+  EuiButtonEmpty,
   EuiButtonIcon,
+  EuiCallOut,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiIcon,
   EuiLink,
-  EuiPanel,
+  EuiSpacer,
   EuiText,
-  EuiTitle,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage, FormattedHTMLMessage } from '@kbn/i18n-react';
 
 import { docLinks } from '../../../../../shared/doc_links';
+import { KibanaLogic } from '../../../../../shared/kibana';
 
-import { MLInferenceLogic } from './ml_inference_logic';
+import { useTextExpansionCallOutData } from './text_expansion_callout_data';
+import { getTextExpansionError, TextExpansionCalloutLogic } from './text_expansion_callout_logic';
+import { TextExpansionErrors } from './text_expansion_errors';
 
 export interface TextExpansionCallOutState {
   dismiss: () => void;
-  dismissable: boolean;
+  isCreateButtonDisabled: boolean;
+  isDismissable: boolean;
+  isStartButtonDisabled: boolean;
   show: boolean;
 }
 
 export interface TextExpansionCallOutProps {
-  dismissable?: boolean;
+  isDismissable?: boolean;
 }
 
-export const TEXT_EXPANSION_CALL_OUT_DISMISSED_KEY =
-  'enterprise-search-text-expansion-callout-dismissed';
-
-export const useTextExpansionCallOutData = ({
-  dismissable = false,
-}: TextExpansionCallOutProps): TextExpansionCallOutState => {
-  const { supportedMLModels } = useValues(MLInferenceLogic);
-
-  const doesNotHaveTextExpansionModel = useMemo(() => {
-    return !supportedMLModels.some((m) => m.inference_config?.text_expansion);
-  }, [supportedMLModels]);
-
-  const [show, setShow] = useState<boolean>(() => {
-    if (!dismissable) return true;
-
-    try {
-      return localStorage.getItem(TEXT_EXPANSION_CALL_OUT_DISMISSED_KEY) !== 'true';
-    } catch {
-      return true;
-    }
-  });
-
-  useEffect(() => {
-    try {
-      localStorage.setItem(TEXT_EXPANSION_CALL_OUT_DISMISSED_KEY, JSON.stringify(!show));
-    } catch {
-      return;
-    }
-  }, [show]);
-
-  const dismiss = useCallback(() => {
-    setShow(false);
-  }, []);
-
-  return { dismiss, dismissable, show: doesNotHaveTextExpansionModel && show };
+export const TextExpansionDismissButton = ({
+  dismiss,
+}: Pick<TextExpansionCallOutState, 'dismiss'>) => {
+  return (
+    <EuiButtonIcon
+      aria-label={i18n.translate(
+        'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.dismissButton',
+        { defaultMessage: 'Dismiss ELSER call out' }
+      )}
+      iconType="cross"
+      onClick={dismiss}
+    />
+  );
 };
 
-export const TextExpansionCallOut: React.FC<TextExpansionCallOutProps> = (props) => {
-  const { dismiss, dismissable, show } = useTextExpansionCallOutData(props);
-
-  if (!show) return null;
+export const DeployModel = ({
+  dismiss,
+  isCreateButtonDisabled,
+  isDismissable,
+}: Pick<TextExpansionCallOutState, 'dismiss' | 'isCreateButtonDisabled' | 'isDismissable'>) => {
+  const { createTextExpansionModel } = useActions(TextExpansionCalloutLogic);
 
   return (
-    <EuiPanel color="success">
+    <EuiCallOut color="success">
       <EuiFlexGroup direction="column" gutterSize="s">
+        <EuiFlexItem>
+          <EuiFlexGroup direction="row" gutterSize="s" alignItems="center">
+            <EuiFlexItem grow={false}>
+              <EuiBadge color="success">
+                <FormattedMessage
+                  id="xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.titleBadge"
+                  defaultMessage="New"
+                />
+              </EuiBadge>
+            </EuiFlexItem>
+            <EuiFlexItem grow>
+              <EuiText color="success" size="xs">
+                <h3>
+                  {i18n.translate(
+                    'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.title',
+                    { defaultMessage: 'Improve your results with ELSER' }
+                  )}
+                </h3>
+              </EuiText>
+            </EuiFlexItem>
+            {isDismissable && (
+              <EuiFlexItem grow={false}>
+                <TextExpansionDismissButton dismiss={dismiss} />
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiFlexGroup direction="column">
+            <EuiFlexItem>
+              <EuiText size="s">
+                <FormattedHTMLMessage
+                  id="xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.body"
+                  defaultMessage="ELSER (Elastic Learned Sparse EncodeR) is our <strong>new trained machine learning model</strong> designed to efficiently use context in natural language queries. This model delivers better results than BM25 without further training on your data."
+                  tagName="p"
+                />
+              </EuiText>
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiFlexGroup
+                direction="row"
+                gutterSize="m"
+                alignItems="center"
+                justifyContent="flexStart"
+              >
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    color="success"
+                    disabled={isCreateButtonDisabled}
+                    iconType="launch"
+                    onClick={() => createTextExpansionModel(undefined)}
+                  >
+                    {i18n.translate(
+                      'xpack.enterpriseSearch.content.indices.pipelines.textExpansionCallOut.deployButton.label',
+                      {
+                        defaultMessage: 'Deploy',
+                      }
+                    )}
+                  </EuiButton>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiLink target="_blank" href={docLinks.elser}>
+                    <FormattedMessage
+                      id="xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.learnMoreLink"
+                      defaultMessage="Learn more"
+                    />
+                  </EuiLink>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiCallOut>
+  );
+};
+
+export const ModelDeploymentInProgress = ({
+  dismiss,
+  isDismissable,
+}: Pick<TextExpansionCallOutState, 'dismiss' | 'isDismissable'>) => (
+  <EuiCallOut color="success">
+    <EuiFlexGroup direction="column" gutterSize="s">
+      <EuiFlexItem grow>
         <EuiFlexGroup direction="row" gutterSize="s" alignItems="center">
           <EuiFlexItem grow={false}>
-            <EuiBadge color="success">
-              <FormattedMessage
-                id="xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.titleBadge"
-                defaultMessage="New"
-              />
-            </EuiBadge>
+            <EuiIcon color="success" type="clock" />
           </EuiFlexItem>
           <EuiFlexItem grow>
-            <EuiTitle size="xs">
-              <h4>
-                <EuiText color="text">
-                  <FormattedMessage
-                    id="xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.title"
-                    defaultMessage="Improve your results with ELSER"
-                  />
-                </EuiText>
-              </h4>
-            </EuiTitle>
+            <EuiText color="success" size="xs">
+              <h3>
+                {i18n.translate(
+                  'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.deployingTitle',
+                  { defaultMessage: 'Your ELSER model is deploying.' }
+                )}
+              </h3>
+            </EuiText>
           </EuiFlexItem>
-          {dismissable && (
+          {isDismissable && (
             <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                aria-label={i18n.translate(
-                  'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.dismissButton',
-                  { defaultMessage: 'Dismiss ELSER call out' }
-                )}
-                iconType="cross"
-                onClick={dismiss}
-              />
+              <TextExpansionDismissButton dismiss={dismiss} />
             </EuiFlexItem>
           )}
         </EuiFlexGroup>
-        <EuiFlexGroup direction="column">
-          <EuiText>
-            <FormattedHTMLMessage
-              id="xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.body"
-              defaultMessage="ELSER (Elastic Learned Sparse EncodeR) is our <strong>new trained machine learning model</strong> designed to efficiently use context in natural language queries. This model delivers better results than BM25 without further training on your data."
-              tagName="p"
-            />
+      </EuiFlexItem>
+      <EuiFlexItem grow>
+        <EuiText size="s">
+          <p>
+            {i18n.translate(
+              'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.deployingBody',
+              {
+                defaultMessage:
+                  'You can continue creating your pipeline with other uploaded models in the meantime.',
+              }
+            )}
+          </p>
+        </EuiText>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiCallOut>
+);
+
+export const ModelDeployed = ({
+  dismiss,
+  isDismissable,
+  isStartButtonDisabled,
+}: Pick<TextExpansionCallOutState, 'dismiss' | 'isDismissable' | 'isStartButtonDisabled'>) => {
+  const { startTextExpansionModel } = useActions(TextExpansionCalloutLogic);
+
+  return (
+    <EuiCallOut color="success">
+      <EuiFlexGroup direction="column" gutterSize="s">
+        <EuiFlexItem grow>
+          <EuiFlexGroup direction="row" gutterSize="s" alignItems="center">
+            <EuiFlexItem grow={false}>
+              <EuiIcon color="success" type="checkInCircleFilled" />
+            </EuiFlexItem>
+            <EuiFlexItem grow>
+              <EuiText color="success" size="xs">
+                <h3>
+                  {i18n.translate(
+                    'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.deployedTitle',
+                    { defaultMessage: 'Your ELSER model has deployed but not started.' }
+                  )}
+                </h3>
+              </EuiText>
+            </EuiFlexItem>
+            {isDismissable && (
+              <EuiFlexItem grow={false}>
+                <TextExpansionDismissButton dismiss={dismiss} />
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
+        </EuiFlexItem>
+        <EuiFlexItem grow>
+          <EuiText size="s">
+            <p>
+              {i18n.translate(
+                'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.deployedBody',
+                {
+                  defaultMessage:
+                    'You may start the model in a single-threaded configuration for testing, or tune the performance for a production environment.',
+                }
+              )}
+            </p>
           </EuiText>
-          <EuiLink target="_blank" href={docLinks.elser}>
-            <FormattedMessage
-              id="xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.learnMoreLink"
-              defaultMessage="Learn more"
-            />
-          </EuiLink>
-        </EuiFlexGroup>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiSpacer size="s" />
+        </EuiFlexItem>
+        <EuiFlexItem grow>
+          <EuiFlexGroup
+            direction="row"
+            gutterSize="s"
+            alignItems="center"
+            justifyContent="flexStart"
+          >
+            <EuiFlexItem grow={false}>
+              <EuiButton
+                color="success"
+                disabled={isStartButtonDisabled}
+                iconType="playFilled"
+                onClick={() => startTextExpansionModel(undefined)}
+              >
+                {i18n.translate(
+                  'xpack.enterpriseSearch.content.indices.pipelines.textExpansionCallOut.startModelButton.label',
+                  {
+                    defaultMessage: 'Start single-threaded',
+                  }
+                )}
+              </EuiButton>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiButtonEmpty
+                iconSide="left"
+                iconType="wrench"
+                onClick={() =>
+                  KibanaLogic.values.navigateToUrl('/app/ml/trained_models', {
+                    shouldNotCreateHref: true,
+                  })
+                }
+              >
+                {i18n.translate('xpack.enterpriseSearch.content.engine.api.step1.viewKeysButton', {
+                  defaultMessage: 'Fine-tune performance',
+                })}
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
       </EuiFlexGroup>
-    </EuiPanel>
+    </EuiCallOut>
+  );
+};
+
+export const ModelStarted = ({
+  dismiss,
+  isDismissable,
+}: Pick<TextExpansionCallOutState, 'dismiss' | 'isDismissable'>) => (
+  <EuiCallOut color="success">
+    <EuiFlexGroup direction="column" gutterSize="s">
+      <EuiFlexItem grow>
+        <EuiFlexGroup direction="row" gutterSize="s" alignItems="center">
+          <EuiFlexItem grow={false}>
+            <EuiIcon type="checkInCircleFilled" color="success" />
+          </EuiFlexItem>
+          <EuiFlexItem grow>
+            <EuiText color="success" size="xs">
+              <h3>
+                {i18n.translate(
+                  'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.startedTitle',
+                  { defaultMessage: 'Your ELSER model has started.' }
+                )}
+              </h3>
+            </EuiText>
+          </EuiFlexItem>
+          {isDismissable && (
+            <EuiFlexItem grow={false}>
+              <TextExpansionDismissButton dismiss={dismiss} />
+            </EuiFlexItem>
+          )}
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <EuiFlexItem grow>
+        <EuiText size="s">
+          <p>
+            {i18n.translate(
+              'xpack.enterpriseSearch.content.index.pipelines.textExpansionCallOut.startedBody',
+              { defaultMessage: 'Enjoy the power of ELSER in your custom Inference pipeline.' }
+            )}
+          </p>
+        </EuiText>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiCallOut>
+);
+
+export const TextExpansionCallOut: React.FC<TextExpansionCallOutProps> = (props) => {
+  const { dismiss, isDismissable, show } = useTextExpansionCallOutData(props);
+  const {
+    createTextExpansionModelError,
+    fetchTextExpansionModelError,
+    isCreateButtonDisabled,
+    isModelDownloadInProgress,
+    isModelDownloaded,
+    isModelStarted,
+    isStartButtonDisabled,
+    startTextExpansionModelError,
+  } = useValues(TextExpansionCalloutLogic);
+
+  // In case of an error, show the error callout only
+  const error = getTextExpansionError(
+    createTextExpansionModelError,
+    fetchTextExpansionModelError,
+    startTextExpansionModelError
+  );
+  if (error) return <TextExpansionErrors error={error} />;
+
+  if (!show) return null;
+
+  if (isModelDownloadInProgress) {
+    return <ModelDeploymentInProgress dismiss={dismiss} isDismissable={isDismissable} />;
+  } else if (isModelDownloaded) {
+    return (
+      <ModelDeployed
+        dismiss={dismiss}
+        isDismissable={isDismissable}
+        isStartButtonDisabled={isStartButtonDisabled}
+      />
+    );
+  } else if (isModelStarted) {
+    return <ModelStarted dismiss={dismiss} isDismissable={isDismissable} />;
+  }
+
+  return (
+    <DeployModel
+      dismiss={dismiss}
+      isDismissable={isDismissable}
+      isCreateButtonDisabled={isCreateButtonDisabled}
+    />
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_data.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_data.tsx
new file mode 100644
index 00000000000000..3f864f030e3f1c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_data.tsx
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useCallback, useEffect, useState } from 'react';
+
+import { useValues } from 'kea';
+
+import { TextExpansionCallOutProps, TextExpansionCallOutState } from './text_expansion_callout';
+import { TextExpansionCalloutLogic } from './text_expansion_callout_logic';
+
+export const TEXT_EXPANSION_CALL_OUT_DISMISSED_KEY =
+  'enterprise-search-text-expansion-callout-dismissed';
+
+const isDismissed = () => localStorage.getItem(TEXT_EXPANSION_CALL_OUT_DISMISSED_KEY) === 'true';
+
+export const useTextExpansionCallOutData = ({
+  isDismissable = false,
+}: TextExpansionCallOutProps): TextExpansionCallOutState => {
+  const { isCreateButtonDisabled, isStartButtonDisabled } = useValues(TextExpansionCalloutLogic);
+
+  const [show, setShow] = useState<boolean>(() => {
+    if (!isDismissable) return true;
+
+    try {
+      return !isDismissed();
+    } catch {
+      return true;
+    }
+  });
+
+  useEffect(() => {
+    try {
+      if (!isDismissed()) {
+        localStorage.setItem(TEXT_EXPANSION_CALL_OUT_DISMISSED_KEY, JSON.stringify(!show));
+      }
+    } catch {
+      return;
+    }
+  }, [show]);
+
+  const dismiss = useCallback(() => {
+    setShow(false);
+  }, []);
+
+  return {
+    dismiss,
+    isCreateButtonDisabled,
+    isDismissable,
+    isStartButtonDisabled,
+    show,
+  };
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.test.ts
new file mode 100644
index 00000000000000..ae781bfb3bd1d9
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.test.ts
@@ -0,0 +1,359 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { LogicMounter } from '../../../../../__mocks__/kea_logic';
+
+import { HttpResponse } from '@kbn/core/public';
+
+import { ErrorResponse, HttpError, Status } from '../../../../../../../common/types/api';
+import { MlModelDeploymentState } from '../../../../../../../common/types/ml';
+import { CreateTextExpansionModelApiLogic } from '../../../../api/ml_models/text_expansion/create_text_expansion_model_api_logic';
+import { FetchTextExpansionModelApiLogic } from '../../../../api/ml_models/text_expansion/fetch_text_expansion_model_api_logic';
+
+import {
+  getTextExpansionError,
+  TextExpansionCalloutLogic,
+  TextExpansionCalloutValues,
+} from './text_expansion_callout_logic';
+
+const DEFAULT_VALUES: TextExpansionCalloutValues = {
+  createTextExpansionModelError: undefined,
+  createTextExpansionModelStatus: Status.IDLE,
+  createdTextExpansionModel: undefined,
+  fetchTextExpansionModelError: undefined,
+  isCreateButtonDisabled: false,
+  isModelDownloadInProgress: false,
+  isModelDownloaded: false,
+  isModelStarted: false,
+  isPollingTextExpansionModelActive: false,
+  isStartButtonDisabled: false,
+  startTextExpansionModelError: undefined,
+  startTextExpansionModelStatus: Status.IDLE,
+  textExpansionModel: undefined,
+  textExpansionModelPollTimeoutId: null,
+};
+
+jest.useFakeTimers();
+
+describe('TextExpansionCalloutLogic', () => {
+  const { mount } = new LogicMounter(TextExpansionCalloutLogic);
+  const { mount: mountCreateTextExpansionModelApiLogic } = new LogicMounter(
+    CreateTextExpansionModelApiLogic
+  );
+  const { mount: mountFetchTextExpansionModelApiLogic } = new LogicMounter(
+    FetchTextExpansionModelApiLogic
+  );
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mountCreateTextExpansionModelApiLogic();
+    mountFetchTextExpansionModelApiLogic();
+    mount();
+  });
+
+  it('has expected default values', () => {
+    expect(TextExpansionCalloutLogic.values).toEqual(DEFAULT_VALUES);
+  });
+
+  describe('getTextExpansionError', () => {
+    const error = {
+      body: {
+        error: 'some-error',
+        message: 'some-error-message',
+        statusCode: 500,
+      },
+    } as HttpError;
+    it('returns null if there is no error', () => {
+      expect(getTextExpansionError(undefined, undefined, undefined)).toBe(null);
+    });
+    it('uses the correct title and message from a create error', () => {
+      expect(getTextExpansionError(error, undefined, undefined)).toEqual({
+        title: 'Error with ELSER deployment',
+        message: error.body?.message,
+      });
+    });
+    it('uses the correct title and message from a fetch error', () => {
+      expect(getTextExpansionError(undefined, error, undefined)).toEqual({
+        title: 'Error fetching ELSER model',
+        message: error.body?.message,
+      });
+    });
+    it('uses the correct title and message from a start error', () => {
+      expect(getTextExpansionError(undefined, undefined, error)).toEqual({
+        title: 'Error starting ELSER deployment',
+        message: error.body?.message,
+      });
+    });
+  });
+
+  describe('listeners', () => {
+    describe('createTextExpansionModelPollingTimeout', () => {
+      const duration = 5000;
+      it('sets polling timeout', () => {
+        jest.spyOn(global, 'setTimeout');
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'setTextExpansionModelPollingId');
+
+        TextExpansionCalloutLogic.actions.createTextExpansionModelPollingTimeout(duration);
+
+        expect(setTimeout).toHaveBeenCalledWith(expect.any(Function), duration);
+        expect(TextExpansionCalloutLogic.actions.setTextExpansionModelPollingId).toHaveBeenCalled();
+      });
+      it('clears polling timeout if it is set', () => {
+        mount({
+          ...DEFAULT_VALUES,
+          textExpansionModelPollTimeoutId: 'timeout-id',
+        });
+
+        jest.spyOn(global, 'clearTimeout');
+
+        TextExpansionCalloutLogic.actions.createTextExpansionModelPollingTimeout(duration);
+
+        expect(clearTimeout).toHaveBeenCalledWith('timeout-id');
+      });
+    });
+
+    describe('createTextExpansionModelSuccess', () => {
+      it('sets createdTextExpansionModel', () => {
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'fetchTextExpansionModel');
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'startPollingTextExpansionModel');
+
+        TextExpansionCalloutLogic.actions.createTextExpansionModelSuccess({
+          deploymentState: MlModelDeploymentState.Downloading,
+          modelId: 'mock-model-id',
+        });
+
+        expect(TextExpansionCalloutLogic.actions.fetchTextExpansionModel).toHaveBeenCalled();
+        expect(TextExpansionCalloutLogic.actions.startPollingTextExpansionModel).toHaveBeenCalled();
+      });
+    });
+
+    describe('fetchTextExpansionModelSuccess', () => {
+      const data = {
+        deploymentState: MlModelDeploymentState.Downloading,
+        modelId: 'mock-model-id',
+      };
+
+      it('starts polling when the model is downloading and polling is not active', () => {
+        mount({
+          ...DEFAULT_VALUES,
+        });
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'startPollingTextExpansionModel');
+
+        TextExpansionCalloutLogic.actions.fetchTextExpansionModelSuccess(data);
+
+        expect(TextExpansionCalloutLogic.actions.startPollingTextExpansionModel).toHaveBeenCalled();
+      });
+      it('sets polling timeout when the model is downloading and polling is active', () => {
+        mount({
+          ...DEFAULT_VALUES,
+          textExpansionModelPollTimeoutId: 'timeout-id',
+        });
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'createTextExpansionModelPollingTimeout');
+
+        TextExpansionCalloutLogic.actions.fetchTextExpansionModelSuccess(data);
+
+        expect(
+          TextExpansionCalloutLogic.actions.createTextExpansionModelPollingTimeout
+        ).toHaveBeenCalled();
+      });
+      it('stops polling when the model is downloaded and polling is active', () => {
+        mount({
+          ...DEFAULT_VALUES,
+          textExpansionModelPollTimeoutId: 'timeout-id',
+        });
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'stopPollingTextExpansionModel');
+
+        TextExpansionCalloutLogic.actions.fetchTextExpansionModelSuccess({
+          deploymentState: MlModelDeploymentState.Downloaded,
+          modelId: 'mock-model-id',
+        });
+
+        expect(TextExpansionCalloutLogic.actions.stopPollingTextExpansionModel).toHaveBeenCalled();
+      });
+    });
+
+    describe('fetchTextExpansionModelError', () => {
+      it('stops polling if it is active', () => {
+        mount({
+          ...DEFAULT_VALUES,
+          textExpansionModelPollTimeoutId: 'timeout-id',
+        });
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'createTextExpansionModelPollingTimeout');
+
+        TextExpansionCalloutLogic.actions.fetchTextExpansionModelError({
+          body: {
+            error: '',
+            message: 'some error',
+            statusCode: 500,
+          },
+        } as HttpResponse<ErrorResponse>);
+
+        expect(
+          TextExpansionCalloutLogic.actions.createTextExpansionModelPollingTimeout
+        ).toHaveBeenCalled();
+      });
+    });
+
+    describe('startPollingTextExpansionModel', () => {
+      it('sets polling timeout', () => {
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'createTextExpansionModelPollingTimeout');
+
+        TextExpansionCalloutLogic.actions.startPollingTextExpansionModel();
+
+        expect(
+          TextExpansionCalloutLogic.actions.createTextExpansionModelPollingTimeout
+        ).toHaveBeenCalled();
+      });
+      it('clears polling timeout if it is set', () => {
+        mount({
+          ...DEFAULT_VALUES,
+          textExpansionModelPollTimeoutId: 'timeout-id',
+        });
+
+        jest.spyOn(global, 'clearTimeout');
+
+        TextExpansionCalloutLogic.actions.startPollingTextExpansionModel();
+
+        expect(clearTimeout).toHaveBeenCalledWith('timeout-id');
+      });
+    });
+
+    describe('startTextExpansionModelSuccess', () => {
+      it('sets startedTextExpansionModel', () => {
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'fetchTextExpansionModel');
+
+        TextExpansionCalloutLogic.actions.startTextExpansionModelSuccess({
+          deploymentState: MlModelDeploymentState.FullyAllocated,
+          modelId: 'mock-model-id',
+        });
+
+        expect(TextExpansionCalloutLogic.actions.fetchTextExpansionModel).toHaveBeenCalled();
+      });
+    });
+
+    describe('stopPollingTextExpansionModel', () => {
+      it('clears polling timeout and poll timeout ID if it is set', () => {
+        mount({
+          ...DEFAULT_VALUES,
+          textExpansionModelPollTimeoutId: 'timeout-id',
+        });
+
+        jest.spyOn(global, 'clearTimeout');
+        jest.spyOn(TextExpansionCalloutLogic.actions, 'clearTextExpansionModelPollingId');
+
+        TextExpansionCalloutLogic.actions.stopPollingTextExpansionModel();
+
+        expect(clearTimeout).toHaveBeenCalledWith('timeout-id');
+        expect(
+          TextExpansionCalloutLogic.actions.clearTextExpansionModelPollingId
+        ).toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('reducers', () => {
+    describe('textExpansionModelPollTimeoutId', () => {
+      it('gets cleared on clearTextExpansionModelPollingId', () => {
+        TextExpansionCalloutLogic.actions.clearTextExpansionModelPollingId();
+
+        expect(TextExpansionCalloutLogic.values.textExpansionModelPollTimeoutId).toBe(null);
+      });
+      it('gets set on setTextExpansionModelPollingId', () => {
+        const timeout = setTimeout(() => {}, 500);
+        TextExpansionCalloutLogic.actions.setTextExpansionModelPollingId(timeout);
+
+        expect(TextExpansionCalloutLogic.values.textExpansionModelPollTimeoutId).toEqual(timeout);
+      });
+    });
+  });
+
+  describe('selectors', () => {
+    describe('isCreateButtonDisabled', () => {
+      it('is set to false if the fetch model API is idle', () => {
+        CreateTextExpansionModelApiLogic.actions.apiReset();
+        expect(TextExpansionCalloutLogic.values.isCreateButtonDisabled).toBe(false);
+      });
+      it('is set to true if the fetch model API is not idle', () => {
+        CreateTextExpansionModelApiLogic.actions.apiSuccess({
+          deploymentState: MlModelDeploymentState.Downloading,
+          modelId: 'mock-model-id',
+        });
+        expect(TextExpansionCalloutLogic.values.isCreateButtonDisabled).toBe(true);
+      });
+    });
+
+    describe('isModelDownloadInProgress', () => {
+      it('is set to true if the model is downloading', () => {
+        FetchTextExpansionModelApiLogic.actions.apiSuccess({
+          deploymentState: MlModelDeploymentState.Downloading,
+          modelId: 'mock-model-id',
+        });
+        expect(TextExpansionCalloutLogic.values.isModelDownloadInProgress).toBe(true);
+      });
+      it('is set to false if the model is downloading', () => {
+        FetchTextExpansionModelApiLogic.actions.apiSuccess({
+          deploymentState: MlModelDeploymentState.Started,
+          modelId: 'mock-model-id',
+        });
+        expect(TextExpansionCalloutLogic.values.isModelDownloadInProgress).toBe(false);
+      });
+    });
+
+    describe('isModelDownloaded', () => {
+      it('is set to true if the model is downloaded', () => {
+        FetchTextExpansionModelApiLogic.actions.apiSuccess({
+          deploymentState: MlModelDeploymentState.Downloaded,
+          modelId: 'mock-model-id',
+        });
+        expect(TextExpansionCalloutLogic.values.isModelDownloaded).toBe(true);
+      });
+      it('is set to false if the model is not downloaded', () => {
+        FetchTextExpansionModelApiLogic.actions.apiSuccess({
+          deploymentState: MlModelDeploymentState.NotDeployed,
+          modelId: 'mock-model-id',
+        });
+        expect(TextExpansionCalloutLogic.values.isModelDownloaded).toBe(false);
+      });
+    });
+
+    describe('isModelStarted', () => {
+      it('is set to true if the model is started', () => {
+        FetchTextExpansionModelApiLogic.actions.apiSuccess({
+          deploymentState: MlModelDeploymentState.FullyAllocated,
+          modelId: 'mock-model-id',
+        });
+        expect(TextExpansionCalloutLogic.values.isModelStarted).toBe(true);
+      });
+      it('is set to false if the model is not started', () => {
+        FetchTextExpansionModelApiLogic.actions.apiSuccess({
+          deploymentState: MlModelDeploymentState.NotDeployed,
+          modelId: 'mock-model-id',
+        });
+        expect(TextExpansionCalloutLogic.values.isModelStarted).toBe(false);
+      });
+    });
+
+    describe('isPollingTextExpansionModelActive', () => {
+      it('is set to false if polling is not active', () => {
+        mount({
+          ...DEFAULT_VALUES,
+          textExpansionModelPollTimeoutId: null,
+        });
+
+        expect(TextExpansionCalloutLogic.values.isPollingTextExpansionModelActive).toBe(false);
+      });
+      it('is set to true if polling is active', () => {
+        mount({
+          ...DEFAULT_VALUES,
+          textExpansionModelPollTimeoutId: 'timeout-id',
+        });
+
+        expect(TextExpansionCalloutLogic.values.isPollingTextExpansionModelActive).toBe(true);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.ts
new file mode 100644
index 00000000000000..dda1be828ee0a8
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_callout_logic.ts
@@ -0,0 +1,264 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { kea, MakeLogicType } from 'kea';
+
+import { i18n } from '@kbn/i18n';
+
+import { HttpError, Status } from '../../../../../../../common/types/api';
+import { MlModelDeploymentState } from '../../../../../../../common/types/ml';
+import { getErrorsFromHttpResponse } from '../../../../../shared/flash_messages/handle_api_errors';
+import {
+  CreateTextExpansionModelApiLogic,
+  CreateTextExpansionModelApiLogicActions,
+  CreateTextExpansionModelResponse,
+} from '../../../../api/ml_models/text_expansion/create_text_expansion_model_api_logic';
+import {
+  FetchTextExpansionModelApiLogic,
+  FetchTextExpansionModelApiLogicActions,
+  FetchTextExpansionModelResponse,
+} from '../../../../api/ml_models/text_expansion/fetch_text_expansion_model_api_logic';
+import {
+  StartTextExpansionModelApiLogic,
+  StartTextExpansionModelApiLogicActions,
+} from '../../../../api/ml_models/text_expansion/start_text_expansion_model_api_logic';
+
+const FETCH_TEXT_EXPANSION_MODEL_POLLING_DURATION = 5000; // 5 seconds
+const FETCH_TEXT_EXPANSION_MODEL_POLLING_DURATION_ON_FAILURE = 30000; // 30 seconds
+
+interface TextExpansionCalloutActions {
+  clearTextExpansionModelPollingId: () => void;
+  createTextExpansionModel: CreateTextExpansionModelApiLogicActions['makeRequest'];
+  createTextExpansionModelPollingTimeout: (duration: number) => { duration: number };
+  createTextExpansionModelSuccess: CreateTextExpansionModelApiLogicActions['apiSuccess'];
+  fetchTextExpansionModel: FetchTextExpansionModelApiLogicActions['makeRequest'];
+  fetchTextExpansionModelError: FetchTextExpansionModelApiLogicActions['apiError'];
+  fetchTextExpansionModelSuccess: FetchTextExpansionModelApiLogicActions['apiSuccess'];
+  setTextExpansionModelPollingId: (pollTimeoutId: ReturnType<typeof setTimeout>) => {
+    pollTimeoutId: ReturnType<typeof setTimeout>;
+  };
+  startPollingTextExpansionModel: () => void;
+  startTextExpansionModel: StartTextExpansionModelApiLogicActions['makeRequest'];
+  startTextExpansionModelSuccess: StartTextExpansionModelApiLogicActions['apiSuccess'];
+  stopPollingTextExpansionModel: () => void;
+  textExpansionModel: FetchTextExpansionModelApiLogicActions['apiSuccess'];
+}
+
+export interface TextExpansionCalloutValues {
+  createTextExpansionModelError: HttpError | undefined;
+  createTextExpansionModelStatus: Status;
+  createdTextExpansionModel: CreateTextExpansionModelResponse | undefined;
+  fetchTextExpansionModelError: HttpError | undefined;
+  isCreateButtonDisabled: boolean;
+  isModelDownloadInProgress: boolean;
+  isModelDownloaded: boolean;
+  isModelStarted: boolean;
+  isPollingTextExpansionModelActive: boolean;
+  isStartButtonDisabled: boolean;
+  startTextExpansionModelError: HttpError | undefined;
+  startTextExpansionModelStatus: Status;
+  textExpansionModel: FetchTextExpansionModelResponse | undefined;
+  textExpansionModelPollTimeoutId: null | ReturnType<typeof setTimeout>;
+}
+
+/**
+ * Extracts the topmost error in precedence order (create > start > fetch).
+ * @param createError
+ * @param fetchError
+ * @param startError
+ * @returns the extracted error or null if there is no error
+ */
+export const getTextExpansionError = (
+  createError: HttpError | undefined,
+  fetchError: HttpError | undefined,
+  startError: HttpError | undefined
+) => {
+  return createError !== undefined
+    ? {
+        title: i18n.translate(
+          'xpack.enterpriseSearch.content.indices.pipelines.textExpansionCreateError.title',
+          {
+            defaultMessage: 'Error with ELSER deployment',
+          }
+        ),
+        message: getErrorsFromHttpResponse(createError)[0],
+      }
+    : startError !== undefined
+    ? {
+        title: i18n.translate(
+          'xpack.enterpriseSearch.content.indices.pipelines.textExpansionStartError.title',
+          {
+            defaultMessage: 'Error starting ELSER deployment',
+          }
+        ),
+        message: getErrorsFromHttpResponse(startError)[0],
+      }
+    : fetchError !== undefined
+    ? {
+        title: i18n.translate(
+          'xpack.enterpriseSearch.content.indices.pipelines.textExpansionFetchError.title',
+          {
+            defaultMessage: 'Error fetching ELSER model',
+          }
+        ),
+        message: getErrorsFromHttpResponse(fetchError)[0],
+      }
+    : null;
+};
+
+export const TextExpansionCalloutLogic = kea<
+  MakeLogicType<TextExpansionCalloutValues, TextExpansionCalloutActions>
+>({
+  actions: {
+    clearTextExpansionModelPollingId: true,
+    createTextExpansionModelPollingTimeout: (duration) => ({ duration }),
+    setTextExpansionModelPollingId: (pollTimeoutId: ReturnType<typeof setTimeout>) => ({
+      pollTimeoutId,
+    }),
+    startPollingTextExpansionModel: true,
+    stopPollingTextExpansionModel: true,
+  },
+  connect: {
+    actions: [
+      CreateTextExpansionModelApiLogic,
+      [
+        'makeRequest as createTextExpansionModel',
+        'apiSuccess as createTextExpansionModelSuccess',
+        'apiError as createTextExpansionModelError',
+      ],
+      FetchTextExpansionModelApiLogic,
+      [
+        'makeRequest as fetchTextExpansionModel',
+        'apiSuccess as fetchTextExpansionModelSuccess',
+        'apiError as fetchTextExpansionModelError',
+      ],
+      StartTextExpansionModelApiLogic,
+      [
+        'makeRequest as startTextExpansionModel',
+        'apiSuccess as startTextExpansionModelSuccess',
+        'apiError as startTextExpansionModelError',
+      ],
+    ],
+    values: [
+      CreateTextExpansionModelApiLogic,
+      [
+        'data as createdTextExpansionModel',
+        'status as createTextExpansionModelStatus',
+        'error as createTextExpansionModelError',
+      ],
+      FetchTextExpansionModelApiLogic,
+      ['data as textExpansionModel', 'error as fetchTextExpansionModelError'],
+      StartTextExpansionModelApiLogic,
+      ['status as startTextExpansionModelStatus', 'error as startTextExpansionModelError'],
+    ],
+  },
+  events: ({ actions, values }) => ({
+    afterMount: () => {
+      actions.fetchTextExpansionModel(undefined);
+    },
+    beforeUnmount: () => {
+      if (values.textExpansionModelPollTimeoutId !== null) {
+        actions.stopPollingTextExpansionModel();
+      }
+    },
+  }),
+  listeners: ({ actions, values }) => ({
+    createTextExpansionModelPollingTimeout: ({ duration }) => {
+      if (values.textExpansionModelPollTimeoutId !== null) {
+        clearTimeout(values.textExpansionModelPollTimeoutId);
+      }
+      const timeoutId = setTimeout(() => {
+        actions.fetchTextExpansionModel(undefined);
+      }, duration);
+      actions.setTextExpansionModelPollingId(timeoutId);
+    },
+    createTextExpansionModelSuccess: () => {
+      actions.fetchTextExpansionModel(undefined);
+      actions.startPollingTextExpansionModel();
+    },
+    fetchTextExpansionModelError: () => {
+      if (values.isPollingTextExpansionModelActive) {
+        actions.createTextExpansionModelPollingTimeout(
+          FETCH_TEXT_EXPANSION_MODEL_POLLING_DURATION_ON_FAILURE
+        );
+      }
+    },
+    fetchTextExpansionModelSuccess: (data) => {
+      if (data?.deploymentState === MlModelDeploymentState.Downloading) {
+        if (!values.isPollingTextExpansionModelActive) {
+          actions.startPollingTextExpansionModel();
+        } else {
+          actions.createTextExpansionModelPollingTimeout(
+            FETCH_TEXT_EXPANSION_MODEL_POLLING_DURATION
+          );
+        }
+      } else if (
+        data?.deploymentState === MlModelDeploymentState.Downloaded &&
+        values.isPollingTextExpansionModelActive
+      ) {
+        actions.stopPollingTextExpansionModel();
+      }
+    },
+    startPollingTextExpansionModel: () => {
+      if (values.textExpansionModelPollTimeoutId !== null) {
+        clearTimeout(values.textExpansionModelPollTimeoutId);
+      }
+      actions.createTextExpansionModelPollingTimeout(FETCH_TEXT_EXPANSION_MODEL_POLLING_DURATION);
+    },
+    startTextExpansionModelSuccess: () => {
+      actions.fetchTextExpansionModel(undefined);
+    },
+    stopPollingTextExpansionModel: () => {
+      if (values.textExpansionModelPollTimeoutId !== null) {
+        clearTimeout(values.textExpansionModelPollTimeoutId);
+        actions.clearTextExpansionModelPollingId();
+      }
+    },
+  }),
+  path: ['enterprise_search', 'content', 'text_expansion_callout_logic'],
+  reducers: {
+    textExpansionModelPollTimeoutId: [
+      null,
+      {
+        clearTextExpansionModelPollingId: () => null,
+        setTextExpansionModelPollingId: (_, { pollTimeoutId }) => pollTimeoutId,
+      },
+    ],
+  },
+  selectors: ({ selectors }) => ({
+    isCreateButtonDisabled: [
+      () => [selectors.createTextExpansionModelStatus],
+      (status: Status) => status !== Status.IDLE && status !== Status.ERROR,
+    ],
+    isModelDownloadInProgress: [
+      () => [selectors.textExpansionModel],
+      (data: FetchTextExpansionModelResponse) =>
+        data?.deploymentState === MlModelDeploymentState.Downloading,
+    ],
+    isModelDownloaded: [
+      () => [selectors.textExpansionModel],
+      (data: FetchTextExpansionModelResponse) =>
+        data?.deploymentState === MlModelDeploymentState.Downloaded,
+    ],
+    isModelStarted: [
+      () => [selectors.textExpansionModel],
+      (data: FetchTextExpansionModelResponse) =>
+        data?.deploymentState === MlModelDeploymentState.Starting ||
+        data?.deploymentState === MlModelDeploymentState.Started ||
+        data?.deploymentState === MlModelDeploymentState.FullyAllocated,
+    ],
+    isPollingTextExpansionModelActive: [
+      () => [selectors.textExpansionModelPollTimeoutId],
+      (pollingTimeoutId: TextExpansionCalloutValues['textExpansionModelPollTimeoutId']) =>
+        pollingTimeoutId !== null,
+    ],
+    isStartButtonDisabled: [
+      () => [selectors.startTextExpansionModelStatus],
+      (status: Status) => status !== Status.IDLE && status !== Status.ERROR,
+    ],
+  }),
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.test.tsx
new file mode 100644
index 00000000000000..cb15c2c5c54110
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.test.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiCallOut } from '@elastic/eui';
+
+import { TextExpansionErrors } from './text_expansion_errors';
+
+describe('TextExpansionErrors', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setMockValues({});
+  });
+  const error = {
+    title: 'some-error-title',
+    message: 'some-error-message',
+  };
+  it('extracts error panel with the given title and message', () => {
+    const wrapper = shallow(<TextExpansionErrors error={error} />);
+    expect(wrapper.find(EuiCallOut).length).toBe(1);
+    expect(wrapper.find(EuiCallOut).prop('title')).toEqual(error.title);
+    expect(wrapper.find(EuiCallOut).find('p').length).toBe(1);
+    expect(wrapper.find(EuiCallOut).find('p').text()).toEqual(error.message);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.tsx
new file mode 100644
index 00000000000000..d9b1d1f1f2bc26
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference/text_expansion_errors.tsx
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { useValues } from 'kea';
+
+import { EuiCallOut, EuiLink } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+
+import { HttpLogic } from '../../../../../shared/http';
+
+import { ML_NOTIFICATIONS_PATH } from '../../../../routes';
+
+export const TextExpansionErrors = ({ error }: { error: { title: string; message: string } }) => {
+  const { http } = useValues(HttpLogic);
+
+  return (
+    <>
+      <EuiCallOut color="danger" iconType="error" title={error.title}>
+        <p>{error.message}</p>
+        <EuiLink href={http.basePath.prepend(ML_NOTIFICATIONS_PATH)} target="_blank">
+          {i18n.translate(
+            'xpack.enterpriseSearch.content.indices.pipelines.textExpansionCreateError.mlNotificationsLink',
+            {
+              defaultMessage: 'Machine Learning notifications',
+            }
+          )}
+        </EuiLink>
+      </EuiCallOut>
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference_pipeline_processors_card.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference_pipeline_processors_card.tsx
index 4a6a6235982fd8..6d3ad46a985c04 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference_pipeline_processors_card.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/pipelines/ml_inference_pipeline_processors_card.tsx
@@ -12,6 +12,8 @@ import { useActions, useValues } from 'kea';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
 import { InferencePipeline } from '../../../../../../common/types/pipelines';
+import { KibanaLogic } from '../../../../shared/kibana/kibana_logic';
+import { LicensingLogic } from '../../../../shared/licensing';
 import { IndexNameLogic } from '../index_name_logic';
 
 import { InferencePipelineCard } from './inference_pipeline_card';
@@ -20,6 +22,8 @@ import { TextExpansionCallOut } from './ml_inference/text_expansion_callout';
 import { PipelinesLogic } from './pipelines_logic';
 
 export const MlInferencePipelineProcessorsCard: React.FC = () => {
+  const { capabilities, isCloud } = useValues(KibanaLogic);
+  const { hasPlatinumLicense } = useValues(LicensingLogic);
   const { indexName } = useValues(IndexNameLogic);
   const { mlInferencePipelineProcessors: inferencePipelines } = useValues(PipelinesLogic);
   const { fetchMlInferenceProcessors, openAddMlInferencePipelineModal } =
@@ -28,9 +32,12 @@ export const MlInferencePipelineProcessorsCard: React.FC = () => {
     fetchMlInferenceProcessors({ indexName });
   }, [indexName]);
 
+  const hasMLPermissions = capabilities?.ml?.canGetTrainedModels ?? false;
+  const isGated = !isCloud && !hasPlatinumLicense;
+
   return (
     <EuiFlexGroup direction="column" gutterSize="s">
-      <TextExpansionCallOut dismissable />
+      {hasMLPermissions && !isGated && <TextExpansionCallOut isDismissable />}
       <EuiFlexItem>
         <AddMLInferencePipelineButton onClick={() => openAddMlInferencePipelineModal()} />
       </EuiFlexItem>
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx
index 6b4e1c475f9fbf..cad08d5252b02c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/search_index.tsx
@@ -98,6 +98,7 @@ export const SearchIndex: React.FC = () => {
   const ALL_INDICES_TABS: EuiTabbedContentTab[] = [
     {
       content: <SearchIndexOverview />,
+      'data-test-subj': 'entSearchContent-index-overview-tab',
       id: SearchIndexTabId.OVERVIEW,
       name: i18n.translate('xpack.enterpriseSearch.content.searchIndex.overviewTabLabel', {
         defaultMessage: 'Overview',
@@ -167,6 +168,7 @@ export const SearchIndex: React.FC = () => {
     },
     {
       content: <AutomaticCrawlScheduler />,
+      'data-test-subj': 'entSearchContent-index-crawler-scheduler-tab',
       id: SearchIndexTabId.SCHEDULING,
       name: i18n.translate('xpack.enterpriseSearch.content.searchIndex.schedulingTabLabel', {
         defaultMessage: 'Scheduling',
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/sync_jobs/sync_jobs.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/sync_jobs/sync_jobs.tsx
index c885160693f444..b82b5559503804 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/sync_jobs/sync_jobs.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/sync_jobs/sync_jobs.tsx
@@ -115,6 +115,7 @@ export const SyncJobs: React.FC = () => {
     <>
       <SyncJobFlyout onClose={() => setSyncJobFlyout(undefined)} syncJob={syncJobFlyout} />
       <EuiBasicTable
+        data-test-subj="entSearchContent-index-syncJobs-table"
         items={syncJobs}
         columns={columns}
         hasActions
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices.tsx
index c744ce0e91a2ec..d7d67ab459df28 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_indices/search_indices.tsx
@@ -106,7 +106,12 @@ export const SearchIndices: React.FC = () => {
             ? []
             : [
                 <EuiLinkTo data-test-subj="create-new-index-button" to={NEW_INDEX_PATH}>
-                  <EuiButton iconType="plusInCircle" color="primary" fill>
+                  <EuiButton
+                    iconType="plusInCircle"
+                    color="primary"
+                    fill
+                    data-test-subj="entSearchContent-searchIndices-createButton"
+                  >
                     {i18n.translate(
                       'xpack.enterpriseSearch.content.searchIndices.create.buttonTitle',
                       {
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/crawler_status_indicator/start_crawl_context_menu.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/crawler_status_indicator/start_crawl_context_menu.tsx
index b85839351e2ea9..09b69ab40ac61d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/crawler_status_indicator/start_crawl_context_menu.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/shared/crawler_status_indicator/start_crawl_context_menu.tsx
@@ -25,7 +25,13 @@ export const StartCrawlContextMenu: React.FC = () => {
   return (
     <EuiPopover
       button={
-        <EuiButton iconType="arrowDown" iconSide="right" onClick={togglePopover} fill>
+        <EuiButton
+          iconType="arrowDown"
+          iconSide="right"
+          onClick={togglePopover}
+          fill
+          data-test-subj="entSearchContent-crawler-startCrawlMenu-menuButton"
+        >
           {i18n.translate(
             'xpack.enterpriseSearch.crawler.crawlerStatusIndicator.retryCrawlButtonLabel',
             {
@@ -48,6 +54,7 @@ export const StartCrawlContextMenu: React.FC = () => {
               startCrawl();
             }}
             icon="play"
+            data-test-subj="entSearchContent-crawler-startCrawlMenu-crawlAllDomains"
           >
             {i18n.translate(
               'xpack.enterpriseSearch.crawler.startCrawlContextMenu.crawlAllDomainsMenuLabel',
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts
index 7b5bc7bf286f58..cfd2447b9aa8b9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/routes.ts
@@ -46,3 +46,4 @@ export enum SearchApplicationContentTabs {
 }
 
 export const ML_MANAGE_TRAINED_MODELS_PATH = '/app/ml/trained_models';
+export const ML_NOTIFICATIONS_PATH = '/app/ml/notifications';
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
index c9d14e6d67006f..010b8a0fb4bb10 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.test.tsx
@@ -27,8 +27,8 @@ import { renderApp, renderHeaderActions } from '.';
 
 describe('renderApp', () => {
   const kibanaDeps = {
-    params: coreMock.createAppMountParameters(),
     core: coreMock.createStart(),
+    params: coreMock.createAppMountParameters(),
     plugins: {
       charts: chartPluginMock.createStartContract(),
       data: dataPluginMock.createStartContract(),
diff --git a/x-pack/plugins/enterprise_search/public/applications/index.tsx b/x-pack/plugins/enterprise_search/public/applications/index.tsx
index 40c3d8bdaf1055..6c07c49292df1c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/index.tsx
@@ -37,10 +37,26 @@ import { mountLicensingLogic } from './shared/licensing';
 
 export const renderApp = (
   App: React.FC<InitialAppData>,
-  { params, core, plugins }: { params: AppMountParameters; core: CoreStart; plugins: PluginsStart },
+  {
+    params,
+    core,
+    plugins,
+    isSidebarEnabled = true,
+  }: {
+    core: CoreStart;
+    isSidebarEnabled: boolean;
+    params: AppMountParameters;
+    plugins: PluginsStart;
+  },
   { config, data }: { config: ClientConfigType; data: ClientData }
 ) => {
-  const { publicUrl, errorConnectingMessage, ...initialData } = data;
+  const { access, features, publicUrl, errorConnectingMessage, readOnlyMode, ...initialData } =
+    data;
+  const { history } = params;
+  const { application, chrome, http, uiSettings } = core;
+  const { capabilities, navigateToUrl } = application;
+  const { charts, cloud, guidedOnboarding, lens, security } = plugins;
+
   const entCloudHost = getCloudEnterpriseSearchHost(plugins.cloud);
   externalUrl.enterpriseSearchUrl = publicUrl || entCloudHost || config.host || '';
 
@@ -48,44 +64,46 @@ export const renderApp = (
     hasAppSearchAccess: false,
     hasWorkplaceSearchAccess: false,
   };
-  const productAccess = data.access || noProductAccess;
-  const productFeatures = data.features ?? { ...DEFAULT_PRODUCT_FEATURES };
+
+  const productAccess = access || noProductAccess;
+  const productFeatures = features ?? { ...DEFAULT_PRODUCT_FEATURES };
 
   const EmptyContext: FC = ({ children }) => <>{children}</>;
-  const CloudContext = plugins.cloud?.CloudContextProvider || EmptyContext;
+  const CloudContext = cloud?.CloudContextProvider || EmptyContext;
 
   resetContext({ createStore: true });
   const store = getContext().store;
 
   const unmountKibanaLogic = mountKibanaLogic({
-    application: core.application,
-    capabilities: core.application.capabilities,
+    application,
+    capabilities,
+    charts,
+    cloud,
     config,
     data: plugins.data,
-    lens: plugins.lens,
+    guidedOnboarding,
+    history,
+    isSidebarEnabled,
+    lens,
+    navigateToUrl,
     productAccess,
     productFeatures,
-    charts: plugins.charts,
-    cloud: plugins.cloud,
-    uiSettings: core.uiSettings,
-    guidedOnboarding: plugins.guidedOnboarding,
-    history: params.history,
-    navigateToUrl: core.application.navigateToUrl,
-    security: plugins.security,
-    setBreadcrumbs: core.chrome.setBreadcrumbs,
-    setChromeIsVisible: core.chrome.setIsVisible,
-    setDocTitle: core.chrome.docTitle.change,
     renderHeaderActions: (HeaderActions) =>
       params.setHeaderActionMenu((el) => renderHeaderActions(HeaderActions, store, el)),
+    security,
+    setBreadcrumbs: chrome.setBreadcrumbs,
+    setChromeIsVisible: chrome.setIsVisible,
+    setDocTitle: chrome.docTitle.change,
+    uiSettings,
   });
   const unmountLicensingLogic = mountLicensingLogic({
-    license$: plugins.licensing.license$,
     canManageLicense: core.application.capabilities.management?.stack?.license_management,
+    license$: plugins.licensing.license$,
   });
   const unmountHttpLogic = mountHttpLogic({
-    http: core.http,
     errorConnectingMessage,
-    readOnlyMode: initialData.readOnlyMode,
+    http,
+    readOnlyMode,
   });
   const unmountFlashMessagesLogic = mountFlashMessagesLogic();
 
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 607dc7361e2f41..bd273957d2ffab 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
@@ -36,6 +36,7 @@ class DocLinks {
   public appSearchWebCrawlerReference: string;
   public behavioralAnalytics: string;
   public behavioralAnalyticsEvents: string;
+  public buildConnector: string;
   public bulkApi: string;
   public clientsGoIndex: string;
   public clientsGuide: string;
@@ -164,6 +165,7 @@ class DocLinks {
     this.appSearchWebCrawlerReference = '';
     this.behavioralAnalytics = '';
     this.behavioralAnalyticsEvents = '';
+    this.buildConnector = '';
     this.bulkApi = '';
     this.clientsGoIndex = '';
     this.clientsGuide = '';
@@ -294,6 +296,7 @@ class DocLinks {
     this.appSearchWebCrawlerReference = docLinks.links.appSearch.webCrawlerReference;
     this.behavioralAnalytics = docLinks.links.enterpriseSearch.behavioralAnalytics;
     this.behavioralAnalyticsEvents = docLinks.links.enterpriseSearch.behavioralAnalyticsEvents;
+    this.buildConnector = docLinks.links.enterpriseSearch.buildConnector;
     this.bulkApi = docLinks.links.enterpriseSearch.bulkApi;
     this.clientsGoIndex = docLinks.links.clients.goIndex;
     this.clientsGuide = docLinks.links.clients.guide;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
index bb0f9c9253771a..9e74d90605dc0e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.ts
@@ -33,7 +33,7 @@ interface Options {
   isQueued?: boolean;
 }
 
-export const defaultErrorMessage = i18n.translate(
+export const defaultErrorMessage: string = i18n.translate(
   'xpack.enterpriseSearch.shared.flashMessages.defaultErrorMessage',
   {
     defaultMessage: 'An unexpected error occurred',
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
index b7d264ba43e99a..df35a2f651363a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
@@ -33,27 +33,26 @@ type RequiredFieldsOnly<T> = {
 };
 interface KibanaLogicProps {
   application: ApplicationStart;
-  config: ClientConfigType;
-  productAccess: ProductAccess;
-  productFeatures: ProductFeatures;
-  // Kibana core
   capabilities: Capabilities;
+  charts: ChartsPluginStart;
+  cloud?: CloudSetup;
+  config: ClientConfigType;
   data: DataPublicPluginStart;
+  guidedOnboarding: GuidedOnboardingPluginStart;
   history: ScopedHistory;
+  isSidebarEnabled: boolean;
   lens: LensPublicStart;
   navigateToUrl: RequiredFieldsOnly<ApplicationStart['navigateToUrl']>;
+  productAccess: ProductAccess;
+  productFeatures: ProductFeatures;
+  renderHeaderActions(HeaderActions: FC): void;
+  security: SecurityPluginStart;
   setBreadcrumbs(crumbs: ChromeBreadcrumb[]): void;
   setChromeIsVisible(isVisible: boolean): void;
   setDocTitle(title: string): void;
-  renderHeaderActions(HeaderActions: FC): void;
-  // Required plugins
-  charts: ChartsPluginStart;
-  guidedOnboarding: GuidedOnboardingPluginStart;
-  security: SecurityPluginStart;
   uiSettings: IUiSettingsClient;
-  // Optional plugins
-  cloud?: CloudSetup;
 }
+
 export interface KibanaValues extends Omit<KibanaLogicProps, 'cloud'> {
   cloud: Partial<CloudSetup>;
   data: DataPublicPluginStart;
@@ -73,6 +72,7 @@ export const KibanaLogic = kea<MakeLogicType<KibanaValues>>({
     data: [props.data, {}],
     guidedOnboarding: [props.guidedOnboarding, {}],
     history: [props.history, {}],
+    isSidebarEnabled: [props.isSidebarEnabled, {}],
     lens: [props.lens, {}],
     navigateToUrl: [
       (url: string, options?: CreateHrefOptions) => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
index dcb343a2beec45..a0fc064d9e5650 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.test.tsx
@@ -35,7 +35,11 @@ describe('useEnterpriseSearchContentNav', () => {
 
   it('returns an array of top-level Enterprise Search nav items', () => {
     const fullProductAccess: ProductAccess = DEFAULT_PRODUCT_ACCESS;
-    setMockValues({ productAccess: fullProductAccess, productFeatures: DEFAULT_PRODUCT_FEATURES });
+    setMockValues({
+      isSidebarEnabled: true,
+      productAccess: fullProductAccess,
+      productFeatures: DEFAULT_PRODUCT_FEATURES,
+    });
 
     expect(useEnterpriseSearchNav()).toEqual([
       {
@@ -48,9 +52,9 @@ describe('useEnterpriseSearchContentNav', () => {
             name: 'Elasticsearch',
           },
           {
+            href: '/app/enterprise_search/search_experiences',
             id: 'searchExperiences',
             name: 'Search Experiences',
-            href: '/app/enterprise_search/search_experiences',
           },
         ],
         name: 'Overview',
@@ -74,12 +78,11 @@ describe('useEnterpriseSearchContentNav', () => {
       },
       {
         id: 'applications',
-        name: 'Applications',
         items: [
           {
+            href: '/app/enterprise_search/content/engines',
             id: 'searchApplications',
             name: 'Search Applications',
-            href: '/app/enterprise_search/content/engines',
           },
           {
             href: '/app/enterprise_search/analytics',
@@ -87,6 +90,7 @@ describe('useEnterpriseSearchContentNav', () => {
             name: 'Behavioral Analytics',
           },
         ],
+        name: 'Applications',
       },
       {
         id: 'standaloneExperiences',
@@ -114,7 +118,11 @@ describe('useEnterpriseSearchContentNav', () => {
       hasWorkplaceSearchAccess: false,
     };
 
-    setMockValues({ productAccess: noProductAccess, productFeatures: DEFAULT_PRODUCT_FEATURES });
+    setMockValues({
+      isSidebarEnabled: true,
+      productAccess: noProductAccess,
+      productFeatures: DEFAULT_PRODUCT_FEATURES,
+    });
     mockKibanaValues.uiSettings.get.mockReturnValue(false);
 
     const esNav = useEnterpriseSearchNav();
@@ -130,6 +138,7 @@ describe('useEnterpriseSearchContentNav', () => {
     };
 
     setMockValues({
+      isSidebarEnabled: true,
       productAccess: workplaceSearchProductAccess,
       productFeatures: DEFAULT_PRODUCT_FEATURES,
     });
@@ -157,6 +166,7 @@ describe('useEnterpriseSearchContentNav', () => {
     };
 
     setMockValues({
+      isSidebarEnabled: true,
       productAccess: appSearchProductAccess,
       productFeatures: DEFAULT_PRODUCT_FEATURES,
     });
@@ -183,6 +193,7 @@ describe('useEnterpriseSearchEngineNav', () => {
     jest.clearAllMocks();
     mockKibanaValues.uiSettings.get.mockReturnValue(true);
     setMockValues({
+      isSidebarEnabled: true,
       productAccess: DEFAULT_PRODUCT_ACCESS,
       productFeatures: DEFAULT_PRODUCT_FEATURES,
     });
@@ -200,9 +211,9 @@ describe('useEnterpriseSearchEngineNav', () => {
             name: 'Elasticsearch',
           },
           {
+            href: '/app/enterprise_search/search_experiences',
             id: 'searchExperiences',
             name: 'Search Experiences',
-            href: '/app/enterprise_search/search_experiences',
           },
         ],
         name: 'Overview',
@@ -225,12 +236,11 @@ describe('useEnterpriseSearchEngineNav', () => {
       },
       {
         id: 'applications',
-        name: 'Applications',
         items: [
           {
+            href: '/app/enterprise_search/content/engines',
             id: 'searchApplications',
             name: 'Search Applications',
-            href: '/app/enterprise_search/content/engines',
           },
           {
             href: '/app/enterprise_search/analytics',
@@ -238,6 +248,7 @@ describe('useEnterpriseSearchEngineNav', () => {
             name: 'Behavioral Analytics',
           },
         ],
+        name: 'Applications',
       },
       {
         id: 'standaloneExperiences',
@@ -287,7 +298,7 @@ describe('useEnterpriseSearchEngineNav', () => {
         {
           href: `/app/enterprise_search/content/engines/${engineName}/preview`,
           id: 'enterpriseSearchEnginePreview',
-          name: 'Preview',
+          name: 'Search Preview',
         },
         {
           href: `/app/enterprise_search/content/engines/${engineName}/content`,
@@ -346,9 +357,9 @@ describe('useEnterpriseSearchAnalyticsNav', () => {
           name: 'Elasticsearch',
         },
         {
+          href: '/app/enterprise_search/search_experiences',
           id: 'searchExperiences',
           name: 'Search Experiences',
-          href: '/app/enterprise_search/search_experiences',
         },
       ],
       name: 'Overview',
@@ -366,7 +377,6 @@ describe('useEnterpriseSearchAnalyticsNav', () => {
     },
     {
       id: 'applications',
-      name: 'Applications',
       items: [
         {
           href: '/app/enterprise_search/content/engines',
@@ -379,6 +389,7 @@ describe('useEnterpriseSearchAnalyticsNav', () => {
           name: 'Behavioral Analytics',
         },
       ],
+      name: 'Applications',
     },
     {
       id: 'standaloneExperiences',
@@ -400,7 +411,9 @@ describe('useEnterpriseSearchAnalyticsNav', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
-    setMockValues({});
+    setMockValues({
+      isSidebarEnabled: true,
+    });
   });
 
   it('returns basic nav all params are empty', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
index 7fbc354ff725f6..e1b9609164efcf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
@@ -30,7 +30,8 @@ import { KibanaLogic } from '../kibana';
 import { generateNavLink } from './nav_link_helpers';
 
 export const useEnterpriseSearchNav = () => {
-  const { productAccess, productFeatures } = useValues(KibanaLogic);
+  const { isSidebarEnabled, productAccess, productFeatures } = useValues(KibanaLogic);
+  if (!isSidebarEnabled) return undefined;
 
   const navItems: Array<EuiSideNavItemType<unknown>> = [
     {
@@ -174,6 +175,7 @@ export const useEnterpriseSearchNav = () => {
 
 export const useEnterpriseSearchEngineNav = (engineName?: string, isEmptyState?: boolean) => {
   const navItems = useEnterpriseSearchNav();
+  if (!navItems) return undefined;
   if (!engineName) return navItems;
   const applicationsItem = navItems.find((item) => item.id === 'applications');
   if (!applicationsItem || !applicationsItem.items) return navItems;
@@ -196,7 +198,7 @@ export const useEnterpriseSearchEngineNav = (engineName?: string, isEmptyState?:
             {
               id: 'enterpriseSearchEnginePreview',
               name: i18n.translate('xpack.enterpriseSearch.nav.engine.previewTitle', {
-                defaultMessage: 'Preview',
+                defaultMessage: 'Search Preview',
               }),
               ...generateNavLink({
                 shouldNotCreateHref: true,
@@ -255,6 +257,9 @@ export const useEnterpriseSearchAnalyticsNav = (
   }
 ) => {
   const navItems = useEnterpriseSearchNav();
+
+  if (!navItems) return undefined;
+
   const applicationsNav = navItems.find((item) => item.id === 'applications');
   const analyticsNav = applicationsNav?.items?.find((item) => item.id === 'analyticsCollections');
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
index 4793d11b56c76a..333d4d5f33b9a5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/page_template.tsx
@@ -35,13 +35,13 @@ import './page_template.scss';
 
 export type PageTemplateProps = KibanaPageTemplateProps & {
   customPageSections?: boolean; // If false, automatically wraps children in an EuiPageSection
+  emptyState?: React.ReactNode;
   hideFlashMessages?: boolean;
   isLoading?: boolean;
-  emptyState?: React.ReactNode;
-  setPageChrome?: React.ReactNode;
   // Used by product-specific page templates
   pageChrome?: BreadcrumbTrail;
   pageViewTelemetry?: string;
+  setPageChrome?: React.ReactNode;
 };
 
 export const EnterpriseSearchPageTemplateWrapper: React.FC<PageTemplateProps> = ({
@@ -73,7 +73,11 @@ export const EnterpriseSearchPageTemplateWrapper: React.FC<PageTemplateProps> =
         ),
       }}
       isEmptyState={isEmptyState && !isLoading}
-      solutionNav={solutionNav ? { icon: 'logoEnterpriseSearch', ...solutionNav } : undefined}
+      solutionNav={
+        solutionNav && solutionNav.items
+          ? { icon: 'logoEnterpriseSearch', ...solutionNav }
+          : undefined
+      }
     >
       {setPageChrome}
       {readOnlyMode && (
diff --git a/x-pack/plugins/enterprise_search/public/index.ts b/x-pack/plugins/enterprise_search/public/index.ts
index b24616fc4b3d87..8dc84c6934e426 100644
--- a/x-pack/plugins/enterprise_search/public/index.ts
+++ b/x-pack/plugins/enterprise_search/public/index.ts
@@ -12,3 +12,5 @@ import { EnterpriseSearchPlugin } from './plugin';
 export const plugin = (initializerContext: PluginInitializerContext) => {
   return new EnterpriseSearchPlugin(initializerContext);
 };
+
+export type { EnterpriseSearchPublicSetup, EnterpriseSearchPublicStart } from './plugin';
diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts
index 0c732495ab416d..c4612fa27a4286 100644
--- a/x-pack/plugins/enterprise_search/public/plugin.ts
+++ b/x-pack/plugins/enterprise_search/public/plugin.ts
@@ -38,10 +38,13 @@ import { ClientConfigType, InitialAppData } from '../common/types';
 import { docLinks } from './applications/shared/doc_links';
 
 export interface ClientData extends InitialAppData {
-  publicUrl?: string;
   errorConnectingMessage?: string;
+  publicUrl?: string;
 }
 
+export type EnterpriseSearchPublicSetup = ReturnType<EnterpriseSearchPlugin['setup']>;
+export type EnterpriseSearchPublicStart = ReturnType<EnterpriseSearchPlugin['start']>;
+
 interface PluginsSetup {
   cloud?: CloudSetup;
   home?: HomePublicPluginSetup;
@@ -49,8 +52,8 @@ interface PluginsSetup {
 }
 
 export interface PluginsStart {
-  cloud?: CloudSetup & CloudStart;
   charts: ChartsPluginStart;
+  cloud?: CloudSetup & CloudStart;
   data: DataPublicPluginStart;
   guidedOnboarding: GuidedOnboardingPluginStart;
   lens: LensPublicStart;
@@ -60,23 +63,63 @@ export interface PluginsStart {
 
 export class EnterpriseSearchPlugin implements Plugin {
   private config: ClientConfigType;
-  private hasInitialized: boolean = false;
-  private data: ClientData = {} as ClientData;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.config = initializerContext.config.get<ClientConfigType>();
   }
 
+  private data: ClientData = {} as ClientData;
+
+  private async getInitialData(http: HttpSetup) {
+    if (!this.config.host && this.config.canDeployEntSearch) return; // No API to call
+    if (this.hasInitialized) return; // We've already made an initial call
+
+    try {
+      this.data = await http.get('/internal/enterprise_search/config_data');
+      this.hasInitialized = true;
+    } catch (e) {
+      this.data.errorConnectingMessage = `${e.response.status} ${e.message}`;
+    }
+  }
+
+  private async getKibanaDeps(
+    core: CoreSetup,
+    params: AppMountParameters,
+    cloudSetup?: CloudSetup
+  ) {
+    // Helper for using start dependencies on mount (instead of setup dependencies)
+    // and for grouping Kibana-related args together (vs. plugin-specific args)
+    const [coreStart, pluginsStart] = await core.getStartServices();
+    const cloud =
+      cloudSetup && (pluginsStart as PluginsStart).cloud
+        ? { ...cloudSetup, ...(pluginsStart as PluginsStart).cloud }
+        : undefined;
+    const plugins = { ...pluginsStart, cloud } as PluginsStart;
+
+    coreStart.chrome
+      .getChromeStyle$()
+      .subscribe((style) => (this.isSidebarEnabled = style === 'classic'));
+
+    return { core: coreStart, isSidebarEnabled: this.isSidebarEnabled, params, plugins };
+  }
+
+  private getPluginData() {
+    // Small helper for grouping plugin data related args together
+    return { config: this.config, data: this.data, isSidebarEnabled: this.isSidebarEnabled };
+  }
+
+  private hasInitialized: boolean = false;
+  private isSidebarEnabled = true;
+
   public setup(core: CoreSetup, plugins: PluginsSetup) {
     const { cloud } = plugins;
     const { config } = this;
 
     core.application.register({
-      id: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.ID,
-      title: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.NAV_TITLE,
-      euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
       appRoute: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.URL,
       category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
+      euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
+      id: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.ID,
       mount: async (params: AppMountParameters) => {
         const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
         const { chrome, http } = kibanaDeps.core;
@@ -92,14 +135,14 @@ export class EnterpriseSearchPlugin implements Plugin {
 
         return renderApp(EnterpriseSearchOverview, kibanaDeps, pluginData);
       },
+      title: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.NAV_TITLE,
     });
 
     core.application.register({
-      id: ENTERPRISE_SEARCH_CONTENT_PLUGIN.ID,
-      title: ENTERPRISE_SEARCH_CONTENT_PLUGIN.NAV_TITLE,
-      euiIconType: ENTERPRISE_SEARCH_CONTENT_PLUGIN.LOGO,
       appRoute: ENTERPRISE_SEARCH_CONTENT_PLUGIN.URL,
       category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
+      euiIconType: ENTERPRISE_SEARCH_CONTENT_PLUGIN.LOGO,
+      id: ENTERPRISE_SEARCH_CONTENT_PLUGIN.ID,
       mount: async (params: AppMountParameters) => {
         const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
         const { chrome, http } = kibanaDeps.core;
@@ -115,16 +158,14 @@ export class EnterpriseSearchPlugin implements Plugin {
 
         return renderApp(EnterpriseSearchContent, kibanaDeps, pluginData);
       },
+      title: ENTERPRISE_SEARCH_CONTENT_PLUGIN.NAV_TITLE,
     });
 
     core.application.register({
-      id: ANALYTICS_PLUGIN.ID,
-      title: ANALYTICS_PLUGIN.NAME,
-      euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
-      searchable: true,
-      navLinkStatus: AppNavLinkStatus.default,
       appRoute: ANALYTICS_PLUGIN.URL,
       category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
+      euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
+      id: ANALYTICS_PLUGIN.ID,
       mount: async (params: AppMountParameters) => {
         const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
         const { chrome, http } = kibanaDeps.core;
@@ -138,14 +179,16 @@ export class EnterpriseSearchPlugin implements Plugin {
 
         return renderApp(Analytics, kibanaDeps, pluginData);
       },
+      navLinkStatus: AppNavLinkStatus.default,
+      searchable: true,
+      title: ANALYTICS_PLUGIN.NAME,
     });
 
     core.application.register({
-      id: ELASTICSEARCH_PLUGIN.ID,
-      title: ELASTICSEARCH_PLUGIN.NAME,
-      euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
       appRoute: ELASTICSEARCH_PLUGIN.URL,
       category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
+      euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
+      id: ELASTICSEARCH_PLUGIN.ID,
       mount: async (params: AppMountParameters) => {
         const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
         const { chrome, http } = kibanaDeps.core;
@@ -159,15 +202,15 @@ export class EnterpriseSearchPlugin implements Plugin {
 
         return renderApp(Elasticsearch, kibanaDeps, pluginData);
       },
+      title: ELASTICSEARCH_PLUGIN.NAME,
     });
 
     if (config.canDeployEntSearch) {
       core.application.register({
-        id: APP_SEARCH_PLUGIN.ID,
-        title: APP_SEARCH_PLUGIN.NAME,
-        euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
         appRoute: APP_SEARCH_PLUGIN.URL,
         category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
+        euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
+        id: APP_SEARCH_PLUGIN.ID,
         mount: async (params: AppMountParameters) => {
           const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
           const { chrome, http } = kibanaDeps.core;
@@ -181,14 +224,14 @@ export class EnterpriseSearchPlugin implements Plugin {
 
           return renderApp(AppSearch, kibanaDeps, pluginData);
         },
+        title: APP_SEARCH_PLUGIN.NAME,
       });
 
       core.application.register({
-        id: WORKPLACE_SEARCH_PLUGIN.ID,
-        title: WORKPLACE_SEARCH_PLUGIN.NAME,
-        euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
         appRoute: WORKPLACE_SEARCH_PLUGIN.URL,
         category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
+        euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
+        id: WORKPLACE_SEARCH_PLUGIN.ID,
         mount: async (params: AppMountParameters) => {
           const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
           const { chrome, http } = kibanaDeps.core;
@@ -205,15 +248,15 @@ export class EnterpriseSearchPlugin implements Plugin {
 
           return renderApp(WorkplaceSearch, kibanaDeps, pluginData);
         },
+        title: WORKPLACE_SEARCH_PLUGIN.NAME,
       });
     }
 
     core.application.register({
-      id: SEARCH_EXPERIENCES_PLUGIN.ID,
-      title: SEARCH_EXPERIENCES_PLUGIN.NAME,
-      euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
       appRoute: SEARCH_EXPERIENCES_PLUGIN.URL,
       category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
+      euiIconType: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.LOGO,
+      id: SEARCH_EXPERIENCES_PLUGIN.ID,
       mount: async (params: AppMountParameters) => {
         const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
         const { chrome, http } = kibanaDeps.core;
@@ -227,68 +270,69 @@ export class EnterpriseSearchPlugin implements Plugin {
 
         return renderApp(SearchExperiences, kibanaDeps, pluginData);
       },
+      title: SEARCH_EXPERIENCES_PLUGIN.NAME,
     });
 
     if (plugins.home) {
       plugins.home.featureCatalogue.registerSolution({
-        id: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.ID,
-        title: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.NAME,
-        icon: 'logoEnterpriseSearch',
         description: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.DESCRIPTION,
-        path: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.URL,
+        icon: 'logoEnterpriseSearch',
+        id: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.ID,
         order: 100,
+        path: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.URL,
+        title: ENTERPRISE_SEARCH_OVERVIEW_PLUGIN.NAME,
       });
 
       plugins.home.featureCatalogue.register({
-        id: ANALYTICS_PLUGIN.ID,
-        title: ANALYTICS_PLUGIN.NAME,
-        icon: 'appAnalytics',
+        category: 'data',
         description: ANALYTICS_PLUGIN.DESCRIPTION,
+        icon: 'appAnalytics',
+        id: ANALYTICS_PLUGIN.ID,
         path: ANALYTICS_PLUGIN.URL,
-        category: 'data',
         showOnHomePage: false,
+        title: ANALYTICS_PLUGIN.NAME,
       });
 
       if (config.canDeployEntSearch) {
         plugins.home.featureCatalogue.register({
-          id: APP_SEARCH_PLUGIN.ID,
-          title: APP_SEARCH_PLUGIN.NAME,
-          icon: 'appSearchApp',
+          category: 'data',
           description: APP_SEARCH_PLUGIN.DESCRIPTION,
+          icon: 'appSearchApp',
+          id: APP_SEARCH_PLUGIN.ID,
           path: APP_SEARCH_PLUGIN.URL,
-          category: 'data',
           showOnHomePage: false,
+          title: APP_SEARCH_PLUGIN.NAME,
         });
 
         plugins.home.featureCatalogue.register({
-          id: WORKPLACE_SEARCH_PLUGIN.ID,
-          title: WORKPLACE_SEARCH_PLUGIN.NAME,
-          icon: 'workplaceSearchApp',
+          category: 'data',
           description: WORKPLACE_SEARCH_PLUGIN.DESCRIPTION,
+          icon: 'workplaceSearchApp',
+          id: WORKPLACE_SEARCH_PLUGIN.ID,
           path: WORKPLACE_SEARCH_PLUGIN.URL,
-          category: 'data',
           showOnHomePage: false,
+          title: WORKPLACE_SEARCH_PLUGIN.NAME,
         });
       }
 
       plugins.home.featureCatalogue.register({
-        id: ELASTICSEARCH_PLUGIN.ID,
-        title: ELASTICSEARCH_PLUGIN.NAME,
-        icon: 'appElasticsearch',
+        category: 'data',
         description: ELASTICSEARCH_PLUGIN.DESCRIPTION,
+        icon: 'appElasticsearch',
+        id: ELASTICSEARCH_PLUGIN.ID,
         path: ELASTICSEARCH_PLUGIN.URL,
-        category: 'data',
         showOnHomePage: false,
+        title: ELASTICSEARCH_PLUGIN.NAME,
       });
 
       plugins.home.featureCatalogue.register({
-        id: SEARCH_EXPERIENCES_PLUGIN.ID,
-        title: SEARCH_EXPERIENCES_PLUGIN.NAME,
-        icon: 'logoEnterpriseSearch',
+        category: 'data',
         description: SEARCH_EXPERIENCES_PLUGIN.DESCRIPTION,
+        icon: 'logoEnterpriseSearch',
+        id: SEARCH_EXPERIENCES_PLUGIN.ID,
         path: SEARCH_EXPERIENCES_PLUGIN.URL,
-        category: 'data',
         showOnHomePage: false,
+        title: SEARCH_EXPERIENCES_PLUGIN.NAME,
       });
     }
   }
@@ -300,38 +344,4 @@ export class EnterpriseSearchPlugin implements Plugin {
   }
 
   public stop() {}
-
-  private async getKibanaDeps(
-    core: CoreSetup,
-    params: AppMountParameters,
-    cloudSetup?: CloudSetup
-  ) {
-    // Helper for using start dependencies on mount (instead of setup dependencies)
-    // and for grouping Kibana-related args together (vs. plugin-specific args)
-    const [coreStart, pluginsStart] = await core.getStartServices();
-    const cloud =
-      cloudSetup && (pluginsStart as PluginsStart).cloud
-        ? { ...cloudSetup, ...(pluginsStart as PluginsStart).cloud }
-        : undefined;
-    const plugins = { ...pluginsStart, cloud } as PluginsStart;
-
-    return { params, core: coreStart, plugins };
-  }
-
-  private getPluginData() {
-    // Small helper for grouping plugin data related args together
-    return { config: this.config, data: this.data };
-  }
-
-  private async getInitialData(http: HttpSetup) {
-    if (!this.config.host && this.config.canDeployEntSearch) return; // No API to call
-    if (this.hasInitialized) return; // We've already made an initial call
-
-    try {
-      this.data = await http.get('/internal/enterprise_search/config_data');
-      this.hasInitialized = true;
-    } catch (e) {
-      this.data.errorConnectingMessage = `${e.response.status} ${e.message}`;
-    }
-  }
 }
diff --git a/x-pack/plugins/enterprise_search/server/lib/connectors/put_update_native.ts b/x-pack/plugins/enterprise_search/server/lib/connectors/put_update_native.ts
new file mode 100644
index 00000000000000..6b3039974f8a4f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/lib/connectors/put_update_native.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 { IScopedClusterClient } from '@kbn/core-elasticsearch-server';
+
+import { CONNECTORS_INDEX } from '../..';
+import { Connector } from '../../../common/types/connectors';
+
+export const putUpdateNative = async (
+  client: IScopedClusterClient,
+  connectorId: string,
+  isNative: boolean
+) => {
+  const result = await client.asCurrentUser.update<Connector>({
+    doc: {
+      is_native: isNative,
+    },
+    id: connectorId,
+    index: CONNECTORS_INDEX,
+  });
+
+  return result;
+};
diff --git a/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.test.ts b/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.test.ts
index 3282fa37f4f4d2..55905e40c6835a 100644
--- a/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.test.ts
@@ -22,11 +22,16 @@ describe('fetchIndicesStats lib function', () => {
     indices: {
       'test-index-name-1': {
         health: 'GREEN',
-        primaries: { docs: [{}] },
+        primaries: {
+          docs: {
+            count: 200,
+            deleted: 0,
+          },
+        },
         status: 'open',
         total: {
           docs: {
-            count: 200,
+            count: 400,
             deleted: 0,
           },
         },
@@ -34,7 +39,12 @@ describe('fetchIndicesStats lib function', () => {
       },
       'test-index-name-2': {
         health: 'YELLOW',
-        primaries: { docs: [{}] },
+        primaries: {
+          docs: {
+            count: 0,
+            deleted: 0,
+          },
+        },
         status: 'closed',
         total: {
           docs: {
@@ -46,11 +56,16 @@ describe('fetchIndicesStats lib function', () => {
       },
       'test-index-name-3': {
         health: 'RED',
-        primaries: { docs: [{}] },
+        primaries: {
+          docs: {
+            count: 150,
+            deleted: 0,
+          },
+        },
         status: 'open',
         total: {
           docs: {
-            count: 150,
+            count: 300,
             deleted: 0,
           },
         },
diff --git a/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.ts b/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.ts
index c682309bbae4a9..234fab310cca33 100644
--- a/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/engines/fetch_indices_stats.ts
@@ -18,7 +18,7 @@ export const fetchIndicesStats = async (client: IScopedClusterClient, indices: s
   const indicesWithStats = indices.map((indexName: string) => {
     const indexStats = indicesStats[indexName];
     const hydratedIndex: EnterpriseSearchEngineIndex = {
-      count: indexStats?.total?.docs?.count ?? 0,
+      count: indexStats?.primaries?.docs?.count ?? 0,
       health: indexStats?.health ?? 'unknown',
       name: indexName,
     };
diff --git a/x-pack/plugins/enterprise_search/server/lib/ml/ml_model_deployment_common.ts b/x-pack/plugins/enterprise_search/server/lib/ml/ml_model_deployment_common.ts
index f97362725bac50..9465a943014431 100644
--- a/x-pack/plugins/enterprise_search/server/lib/ml/ml_model_deployment_common.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/ml/ml_model_deployment_common.ts
@@ -11,7 +11,7 @@ import {
   isResourceNotFoundException,
 } from '../../utils/identify_exceptions';
 
-export const acceptableModelNames = ['.elser_model_1_SNAPSHOT'];
+export const acceptableModelNames = ['.elser_model_1', '.elser_model_1_SNAPSHOT'];
 
 export function isNotFoundExceptionError(error: unknown): boolean {
   return (
diff --git a/x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_deployment.test.ts b/x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_deployment.test.ts
index 827f41b83f5755..ae11a89ed5ac08 100644
--- a/x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_deployment.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_deployment.test.ts
@@ -15,7 +15,8 @@ import * as mockGetStatus from './get_ml_model_deployment_status';
 import { startMlModelDeployment } from './start_ml_model_deployment';
 
 describe('startMlModelDeployment', () => {
-  const knownModelName = '.elser_model_1_SNAPSHOT';
+  const productionModelName = '.elser_model_1';
+  const snapshotModelName = '.elser_model_1_SNAPSHOT';
   const mockTrainedModelsProvider = {
     getTrainedModels: jest.fn(),
     getTrainedModelsStats: jest.fn(),
@@ -27,7 +28,7 @@ describe('startMlModelDeployment', () => {
   });
 
   it('should error when there is no trained model provider', () => {
-    expect(() => startMlModelDeployment(knownModelName, undefined)).rejects.toThrowError(
+    expect(() => startMlModelDeployment(productionModelName, undefined)).rejects.toThrowError(
       'Machine Learning is not enabled'
     );
   });
@@ -49,7 +50,7 @@ describe('startMlModelDeployment', () => {
     jest.spyOn(mockGetStatus, 'getMlModelDeploymentStatus').mockReturnValueOnce(
       Promise.resolve({
         deploymentState: MlModelDeploymentState.Starting,
-        modelId: knownModelName,
+        modelId: productionModelName,
         nodeAllocationCount: 0,
         startTime: 123456,
         targetAllocationCount: 3,
@@ -57,7 +58,26 @@ describe('startMlModelDeployment', () => {
     );
 
     const response = await startMlModelDeployment(
-      knownModelName,
+      productionModelName,
+      mockTrainedModelsProvider as unknown as MlTrainedModels
+    );
+
+    expect(response.deploymentState).toEqual(MlModelDeploymentState.Starting);
+  });
+
+  it('should return the deployment state if not "downloaded" for snapshot model', async () => {
+    jest.spyOn(mockGetStatus, 'getMlModelDeploymentStatus').mockReturnValueOnce(
+      Promise.resolve({
+        deploymentState: MlModelDeploymentState.Starting,
+        modelId: snapshotModelName,
+        nodeAllocationCount: 0,
+        startTime: 123456,
+        targetAllocationCount: 3,
+      })
+    );
+
+    const response = await startMlModelDeployment(
+      snapshotModelName,
       mockTrainedModelsProvider as unknown as MlTrainedModels
     );
 
@@ -70,7 +90,7 @@ describe('startMlModelDeployment', () => {
       .mockReturnValueOnce(
         Promise.resolve({
           deploymentState: MlModelDeploymentState.Downloaded,
-          modelId: knownModelName,
+          modelId: productionModelName,
           nodeAllocationCount: 0,
           startTime: 123456,
           targetAllocationCount: 3,
@@ -79,7 +99,7 @@ describe('startMlModelDeployment', () => {
       .mockReturnValueOnce(
         Promise.resolve({
           deploymentState: MlModelDeploymentState.Starting,
-          modelId: knownModelName,
+          modelId: productionModelName,
           nodeAllocationCount: 0,
           startTime: 123456,
           targetAllocationCount: 3,
@@ -88,7 +108,7 @@ describe('startMlModelDeployment', () => {
     mockTrainedModelsProvider.startTrainedModelDeployment.mockImplementation(async () => {});
 
     const response = await startMlModelDeployment(
-      knownModelName,
+      productionModelName,
       mockTrainedModelsProvider as unknown as MlTrainedModels
     );
     expect(response.deploymentState).toEqual(MlModelDeploymentState.Starting);
diff --git a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/connectors.ts b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/connectors.ts
index 32e7cb79a25976..f0c0df50f7155d 100644
--- a/x-pack/plugins/enterprise_search/server/routes/enterprise_search/connectors.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/enterprise_search/connectors.ts
@@ -22,6 +22,7 @@ import { fetchSyncJobsByConnectorId } from '../../lib/connectors/fetch_sync_jobs
 import { cancelSyncs } from '../../lib/connectors/post_cancel_syncs';
 import { updateFiltering } from '../../lib/connectors/put_update_filtering';
 import { updateFilteringDraft } from '../../lib/connectors/put_update_filtering_draft';
+import { putUpdateNative } from '../../lib/connectors/put_update_native';
 import { startConnectorSync } from '../../lib/connectors/start_sync';
 import { updateConnectorConfiguration } from '../../lib/connectors/update_connector_configuration';
 import { updateConnectorNameAndDescription } from '../../lib/connectors/update_connector_name_and_description';
@@ -383,4 +384,24 @@ export function registerConnectorRoutes({ router, log }: RouteDependencies) {
       return result ? response.ok({ body: result }) : response.conflict();
     })
   );
+  router.put(
+    {
+      path: '/internal/enterprise_search/connectors/{connectorId}/native',
+      validate: {
+        body: schema.object({
+          is_native: schema.boolean(),
+        }),
+        params: schema.object({
+          connectorId: schema.string(),
+        }),
+      },
+    },
+    elasticsearchErrorHandler(log, async (context, request, response) => {
+      const { client } = (await context.core).elasticsearch;
+      const connectorId = decodeURIComponent(request.params.connectorId);
+      const { is_native } = request.body;
+      const result = await putUpdateNative(client, connectorId, is_native);
+      return result ? response.ok({ body: result }) : response.conflict();
+    })
+  );
 }
diff --git a/x-pack/plugins/event_log/server/plugin.ts b/x-pack/plugins/event_log/server/plugin.ts
index d5bf14a1259c13..9c96e2ae8073af 100644
--- a/x-pack/plugins/event_log/server/plugin.ts
+++ b/x-pack/plugins/event_log/server/plugin.ts
@@ -12,23 +12,19 @@ import {
   Plugin as CorePlugin,
   PluginInitializerContext,
   IClusterClient,
-  IContextProvider,
 } from '@kbn/core/server';
 import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 
 import type {
-  EventLogRequestHandlerContext,
   IEventLogConfig,
   IEventLogService,
   IEventLogger,
   IEventLogClientService,
 } from './types';
-import { findRoute } from './routes';
 import { EventLogService } from './event_log_service';
 import { createEsContext, EsContext } from './es';
 import { EventLogClientService } from './event_log_start_service';
 import { SavedObjectProviderRegistry } from './saved_object_provider_registry';
-import { findByIdsRoute } from './routes/find_by_ids';
 
 export type PluginClusterClient = Pick<IClusterClient, 'asInternalUser'>;
 
@@ -88,17 +84,6 @@ export class Plugin implements CorePlugin<IEventLogService, IEventLogClientServi
       event: { provider: PROVIDER },
     });
 
-    core.http.registerRouteHandlerContext<EventLogRequestHandlerContext, 'eventLog'>(
-      'eventLog',
-      this.createRouteHandlerContext()
-    );
-
-    // Routes
-    const router = core.http.createRouter<EventLogRequestHandlerContext>();
-    // Register routes
-    findRoute(router, this.systemLogger);
-    findByIdsRoute(router, this.systemLogger);
-
     return this.eventLogService;
   }
 
@@ -161,15 +146,4 @@ export class Plugin implements CorePlugin<IEventLogService, IEventLogClientServi
     await this.esContext?.shutdown();
     this.systemLogger.debug('shutdown: finished');
   }
-
-  private createRouteHandlerContext = (): IContextProvider<
-    EventLogRequestHandlerContext,
-    'eventLog'
-  > => {
-    return async (context, request) => {
-      return {
-        getEventLogClient: () => this.eventLogClientService!.getClient(request),
-      };
-    };
-  };
 }
diff --git a/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts b/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts
deleted file mode 100644
index d9c78aea08b8ec..00000000000000
--- a/x-pack/plugins/event_log/server/routes/_mock_handler_arguments.ts
+++ /dev/null
@@ -1,73 +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 { identity, merge } from 'lodash';
-import { RequestHandlerContext, KibanaRequest, KibanaResponseFactory } from '@kbn/core/server';
-import type { MethodKeysOf } from '@kbn/utility-types';
-
-import { httpServerMock } from '@kbn/core/server/mocks';
-import { IEventLogClient } from '../types';
-
-export function mockHandlerArguments(
-  eventLogClient: IEventLogClient,
-  request: unknown,
-  response?: Array<MethodKeysOf<KibanaResponseFactory>>
-): [RequestHandlerContext, KibanaRequest<unknown, unknown, unknown>, KibanaResponseFactory] {
-  return [
-    {
-      eventLog: {
-        getEventLogClient() {
-          return eventLogClient;
-        },
-      },
-    } as unknown as RequestHandlerContext,
-    request as KibanaRequest<unknown, unknown, unknown>,
-    mockResponseFactory(response),
-  ];
-}
-
-export const mockResponseFactory = (resToMock: Array<MethodKeysOf<KibanaResponseFactory>> = []) => {
-  const factory: jest.Mocked<KibanaResponseFactory> = httpServerMock.createResponseFactory();
-  resToMock.forEach((key: string) => {
-    if (key in factory) {
-      Object.defineProperty(factory, key, {
-        value: jest.fn(identity),
-      });
-    }
-  });
-  return factory as unknown as KibanaResponseFactory;
-};
-
-export function fakeEvent(overrides = {}) {
-  return merge(
-    {
-      event: {
-        provider: 'actions',
-        action: 'execute',
-        start: '2020-03-30T14:55:47.054Z',
-        end: '2020-03-30T14:55:47.055Z',
-        duration: '1000000',
-      },
-      kibana: {
-        saved_objects: [
-          {
-            namespace: 'default',
-            type: 'action',
-            id: '968f1b82-0414-4a10-becc-56b6473e4a29',
-          },
-        ],
-        server_uuid: '5b2de169-2785-441b-ae8c-186a1936b17d',
-      },
-      message: 'action executed: .server-log:968f1b82-0414-4a10-becc-56b6473e4a29: logger',
-      '@timestamp': '2020-03-30T14:55:47.055Z',
-      ecs: {
-        version: '1.3.1',
-      },
-    },
-    overrides
-  );
-}
diff --git a/x-pack/plugins/event_log/server/routes/find.test.ts b/x-pack/plugins/event_log/server/routes/find.test.ts
deleted file mode 100644
index ee7985d34d249d..00000000000000
--- a/x-pack/plugins/event_log/server/routes/find.test.ts
+++ /dev/null
@@ -1,126 +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 { findRoute } from './find';
-import { httpServiceMock } from '@kbn/core/server/mocks';
-import { mockHandlerArguments, fakeEvent } from './_mock_handler_arguments';
-import { eventLogClientMock } from '../event_log_client.mock';
-import { loggingSystemMock } from '@kbn/core/server/mocks';
-
-const eventLogClient = eventLogClientMock.create();
-const systemLogger = loggingSystemMock.createLogger();
-
-beforeEach(() => {
-  jest.resetAllMocks();
-});
-
-describe('find', () => {
-  it('finds events with proper parameters', async () => {
-    const router = httpServiceMock.createRouter();
-
-    findRoute(router, systemLogger);
-
-    const [config, handler] = router.get.mock.calls[0];
-
-    expect(config.path).toMatchInlineSnapshot(`"/internal/event_log/{type}/{id}/_find"`);
-
-    const events = [fakeEvent(), fakeEvent()];
-    const result = {
-      page: 0,
-      per_page: 10,
-      total: events.length,
-      data: events,
-    };
-    eventLogClient.findEventsBySavedObjectIds.mockResolvedValueOnce(result);
-
-    const [context, req, res] = mockHandlerArguments(
-      eventLogClient,
-      {
-        params: { id: '1', type: 'action' },
-      },
-      ['ok']
-    );
-
-    await handler(context, req, res);
-
-    expect(eventLogClient.findEventsBySavedObjectIds).toHaveBeenCalledTimes(1);
-
-    const [type, ids] = eventLogClient.findEventsBySavedObjectIds.mock.calls[0];
-    expect(type).toEqual(`action`);
-    expect(ids).toEqual(['1']);
-
-    expect(res.ok).toHaveBeenCalledWith({
-      body: result,
-    });
-  });
-
-  it('supports optional pagination parameters', async () => {
-    const router = httpServiceMock.createRouter();
-
-    findRoute(router, systemLogger);
-
-    const [, handler] = router.get.mock.calls[0];
-    eventLogClient.findEventsBySavedObjectIds.mockResolvedValueOnce({
-      page: 0,
-      per_page: 10,
-      total: 0,
-      data: [],
-    });
-
-    const [context, req, res] = mockHandlerArguments(
-      eventLogClient,
-      {
-        params: { id: '1', type: 'action' },
-        query: { page: 3, per_page: 10 },
-      },
-      ['ok']
-    );
-
-    await handler(context, req, res);
-
-    expect(eventLogClient.findEventsBySavedObjectIds).toHaveBeenCalledTimes(1);
-
-    const [type, ids, options] = eventLogClient.findEventsBySavedObjectIds.mock.calls[0];
-    expect(type).toEqual(`action`);
-    expect(ids).toEqual(['1']);
-    expect(options).toMatchObject({});
-
-    expect(res.ok).toHaveBeenCalledWith({
-      body: {
-        page: 0,
-        per_page: 10,
-        total: 0,
-        data: [],
-      },
-    });
-  });
-
-  it('logs a warning when the query throws an error', async () => {
-    const router = httpServiceMock.createRouter();
-
-    findRoute(router, systemLogger);
-
-    const [, handler] = router.get.mock.calls[0];
-    eventLogClient.findEventsBySavedObjectIds.mockRejectedValueOnce(new Error('oof!'));
-
-    const [context, req, res] = mockHandlerArguments(
-      eventLogClient,
-      {
-        params: { id: '1', type: 'action' },
-        query: { page: 3, per_page: 10 },
-      },
-      ['ok']
-    );
-
-    await handler(context, req, res);
-
-    expect(systemLogger.debug).toHaveBeenCalledTimes(1);
-    expect(systemLogger.debug).toHaveBeenCalledWith(
-      'error calling eventLog findEventsBySavedObjectIds(action, [1], {"page":3,"per_page":10}): oof!'
-    );
-  });
-});
diff --git a/x-pack/plugins/event_log/server/routes/find.ts b/x-pack/plugins/event_log/server/routes/find.ts
deleted file mode 100644
index 4c9ab70bbe3a52..00000000000000
--- a/x-pack/plugins/event_log/server/routes/find.ts
+++ /dev/null
@@ -1,58 +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 { schema, TypeOf } from '@kbn/config-schema';
-import type {
-  KibanaRequest,
-  IKibanaResponse,
-  KibanaResponseFactory,
-  Logger,
-} from '@kbn/core/server';
-import type { EventLogRouter, EventLogRequestHandlerContext } from '../types';
-import { BASE_EVENT_LOG_API_PATH } from '../../common';
-import { queryOptionsSchema, FindOptionsType } from '../event_log_client';
-
-const paramSchema = schema.object({
-  type: schema.string(),
-  id: schema.string(),
-});
-
-export const findRoute = (router: EventLogRouter, systemLogger: Logger) => {
-  router.get(
-    {
-      path: `${BASE_EVENT_LOG_API_PATH}/{type}/{id}/_find`,
-      validate: {
-        params: paramSchema,
-        query: queryOptionsSchema,
-      },
-    },
-    router.handleLegacyErrors(async function (
-      context: EventLogRequestHandlerContext,
-      req: KibanaRequest<TypeOf<typeof paramSchema>, FindOptionsType, unknown>,
-      res: KibanaResponseFactory
-    ): Promise<IKibanaResponse> {
-      if (!context.eventLog) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for eventLog' });
-      }
-      const eventLogClient = (await context.eventLog).getEventLogClient();
-      const {
-        params: { id, type },
-        query,
-      } = req;
-
-      try {
-        return res.ok({
-          body: await eventLogClient.findEventsBySavedObjectIds(type, [id], query),
-        });
-      } catch (err) {
-        const call = `findEventsBySavedObjectIds(${type}, [${id}], ${JSON.stringify(query)})`;
-        systemLogger.debug(`error calling eventLog ${call}: ${err.message}`);
-        return res.notFound();
-      }
-    })
-  );
-};
diff --git a/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts b/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
deleted file mode 100644
index 81172f2119410c..00000000000000
--- a/x-pack/plugins/event_log/server/routes/find_by_ids.test.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { httpServiceMock } from '@kbn/core/server/mocks';
-import { mockHandlerArguments, fakeEvent } from './_mock_handler_arguments';
-import { eventLogClientMock } from '../event_log_client.mock';
-import { loggingSystemMock } from '@kbn/core/server/mocks';
-import { findByIdsRoute } from './find_by_ids';
-
-const eventLogClient = eventLogClientMock.create();
-const systemLogger = loggingSystemMock.createLogger();
-
-beforeEach(() => {
-  jest.resetAllMocks();
-});
-
-describe('find_by_ids', () => {
-  it('finds events with proper parameters', async () => {
-    const router = httpServiceMock.createRouter();
-
-    findByIdsRoute(router, systemLogger);
-
-    const [config, handler] = router.post.mock.calls[0];
-
-    expect(config.path).toMatchInlineSnapshot(`"/internal/event_log/{type}/_find"`);
-
-    const events = [fakeEvent(), fakeEvent()];
-    const result = {
-      page: 0,
-      per_page: 10,
-      total: events.length,
-      data: events,
-    };
-    eventLogClient.findEventsBySavedObjectIds.mockResolvedValueOnce(result);
-
-    const [context, req, res] = mockHandlerArguments(
-      eventLogClient,
-      {
-        params: { type: 'action' },
-        body: { ids: ['1'], legacyIds: ['2'] },
-      },
-      ['ok']
-    );
-
-    await handler(context, req, res);
-
-    expect(eventLogClient.findEventsBySavedObjectIds).toHaveBeenCalledTimes(1);
-
-    const [type, ids, , legacyIds] = eventLogClient.findEventsBySavedObjectIds.mock.calls[0];
-    expect(type).toEqual(`action`);
-    expect(ids).toEqual(['1']);
-    expect(legacyIds).toEqual(['2']);
-
-    expect(res.ok).toHaveBeenCalledWith({
-      body: result,
-    });
-  });
-
-  it('supports optional pagination parameters', async () => {
-    const router = httpServiceMock.createRouter();
-
-    findByIdsRoute(router, systemLogger);
-
-    const [, handler] = router.post.mock.calls[0];
-    eventLogClient.findEventsBySavedObjectIds.mockResolvedValueOnce({
-      page: 0,
-      per_page: 10,
-      total: 0,
-      data: [],
-    });
-
-    const [context, req, res] = mockHandlerArguments(
-      eventLogClient,
-      {
-        params: { type: 'action' },
-        body: { ids: ['1'] },
-        query: { page: 3, per_page: 10 },
-      },
-      ['ok']
-    );
-
-    await handler(context, req, res);
-
-    expect(eventLogClient.findEventsBySavedObjectIds).toHaveBeenCalledTimes(1);
-
-    const [type, id, options] = eventLogClient.findEventsBySavedObjectIds.mock.calls[0];
-    expect(type).toEqual(`action`);
-    expect(id).toEqual(['1']);
-    expect(options).toMatchObject({});
-
-    expect(res.ok).toHaveBeenCalledWith({
-      body: {
-        page: 0,
-        per_page: 10,
-        total: 0,
-        data: [],
-      },
-    });
-  });
-
-  it('logs a warning when the query throws an error', async () => {
-    const router = httpServiceMock.createRouter();
-
-    findByIdsRoute(router, systemLogger);
-
-    const [, handler] = router.post.mock.calls[0];
-    eventLogClient.findEventsBySavedObjectIds.mockRejectedValueOnce(new Error('oof!'));
-
-    const [context, req, res] = mockHandlerArguments(
-      eventLogClient,
-      {
-        params: { type: 'action' },
-        body: { ids: ['1'] },
-        query: { page: 3, per_page: 10 },
-      },
-      ['ok']
-    );
-
-    await handler(context, req, res);
-
-    expect(systemLogger.debug).toHaveBeenCalledTimes(1);
-    expect(systemLogger.debug).toHaveBeenCalledWith(
-      'error calling eventLog findEventsBySavedObjectIds(action, [1], {"page":3,"per_page":10}): oof!'
-    );
-  });
-});
diff --git a/x-pack/plugins/event_log/server/routes/find_by_ids.ts b/x-pack/plugins/event_log/server/routes/find_by_ids.ts
deleted file mode 100644
index a33a03c8242c48..00000000000000
--- a/x-pack/plugins/event_log/server/routes/find_by_ids.ts
+++ /dev/null
@@ -1,65 +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 { schema, TypeOf } from '@kbn/config-schema';
-import type {
-  KibanaRequest,
-  IKibanaResponse,
-  KibanaResponseFactory,
-  Logger,
-} from '@kbn/core/server';
-import type { EventLogRouter, EventLogRequestHandlerContext } from '../types';
-
-import { BASE_EVENT_LOG_API_PATH } from '../../common';
-import { queryOptionsSchema, FindOptionsType } from '../event_log_client';
-
-const paramSchema = schema.object({
-  type: schema.string(),
-});
-
-const bodySchema = schema.object({
-  ids: schema.arrayOf(schema.string(), { defaultValue: [] }),
-  legacyIds: schema.arrayOf(schema.string(), { defaultValue: [] }),
-});
-
-export const findByIdsRoute = (router: EventLogRouter, systemLogger: Logger) => {
-  router.post(
-    {
-      path: `${BASE_EVENT_LOG_API_PATH}/{type}/_find`,
-      validate: {
-        params: paramSchema,
-        query: queryOptionsSchema,
-        body: bodySchema,
-      },
-    },
-    router.handleLegacyErrors(async function (
-      context: EventLogRequestHandlerContext,
-      req: KibanaRequest<TypeOf<typeof paramSchema>, FindOptionsType, TypeOf<typeof bodySchema>>,
-      res: KibanaResponseFactory
-    ): Promise<IKibanaResponse> {
-      if (!context.eventLog) {
-        return res.badRequest({ body: 'RouteHandlerContext is not registered for eventLog' });
-      }
-      const eventLogClient = (await context.eventLog).getEventLogClient();
-      const {
-        params: { type },
-        body: { ids, legacyIds },
-        query,
-      } = req;
-
-      try {
-        return res.ok({
-          body: await eventLogClient.findEventsBySavedObjectIds(type, ids, query, legacyIds),
-        });
-      } catch (err) {
-        const call = `findEventsBySavedObjectIds(${type}, [${ids}], ${JSON.stringify(query)})`;
-        systemLogger.debug(`error calling eventLog ${call}: ${err.message}`);
-        return res.notFound();
-      }
-    })
-  );
-};
diff --git a/x-pack/plugins/event_log/server/types.ts b/x-pack/plugins/event_log/server/types.ts
index 6969ade7c3a8e3..7287da0c0fd6eb 100644
--- a/x-pack/plugins/event_log/server/types.ts
+++ b/x-pack/plugins/event_log/server/types.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import type { IRouter, KibanaRequest, CustomRequestHandlerContext } from '@kbn/core/server';
+import type { KibanaRequest } from '@kbn/core/server';
 import { KueryNode } from '@kbn/es-query';
 
 export type { IEvent, IValidatedEvent } from '../generated/schemas';
@@ -84,22 +84,3 @@ export interface IEventLogger {
   startTiming(event: IEvent, startTime?: Date): void;
   stopTiming(event: IEvent): void;
 }
-
-/**
- * @internal
- */
-export interface EventLogApiRequestHandlerContext {
-  getEventLogClient(): IEventLogClient;
-}
-
-/**
- * @internal
- */
-export type EventLogRequestHandlerContext = CustomRequestHandlerContext<{
-  eventLog: EventLogApiRequestHandlerContext;
-}>;
-
-/**
- * @internal
- */
-export type EventLogRouter = IRouter<EventLogRequestHandlerContext>;
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/index.tsx b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/index.tsx
index 85fb195d29d4fa..aa07c2c2d35514 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/index.tsx
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/index.tsx
@@ -138,7 +138,7 @@ export function getExploratoryViewEmbeddable(
                 {...embedProps}
                 dataViewState={dataViews}
                 lens={lens}
-                lensFormulaHelper={lensHelper.formula}
+                lensFormulaHelper={lensHelper?.formula}
                 searchSessionId={services.data.search.session.getSessionId()}
                 onLoad={onLensLoaded}
               />
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_app_data_view.ts b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_app_data_view.ts
index ab1ca8827c58a7..0852c98bb3dc99 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_app_data_view.ts
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/embeddable/use_app_data_view.ts
@@ -48,5 +48,5 @@ export const useAppDataView = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [dataViewTitle, seriesDataType, JSON.stringify(series)]);
 
-  return { dataViews, loading };
+  return { dataViews, loading: loading && !dataViews[seriesDataType] };
 };
diff --git a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_add_to_case.ts b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
index 67f79242a93763..bdd2e228d93f39 100644
--- a/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
+++ b/x-pack/plugins/exploratory_view/public/components/shared/exploratory_view/hooks/use_add_to_case.ts
@@ -8,7 +8,7 @@
 import { useCallback, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { HttpSetup, MountPoint } from '@kbn/core/public';
-import { Case } from '@kbn/cases-plugin/common';
+import { CaseUI } from '@kbn/cases-plugin/common';
 import { TypedLensByValueInput } from '@kbn/lens-plugin/public';
 import { CasesDeepLinkId, DRAFT_COMMENT_STORAGE_ID } from '@kbn/cases-plugin/public';
 import { observabilityFeatureId } from '@kbn/observability-shared-plugin/public';
@@ -17,7 +17,7 @@ import { AddToCaseProps } from '../header/add_to_case_action';
 
 async function addToCase(
   http: HttpSetup,
-  theCase: Case,
+  theCase: CaseUI,
   attributes: TypedLensByValueInput['attributes'],
   timeRange?: { from: string; to: string },
   owner?: string
@@ -46,7 +46,7 @@ export const useAddToCase = ({
   owner = observabilityFeatureId,
 }: AddToCaseProps & {
   appId?: 'securitySolutionUI' | 'observability';
-  getToastText: (thaCase: Case) => MountPoint<HTMLElement>;
+  getToastText: (thaCase: CaseUI) => MountPoint<HTMLElement>;
 }) => {
   const [isSaving, setIsSaving] = useState(false);
   const [isCasesOpen, setIsCasesOpen] = useState(false);
@@ -59,7 +59,7 @@ export const useAddToCase = ({
   } = useKibana().services;
 
   const onCaseClicked = useCallback(
-    (theCase?: Case) => {
+    (theCase?: CaseUI) => {
       if (theCase && lensAttributes) {
         setIsCasesOpen(false);
         setIsSaving(true);
diff --git a/x-pack/plugins/fleet/common/errors.ts b/x-pack/plugins/fleet/common/errors.ts
index 8e22b971be6ad1..75c789e30e9ce5 100644
--- a/x-pack/plugins/fleet/common/errors.ts
+++ b/x-pack/plugins/fleet/common/errors.ts
@@ -17,3 +17,5 @@ export class FleetError extends Error {
 }
 
 export class PackagePolicyValidationError extends FleetError {}
+
+export class MessageSigningError extends FleetError {}
diff --git a/x-pack/plugins/fleet/common/openapi/bundled.json b/x-pack/plugins/fleet/common/openapi/bundled.json
index 6e7c9d8606955d..34d2a8606daa29 100644
--- a/x-pack/plugins/fleet/common/openapi/bundled.json
+++ b/x-pack/plugins/fleet/common/openapi/bundled.json
@@ -581,9 +581,27 @@
                   "packages": {
                     "type": "array",
                     "items": {
-                      "type": "string"
+                      "oneOf": [
+                        {
+                          "type": "string",
+                          "description": "package name"
+                        },
+                        {
+                          "type": "object",
+                          "properties": {
+                            "name": {
+                              "type": "string",
+                              "description": "package name"
+                            },
+                            "version": {
+                              "type": "string",
+                              "description": "package version"
+                            }
+                          }
+                        }
+                      ]
                     },
-                    "description": "list of package names to install"
+                    "description": "list of packages to install"
                   },
                   "force": {
                     "type": "boolean",
@@ -3402,46 +3420,6 @@
       },
       "parameters": []
     },
-    "/message_signing_service/rotate_key_pair": {
-      "post": {
-        "summary": "Rotate key pair",
-        "tags": [
-          "Message Signing Service"
-        ],
-        "operationId": "rotate-key-pair",
-        "parameters": [
-          {
-            "schema": {
-              "type": "boolean"
-            },
-            "in": "query",
-            "name": "acknowledge",
-            "required": true,
-            "description": "When set to true, rotate key pair is done. If set to false or missing, it returns an error."
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "OK",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "message": {
-                      "type": "string"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "400": {
-            "$ref": "#/components/responses/error"
-          }
-        }
-      }
-    },
     "/data_streams": {
       "get": {
         "summary": "List data streams",
diff --git a/x-pack/plugins/fleet/common/openapi/bundled.yaml b/x-pack/plugins/fleet/common/openapi/bundled.yaml
index a62444586efeb5..dd697cadfa4eda 100644
--- a/x-pack/plugins/fleet/common/openapi/bundled.yaml
+++ b/x-pack/plugins/fleet/common/openapi/bundled.yaml
@@ -378,8 +378,18 @@ paths:
                 packages:
                   type: array
                   items:
-                    type: string
-                  description: list of package names to install
+                    oneOf:
+                      - type: string
+                        description: package name
+                      - type: object
+                        properties:
+                          name:
+                            type: string
+                            description: package name
+                          version:
+                            type: string
+                            description: package version
+                  description: list of packages to install
                 force:
                   type: boolean
                   description: force install to ignore package verification errors
@@ -2113,33 +2123,6 @@ paths:
       parameters:
         - $ref: '#/components/parameters/kbn_xsrf'
     parameters: []
-  /message_signing_service/rotate_key_pair:
-    post:
-      summary: Rotate key pair
-      tags:
-        - Message Signing Service
-      operationId: rotate-key-pair
-      parameters:
-        - schema:
-            type: boolean
-          in: query
-          name: acknowledge
-          required: true
-          description: >-
-            When set to true, rotate key pair is done. If set to false or
-            missing, it returns an error.
-      responses:
-        '200':
-          description: OK
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  message:
-                    type: string
-        '400':
-          $ref: '#/components/responses/error'
   /data_streams:
     get:
       summary: List data streams
diff --git a/x-pack/plugins/fleet/common/openapi/entrypoint.yaml b/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
index ee95d9899a5709..ca9d1cd3c8e19a 100644
--- a/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
+++ b/x-pack/plugins/fleet/common/openapi/entrypoint.yaml
@@ -105,10 +105,6 @@ paths:
   /agent_policies/delete:
     $ref: paths/agent_policies@delete.yaml
 
-  # Message signing service
-  /message_signing_service/rotate_key_pair:
-   $ref: paths/message_signing_service@rotate_key_pair.yaml
-
   # Data streams endpoints
   /data_streams:
     $ref: paths/data_streams.yaml
diff --git a/x-pack/plugins/fleet/common/openapi/paths/epm@packages_bulk.yaml b/x-pack/plugins/fleet/common/openapi/paths/epm@packages_bulk.yaml
index a3775e69a7131f..7a3b3f293cf873 100644
--- a/x-pack/plugins/fleet/common/openapi/paths/epm@packages_bulk.yaml
+++ b/x-pack/plugins/fleet/common/openapi/paths/epm@packages_bulk.yaml
@@ -29,8 +29,18 @@ post:
             packages:
               type: array
               items:
-                type: string
-              description: list of package names to install
+                oneOf:
+                  - type: string
+                    description: package name
+                  - type: object
+                    properties:
+                      name:
+                        type: string
+                        description: package name
+                      version:
+                        type: string
+                        description: package version
+              description: list of packages to install
             force:
               type: boolean
               description: force install to ignore package verification errors
diff --git a/x-pack/plugins/fleet/common/openapi/paths/message_signing_service@rotate_key_pair.yaml b/x-pack/plugins/fleet/common/openapi/paths/message_signing_service@rotate_key_pair.yaml
deleted file mode 100644
index 477967d3cb2b1b..00000000000000
--- a/x-pack/plugins/fleet/common/openapi/paths/message_signing_service@rotate_key_pair.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-post:
-  summary: Rotate key pair
-  tags:
-    - Message Signing Service
-  operationId: rotate-key-pair
-  parameters:
-    - schema:
-        type: boolean
-      in: query
-      name: acknowledge
-      required: true
-      description: When set to true, rotate key pair is done. If set to false or missing, it returns an error.
-  responses:
-    '200':
-      description: OK
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              message:
-                type: string
-    '400':
-      $ref: ../components/responses/error.yaml
\ No newline at end of file
diff --git a/x-pack/plugins/fleet/common/types/models/agent.ts b/x-pack/plugins/fleet/common/types/models/agent.ts
index 304da5b3f65142..34f68fc34c502a 100644
--- a/x-pack/plugins/fleet/common/types/models/agent.ts
+++ b/x-pack/plugins/fleet/common/types/models/agent.ts
@@ -180,6 +180,9 @@ export interface AgentDiagnostics {
 }
 
 // Generated from FleetServer schema.json
+/**
+ * Fleet Server agent component unit
+ */
 export interface FleetServerAgentComponentUnit {
   id: string;
   type: 'input' | 'output';
@@ -190,7 +193,10 @@ export interface FleetServerAgentComponentUnit {
   };
 }
 
-interface FleetServerAgentComponent {
+/**
+ * Fleet server agent component
+ */
+export interface FleetServerAgentComponent {
   id: string;
   type: string;
   status: FleetServerAgentComponentStatus;
diff --git a/x-pack/plugins/fleet/common/types/models/package_spec.ts b/x-pack/plugins/fleet/common/types/models/package_spec.ts
index 95edf515725d06..60f9b29bd218b2 100644
--- a/x-pack/plugins/fleet/common/types/models/package_spec.ts
+++ b/x-pack/plugins/fleet/common/types/models/package_spec.ts
@@ -36,6 +36,7 @@ export interface PackageSpecManifest {
 export type PackageSpecPackageType = 'integration' | 'input';
 
 export type PackageSpecCategory =
+  | 'advanced_analytics_ueba'
   | 'analytics_engine'
   | 'application_observability'
   | 'app_search'
diff --git a/x-pack/plugins/fleet/cypress/e2e/agent_list.cy.ts b/x-pack/plugins/fleet/cypress/e2e/agent_list.cy.ts
deleted file mode 100644
index 5c0e6c637eac0b..00000000000000
--- a/x-pack/plugins/fleet/cypress/e2e/agent_list.cy.ts
+++ /dev/null
@@ -1,244 +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 { FLEET_AGENT_LIST_PAGE } from '../screens/fleet';
-
-import { createAgentDoc } from '../tasks/agents';
-import { setupFleetServer } from '../tasks/fleet_server';
-import { deleteFleetServerDocs, deleteAgentDocs } from '../tasks/cleanup';
-
-const createAgentDocs = (kibanaVersion: string) => [
-  createAgentDoc('agent-1', 'policy-1'), // this agent will have upgrade available
-  createAgentDoc('agent-2', 'policy-2', 'error', kibanaVersion),
-  ...[...Array(15).keys()].map((_, index) => createAgentDoc(`agent-${index + 2}`, 'policy-3')),
-];
-
-let docs: any[] = [];
-
-describe('View agents list', () => {
-  before(() => {
-    deleteFleetServerDocs(true);
-    deleteAgentDocs(true);
-    setupFleetServer();
-
-    cy.getKibanaVersion().then((version) => {
-      docs = createAgentDocs(version);
-      cy.task('insertDocs', { index: '.fleet-agents', docs });
-    });
-  });
-  after(() => {
-    deleteFleetServerDocs();
-    deleteAgentDocs();
-  });
-  beforeEach(() => {
-    cy.intercept('/api/fleet/agents/setup', {
-      isReady: true,
-      missing_optional_features: [],
-      missing_requirements: [],
-    });
-    cy.intercept('/api/fleet/setup', { isInitialized: true, nonFatalErrors: [] });
-    cy.intercept('/api/fleet/agents_status', {
-      total: 18,
-      inactive: 0,
-      online: 18,
-      error: 0,
-      offline: 0,
-      updating: 0,
-      other: 0,
-      events: 0,
-    });
-    cy.intercept(/\/api\/fleet\/agent_policies(\?.*)?$/, {
-      items: [
-        {
-          id: 'policy-1',
-          name: 'Agent policy 1',
-          description: '',
-          namespace: 'default',
-          monitoring_enabled: ['logs', 'metrics'],
-          status: 'active',
-        },
-        {
-          id: 'policy-2',
-          name: 'Agent policy 2',
-          description: '',
-          namespace: 'default',
-          monitoring_enabled: ['logs', 'metrics'],
-          status: 'active',
-        },
-        {
-          id: 'policy-3',
-          name: 'Agent policy 3',
-          description: '',
-          namespace: 'default',
-          monitoring_enabled: ['logs', 'metrics'],
-          status: 'active',
-        },
-        {
-          id: 'policy-4',
-          name: 'Agent policy 4',
-          description: '',
-          namespace: 'default',
-          monitoring_enabled: ['logs', 'metrics'],
-          status: 'active',
-        },
-      ],
-    });
-  });
-
-  describe('Agent filter suggestions', () => {
-    it('should filter based on agent id', () => {
-      cy.visit('/app/fleet/agents');
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.QUERY_INPUT).type('agent.id: "agent-1"{enter}');
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 2);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
-    });
-  });
-
-  describe('Upgrade available filter', () => {
-    it('should only show agents with upgrade available after click', () => {
-      cy.visit('/app/fleet/agents');
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.SHOW_UPGRADEABLE).click();
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 17);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
-    });
-
-    it('should clear filter on second click', () => {
-      cy.visit('/app/fleet/agents');
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.SHOW_UPGRADEABLE).click();
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.SHOW_UPGRADEABLE).click();
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 19);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-2');
-    });
-  });
-
-  describe('Agent policy filter', () => {
-    it('should should show all policies as options', () => {
-      cy.visit('/app/fleet/agents');
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
-
-      cy.get('button').contains('Agent policy 1');
-      cy.get('button').contains('Agent policy 2');
-      cy.get('button').contains('Agent policy 3');
-    });
-
-    it('should filter on single policy (no results)', () => {
-      cy.visit('/app/fleet/agents');
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
-
-      cy.get('button').contains('Agent policy 4').click();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('No agents found');
-    });
-
-    it('should filter on single policy', () => {
-      cy.visit('/app/fleet/agents');
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
-
-      cy.get('button').contains('Agent policy 1').click();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 2);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
-    });
-
-    it('should filter on multiple policies', () => {
-      cy.visit('/app/fleet/agents');
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
-
-      cy.get('button').contains('Agent policy 1').click();
-      cy.get('button').contains('Agent policy 2').click();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 3);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-2');
-    });
-  });
-
-  describe('Agent status filter', () => {
-    const clearFilters = () => {
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
-      cy.get('button').contains('Healthy').click();
-      cy.get('button').contains('Unhealthy').click();
-      cy.get('button').contains('Updating').click();
-      cy.get('button').contains('Offline').click();
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
-    };
-    it('should filter on healthy (16 result)', () => {
-      cy.visit('/app/fleet/agents');
-      clearFilters();
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
-
-      cy.get('button').contains('Healthy').click();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 18);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
-    });
-
-    it('should filter on unhealthy (1 result)', () => {
-      cy.visit('/app/fleet/agents');
-      clearFilters();
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
-
-      cy.get('button').contains('Unhealthy').click();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 2);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-2');
-    });
-
-    it('should filter on inactive (0 result)', () => {
-      cy.visit('/app/fleet/agents');
-      clearFilters();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
-
-      cy.get('button').contains('Inactive').click();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('No agents found');
-    });
-
-    it('should filter on healthy and unhealthy', () => {
-      cy.visit('/app/fleet/agents');
-      clearFilters();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
-
-      cy.get('button').contains('healthy').click();
-      cy.get('button').contains('Unhealthy').click();
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 19);
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-2');
-    });
-  });
-
-  describe('Bulk actions', () => {
-    it('should allow to bulk upgrade agents', () => {
-      cy.visit('/app/fleet/agents');
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
-
-      cy.get('button').contains('Agent policy 3').click();
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 16);
-
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.CHECKBOX_SELECT_ALL).click();
-      // Trigger a bulk upgrade
-      cy.getBySel(FLEET_AGENT_LIST_PAGE.BULK_ACTIONS_BUTTON).click();
-      cy.get('button').contains('Upgrade 15 agents').click();
-      cy.get('.euiModalFooter button').contains('Upgrade 15 agents').click();
-      // Cancel upgrade - this assertion is currently flaky
-      // cy.getBySel(CURRENT_BULK_UPGRADES_CALLOUT.ABORT_BTN).click();
-      // cy.get('button').contains('Confirm').click();
-    });
-  });
-});
diff --git a/x-pack/plugins/fleet/cypress/e2e/agents/agent_list.cy.ts b/x-pack/plugins/fleet/cypress/e2e/agents/agent_list.cy.ts
new file mode 100644
index 00000000000000..fd85e05e51aec9
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/e2e/agents/agent_list.cy.ts
@@ -0,0 +1,386 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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_AGENT_LIST_PAGE } from '../../screens/fleet';
+
+import { createAgentDoc } from '../../tasks/agents';
+import { setupFleetServer } from '../../tasks/fleet_server';
+import { deleteFleetServerDocs, deleteAgentDocs, cleanupAgentPolicies } from '../../tasks/cleanup';
+import type { CreateAgentPolicyRequest } from '../../../common/types';
+import { setUISettings } from '../../tasks/ui_settings';
+
+const createAgentDocs = (kibanaVersion: string) => [
+  createAgentDoc('agent-1', 'policy-1'), // this agent will have upgrade available
+  createAgentDoc('agent-2', 'policy-2', 'error', kibanaVersion),
+  ...[...Array(2).keys()].map((_, index) =>
+    createAgentDoc(`agent-${index + 3}`, 'policy-3', undefined, undefined, {
+      tags: ['tag1', 'tag2'],
+    })
+  ),
+  ...[...Array(2).keys()].map((_, index) =>
+    createAgentDoc(`agent-${index + 5}`, 'policy-3', undefined, undefined, {
+      tags: ['tag2'],
+    })
+  ),
+  ...[...Array(11).keys()].map((_, index) => createAgentDoc(`agent-${index + 6}`, 'policy-3')),
+];
+
+let docs: any[] = [];
+
+const POLICIES: Array<CreateAgentPolicyRequest['body']> = [
+  {
+    id: 'policy-1',
+    name: 'Agent policy 1',
+    description: '',
+    namespace: 'default',
+    monitoring_enabled: ['logs', 'metrics'],
+  },
+  {
+    id: 'policy-2',
+    name: 'Agent policy 2',
+    description: '',
+    namespace: 'default',
+    monitoring_enabled: ['logs', 'metrics'],
+  },
+  {
+    id: 'policy-3',
+    name: 'Agent policy 3',
+    description: '',
+    namespace: 'default',
+    monitoring_enabled: ['logs', 'metrics'],
+  },
+  {
+    id: 'policy-4',
+    name: 'Agent policy 4',
+    description: '',
+    namespace: 'default',
+    monitoring_enabled: ['logs', 'metrics'],
+  },
+];
+
+function createAgentPolicy(body: CreateAgentPolicyRequest['body']) {
+  cy.request({
+    method: 'POST',
+    url: '/api/fleet/agent_policies',
+    headers: { 'kbn-xsrf': 'xx' },
+    body,
+  });
+}
+
+function assertTableContainsNAgents(n: number) {
+  cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE)
+    .find('tr')
+    .should('have.length', n + 1); // header
+}
+
+function assertTableIsEmpty() {
+  cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('No agents found');
+}
+
+describe('View agents list', () => {
+  before(() => {
+    deleteFleetServerDocs(true);
+    deleteAgentDocs(true);
+    cleanupAgentPolicies();
+    setupFleetServer();
+    setUISettings('hideAgentActivityTour', true);
+
+    cy.getKibanaVersion().then((version) => {
+      docs = createAgentDocs(version);
+      cy.task('insertDocs', { index: '.fleet-agents', docs });
+    });
+
+    for (const policy of POLICIES) {
+      createAgentPolicy(policy);
+    }
+  });
+  after(() => {
+    deleteFleetServerDocs();
+    deleteAgentDocs();
+    cleanupAgentPolicies();
+  });
+  beforeEach(() => {
+    cy.intercept('/api/fleet/agents/setup', {
+      isReady: true,
+      missing_optional_features: [],
+      missing_requirements: [],
+    });
+    cy.intercept('/api/fleet/setup', { isInitialized: true, nonFatalErrors: [] });
+    cy.intercept('/api/fleet/agents_status', {
+      total: 18,
+      inactive: 0,
+      online: 18,
+      error: 0,
+      offline: 0,
+      updating: 0,
+      other: 0,
+      events: 0,
+    });
+    cy.intercept('GET', /\/api\/fleet\/agents/).as('getAgents');
+  });
+
+  describe('Agent filter suggestions', () => {
+    it('should filter based on agent id', () => {
+      cy.visit('/app/fleet/agents');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.QUERY_INPUT).type('agent.id: "agent-1"{enter}');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE);
+      assertTableContainsNAgents(1);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
+    });
+  });
+
+  describe('Upgrade available filter', () => {
+    it('should only show agents with upgrade available after click', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.SHOW_UPGRADEABLE).click();
+      assertTableContainsNAgents(16);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
+    });
+
+    it('should clear filter on second click', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.SHOW_UPGRADEABLE).click();
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.SHOW_UPGRADEABLE).click();
+      assertTableContainsNAgents(18);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-2');
+    });
+  });
+
+  describe('Agent policy filter', () => {
+    it('should should show all policies as options', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
+
+      cy.get('button').contains('Agent policy 1');
+      cy.get('button').contains('Agent policy 2');
+      cy.get('button').contains('Agent policy 3');
+    });
+
+    it('should filter on single policy (no results)', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
+
+      cy.get('button').contains('Agent policy 4').click();
+
+      assertTableIsEmpty();
+    });
+
+    it('should filter on single policy', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
+
+      cy.get('button').contains('Agent policy 1').click();
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 2);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
+    });
+
+    it('should filter on multiple policies', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
+
+      cy.get('button').contains('Agent policy 1').click();
+      cy.get('button').contains('Agent policy 2').click();
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).find('tr').should('have.length', 3);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-2');
+    });
+  });
+
+  describe('Agent status filter', () => {
+    const clearFilters = () => {
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
+      cy.get('button').contains('Healthy').click();
+      cy.get('button').contains('Unhealthy').click();
+      cy.get('button').contains('Updating').click();
+      cy.get('button').contains('Offline').click();
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
+      cy.wait('@getAgents');
+    };
+    it('should filter on healthy (16 result)', () => {
+      cy.visit('/app/fleet/agents');
+      clearFilters();
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
+
+      cy.get('button').contains('Healthy').click();
+      cy.wait('@getAgents');
+
+      assertTableContainsNAgents(18);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
+    });
+
+    it('should filter on unhealthy (1 result)', () => {
+      cy.visit('/app/fleet/agents');
+      clearFilters();
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
+
+      cy.get('button').contains('Unhealthy').click();
+      cy.wait('@getAgents');
+
+      assertTableContainsNAgents(1);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-2');
+    });
+
+    it('should filter on inactive (0 result)', () => {
+      cy.visit('/app/fleet/agents');
+      clearFilters();
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
+
+      cy.get('button').contains('Inactive').click();
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('No agents found');
+    });
+
+    it('should filter on healthy and unhealthy', () => {
+      cy.visit('/app/fleet/agents');
+      clearFilters();
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.STATUS_FILTER).click();
+
+      cy.get('button').contains('Healthy').click();
+      cy.get('button').contains('Unhealthy').click();
+      cy.wait('@getAgents');
+
+      assertTableContainsNAgents(18);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-1');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-2');
+    });
+  });
+
+  describe('Tags filter', () => {
+    it('should allow to filter on one tag (tag1)', () => {
+      cy.visit('/app/fleet/agents');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TAGS_FILTER).click();
+      cy.get('button').contains('tag1').click();
+
+      assertTableContainsNAgents(2);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-3');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-4');
+    });
+
+    it('should allow to filter on multiple tag (tag1, tag2)', () => {
+      cy.visit('/app/fleet/agents');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TAGS_FILTER).click();
+      cy.get('button').contains('tag1').click();
+      cy.get('button').contains('tag2').click();
+      cy.wait('@getAgents');
+
+      assertTableContainsNAgents(4);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-3');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-4');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-5');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TABLE).contains('agent-6');
+    });
+
+    it('should allow to clear filters', () => {
+      cy.visit('/app/fleet/agents');
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TAGS_FILTER).click();
+      cy.get('button').contains('tag1').click();
+      cy.get('button').contains('tag2').click();
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TAGS_FILTER).click();
+
+      assertTableContainsNAgents(4);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.TAGS_FILTER).click();
+      cy.get('button').contains('Clear all').click();
+      assertTableContainsNAgents(18);
+    });
+  });
+
+  describe('Bulk actions', () => {
+    it('should allow to bulk upgrade agents and cancel that upgrade', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
+
+      cy.get('button').contains('Agent policy 3').click();
+      assertTableContainsNAgents(15);
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.CHECKBOX_SELECT_ALL).click();
+      // Trigger a bulk upgrade
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.BULK_ACTIONS_BUTTON).click();
+      cy.get('button').contains('Upgrade 15 agents').click();
+      cy.get('.euiModalFooter button:enabled').contains('Upgrade 15 agents').click();
+
+      // Expect agent status to be Updating
+      cy.get('.euiBadge:contains("Updating")').should('have.length', 15);
+
+      // Cancel upgrade
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.ACTIVITY_BUTTON).click();
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.ACTIVITY_FLYOUT.FLYOUT_ID).contains(/Upgrading 15 agents/);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.ACTIVITY_FLYOUT.FLYOUT_ID)
+        .get('button')
+        .contains('Cancel')
+        .click();
+
+      cy.get('button').contains('Confirm').click();
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.ACTIVITY_FLYOUT.CLOSE_BUTTON).click();
+
+      // Expect agent status to be Healthy
+      cy.get('.euiBadge:contains("Healthy")').should('have.length', 15);
+    });
+
+    it('should allow to bulk edit agent tags', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
+
+      cy.get('button').contains('Agent policy 3').click();
+      assertTableContainsNAgents(15);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.CHECKBOX_SELECT_ALL).click();
+      // Trigger a bulk upgrade
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.BULK_ACTIONS_BUTTON).click();
+      cy.get('button').contains('Add / remove tags').click();
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.BULK_ACTIONS.ADD_REMOVE_TAG_INPUT).focus();
+      cy.wait(500);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.BULK_ACTIONS.ADD_REMOVE_TAG_INPUT).type('tagtest{enter}');
+      cy.get('button').contains('Create a new tag "tagtest"').click();
+    });
+
+    it('should allow to bulk reassign agent to another policy', () => {
+      cy.visit('/app/fleet/agents');
+
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
+      cy.get('button').contains('Agent policy 3').click();
+      cy.wait('@getAgents');
+      assertTableContainsNAgents(15);
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.CHECKBOX_SELECT_ALL).click();
+      // Trigger a bulk upgrade
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.BULK_ACTIONS_BUTTON).click();
+      cy.get('button').contains('Assign to new policy').click();
+      cy.get('.euiModalBody select').select('Agent policy 4');
+      cy.get('.euiModalFooter button:enabled').contains('Assign policy').click();
+      cy.wait('@getAgents');
+      assertTableIsEmpty();
+      cy.pause();
+      // Select new policy is filters
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.POLICY_FILTER).click();
+      cy.get('button').contains('Agent policy 4').click();
+      cy.wait('@getAgents');
+      assertTableContainsNAgents(15);
+
+      // Change back those agents to Agent policy 3
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.CHECKBOX_SELECT_ALL).click();
+      // Trigger a bulk upgrade
+      cy.getBySel(FLEET_AGENT_LIST_PAGE.BULK_ACTIONS_BUTTON).click();
+      cy.get('button').contains('Assign to new policy').click();
+      cy.get('.euiModalBody select').select('Agent policy 3');
+      cy.get('.euiModalFooter button:enabled').contains('Assign policy').click();
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/cypress/screens/fleet.ts b/x-pack/plugins/fleet/cypress/screens/fleet.ts
index f819ceaab301ed..2855a2ac875087 100644
--- a/x-pack/plugins/fleet/cypress/screens/fleet.ts
+++ b/x-pack/plugins/fleet/cypress/screens/fleet.ts
@@ -113,11 +113,20 @@ export const AGENT_POLICY_FORM = {
 export const FLEET_AGENT_LIST_PAGE = {
   TABLE: 'fleetAgentListTable',
   STATUS_FILTER: 'agentList.statusFilter',
+  TAGS_FILTER: 'agentList.tagsFilter',
   POLICY_FILTER: 'agentList.policyFilter',
   QUERY_INPUT: 'agentList.queryInput',
   SHOW_UPGRADEABLE: 'agentList.showUpgradeable',
   CHECKBOX_SELECT_ALL: 'checkboxSelectAll',
   BULK_ACTIONS_BUTTON: 'agentBulkActionsButton',
+  ACTIVITY_BUTTON: 'agentActivityButton',
+  ACTIVITY_FLYOUT: {
+    FLYOUT_ID: 'agentActivityFlyout',
+    CLOSE_BUTTON: 'euiFlyoutCloseButton',
+  },
+  BULK_ACTIONS: {
+    ADD_REMOVE_TAG_INPUT: 'addRemoveTags',
+  },
 };
 
 export const FLEET_SERVER_HOST_FLYOUT = {
diff --git a/x-pack/plugins/fleet/cypress/tasks/agents.ts b/x-pack/plugins/fleet/cypress/tasks/agents.ts
index c8341e5acdc7bc..499ed71ee0a266 100644
--- a/x-pack/plugins/fleet/cypress/tasks/agents.ts
+++ b/x-pack/plugins/fleet/cypress/tasks/agents.ts
@@ -5,11 +5,14 @@
  * 2.0.
  */
 
+import { type FleetServerAgent } from '../../common/types';
+
 export const createAgentDoc = (
   id: string,
   policy: string,
   status = 'online',
-  version: string = '8.1.0'
+  version: string = '8.1.0',
+  data?: Partial<FleetServerAgent>
 ) => ({
   access_api_key_id: 'abcdefghijklmn',
   action_seq_no: [-1],
@@ -60,4 +63,5 @@ export const createAgentDoc = (
   policy_revision: 1,
   status,
   packages: [],
+  ...data,
 });
diff --git a/x-pack/plugins/fleet/cypress/tasks/ui_settings.ts b/x-pack/plugins/fleet/cypress/tasks/ui_settings.ts
new file mode 100644
index 00000000000000..4ba239e107f1b5
--- /dev/null
+++ b/x-pack/plugins/fleet/cypress/tasks/ui_settings.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// Create a Fleet server policy
+export function setUISettings(settingsKey: string, settingsValue: any) {
+  cy.request({
+    method: 'POST',
+    url: '/api/kibana/settings',
+    headers: { 'kbn-xsrf': 'xx' },
+    body: {
+      changes: {
+        [settingsKey]: settingsValue,
+      },
+    },
+  });
+}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
index d947115861af9c..99cf83aee78161 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -30,7 +30,7 @@ import type { FleetConfigType, FleetStartServices } from '../../plugin';
 
 import { PackageInstallProvider } from '../integrations/hooks';
 
-import { useAuthz, useFleetStatus, useFlyoutContext } from './hooks';
+import { type FleetStatusProviderProps, useAuthz, useFleetStatus, useFlyoutContext } from './hooks';
 
 import {
   ConfigContext,
@@ -240,6 +240,7 @@ export const FleetAppContext: React.FC<{
   theme$: AppMountParameters['theme$'];
   /** For testing purposes only */
   routerHistory?: History<any>;
+  fleetStatus?: FleetStatusProviderProps;
 }> = memo(
   ({
     children,
@@ -250,6 +251,7 @@ export const FleetAppContext: React.FC<{
     extensions,
     routerHistory,
     theme$,
+    fleetStatus,
   }) => {
     const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
 
@@ -265,7 +267,7 @@ export const FleetAppContext: React.FC<{
                       <QueryClientProvider client={queryClient}>
                         <ReactQueryDevtools initialIsOpen={false} />
                         <UIExtensionsContext.Provider value={extensions}>
-                          <FleetStatusProvider>
+                          <FleetStatusProvider defaultFleetStatus={fleetStatus}>
                             <Router history={history}>
                               <PackageInstallProvider
                                 notifications={startServices.notifications}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/datastream_pipelines.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/datastream_pipelines.test.tsx
index 9caea777a479d7..0209c1ad9f2ede 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/datastream_pipelines.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/datastream_pipelines.test.tsx
@@ -17,10 +17,6 @@ const mockedUseGetPipeline = useGetPipeline as jest.MockedFunction<typeof useGet
 jest.mock('../../../../hooks', () => {
   return {
     ...jest.requireActual('../../../../hooks'),
-    FleetStatusProvider: (props: any) => {
-      return props.children;
-    },
-    useFleetStatus: jest.fn().mockReturnValue({ isReady: true } as any),
     useGetPipeline: jest.fn(),
   };
 });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/experimental_datastream_settings.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/experimental_datastream_settings.test.tsx
index 2981e3cbca9018..0b5cdc0f6ad916 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/experimental_datastream_settings.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/experimental_datastream_settings.test.tsx
@@ -14,19 +14,6 @@ import type { RegistryDataStream } from '../../../../../../../../../common/types
 
 import { ExperimentDatastreamSettings } from './experimental_datastream_settings';
 
-jest.mock('../../../../../../../../hooks', () => {
-  return {
-    ...jest.requireActual('../../../../../../../../hooks'),
-    FleetStatusProvider: (props: any) => {
-      return props.children;
-    },
-    useFleetStatus: jest.fn().mockReturnValue({ isReady: true } as any),
-    sendGetStatus: jest
-      .fn()
-      .mockResolvedValue({ data: { isReady: true, missing_requirements: [] } }),
-  };
-});
-
 describe('ExperimentDatastreamSettings', () => {
   describe('Synthetic source', () => {
     it('should be enabled an not checked by default', () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
index 9e77b746214e1a..cc01cadccb7887 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.tsx
@@ -257,9 +257,9 @@ export function useOnSubmit({
         try {
           setFormState('LOADING');
           if ((withSysMonitoring || newAgentPolicy.monitoring_enabled?.length) ?? 0 > 0) {
-            const packagesToPreinstall: string[] = [];
+            const packagesToPreinstall: Array<string | { name: string; version: string }> = [];
             if (packageInfo) {
-              packagesToPreinstall.push(packageInfo.name);
+              packagesToPreinstall.push({ name: packageInfo.name, version: packageInfo.version });
             }
             if (withSysMonitoring) {
               packagesToPreinstall.push(FLEET_SYSTEM_PACKAGE);
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/action_menu.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/action_menu.test.tsx
new file mode 100644
index 00000000000000..094e3b820ab9bf
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/action_menu.test.tsx
@@ -0,0 +1,162 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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/dom';
+
+import { createFleetTestRendererMock } from '../../../../../../mock';
+import type { Agent, AgentPolicy } from '../../../../types';
+import { ExperimentalFeaturesService } from '../../../../services';
+import { useAuthz } from '../../../../../../hooks/use_authz';
+
+import { AgentDetailsActionMenu } from './actions_menu';
+
+jest.mock('../../../../../../services/experimental_features');
+jest.mock('../../../../../../hooks/use_authz');
+
+const mockedExperimentalFeaturesService = jest.mocked(ExperimentalFeaturesService);
+const mockedUseAuthz = jest.mocked(useAuthz);
+
+function renderActions({ agent, agentPolicy }: { agent: Agent; agentPolicy?: AgentPolicy }) {
+  const renderer = createFleetTestRendererMock();
+
+  const utils = renderer.render(
+    <AgentDetailsActionMenu
+      agent={agent}
+      agentPolicy={agentPolicy}
+      assignFlyoutOpenByDefault={false}
+      onCancelReassign={jest.fn()}
+    />
+  );
+
+  fireEvent.click(utils.getByRole('button'));
+
+  return { utils };
+}
+
+describe('AgentDetailsActionMenu', () => {
+  beforeEach(() => {
+    mockedExperimentalFeaturesService.get.mockReturnValue({
+      diagnosticFileUploadEnabled: true,
+    } as any);
+    mockedUseAuthz.mockReturnValue({
+      fleet: {
+        all: true,
+      },
+    } as any);
+  });
+
+  describe('Request Diagnotics action', () => {
+    function renderAndGetDiagnosticsButton({
+      agent,
+      agentPolicy,
+    }: {
+      agent: Agent;
+      agentPolicy?: AgentPolicy;
+    }) {
+      const { utils } = renderActions({
+        agent,
+        agentPolicy,
+      });
+
+      return utils.queryByTestId('requestAgentDiagnosticsBtn');
+    }
+
+    it('should not render action if feature is disabled', async () => {
+      mockedExperimentalFeaturesService.get.mockReturnValue({
+        diagnosticFileUploadEnabled: false,
+      } as any);
+      const res = renderAndGetDiagnosticsButton({
+        agent: {} as Agent,
+        agentPolicy: {} as AgentPolicy,
+      });
+      expect(res).toBe(null);
+    });
+
+    it('should render an active action button if agent version >= 8.7', async () => {
+      const res = renderAndGetDiagnosticsButton({
+        agent: {
+          status: 'online',
+          local_metadata: { elastic: { agent: { version: '8.8.0' } } },
+        } as any,
+        agentPolicy: {} as AgentPolicy,
+      });
+
+      expect(res).not.toBe(null);
+      expect(res).toBeEnabled();
+    });
+
+    it('should render an active action button if agent version >= 8.7 and policy is_managed', async () => {
+      const res = renderAndGetDiagnosticsButton({
+        agent: {
+          status: 'online',
+          local_metadata: { elastic: { agent: { version: '8.8.0' } } },
+        } as any,
+        agentPolicy: {
+          is_managed: true,
+        } as AgentPolicy,
+      });
+
+      expect(res).not.toBe(null);
+      expect(res).toBeEnabled();
+    });
+
+    it('should render a disabled action button if agent version < 8.7', async () => {
+      const res = renderAndGetDiagnosticsButton({
+        agent: {
+          status: 'online',
+          local_metadata: { elastic: { agent: { version: '8.6.0' } } },
+        } as any,
+        agentPolicy: {
+          is_managed: true,
+        } as AgentPolicy,
+      });
+
+      expect(res).not.toBe(null);
+      expect(res).not.toBeEnabled();
+    });
+  });
+
+  describe('View agent JSON action', () => {
+    function renderAndGetViewJSONButton({
+      agent,
+      agentPolicy,
+    }: {
+      agent: Agent;
+      agentPolicy?: AgentPolicy;
+    }) {
+      const { utils } = renderActions({
+        agent,
+        agentPolicy,
+      });
+
+      return utils.queryByTestId('viewAgentDetailsJsonBtn');
+    }
+
+    it('should render an active button', async () => {
+      const res = renderAndGetViewJSONButton({
+        agent: {} as any,
+        agentPolicy: {} as AgentPolicy,
+      });
+
+      expect(res).not.toBe(null);
+      expect(res).toBeEnabled();
+    });
+
+    it('should render an active button for managed agent policy', async () => {
+      const res = renderAndGetViewJSONButton({
+        agent: {} as any,
+        agentPolicy: {
+          is_managed: true,
+        } as AgentPolicy,
+      });
+
+      expect(res).not.toBe(null);
+      expect(res).toBeEnabled();
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/actions_menu.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/actions_menu.tsx
index d4710e71de9c22..80651ad5a4ab3e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/actions_menu.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/actions_menu.tsx
@@ -61,53 +61,60 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
     }
   }, [onCancelReassign, setIsReassignFlyoutOpen]);
 
-  const menuItems = [
-    <EuiContextMenuItem
-      icon="pencil"
-      onClick={() => {
-        setIsReassignFlyoutOpen(true);
-      }}
-      disabled={!agent.active}
-      key="reassignPolicy"
-    >
-      <FormattedMessage
-        id="xpack.fleet.agentList.reassignActionText"
-        defaultMessage="Assign to new policy"
-      />
-    </EuiContextMenuItem>,
-    <EuiContextMenuItem
-      icon="trash"
-      disabled={!hasFleetAllPrivileges || !agent.active}
-      onClick={() => {
-        setIsUnenrollModalOpen(true);
-      }}
-      key="unenrollAgent"
-    >
-      {isUnenrolling ? (
+  const menuItems = [];
+
+  if (!agentPolicy?.is_managed) {
+    menuItems.push(
+      <EuiContextMenuItem
+        icon="pencil"
+        onClick={() => {
+          setIsReassignFlyoutOpen(true);
+        }}
+        disabled={!agent.active && !agentPolicy}
+        key="reassignPolicy"
+      >
         <FormattedMessage
-          id="xpack.fleet.agentList.forceUnenrollOneButton"
-          defaultMessage="Force unenroll"
+          id="xpack.fleet.agentList.reassignActionText"
+          defaultMessage="Assign to new policy"
         />
-      ) : (
+      </EuiContextMenuItem>,
+      <EuiContextMenuItem
+        icon="trash"
+        disabled={!hasFleetAllPrivileges || !agent.active}
+        onClick={() => {
+          setIsUnenrollModalOpen(true);
+        }}
+        key="unenrollAgent"
+      >
+        {isUnenrolling ? (
+          <FormattedMessage
+            id="xpack.fleet.agentList.forceUnenrollOneButton"
+            defaultMessage="Force unenroll"
+          />
+        ) : (
+          <FormattedMessage
+            id="xpack.fleet.agentList.unenrollOneButton"
+            defaultMessage="Unenroll agent"
+          />
+        )}
+      </EuiContextMenuItem>,
+      <EuiContextMenuItem
+        icon="refresh"
+        disabled={!isAgentUpgradeable(agent, kibanaVersion)}
+        onClick={() => {
+          setIsUpgradeModalOpen(true);
+        }}
+        key="upgradeAgent"
+      >
         <FormattedMessage
-          id="xpack.fleet.agentList.unenrollOneButton"
-          defaultMessage="Unenroll agent"
+          id="xpack.fleet.agentList.upgradeOneButton"
+          defaultMessage="Upgrade agent"
         />
-      )}
-    </EuiContextMenuItem>,
-    <EuiContextMenuItem
-      icon="refresh"
-      disabled={!isAgentUpgradeable(agent, kibanaVersion)}
-      onClick={() => {
-        setIsUpgradeModalOpen(true);
-      }}
-      key="upgradeAgent"
-    >
-      <FormattedMessage
-        id="xpack.fleet.agentList.upgradeOneButton"
-        defaultMessage="Upgrade agent"
-      />
-    </EuiContextMenuItem>,
+      </EuiContextMenuItem>
+    );
+  }
+
+  menuItems.push(
     <EuiContextMenuItem
       icon="inspect"
       onClick={() => {
@@ -115,13 +122,14 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
         setIsAgentDetailsJsonFlyoutOpen(!isAgentDetailsJsonFlyoutOpen);
       }}
       key="agentDetailsJson"
+      data-test-subj="viewAgentDetailsJsonBtn"
     >
       <FormattedMessage
         id="xpack.fleet.agentList.viewAgentDetailsJsonText"
         defaultMessage="View agent JSON"
       />
-    </EuiContextMenuItem>,
-  ];
+    </EuiContextMenuItem>
+  );
 
   if (diagnosticFileUploadEnabled) {
     menuItems.push(
@@ -131,6 +139,7 @@ export const AgentDetailsActionMenu: React.FunctionComponent<{
         onClick={() => {
           setIsRequestDiagnosticsModalOpen(true);
         }}
+        data-test-subj="requestAgentDiagnosticsBtn"
         key="requestDiagnostics"
       >
         <FormattedMessage
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/index.tsx
index 28589906bd2c7e..5b0e993a5a675d 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/index.tsx
@@ -117,7 +117,7 @@ export const AgentDetailsPage: React.FunctionComponent = () => {
         <>
           <EuiSpacer size="m" />
           <EuiFlexGroup justifyContent="flexEnd" alignItems="center" gutterSize="s" direction="row">
-            {!isAgentPolicyLoading && !agentPolicyData?.item?.is_managed && (
+            {!isAgentPolicyLoading && (
               <EuiFlexItem grow={false}>
                 <AgentDetailsActionMenu
                   agent={agentData.item}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
index 9af04b04761a64..5e1e8f773dedb4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.test.tsx
@@ -7,29 +7,12 @@
 
 import React from 'react';
 
-import { ThemeProvider } from 'styled-components';
-
-import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
-
-import { coreMock } from '@kbn/core/public/mocks';
-import { registerTestBed } from '@kbn/test-jest-helpers';
-
 import type { Agent } from '../../../../types';
-
-import { FleetStatusProvider, ConfigContext, KibanaVersionContext } from '../../../../../../hooks';
-
-import { getMockTheme } from '../../../../../../mocks';
-
+import { createFleetTestRendererMock } from '../../../../../../mock';
 import { ExperimentalFeaturesService } from '../../../../services';
 
 import { SearchAndFilterBar } from './search_and_filter_bar';
 
-const mockTheme = getMockTheme({
-  eui: {
-    euiSize: '10px',
-  },
-});
-
 jest.mock('../../../../components', () => {
   return {
     SearchBar: () => <div />,
@@ -41,31 +24,24 @@ jest.mock('../../../../../../hooks/use_locator', () => {
     useDashboardLocator: jest.fn().mockImplementation(() => {
       return {
         id: 'DASHBOARD_APP_LOCATOR',
-        getRedirectUrl: jest.fn().mockResolvedValue('app/dashboards#/view/elastic_agent-a0002'),
+        getRedirectUrl: jest.fn().mockReturnValue('app/dashboards#/view/elastic_agent-a0002'),
       };
     }),
   };
 });
 
-const TestComponent = (props: any) => (
-  <KibanaContextProvider services={coreMock.createStart()}>
-    <ConfigContext.Provider value={{ agents: { enabled: true, elasticsearch: {} }, enabled: true }}>
-      <KibanaVersionContext.Provider value={'8.2.0'}>
-        <ThemeProvider theme={mockTheme}>
-          <FleetStatusProvider>
-            <SearchAndFilterBar {...props} />
-          </FleetStatusProvider>
-        </ThemeProvider>
-      </KibanaVersionContext.Provider>
-    </ConfigContext.Provider>
-  </KibanaContextProvider>
-);
-
 describe('SearchAndFilterBar', () => {
   beforeAll(() => {
     // @ts-ignore - prevents us needing to mock the entire service
     ExperimentalFeaturesService.init({});
   });
+
+  function render(props: any) {
+    const renderer = createFleetTestRendererMock();
+
+    return renderer.render(<SearchAndFilterBar {...props} />);
+  }
+
   it('should show no Actions button when no agent is selected', async () => {
     const selectedAgents: Agent[] = [];
     const props: any = {
@@ -83,10 +59,8 @@ describe('SearchAndFilterBar', () => {
       selectedAgentPolicies: [],
       showAgentActivityTour: {},
     };
-    const testBed = registerTestBed(TestComponent)(props);
-    const { exists } = testBed;
-
-    expect(exists('agentBulkActionsButton')).toBe(false);
+    const results = render(props);
+    expect(results.queryByTestId('agentBulkActionsButton')).toBeNull();
   });
 
   it('should show an Actions button when at least an agent is selected', async () => {
@@ -117,10 +91,8 @@ describe('SearchAndFilterBar', () => {
       selectedAgentPolicies: [],
       showAgentActivityTour: {},
     };
-    const testBed = registerTestBed(TestComponent)(props);
-    const { exists } = testBed;
-
-    expect(exists('agentBulkActionsButton')).not.toBeNull();
+    const results = render(props);
+    expect(results.queryByTestId('agentBulkActionsButton')).not.toBeNull();
   });
 
   it('should show an Actions button when agents selected in query mode', async () => {
@@ -139,9 +111,7 @@ describe('SearchAndFilterBar', () => {
       selectedAgentPolicies: [],
       showAgentActivityTour: {},
     };
-    const testBed = registerTestBed(TestComponent)(props);
-    const { exists } = testBed;
-
-    expect(exists('agentBulkActionsButton')).not.toBeNull();
+    const results = render(props);
+    expect(results.queryByTestId('agentBulkActionsButton')).not.toBeNull();
   });
 });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
index c9c527ba36e0a3..e66a579fdab7a6 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/search_and_filter_bar.tsx
@@ -37,7 +37,7 @@ const ClearAllTagsFilterItem = styled(EuiFilterSelectItem)`
   padding: ${(props) => props.theme.eui.euiSizeS};
 `;
 
-export const SearchAndFilterBar: React.FunctionComponent<{
+export interface SearchAndFilterBarProps {
   agentPolicies: AgentPolicy[];
   draftKuery: string;
   onDraftKueryChange: (kuery: string) => void;
@@ -62,7 +62,9 @@ export const SearchAndFilterBar: React.FunctionComponent<{
   visibleAgents: Agent[];
   onClickAgentActivity: () => void;
   showAgentActivityTour: { isOpen: boolean };
-}> = ({
+}
+
+export const SearchAndFilterBar: React.FunctionComponent<SearchAndFilterBarProps> = ({
   agentPolicies,
   draftKuery,
   onDraftKueryChange,
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.test.tsx
new file mode 100644
index 00000000000000..529bd41e4897eb
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.test.tsx
@@ -0,0 +1,131 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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/dom';
+
+import { createFleetTestRendererMock } from '../../../../../../mock';
+import type { Agent, AgentPolicy } from '../../../../types';
+import { ExperimentalFeaturesService } from '../../../../services';
+import { useAuthz } from '../../../../../../hooks/use_authz';
+
+import { TableRowActions } from './table_row_actions';
+
+jest.mock('../../../../../../services/experimental_features');
+jest.mock('../../../../../../hooks/use_authz');
+
+const mockedExperimentalFeaturesService = jest.mocked(ExperimentalFeaturesService);
+const mockedUseAuthz = jest.mocked(useAuthz);
+
+function renderTableRowActions({
+  agent,
+  agentPolicy,
+}: {
+  agent: Agent;
+  agentPolicy?: AgentPolicy;
+}) {
+  const renderer = createFleetTestRendererMock();
+
+  const utils = renderer.render(
+    <TableRowActions
+      agent={agent}
+      agentPolicy={agentPolicy}
+      onAddRemoveTagsClick={jest.fn()}
+      onReassignClick={jest.fn()}
+      onRequestDiagnosticsClick={jest.fn()}
+      onUnenrollClick={jest.fn()}
+      onUpgradeClick={jest.fn}
+    />
+  );
+
+  fireEvent.click(utils.getByTestId('agentActionsBtn'));
+
+  return { utils };
+}
+describe('TableRowActions', () => {
+  beforeEach(() => {
+    mockedExperimentalFeaturesService.get.mockReturnValue({
+      diagnosticFileUploadEnabled: true,
+    } as any);
+    mockedUseAuthz.mockReturnValue({
+      fleet: {
+        all: true,
+      },
+    } as any);
+  });
+
+  describe('Request Diagnotics action', () => {
+    function renderAndGetDiagnosticsButton({
+      agent,
+      agentPolicy,
+    }: {
+      agent: Agent;
+      agentPolicy?: AgentPolicy;
+    }) {
+      const { utils } = renderTableRowActions({
+        agent,
+        agentPolicy,
+      });
+
+      return utils.queryByTestId('requestAgentDiagnosticsBtn');
+    }
+
+    it('should not render action if feature is disabled', async () => {
+      mockedExperimentalFeaturesService.get.mockReturnValue({
+        diagnosticFileUploadEnabled: false,
+      } as any);
+      const res = renderAndGetDiagnosticsButton({
+        agent: {} as Agent,
+        agentPolicy: {} as AgentPolicy,
+      });
+      expect(res).toBe(null);
+    });
+
+    it('should render an active action button if agent version >= 8.7', async () => {
+      const res = renderAndGetDiagnosticsButton({
+        agent: {
+          status: 'online',
+          local_metadata: { elastic: { agent: { version: '8.8.0' } } },
+        } as any,
+        agentPolicy: {} as AgentPolicy,
+      });
+
+      expect(res).not.toBe(null);
+      expect(res).toBeEnabled();
+    });
+
+    it('should render an active action button if agent version >= 8.7 and policy is_managed', async () => {
+      const res = renderAndGetDiagnosticsButton({
+        agent: {
+          status: 'online',
+          local_metadata: { elastic: { agent: { version: '8.8.0' } } },
+        } as any,
+        agentPolicy: {
+          is_managed: true,
+        } as AgentPolicy,
+      });
+
+      expect(res).not.toBe(null);
+      expect(res).toBeEnabled();
+    });
+
+    it('should render a disabled action button if agent version < 8.7', async () => {
+      const res = renderAndGetDiagnosticsButton({
+        agent: {
+          status: 'online',
+          local_metadata: { elastic: { agent: { version: '8.6.0' } } },
+        } as any,
+        agentPolicy: {
+          is_managed: true,
+        } as AgentPolicy,
+      });
+
+      expect(res).not.toBe(null);
+      expect(res).not.toBeEnabled();
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.tsx
index 243eabadcf3b75..e3e56ed2696af2 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/table_row_actions.tsx
@@ -80,6 +80,7 @@ export const TableRowActions: React.FunctionComponent<{
         />
       </EuiContextMenuItem>,
       <EuiContextMenuItem
+        key="agentUnenrollBtn"
         disabled={!hasFleetAllPrivileges || !agent.active}
         icon="trash"
         onClick={() => {
@@ -99,6 +100,7 @@ export const TableRowActions: React.FunctionComponent<{
         )}
       </EuiContextMenuItem>,
       <EuiContextMenuItem
+        key="agentUpgradeBtn"
         icon="refresh"
         disabled={!isAgentUpgradeable(agent, kibanaVersion)}
         onClick={() => {
@@ -111,24 +113,27 @@ export const TableRowActions: React.FunctionComponent<{
         />
       </EuiContextMenuItem>
     );
+  }
 
-    if (diagnosticFileUploadEnabled) {
-      menuItems.push(
-        <EuiContextMenuItem
-          icon="download"
-          disabled={!hasFleetAllPrivileges || !isAgentRequestDiagnosticsSupported(agent)}
-          onClick={() => {
-            onRequestDiagnosticsClick();
-          }}
-        >
-          <FormattedMessage
-            id="xpack.fleet.agentList.diagnosticsOneButton"
-            defaultMessage="Request diagnostics .zip"
-          />
-        </EuiContextMenuItem>
-      );
-    }
+  if (diagnosticFileUploadEnabled) {
+    menuItems.push(
+      <EuiContextMenuItem
+        key="requestAgentDiagnosticsBtn"
+        icon="download"
+        data-test-subj="requestAgentDiagnosticsBtn"
+        disabled={!hasFleetAllPrivileges || !isAgentRequestDiagnosticsSupported(agent)}
+        onClick={() => {
+          onRequestDiagnosticsClick();
+        }}
+      >
+        <FormattedMessage
+          id="xpack.fleet.agentList.diagnosticsOneButton"
+          defaultMessage="Request diagnostics .zip"
+        />
+      </EuiContextMenuItem>
+    );
   }
+
   return (
     <ContextMenuActions
       isOpen={isMenuOpen}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/hooks.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/hooks.test.tsx
index 3f4fcea3ca5f77..8aea16559058a6 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/hooks.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/hooks.test.tsx
@@ -12,13 +12,6 @@ import { createFleetTestRendererMock } from '../../../../../../mock';
 
 import { useScheduleDateTime } from './hooks';
 
-jest.mock('../../../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-  useFleetStatus: jest.fn().mockReturnValue({}),
-}));
-
 describe('useScheduleDateTime', () => {
   it('do not allow to set a date before the current time', async () => {
     const renderer = createFleetTestRendererMock();
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
index 393b6519fc6c10..78619b976c49fc 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx
@@ -14,13 +14,6 @@ import { createFleetTestRendererMock } from '../../../../../../mock';
 import { AgentUpgradeAgentModal } from '.';
 import type { AgentUpgradeAgentModalProps } from '.';
 
-jest.mock('../../../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-  useFleetStatus: jest.fn().mockReturnValue({}),
-}));
-
 jest.mock('@elastic/eui', () => {
   return {
     ...jest.requireActual('@elastic/eui'),
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.test.tsx
index 20db1fc804d11d..30ac08e0981a7c 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.test.tsx
@@ -14,9 +14,7 @@ import { useAuthz } from '../../../../hooks/use_authz';
 import { AgentsApp } from '.';
 
 jest.mock('../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
+  ...jest.requireActual('../../../../hooks/use_fleet_status'),
   useFleetStatus: jest.fn().mockReturnValue({}),
 }));
 jest.mock('../../../../hooks/use_request/settings');
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/download_source_flyout/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/download_source_flyout/index.test.tsx
index 464d0601ced2b6..1c7b1a28d560f4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/download_source_flyout/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/settings/components/download_source_flyout/index.test.tsx
@@ -12,13 +12,6 @@ import { createFleetTestRendererMock } from '../../../../../../mock';
 
 import { EditDownloadSourceFlyout } from '.';
 
-jest.mock('../../../../../../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-  useFleetStatus: jest.fn().mockReturnValue({}),
-}));
-
 function renderFlyout(downloadSource?: DownloadSource) {
   const renderer = createFleetTestRendererMock();
 
diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
index 68b40589d0b8ef..bac899a06a9e66 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -26,6 +26,7 @@ import type { FleetConfigType, FleetStartServices } from '../../plugin';
 import {
   ConfigContext,
   FleetStatusProvider,
+  type FleetStatusProviderProps,
   KibanaVersionContext,
   useFleetStatus,
 } from '../../hooks';
@@ -61,6 +62,7 @@ export const IntegrationsAppContext: React.FC<{
   theme$: AppMountParameters['theme$'];
   /** For testing purposes only */
   routerHistory?: History<any>; // TODO remove
+  fleetStatus?: FleetStatusProviderProps;
 }> = memo(
   ({
     children,
@@ -71,6 +73,7 @@ export const IntegrationsAppContext: React.FC<{
     extensions,
     setHeaderActionMenu,
     theme$,
+    fleetStatus,
   }) => {
     const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
     const CloudContext = startServices.cloud?.CloudContextProvider || EmptyContext;
@@ -87,7 +90,7 @@ export const IntegrationsAppContext: React.FC<{
                       <QueryClientProvider client={queryClient}>
                         <ReactQueryDevtools initialIsOpen={false} />
                         <UIExtensionsContext.Provider value={extensions}>
-                          <FleetStatusProvider>
+                          <FleetStatusProvider defaultFleetStatus={fleetStatus}>
                             <startServices.customIntegrations.ContextProvider>
                               <CloudContext>
                                 <Router history={history}>
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
index a64425d28ae046..63a621f166520f 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
@@ -46,6 +46,7 @@ describe('when on integration detail', () => {
   let testRenderer: TestRenderer;
   let renderResult: ReturnType<typeof testRenderer.render>;
   let mockedApi: MockedApi<EpmPackageDetailsResponseProvidersMock>;
+
   const render = async () => {
     await act(async () => {
       renderResult = testRenderer.render(
@@ -67,16 +68,15 @@ describe('when on integration detail', () => {
   });
 
   describe('and the package is installed', () => {
-    beforeEach(async () => render());
+    beforeEach(async () => await render());
 
     it('should display agent policy usage count', async () => {
       await act(() => mockedApi.waitForApi());
-
       expect(renderResult.queryByTestId('agentPolicyCount')).not.toBeNull();
     });
 
     it('should show the Policies tab', async () => {
-      await mockedApi.waitForApi();
+      await act(() => mockedApi.waitForApi());
       expect(renderResult.queryByTestId('tab-policies')).not.toBeNull();
     });
   });
@@ -85,6 +85,7 @@ describe('when on integration detail', () => {
     const unInstalledPackage = mockedApi.responseProvider.epmGetInfo('nginx');
     unInstalledPackage.item.status = 'not_installed';
     unInstalledPackage.item.version = pkgVersion;
+
     mockedApi.responseProvider.epmGetInfo.mockImplementation((name, version, query) => {
       if (query?.prerelease === false) {
         const gaPackage = { item: { ...unInstalledPackage.item } };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.tsx
similarity index 83%
rename from x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts
rename to x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.tsx
index 661c72fbc51183..8f9b13671ce65d 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.ts
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.mocks.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import React from 'react';
 // TODO(jbudz): should be removed when upgrading to TS@4.8
 // this is a skip for the errors created when typechecking with isolatedModules
 export {};
@@ -12,7 +13,6 @@ export {};
 jest.mock('../../hooks', () => {
   return {
     ...jest.requireActual('../../hooks'),
-    useFleetStatus: jest.fn(),
     useFleetServerStandalone: jest.fn(),
     useAgentEnrollmentFlyoutData: jest.fn(),
   };
@@ -96,14 +96,28 @@ jest.mock('./steps', () => {
     AgentPolicySelectionStep: jest.fn().mockReturnValue({
       'data-test-subj': 'agent-policy-selection-step',
       title: 'agent-policy-selection-step',
+      children: <>TEST</>,
     }),
     AgentEnrollmentKeySelectionStep: jest.fn().mockReturnValue({
       'data-test-subj': 'agent-enrollment-key-selection-step',
       title: 'agent-enrollment-key-selection-step',
+      children: <>TEST</>,
+    }),
+    ConfigureStandaloneAgentStep: jest.fn().mockReturnValue({
+      'data-test-subj': 'configure-standalone-step',
+      title: 'configure-standalone-step',
+      children: <>TEST</>,
+    }),
+    DownloadStep: jest.fn().mockReturnValue({
+      'data-test-subj': 'download-step',
+      title: 'download-step',
+      children: <>TEST</>,
+    }),
+    IncomingDataConfirmationStep: jest.fn().mockReturnValue({
+      'data-test-subj': 'incoming-data-confirmation-step',
+      title: 'incoming-data-confirmation-step',
+      children: <>TEST</>,
     }),
-    DownloadStep: jest
-      .fn()
-      .mockReturnValue({ 'data-test-subj': 'download-step', title: 'download-step' }),
   };
 });
 
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
index b2a070ac93c55e..5f6d46e5e2573b 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
@@ -8,27 +8,17 @@
 import './agent_enrollment_flyout.test.mocks';
 
 import React from 'react';
-import { registerTestBed } from '@kbn/test-jest-helpers';
-import { act } from '@testing-library/react';
-
-import { coreMock } from '@kbn/core/public/mocks';
-
-import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { act, cleanup, fireEvent, waitFor } from '@testing-library/react';
+import type { RenderResult } from '@testing-library/react';
 
+import { createFleetTestRendererMock } from '../../mock';
 import type { AgentPolicy } from '../../../common';
 import {
   useGetFleetServerHosts,
   sendGetOneAgentPolicy,
   useGetAgents,
 } from '../../hooks/use_request';
-import {
-  FleetStatusProvider,
-  ConfigContext,
-  useAgentEnrollmentFlyoutData,
-  KibanaVersionContext,
-  useFleetStatus,
-  useFleetServerStandalone,
-} from '../../hooks';
+import { useAgentEnrollmentFlyoutData, useFleetServerStandalone } from '../../hooks';
 
 import { useAdvancedForm } from '../../applications/fleet/components/fleet_server_instructions/hooks';
 import { useFleetServerUnhealthy } from '../../applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy';
@@ -36,36 +26,13 @@ import { useFleetServerUnhealthy } from '../../applications/fleet/sections/agent
 import type { FlyOutProps } from './types';
 import { AgentEnrollmentFlyout } from '.';
 
-const TestComponent = (props: FlyOutProps) => (
-  <KibanaContextProvider services={coreMock.createStart()}>
-    <ConfigContext.Provider value={{ agents: { enabled: true, elasticsearch: {} }, enabled: true }}>
-      <KibanaVersionContext.Provider value={'8.1.0'}>
-        <FleetStatusProvider>
-          <AgentEnrollmentFlyout {...props} />
-        </FleetStatusProvider>
-      </KibanaVersionContext.Provider>
-    </ConfigContext.Provider>
-  </KibanaContextProvider>
-);
-
-const setup = (props?: FlyOutProps) => {
-  const testBed = registerTestBed(TestComponent)(props);
-  const { find, component } = testBed;
-
-  return {
-    ...testBed,
-    actions: {
-      goToStandaloneTab: () =>
-        act(() => {
-          find('agentEnrollmentFlyout.standaloneTab').simulate('click');
-          component.update();
-        }),
-    },
-  };
-};
+const render = (props?: Partial<FlyOutProps>) => {
+  cleanup();
+  const renderer = createFleetTestRendererMock();
+  const results = renderer.render(<AgentEnrollmentFlyout onClose={jest.fn()} {...props} />);
 
-type SetupReturn = ReturnType<typeof setup>;
-type TestBed = SetupReturn extends Promise<infer U> ? U : SetupReturn;
+  return results;
+};
 
 const testAgentPolicy: AgentPolicy = {
   id: 'test',
@@ -80,9 +47,9 @@ const testAgentPolicy: AgentPolicy = {
 };
 
 describe('<AgentEnrollmentFlyout />', () => {
-  let testBed: TestBed;
+  let results: RenderResult;
 
-  beforeEach(() => {
+  beforeEach(async () => {
     (useGetFleetServerHosts as jest.Mock).mockReturnValue({
       data: {
         items: [
@@ -95,7 +62,6 @@ describe('<AgentEnrollmentFlyout />', () => {
     });
     jest.mocked(useFleetServerStandalone).mockReturnValue({ isFleetServerStandalone: false });
 
-    (useFleetStatus as jest.Mock).mockReturnValue({ isReady: true });
     (useFleetServerUnhealthy as jest.Mock).mockReturnValue({
       isLoading: false,
       isUnhealthy: false,
@@ -135,10 +101,7 @@ describe('<AgentEnrollmentFlyout />', () => {
     });
 
     act(() => {
-      testBed = setup({
-        onClose: jest.fn(),
-      });
-      testBed.component.update();
+      results = render();
     });
   });
 
@@ -153,98 +116,93 @@ describe('<AgentEnrollmentFlyout />', () => {
       isLoadingInitialAgentPolicies: true,
     });
 
-    act(() => {
-      testBed = setup({
-        onClose: jest.fn(),
-      });
-      testBed.component.update();
-    });
+    results = render();
 
-    const { exists } = testBed;
-    expect(exists('agentEnrollmentFlyout')).toBe(true);
-    expect(exists('loadingSpinner')).toBe(true);
+    expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+    expect(results.queryByTestId('loadingSpinner')).not.toBeNull();
   });
 
   describe('managed instructions', () => {
     it('uses the agent policy selection step', () => {
-      const { exists } = testBed;
-      expect(exists('agentEnrollmentFlyout')).toBe(true);
-      expect(exists('agent-policy-selection-step')).toBe(true);
-      expect(exists('agent-enrollment-key-selection-step')).toBe(false);
+      expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+      expect(results.queryByTestId('agent-policy-selection-step')).not.toBeNull();
+      expect(results.queryByTestId('agent-enrollment-key-selection-step')).toBeNull();
     });
 
     describe('with a specific policy', () => {
-      beforeEach(() => {
-        jest.clearAllMocks();
-        act(() => {
-          testBed = setup({
-            agentPolicy: testAgentPolicy,
-            onClose: jest.fn(),
-          });
-          testBed.component.update();
+      beforeEach(async () => {
+        results = render({
+          agentPolicy: testAgentPolicy,
+        });
+        await waitFor(() => {
+          expect(sendGetOneAgentPolicy).toBeCalled();
         });
       });
 
       it('uses the configure enrollment step, not the agent policy selection step', () => {
-        const { exists } = testBed;
-        expect(exists('agentEnrollmentFlyout')).toBe(true);
-        expect(exists('agent-policy-selection-step')).toBe(false);
-        expect(exists('agent-enrollment-key-selection-step')).toBe(true);
+        expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+        expect(results.queryByTestId('agent-policy-selection-step')).toBeNull();
+        expect(results.queryByTestId('agent-enrollment-key-selection-step')).not.toBeNull();
       });
     });
 
     describe('with a specific policy when no agentPolicies set', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         jest.clearAllMocks();
-        act(() => {
-          testBed = setup({
-            agentPolicy: testAgentPolicy,
-            onClose: jest.fn(),
-          });
-          testBed.component.update();
+        results = render({
+          agentPolicy: testAgentPolicy,
+        });
+        await waitFor(() => {
+          expect(sendGetOneAgentPolicy).toBeCalled();
         });
       });
 
       it('should not show fleet server instructions', () => {
-        const { exists } = testBed;
-        expect(exists('agentEnrollmentFlyout')).toBe(true);
-        expect(exists('agent-enrollment-key-selection-step')).toBe(true);
+        expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+        expect(results.queryByTestId('agent-enrollment-key-selection-step')).not.toBeNull();
       });
     });
 
-    // Skipped due to UI changing in https://github.com/elastic/kibana/issues/125534. These tests should be rethought overall
-    // to provide value around the new flyout structure
-    describe.skip('standalone instructions', () => {
+    describe('standalone instructions', () => {
+      function goToStandaloneTab() {
+        act(() => {
+          fireEvent.click(results.getByTestId('standaloneTab'));
+        });
+      }
+
+      beforeEach(() => {
+        results = render({
+          isIntegrationFlow: true,
+        });
+      });
+
       it('uses the agent policy selection step', async () => {
-        const { exists, actions } = testBed;
-        actions.goToStandaloneTab();
+        goToStandaloneTab();
 
-        expect(exists('agentEnrollmentFlyout')).toBe(true);
-        expect(exists('agent-policy-selection-step')).toBe(true);
-        expect(exists('agent-enrollment-key-selection-step')).toBe(false);
+        expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+        expect(results.queryByTestId('agent-policy-selection-step')).not.toBeNull();
+        expect(results.queryByTestId('agent-enrollment-key-selection-step')).toBeNull();
+        expect(results.queryByTestId('configure-standalone-step')).not.toBeNull();
       });
 
       describe('with a specific policy', () => {
-        beforeEach(() => {
-          jest.clearAllMocks();
-          act(() => {
-            testBed = setup({
-              agentPolicy: testAgentPolicy,
-              onClose: jest.fn(),
-            });
-            testBed.component.update();
+        beforeEach(async () => {
+          results = render({
+            isIntegrationFlow: true,
+            agentPolicy: testAgentPolicy,
+          });
+          await waitFor(() => {
+            expect(sendGetOneAgentPolicy).toBeCalled();
           });
         });
 
         it('does not use either of the agent policy selection or enrollment key steps', () => {
-          const { exists, actions } = testBed;
-          jest.clearAllMocks();
-
-          actions.goToStandaloneTab();
+          goToStandaloneTab();
 
-          expect(exists('agentEnrollmentFlyout')).toBe(true);
-          expect(exists('agent-policy-selection-step')).toBe(false);
-          expect(exists('agent-enrollment-key-selection-step')).toBe(false);
+          expect(results.queryByTestId('agentEnrollmentFlyout')).not.toBeNull();
+          expect(results.queryByTestId('agent-policy-selection-step')).toBeNull();
+          expect(results.queryByTestId('agent-enrollment-key-selection-step')).toBeNull();
+          expect(results.queryByTestId('configure-standalone-step')).not.toBeNull();
         });
       });
     });
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
index ad2a5339aeea1e..3a965d9f4e81ff 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/instructions.tsx
@@ -62,9 +62,6 @@ export const Instructions = (props: InstructionProps) => {
 
   const fleetServers = agents?.items || [];
 
-  if (isLoadingAgents || isLoadingAgentPolicies || isLoadingFleetServerHealth)
-    return <Loading size="l" />;
-
   const hasNoFleetServerHost = fleetStatus.isReady && (fleetServerHosts?.length ?? 0) === 0;
 
   const showAgentEnrollment =
@@ -81,12 +78,16 @@ export const Instructions = (props: InstructionProps) => {
     (fleetServers.length === 0 ||
       isFleetServerUnhealthy ||
       (fleetStatus.missingRequirements ?? []).some((r) => r === FLEET_SERVER_PACKAGE));
+  useEffect(() => {
+    if (!isIntegrationFlow && showAgentEnrollment) {
+      setSelectionType('radio');
+    } else {
+      setSelectionType('tabs');
+    }
+  }, [isIntegrationFlow, showAgentEnrollment, setSelectionType]);
 
-  if (!isIntegrationFlow && showAgentEnrollment) {
-    setSelectionType('radio');
-  } else {
-    setSelectionType('tabs');
-  }
+  if (isLoadingAgents || isLoadingAgentPolicies || isLoadingFleetServerHealth)
+    return <Loading size="l" />;
 
   if (hasNoFleetServerHost) {
     return null;
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
index 997efe59c8fe68..8274939da374fc 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/install_managed_agent_step.tsx
@@ -46,15 +46,18 @@ export const InstallManagedAgentStep = ({
     title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
       defaultMessage: 'Install Elastic Agent on your host',
     }),
-    children: selectedApiKeyId && apiKeyData && (
-      <InstallSection
-        installCommand={installCommand}
-        isK8s={isK8s}
-        enrollToken={enrollToken}
-        onCopy={onCopy}
-        fullCopyButton={fullCopyButton}
-        cloudFormationTemplateUrl={cloudFormationTemplateUrl}
-      />
-    ),
+    children:
+      selectedApiKeyId && apiKeyData ? (
+        <InstallSection
+          installCommand={installCommand}
+          isK8s={isK8s}
+          enrollToken={enrollToken}
+          onCopy={onCopy}
+          fullCopyButton={fullCopyButton}
+          cloudFormationTemplateUrl={cloudFormationTemplateUrl}
+        />
+      ) : (
+        <React.Fragment />
+      ),
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
index c5213f061bceb1..17dc6df6926ba5 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
@@ -86,6 +86,8 @@ export const InstallationModeSelectionStep = ({
         onChange={onChangeCallback}
         name={`radio group ${radioSuffix}`}
       />
-    ) : null,
+    ) : (
+      <React.Fragment />
+    ),
   };
 };
diff --git a/x-pack/plugins/fleet/public/components/link_and_revision.test.tsx b/x-pack/plugins/fleet/public/components/link_and_revision.test.tsx
index f2d0a8970cfa37..46fdfe69c63bdc 100644
--- a/x-pack/plugins/fleet/public/components/link_and_revision.test.tsx
+++ b/x-pack/plugins/fleet/public/components/link_and_revision.test.tsx
@@ -14,13 +14,6 @@ import type { AgentPolicy, Agent } from '../types';
 
 import { AgentPolicySummaryLine } from './link_and_revision';
 
-jest.mock('../hooks/use_fleet_status', () => ({
-  FleetStatusProvider: (props: any) => {
-    return props.children;
-  },
-  useFleetStatus: jest.fn().mockReturnValue({}),
-}));
-
 describe('AgentPolicySummaryLine', () => {
   let testRenderer: TestRenderer;
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx b/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx
index d0f3414a4d0161..62c1a8f814f2a9 100644
--- a/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx
+++ b/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx
@@ -12,7 +12,7 @@ import type { GetFleetStatusResponse } from '../types';
 import { useConfig } from './use_config';
 import { sendGetFleetStatus } from './use_request';
 
-interface FleetStatusState {
+export interface FleetStatusProviderProps {
   enabled: boolean;
   isLoading: boolean;
   isReady: boolean;
@@ -21,7 +21,7 @@ interface FleetStatusState {
   missingOptionalFeatures?: GetFleetStatusResponse['missing_optional_features'];
 }
 
-interface FleetStatus extends FleetStatusState {
+interface FleetStatus extends FleetStatusProviderProps {
   refresh: () => Promise<void>;
 
   // This flag allows us to opt into displaying the Fleet Server enrollment instructions even if
@@ -33,15 +33,19 @@ interface FleetStatus extends FleetStatusState {
 
 const FleetStatusContext = React.createContext<FleetStatus | undefined>(undefined);
 
-export const FleetStatusProvider: React.FC = ({ children }) => {
+export const FleetStatusProvider: React.FC<{
+  defaultFleetStatus?: FleetStatusProviderProps;
+}> = ({ defaultFleetStatus, children }) => {
   const config = useConfig();
   const [forceDisplayInstructions, setForceDisplayInstructions] = useState(false);
 
-  const [state, setState] = useState<FleetStatusState>({
-    enabled: config.agents.enabled,
-    isLoading: false,
-    isReady: false,
-  });
+  const [state, setState] = useState<FleetStatusProviderProps>(
+    defaultFleetStatus ?? {
+      enabled: config.agents.enabled,
+      isLoading: false,
+      isReady: false,
+    }
+  );
 
   // TODO: Refactor to use react-query
   const sendGetStatus = useCallback(
@@ -68,8 +72,10 @@ export const FleetStatusProvider: React.FC = ({ children }) => {
   );
 
   useEffect(() => {
-    sendGetStatus();
-  }, [sendGetStatus]);
+    if (!defaultFleetStatus) {
+      sendGetStatus();
+    }
+  }, [sendGetStatus, defaultFleetStatus]);
 
   const refresh = useCallback(() => sendGetStatus(), [sendGetStatus]);
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_request/epm.ts b/x-pack/plugins/fleet/public/hooks/use_request/epm.ts
index f050820508d98b..c1cd11f6a8092d 100644
--- a/x-pack/plugins/fleet/public/hooks/use_request/epm.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/epm.ts
@@ -204,7 +204,9 @@ export const sendInstallPackage = (pkgName: string, pkgVersion: string, force: b
   });
 };
 
-export const sendBulkInstallPackages = (packages: string[]) => {
+export const sendBulkInstallPackages = (
+  packages: Array<string | { name: string; version: string }>
+) => {
   return sendRequest<InstallPackageResponse, FleetErrorResponse>({
     path: epmRouteService.getBulkInstallPath(),
     method: 'post',
diff --git a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
index 778dcdb32bc475..f0861582fd65f8 100644
--- a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
+++ b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
@@ -96,6 +96,11 @@ export const createFleetTestRendererMock = (): TestRenderer => {
           extensions={extensions}
           routerHistory={testRendererMocks.history}
           theme$={themeServiceMock.createTheme$()}
+          fleetStatus={{
+            enabled: true,
+            isLoading: false,
+            isReady: true,
+          }}
         >
           {children}
         </FleetAppContext>
@@ -156,6 +161,11 @@ export const createIntegrationsTestRendererMock = (): TestRenderer => {
           routerHistory={testRendererMocks.history}
           theme$={themeServiceMock.createTheme$()}
           setHeaderActionMenu={() => {}}
+          fleetStatus={{
+            enabled: true,
+            isLoading: false,
+            isReady: true,
+          }}
         >
           {children}
         </IntegrationsAppContext>
diff --git a/x-pack/plugins/fleet/server/routes/message_signing_service/handlers.test.ts b/x-pack/plugins/fleet/server/routes/message_signing_service/handlers.test.ts
index b20a29121f81b1..d9987f325338b8 100644
--- a/x-pack/plugins/fleet/server/routes/message_signing_service/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/message_signing_service/handlers.test.ts
@@ -10,7 +10,7 @@ import { httpServerMock, coreMock } from '@kbn/core/server/mocks';
 import type { KibanaRequest } from '@kbn/core/server';
 
 import { createAppContextStartContractMock, xpackMocks } from '../../mocks';
-import { appContextService } from '../../services/app_context';
+import { appContextService } from '../../services';
 import type { FleetRequestHandlerContext } from '../../types';
 
 import { rotateKeyPairHandler } from './handlers';
@@ -44,27 +44,12 @@ describe('FleetMessageSigningServiceHandler', () => {
     appContextService.stop();
   });
 
-  it('POST /message_signing_service/rotate_key_pair?acknowledge=true succeeds with an 200 with `acknowledge=true`', async () => {
-    (appContextService.getMessageSigningService()?.rotateKeyPair as jest.Mock).mockReturnValue(
-      true
-    );
-
-    await rotateKeyPairHandler(
-      coreMock.createCustomRequestHandlerContext(context),
-      request,
-      response
-    );
-    expect(response.ok).toHaveBeenCalledWith({
-      body: {
-        message: 'Key pair rotated successfully.',
-      },
+  it(`POST /message_signing_service/rotate_key_pair?acknowledge=true fails with an 500 with "acknowledge=true" when no messaging service`, async () => {
+    appContextService.start({
+      ...createAppContextStartContractMock(),
+      // @ts-expect-error
+      messageSigningService: undefined,
     });
-  });
-
-  it(`POST /message_signing_service/rotate_key_pair?acknowledge=true fails with an 500 with "acknowledge=true" when rotateKeyPair doesn't succeed`, async () => {
-    (appContextService.getMessageSigningService()?.rotateKeyPair as jest.Mock).mockReturnValue(
-      false
-    );
 
     await rotateKeyPairHandler(
       coreMock.createCustomRequestHandlerContext(context),
@@ -74,26 +59,49 @@ describe('FleetMessageSigningServiceHandler', () => {
     expect(response.customError).toHaveBeenCalledWith({
       statusCode: 500,
       body: {
-        message: 'Failed to rotate key pair!',
+        message: 'Failed to rotate key pair. Message signing service is unavailable!',
       },
     });
   });
 
-  it(`POST /message_signing_service/rotate_key_pair?acknowledge=true fails with an 500 with "acknowledge=true" when no messaging service`, async () => {
-    (appContextService.getMessageSigningService()?.rotateKeyPair as jest.Mock).mockReturnValue(
-      undefined
-    );
-
+  it('POST /message_signing_service/rotate_key_pair?acknowledge=true succeeds with `acknowledge=true`', async () => {
     await rotateKeyPairHandler(
       coreMock.createCustomRequestHandlerContext(context),
       request,
       response
     );
-    expect(response.customError).toHaveBeenCalledWith({
-      statusCode: 500,
+    expect(response.ok).toHaveBeenCalledWith({
       body: {
-        message: 'Failed to rotate key pair!',
+        message: 'Key pair rotated successfully.',
       },
     });
   });
+
+  it.each([
+    'foo',
+    Error('do not show this').message,
+    Error(JSON.stringify({ not: 'even this' })).message,
+  ])(
+    'POST /message_signing_service/rotate_key_pair?acknowledge=true throws only a generic 500 error if rotate fails with error `%s`',
+    async (error) => {
+      // specific error
+      (appContextService.getMessageSigningService()?.rotateKeyPair as jest.Mock).mockRejectedValue(
+        Error(error)
+      );
+
+      await rotateKeyPairHandler(
+        coreMock.createCustomRequestHandlerContext(context),
+        request,
+        response
+      );
+
+      // API shows generic error
+      expect(response.customError).toHaveBeenCalledWith({
+        statusCode: 500,
+        body: {
+          message: 'Failed to rotate key pair!',
+        },
+      });
+    }
+  );
 });
diff --git a/x-pack/plugins/fleet/server/routes/message_signing_service/handlers.ts b/x-pack/plugins/fleet/server/routes/message_signing_service/handlers.ts
index 18a00ca86fdd89..7e2acdb5171a8f 100644
--- a/x-pack/plugins/fleet/server/routes/message_signing_service/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/message_signing_service/handlers.ts
@@ -18,25 +18,29 @@ export const rotateKeyPairHandler: FleetRequestHandler<
   TypeOf<typeof RotateKeyPairSchema.query>,
   undefined
 > = async (_, __, response) => {
+  const logger = appContextService.getLogger();
+  const messageSigningService = appContextService.getMessageSigningService();
+  if (!messageSigningService) {
+    const errorMessage = 'Failed to rotate key pair. Message signing service is unavailable!';
+    logger.error(errorMessage);
+    return response.customError({
+      statusCode: 500,
+      body: {
+        message: errorMessage,
+      },
+    });
+  }
+
   try {
-    const rotateKeyPairResponse = await appContextService
-      .getMessageSigningService()
-      ?.rotateKeyPair();
+    await messageSigningService.rotateKeyPair();
 
-    if (!rotateKeyPairResponse) {
-      return response.customError({
-        statusCode: 500,
-        body: {
-          message: 'Failed to rotate key pair!',
-        },
-      });
-    }
     return response.ok({
       body: {
         message: 'Key pair rotated successfully.',
       },
     });
   } catch (error) {
-    return defaultFleetErrorHandler({ error, response });
+    logger.error(error);
+    return defaultFleetErrorHandler({ error: new Error('Failed to rotate key pair!'), response });
   }
 };
diff --git a/x-pack/plugins/fleet/server/services/security/message_signing_service.test.ts b/x-pack/plugins/fleet/server/services/security/message_signing_service.test.ts
index 6503f2f08d566c..cb4288cd314884 100644
--- a/x-pack/plugins/fleet/server/services/security/message_signing_service.test.ts
+++ b/x-pack/plugins/fleet/server/services/security/message_signing_service.test.ts
@@ -14,7 +14,7 @@ import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/s
 
 import { MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE } from '../../constants';
 import { createAppContextStartContractMock } from '../../mocks';
-import { appContextService } from '../app_context';
+import { appContextService } from '..';
 
 import {
   type MessageSigningServiceInterface,
@@ -108,7 +108,7 @@ describe('MessageSigningService', () => {
     it('can correctly rotate existing key pair', async () => {
       mockCreatePointInTimeFinderAsInternalUserOnce([keyPairObj]);
 
-      const rotateKeyPairResponse = await messageSigningService.rotateKeyPair();
+      await messageSigningService.rotateKeyPair();
 
       expect(soClientMock.delete).toBeCalledWith(
         MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE,
@@ -119,8 +119,60 @@ describe('MessageSigningService', () => {
         public_key: expect.any(String),
         passphrase: expect.any(String),
       });
+    });
+
+    it('does not generate key pair on rotation if no key pair exists', async () => {
+      // no previous key pair
+      mockCreatePointInTimeFinderAsInternalUserOnce([]);
+
+      const response = messageSigningService.rotateKeyPair();
+      await expect(response).rejects.toThrowError(
+        'Error rotating key pair: Error fetching current key pair: No current key pair found!'
+      );
+    });
+
+    it('throws `getCurrentKeyPairObj` error if any on rotate', async () => {
+      mockCreatePointInTimeFinderAsInternalUserOnce([keyPairObj]);
+      // mock delete to throw
+      jest
+        .spyOn(messageSigningService, 'getCurrentKeyPairObj' as any)
+        .mockRejectedValue(Error('foo'));
+
+      const response = messageSigningService.rotateKeyPair();
+      await expect(response).rejects.toThrowError(
+        'Error rotating key pair: Error fetching current key pair: foo'
+      );
+    });
+
+    it('throws `soClient` `delete` error if any on rotate', async () => {
+      mockCreatePointInTimeFinderAsInternalUserOnce([keyPairObj]);
+      // mock delete to throw
+      soClientMock.delete.mockRejectedValue(Error('foo'));
+
+      const response = messageSigningService.rotateKeyPair();
+      await expect(response).rejects.toThrowError(
+        'Error rotating key pair: Error deleting current key pair: foo'
+      );
+    });
+
+    it('throws `soClient` `create` error if any on rotate', async () => {
+      mockCreatePointInTimeFinderAsInternalUserOnce([keyPairObj]);
+      // mock delete to throw
+      soClientMock.create.mockRejectedValue(Error('foo'));
+
+      const response = messageSigningService.rotateKeyPair();
+      await expect(response).rejects.toThrowError(
+        'Error rotating key pair: Error creating key pair: foo'
+      );
+    });
+
+    it('throws `generateKeyPair` error if any on rotate', async () => {
+      mockCreatePointInTimeFinderAsInternalUserOnce([keyPairObj]);
+      // mock delete to throw
+      messageSigningService.generateKeyPair = jest.fn().mockRejectedValue(Error('foo'));
 
-      expect(rotateKeyPairResponse).toEqual(true);
+      const response = messageSigningService.rotateKeyPair();
+      await expect(response).rejects.toThrowError('Error rotating key pair: foo');
     });
 
     it('does not generate key pair if one exists', async () => {
diff --git a/x-pack/plugins/fleet/server/services/security/message_signing_service.ts b/x-pack/plugins/fleet/server/services/security/message_signing_service.ts
index fc5583dec01d02..6fcf92c0aebe86 100644
--- a/x-pack/plugins/fleet/server/services/security/message_signing_service.ts
+++ b/x-pack/plugins/fleet/server/services/security/message_signing_service.ts
@@ -15,6 +15,8 @@ import type {
 import type { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
 import { SECURITY_EXTENSION_ID } from '@kbn/core-saved-objects-server';
 
+import { MessageSigningError } from '../../../common/errors';
+
 import { MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE } from '../../constants';
 import { appContextService } from '../app_context';
 
@@ -30,7 +32,7 @@ export interface MessageSigningServiceInterface {
   generateKeyPair(
     providedPassphrase?: string
   ): Promise<{ privateKey: string; publicKey: string; passphrase: string }>;
-  rotateKeyPair(): Promise<boolean>;
+  rotateKeyPair(): Promise<void>;
   sign(message: Buffer | Record<string, unknown>): Promise<{ data: Buffer; signature: string }>;
   getPublicKey(): Promise<string>;
 }
@@ -40,15 +42,13 @@ export class MessageSigningService implements MessageSigningServiceInterface {
 
   constructor(private esoClient: EncryptedSavedObjectsClient) {}
 
-  public get isEncryptionAvailable(): boolean {
+  public get isEncryptionAvailable(): MessageSigningServiceInterface['isEncryptionAvailable'] {
     return appContextService.getEncryptedSavedObjectsSetup()?.canEncrypt ?? false;
   }
 
-  public async generateKeyPair(providedPassphrase?: string): Promise<{
-    privateKey: string;
-    publicKey: string;
-    passphrase: string;
-  }> {
+  public async generateKeyPair(
+    providedPassphrase?: string
+  ): ReturnType<MessageSigningServiceInterface['generateKeyPair']> {
     const existingKeyPair = await this.checkForExistingKeyPair();
     if (existingKeyPair) {
       return existingKeyPair;
@@ -82,21 +82,25 @@ export class MessageSigningService implements MessageSigningServiceInterface {
         }
       : { ...keypairSoObject, passphrase_plain: passphrase };
 
-    await this.soClient.create<Partial<MessageSigningKeys>>(
-      MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE,
-      keypairSoObject
-    );
+    try {
+      await this.soClient.create<Partial<MessageSigningKeys>>(
+        MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE,
+        keypairSoObject
+      );
 
-    return {
-      privateKey,
-      publicKey,
-      passphrase,
-    };
+      return {
+        privateKey,
+        publicKey,
+        passphrase,
+      };
+    } catch (error) {
+      throw new MessageSigningError(`Error creating key pair: ${error.message}`, error);
+    }
   }
 
   public async sign(
     message: Buffer | Record<string, unknown>
-  ): Promise<{ data: Buffer; signature: string }> {
+  ): ReturnType<MessageSigningServiceInterface['sign']> {
     const { privateKey: serializedPrivateKey, passphrase } = await this.generateKeyPair();
 
     const msgBuffer = Buffer.isBuffer(message)
@@ -125,7 +129,7 @@ export class MessageSigningService implements MessageSigningServiceInterface {
     };
   }
 
-  public async getPublicKey(): Promise<string> {
+  public async getPublicKey(): ReturnType<MessageSigningServiceInterface['getPublicKey']> {
     const { publicKey } = await this.generateKeyPair();
 
     if (!publicKey) {
@@ -135,26 +139,34 @@ export class MessageSigningService implements MessageSigningServiceInterface {
     return publicKey;
   }
 
-  public async rotateKeyPair(): Promise<boolean> {
-    const isRemoved = await this.removeKeyPair();
-    if (isRemoved) {
+  public async rotateKeyPair(): ReturnType<MessageSigningServiceInterface['rotateKeyPair']> {
+    try {
+      await this.removeKeyPair();
       await this.generateKeyPair();
-      return true;
+    } catch (error) {
+      throw new MessageSigningError(`Error rotating key pair: ${error.message}`, error);
     }
-    return false;
-    // TODO: Apply changes to all policies
   }
 
-  private async removeKeyPair(): Promise<boolean> {
-    const currentKeyPair = await this.getCurrentKeyPairObj();
-    if (currentKeyPair) {
+  private async removeKeyPair(): Promise<void> {
+    let currentKeyPair: Awaited<ReturnType<typeof this.getCurrentKeyPairObj>>;
+    try {
+      currentKeyPair = await this.getCurrentKeyPairObj();
+      if (!currentKeyPair) {
+        throw new MessageSigningError('No current key pair found!');
+      }
+    } catch (error) {
+      throw new MessageSigningError(`Error fetching current key pair: ${error.message}`, error);
+    }
+
+    try {
       await this.soClient.delete(MESSAGE_SIGNING_KEYS_SAVED_OBJECT_TYPE, currentKeyPair.id);
-      return true;
+    } catch (error) {
+      throw new MessageSigningError(`Error deleting current key pair: ${error.message}`, error);
     }
-    return false;
   }
 
-  private get soClient() {
+  private get soClient(): SavedObjectsClientContract {
     if (this._soClient) {
       return this._soClient;
     }
diff --git a/x-pack/plugins/fleet/server/types/models/preconfiguration.ts b/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
index a8b121aa9c3745..65427544420f5a 100644
--- a/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
@@ -134,7 +134,7 @@ export const PreconfiguredAgentPoliciesSchema = schema.arrayOf(
               if (value === 'synthetics') {
                 return i18n.translate('xpack.fleet.config.disableSynthetics', {
                   defaultMessage:
-                    'Synthetics package is not supported via kibana.yml config. Please use synthetics app to create monitors in private locations. https://www.elastic.co/guide/en/observability/current/synthetics-private-location.html',
+                    'Synthetics package is not supported via kibana.yml config. Please use Synthetics App to create monitors in private locations. https://www.elastic.co/guide/en/observability/current/synthetics-private-location.html',
                 });
               }
             },
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/epm.ts b/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
index 56187c62025c6f..204183a056b1b6 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
@@ -134,7 +134,13 @@ export const BulkInstallPackagesFromRegistryRequestSchema = {
     prerelease: schema.maybe(schema.boolean()),
   }),
   body: schema.object({
-    packages: schema.arrayOf(schema.string(), { minSize: 1 }),
+    packages: schema.arrayOf(
+      schema.oneOf([
+        schema.string(),
+        schema.object({ name: schema.string(), version: schema.string() }),
+      ]),
+      { minSize: 1 }
+    ),
     force: schema.boolean({ defaultValue: false }),
   }),
 };
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.test.ts b/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.test.ts
index fa1f34164ea998..cc06bd5acae5ec 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.test.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { RotateKeyPairSchema } from './message_signing_service';
+import { errorMessage, RotateKeyPairSchema } from './message_signing_service';
 
 describe('RotateKeyPairSchema', () => {
   it('should throw on `false` values for acknowledge', () => {
@@ -13,15 +13,11 @@ describe('RotateKeyPairSchema', () => {
       RotateKeyPairSchema.query.validate({
         acknowledge: false,
       })
-    ).toThrowError(
-      'You must acknowledge the risks of rotating the key pair with acknowledge=true in the request parameters.'
-    );
+    ).toThrowError(errorMessage);
   });
 
   it('should allow without any query', () => {
-    expect(() => RotateKeyPairSchema.query.validate({})).toThrowError(
-      'You must acknowledge the risks of rotating the key pair with acknowledge=true in the request parameters.'
-    );
+    expect(() => RotateKeyPairSchema.query.validate({})).toThrowError(errorMessage);
   });
 
   it.each([1, 'string'])('should not allow non-boolean `%s` values for acknowledge', (value) => {
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.ts b/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.ts
index d6037748e4682f..e643fd0505618e 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/message_signing_service.ts
@@ -7,6 +7,8 @@
 
 import { schema } from '@kbn/config-schema';
 
+export const errorMessage =
+  'Warning: this API will cause a key pair to rotate and should not be necessary in normal operation.  If you proceed, you may need to reinstall Agents in your network. You must acknowledge the risks of rotating the key pair with acknowledge=true in the request parameters.  For more information, reach out to your administrator.';
 export const RotateKeyPairSchema = {
   query: schema.maybe(
     schema.object(
@@ -19,9 +21,7 @@ export const RotateKeyPairSchema = {
         defaultValue: { acknowledge: false },
         validate: (value: { acknowledge: boolean }) => {
           if (!value || !value.acknowledge) {
-            throw new Error(
-              'You must acknowledge the risks of rotating the key pair with acknowledge=true in the request parameters.'
-            );
+            throw new Error(errorMessage);
           }
         },
       }
diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json
index f80d7d51686d8d..0aafb8faacc28f 100644
--- a/x-pack/plugins/fleet/tsconfig.json
+++ b/x-pack/plugins/fleet/tsconfig.json
@@ -63,7 +63,6 @@
     "@kbn/global-search-plugin",
     "@kbn/utility-types",
     "@kbn/utility-types-jest",
-    "@kbn/test-jest-helpers",
     "@kbn/es-query",
     "@kbn/ui-theme",
     "@kbn/rison",
diff --git a/x-pack/plugins/infra/common/alerting/metrics/types.ts b/x-pack/plugins/infra/common/alerting/metrics/types.ts
index 38a6542b9f788b..5a9105ed2e19d0 100644
--- a/x-pack/plugins/infra/common/alerting/metrics/types.ts
+++ b/x-pack/plugins/infra/common/alerting/metrics/types.ts
@@ -6,8 +6,8 @@
  */
 import * as rt from 'io-ts';
 import { TimeUnitChar } from '@kbn/observability-plugin/common/utils/formatters/duration';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 import { SnapshotCustomMetricInput } from '../../http_api';
-import { ANOMALY_THRESHOLD } from '../../infra_ml';
 import { InventoryItemType, SnapshotMetricType } from '../../inventory_models/types';
 
 export const METRIC_THRESHOLD_ALERT_TYPE_ID = 'metrics.alert.threshold';
@@ -61,7 +61,7 @@ export interface MetricAnomalyParams {
   alertInterval?: string;
   sourceId?: string;
   spaceId?: string;
-  threshold: Exclude<ANOMALY_THRESHOLD, ANOMALY_THRESHOLD.LOW>;
+  threshold: Exclude<ML_ANOMALY_THRESHOLD, ML_ANOMALY_THRESHOLD.LOW>;
   influencerFilter: rt.TypeOf<typeof metricAnomalyInfluencerFilterRT> | undefined;
 }
 
diff --git a/x-pack/plugins/infra/common/infra_ml/anomaly_results.ts b/x-pack/plugins/infra/common/infra_ml/anomaly_results.ts
index 81e46d85ba220d..524552b306881d 100644
--- a/x-pack/plugins/infra/common/infra_ml/anomaly_results.ts
+++ b/x-pack/plugins/infra/common/infra_ml/anomaly_results.ts
@@ -5,44 +5,21 @@
  * 2.0.
  */
 
-export enum ANOMALY_SEVERITY {
-  CRITICAL = 'critical',
-  MAJOR = 'major',
-  MINOR = 'minor',
-  WARNING = 'warning',
-  LOW = 'low',
-  UNKNOWN = 'unknown',
-}
-
-export enum ANOMALY_THRESHOLD {
-  CRITICAL = 75,
-  MAJOR = 50,
-  MINOR = 25,
-  WARNING = 3,
-  LOW = 0,
-}
-
-export const SEVERITY_COLORS = {
-  CRITICAL: '#fe5050',
-  MAJOR: '#fba740',
-  MINOR: '#fdec25',
-  WARNING: '#8bc8fb',
-  LOW: '#d2e9f7',
-  BLANK: '#ffffff',
-};
-
-export const getSeverityCategoryForScore = (score: number): ANOMALY_SEVERITY | undefined => {
-  if (score >= ANOMALY_THRESHOLD.CRITICAL) {
-    return ANOMALY_SEVERITY.CRITICAL;
-  } else if (score >= ANOMALY_THRESHOLD.MAJOR) {
-    return ANOMALY_SEVERITY.MAJOR;
-  } else if (score >= ANOMALY_THRESHOLD.MINOR) {
-    return ANOMALY_SEVERITY.MINOR;
-  } else if (score >= ANOMALY_THRESHOLD.WARNING) {
-    return ANOMALY_SEVERITY.WARNING;
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
+
+export const getSeverityCategoryForScore = (score: number): ML_ANOMALY_SEVERITY | undefined => {
+  if (score >= ML_ANOMALY_THRESHOLD.CRITICAL) {
+    return ML_ANOMALY_SEVERITY.CRITICAL;
+  } else if (score >= ML_ANOMALY_THRESHOLD.MAJOR) {
+    return ML_ANOMALY_SEVERITY.MAJOR;
+  } else if (score >= ML_ANOMALY_THRESHOLD.MINOR) {
+    return ML_ANOMALY_SEVERITY.MINOR;
+  } else if (score >= ML_ANOMALY_THRESHOLD.WARNING) {
+    return ML_ANOMALY_SEVERITY.WARNING;
   } else {
     // Category is too low to include
-    return ANOMALY_SEVERITY.LOW;
+    return ML_ANOMALY_SEVERITY.LOW;
   }
 };
 
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
index 1e54c890d62450..37db6cb499f30c 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/expression.tsx
@@ -15,9 +15,9 @@ import {
   RuleTypeParamsExpressionProps,
   WhenExpression,
 } from '@kbn/triggers-actions-ui-plugin/public';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 import { useSourceContext, withSourceProvider } from '../../../containers/metrics_source';
 import { MetricAnomalyParams } from '../../../../common/alerting/metrics';
-import { ANOMALY_THRESHOLD } from '../../../../common/infra_ml';
 import { findInventoryModel } from '../../../../common/inventory_models';
 import { InventoryItemType, SnapshotMetricType } from '../../../../common/inventory_models/types';
 import { SubscriptionSplashPrompt } from '../../../components/subscription_splash_content';
@@ -43,7 +43,7 @@ type Props = Omit<
 
 export const defaultExpression = {
   metric: 'memory_usage' as MetricAnomalyParams['metric'],
-  threshold: ANOMALY_THRESHOLD.MAJOR as MetricAnomalyParams['threshold'],
+  threshold: ML_ANOMALY_THRESHOLD.MAJOR as MetricAnomalyParams['threshold'],
   nodeType: 'hosts' as MetricAnomalyParams['nodeType'],
   influencerFilter: undefined,
 };
@@ -220,7 +220,7 @@ export const Expression: React.FC<Props> = (props) => {
         </StyledExpression>
         <StyledExpression>
           <SeverityThresholdExpression
-            value={ruleParams.threshold ?? ANOMALY_THRESHOLD.CRITICAL}
+            value={ruleParams.threshold ?? ML_ANOMALY_THRESHOLD.CRITICAL}
             onChange={updateSeverityThreshold}
           />
         </StyledExpression>
diff --git a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/severity_threshold.tsx b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/severity_threshold.tsx
index d93e088fe25a78..f0de1d0d30e7ee 100644
--- a/x-pack/plugins/infra/public/alerting/metric_anomaly/components/severity_threshold.tsx
+++ b/x-pack/plugins/infra/public/alerting/metric_anomaly/components/severity_threshold.tsx
@@ -10,11 +10,11 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiExpression, EuiPopover, EuiFlexGroup, EuiFlexItem, EuiSelect } from '@elastic/eui';
 import { EuiPopoverTitle, EuiButtonIcon } from '@elastic/eui';
-import { ANOMALY_THRESHOLD } from '../../../../common/infra_ml';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 
 interface WhenExpressionProps {
-  value: Exclude<ANOMALY_THRESHOLD, ANOMALY_THRESHOLD.LOW>;
-  onChange: (value: ANOMALY_THRESHOLD) => void;
+  value: Exclude<ML_ANOMALY_THRESHOLD, ML_ANOMALY_THRESHOLD.LOW>;
+  onChange: (value: ML_ANOMALY_THRESHOLD) => void;
   popupPosition?:
     | 'upCenter'
     | 'upLeft'
@@ -31,29 +31,29 @@ interface WhenExpressionProps {
 }
 
 const options = {
-  [ANOMALY_THRESHOLD.CRITICAL]: {
+  [ML_ANOMALY_THRESHOLD.CRITICAL]: {
     text: i18n.translate('xpack.infra.metrics.alertFlyout.expression.severityScore.criticalLabel', {
       defaultMessage: 'Critical',
     }),
-    value: ANOMALY_THRESHOLD.CRITICAL,
+    value: ML_ANOMALY_THRESHOLD.CRITICAL,
   },
-  [ANOMALY_THRESHOLD.MAJOR]: {
+  [ML_ANOMALY_THRESHOLD.MAJOR]: {
     text: i18n.translate('xpack.infra.metrics.alertFlyout.expression.severityScore.majorLabel', {
       defaultMessage: 'Major',
     }),
-    value: ANOMALY_THRESHOLD.MAJOR,
+    value: ML_ANOMALY_THRESHOLD.MAJOR,
   },
-  [ANOMALY_THRESHOLD.MINOR]: {
+  [ML_ANOMALY_THRESHOLD.MINOR]: {
     text: i18n.translate('xpack.infra.metrics.alertFlyout.expression.severityScore.minorLabel', {
       defaultMessage: 'Minor',
     }),
-    value: ANOMALY_THRESHOLD.MINOR,
+    value: ML_ANOMALY_THRESHOLD.MINOR,
   },
-  [ANOMALY_THRESHOLD.WARNING]: {
+  [ML_ANOMALY_THRESHOLD.WARNING]: {
     text: i18n.translate('xpack.infra.metrics.alertFlyout.expression.severityScore.warningLabel', {
       defaultMessage: 'Warning',
     }),
-    value: ANOMALY_THRESHOLD.WARNING,
+    value: ML_ANOMALY_THRESHOLD.WARNING,
   },
 };
 
@@ -101,7 +101,7 @@ export const SeverityThresholdExpression = ({
           value={value}
           fullWidth
           onChange={(e) => {
-            onChange(Number(e.target.value) as ANOMALY_THRESHOLD);
+            onChange(Number(e.target.value) as ML_ANOMALY_THRESHOLD);
             setAggTypePopoverOpen(false);
           }}
           options={Object.values(options).map((o) => o)}
diff --git a/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx b/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
index 87ab4eaa4d6271..f4427ba6152352 100644
--- a/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_analysis_results/anomaly_severity_indicator.tsx
@@ -7,7 +7,7 @@
 
 import { EuiHealth } from '@elastic/eui';
 import React, { useMemo } from 'react';
-import { getFormattedSeverityScore } from '@kbn/ml-plugin/public';
+import { getFormattedSeverityScore } from '@kbn/ml-anomaly-utils/get_formatted_severity_score';
 import { getSeverityCategoryForScore, ML_SEVERITY_COLORS } from '../../../../common/log_analysis';
 
 export const AnomalySeverityIndicator: React.FunctionComponent<{
diff --git a/x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx b/x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx
index 33e5b71c56a3fa..e503bdebafa037 100644
--- a/x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx
+++ b/x-pack/plugins/infra/public/components/saved_views/manage_views_flyout.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useState } from 'react';
+import React, { useMemo } from 'react';
 import useToggle from 'react-use/lib/useToggle';
 
 import {
@@ -22,16 +22,23 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SavedView } from '../../containers/saved_view/saved_view';
+import { EuiBasicTableColumn } from '@elastic/eui';
+import { EuiButtonIcon } from '@elastic/eui';
+import { MetricsExplorerView } from '../../../common/metrics_explorer_views';
+import type { InventoryView } from '../../../common/inventory_views';
+import { UseInventoryViewsResult } from '../../hooks/use_inventory_views';
+import { UseMetricsExplorerViewsResult } from '../../hooks/use_metrics_explorer_views';
 
-interface Props<ViewState> {
-  views: Array<SavedView<ViewState>>;
+type View = InventoryView | MetricsExplorerView;
+type UseViewResult = UseInventoryViewsResult | UseMetricsExplorerViewsResult;
+
+export interface ManageViewsFlyoutProps {
+  views: UseViewResult['views'];
   loading: boolean;
-  sourceIsLoading: boolean;
   onClose(): void;
-  onMakeDefaultView(id: string): void;
-  setView(viewState: ViewState): void;
-  onDeleteView(id: string): void;
+  onMakeDefaultView: UseViewResult['setDefaultViewById'];
+  onSwitchView: UseViewResult['switchViewById'];
+  onDeleteView: UseViewResult['deleteViewById'];
 }
 
 interface DeleteConfimationProps {
@@ -39,55 +46,27 @@ interface DeleteConfimationProps {
   onConfirm(): void;
 }
 
-const DeleteConfimation = ({ isDisabled, onConfirm }: DeleteConfimationProps) => {
-  const [isConfirmVisible, toggleVisibility] = useToggle(false);
-
-  return isConfirmVisible ? (
-    <EuiFlexGroup>
-      <EuiButtonEmpty onClick={toggleVisibility} data-test-subj="hideConfirm">
-        <FormattedMessage defaultMessage="cancel" id="xpack.infra.waffle.savedViews.cancel" />
-      </EuiButtonEmpty>
-      <EuiButton
-        disabled={isDisabled}
-        fill={true}
-        iconType="trash"
-        color="danger"
-        onClick={onConfirm}
-        data-test-subj="showConfirm"
-      >
-        <FormattedMessage
-          defaultMessage="Delete view?"
-          id="xpack.infra.openView.actionNames.deleteConfirmation"
-        />
-      </EuiButton>
-    </EuiFlexGroup>
-  ) : (
-    <EuiButtonEmpty
-      data-test-subj="infraDeleteConfimationButton"
-      iconType="trash"
-      color="danger"
-      onClick={toggleVisibility}
-    />
-  );
+const searchConfig = {
+  box: { incremental: true },
 };
 
-export function SavedViewManageViewsFlyout<ViewState>({
+export function ManageViewsFlyout({
   onClose,
-  views,
-  setView,
+  views = [],
+  onSwitchView,
   onMakeDefaultView,
   onDeleteView,
   loading,
-  sourceIsLoading,
-}: Props<ViewState>) {
-  const [inProgressView, setInProgressView] = useState<string | null>(null);
+}: ManageViewsFlyoutProps) {
+  // Add name as top level property to allow in memory search
+  const namedViews = useMemo(() => views.map(addOwnName), [views]);
 
-  const renderName = (name: string, item: SavedView<ViewState>) => (
+  const renderName = (name: string, item: View) => (
     <EuiButtonEmpty
       key={item.id}
       data-test-subj="infraRenderNameButton"
       onClick={() => {
-        setView(item);
+        onSwitchView(item.id);
         onClose();
       }}
     >
@@ -95,11 +74,11 @@ export function SavedViewManageViewsFlyout<ViewState>({
     </EuiButtonEmpty>
   );
 
-  const renderDeleteAction = (item: SavedView<ViewState>) => {
+  const renderDeleteAction = (item: View) => {
     return (
       <DeleteConfimation
         key={item.id}
-        isDisabled={item.isDefault}
+        isDisabled={item.attributes.isDefault}
         onConfirm={() => {
           onDeleteView(item.id);
         }}
@@ -107,22 +86,21 @@ export function SavedViewManageViewsFlyout<ViewState>({
     );
   };
 
-  const renderMakeDefaultAction = (item: SavedView<ViewState>) => {
+  const renderMakeDefaultAction = (item: View) => {
     return (
-      <EuiButtonEmpty
+      <EuiButtonIcon
         key={item.id}
         data-test-subj="infraRenderMakeDefaultActionButton"
-        isLoading={inProgressView === item.id && sourceIsLoading}
-        iconType={item.isDefault ? 'starFilled' : 'starEmpty'}
+        iconType={item.attributes.isDefault ? 'starFilled' : 'starEmpty'}
+        size="s"
         onClick={() => {
-          setInProgressView(item.id);
           onMakeDefaultView(item.id);
         }}
       />
     );
   };
 
-  const columns = [
+  const columns: Array<EuiBasicTableColumn<View>> = [
     {
       field: 'name',
       name: i18n.translate('xpack.infra.openView.columnNames.name', { defaultMessage: 'Name' }),
@@ -139,7 +117,7 @@ export function SavedViewManageViewsFlyout<ViewState>({
           render: renderMakeDefaultAction,
         },
         {
-          available: (item: SavedView<ViewState>) => item.id !== '0',
+          available: (item) => !item.attributes.isStatic,
           render: renderDeleteAction,
         },
       ],
@@ -161,10 +139,10 @@ export function SavedViewManageViewsFlyout<ViewState>({
         </EuiFlyoutHeader>
         <EuiFlyoutBody>
           <EuiInMemoryTable
-            items={views}
+            items={namedViews}
             columns={columns}
             loading={loading}
-            search={true}
+            search={searchConfig}
             pagination={true}
             sorting={true}
           />
@@ -178,3 +156,41 @@ export function SavedViewManageViewsFlyout<ViewState>({
     </EuiPortal>
   );
 }
+
+const DeleteConfimation = ({ isDisabled, onConfirm }: DeleteConfimationProps) => {
+  const [isConfirmVisible, toggleVisibility] = useToggle(false);
+
+  return isConfirmVisible ? (
+    <EuiFlexGroup>
+      <EuiButtonEmpty onClick={toggleVisibility} data-test-subj="hideConfirm">
+        <FormattedMessage defaultMessage="cancel" id="xpack.infra.waffle.savedViews.cancel" />
+      </EuiButtonEmpty>
+      <EuiButton
+        disabled={isDisabled}
+        fill={true}
+        iconType="trash"
+        color="danger"
+        onClick={onConfirm}
+        data-test-subj="showConfirm"
+      >
+        <FormattedMessage
+          defaultMessage="Delete view?"
+          id="xpack.infra.openView.actionNames.deleteConfirmation"
+        />
+      </EuiButton>
+    </EuiFlexGroup>
+  ) : (
+    <EuiButtonIcon
+      data-test-subj="infraDeleteConfimationButton"
+      iconType="trash"
+      color="danger"
+      size="s"
+      onClick={toggleVisibility}
+    />
+  );
+};
+
+/**
+ * Helpers
+ */
+const addOwnName = (view: View) => ({ ...view, name: view.attributes.name });
diff --git a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
index 1610b1b63fd82c..b52d83cac60c6c 100644
--- a/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
+++ b/x-pack/plugins/infra/public/components/saved_views/toolbar_control.tsx
@@ -5,132 +5,105 @@
  * 2.0.
  */
 
-import React, { useCallback, useState, useEffect } from 'react';
+import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiPopover, EuiListGroup, EuiListGroupItem } from '@elastic/eui';
-import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { SavedViewManageViewsFlyout } from './manage_views_flyout';
-import { useSavedViewContext } from '../../containers/saved_view/saved_view';
-import { SavedViewListModal } from './view_list_modal';
+import { NonEmptyString } from '@kbn/io-ts-utils';
+import { ManageViewsFlyout } from './manage_views_flyout';
 import { useBoolean } from '../../hooks/use_boolean';
 import { UpsertViewModal } from './upsert_modal';
-
-interface Props<ViewState> {
-  viewState: ViewState;
+import { UseInventoryViewsResult } from '../../hooks/use_inventory_views';
+import { UseMetricsExplorerViewsResult } from '../../hooks/use_metrics_explorer_views';
+
+type UseViewProps =
+  | 'currentView'
+  | 'views'
+  | 'isFetchingViews'
+  | 'isFetchingCurrentView'
+  | 'isCreatingView'
+  | 'isUpdatingView';
+
+type UseViewResult = UseInventoryViewsResult | UseMetricsExplorerViewsResult;
+type InventoryViewsResult = Pick<UseInventoryViewsResult, UseViewProps>;
+type MetricsExplorerViewsResult = Pick<UseMetricsExplorerViewsResult, UseViewProps>;
+
+interface Props<ViewState> extends InventoryViewsResult, MetricsExplorerViewsResult {
+  viewState: ViewState & { time?: number };
+  onCreateView: UseViewResult['createView'];
+  onDeleteView: UseViewResult['deleteViewById'];
+  onUpdateView: UseViewResult['updateViewById'];
+  onLoadViews: UseViewResult['fetchViews'];
+  onSetDefaultView: UseViewResult['setDefaultViewById'];
+  onSwitchView: UseViewResult['switchViewById'];
 }
 
 export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
-  const kibana = useKibana();
   const {
-    views,
-    saveView,
-    loading,
-    updateView,
-    deletedId,
-    deleteView,
-    makeDefault,
-    sourceIsLoading,
-    find,
-    errorOnFind,
-    errorOnCreate,
-    createdView,
-    updatedView,
     currentView,
-    setCurrentView,
-  } = useSavedViewContext();
+    views,
+    isFetchingViews,
+    isFetchingCurrentView,
+    isCreatingView,
+    isUpdatingView,
+    onCreateView,
+    onDeleteView,
+    onUpdateView,
+    onLoadViews,
+    onSetDefaultView,
+    onSwitchView,
+    viewState,
+  } = props;
 
   const [isPopoverOpen, { off: closePopover, toggle: togglePopover }] = useBoolean(false);
 
   const [isManageFlyoutOpen, { on: openManageFlyout, off: closeManageFlyout }] = useBoolean(false);
-  const [isUpdateModalOpen, { on: openUpdateModal, off: closeUpdateModal }] = useBoolean(false);
-  const [isLoadModalOpen, { on: openLoadModal, off: closeLoadModal }] = useBoolean(false);
   const [isCreateModalOpen, { on: openCreateModal, off: closeCreateModal }] = useBoolean(false);
+  const [isUpdateModalOpen, { on: openUpdateModal, off: closeUpdateModal }] = useBoolean(false);
 
-  const [isInvalid, setIsInvalid] = useState(false);
+  const togglePopoverAndLoad = () => {
+    if (!isPopoverOpen) {
+      onLoadViews();
+    }
+    togglePopover();
+  };
 
   const goToManageViews = () => {
     closePopover();
-    find();
     openManageFlyout();
   };
 
-  const goToLoadView = () => {
-    closePopover();
-    find();
-    openLoadModal();
-  };
-
   const goToCreateView = () => {
     closePopover();
-    setIsInvalid(false);
     openCreateModal();
   };
 
   const goToUpdateView = () => {
     closePopover();
-    setIsInvalid(false);
     openUpdateModal();
   };
 
-  const save = useCallback(
-    (name: string, hasTime: boolean = false) => {
-      const currentState = {
-        ...props.viewState,
-        ...(!hasTime ? { time: undefined } : {}),
-      };
-      saveView({ ...currentState, name });
-    },
-    [props.viewState, saveView]
-  );
-
-  const update = useCallback(
-    (name: string, hasTime: boolean = false) => {
-      const currentState = {
-        ...props.viewState,
-        ...(!hasTime ? { time: undefined } : {}),
-      };
-      updateView(currentView.id, { ...currentState, name });
-    },
-    [props.viewState, updateView, currentView]
-  );
+  const handleCreateView = (name: NonEmptyString, shouldIncludeTime: boolean = false) => {
+    const attributes = { ...viewState, name };
 
-  useEffect(() => {
-    if (errorOnCreate) {
-      setIsInvalid(true);
+    if (!shouldIncludeTime) {
+      delete attributes.time;
     }
-  }, [errorOnCreate]);
 
-  useEffect(() => {
-    if (updatedView !== undefined) {
-      setCurrentView(updatedView);
-      // INFO: Close the modal after the view is created.
-      closeUpdateModal();
-    }
-  }, [updatedView, setCurrentView, closeUpdateModal]);
+    onCreateView(attributes).then(closeCreateModal);
+  };
 
-  useEffect(() => {
-    if (createdView !== undefined) {
-      // INFO: Close the modal after the view is created.
-      setCurrentView(createdView);
-      closeCreateModal();
-    }
-  }, [createdView, setCurrentView, closeCreateModal]);
+  const handleUpdateView = (name: NonEmptyString, shouldIncludeTime: boolean = false) => {
+    if (!currentView) return;
 
-  useEffect(() => {
-    if (deletedId !== undefined) {
-      // INFO: Refresh view list after an item is deleted
-      find();
-    }
-  }, [deletedId, find]);
+    const attributes = { ...viewState, name };
 
-  useEffect(() => {
-    if (errorOnCreate) {
-      kibana.notifications.toasts.warning(getErrorToast('create', errorOnCreate)!);
-    } else if (errorOnFind) {
-      kibana.notifications.toasts.warning(getErrorToast('find', errorOnFind)!);
+    if (!shouldIncludeTime) {
+      delete attributes.time;
     }
-  }, [errorOnCreate, errorOnFind, kibana]);
+
+    onUpdateView({ id: currentView.id, attributes }).then(closeUpdateModal);
+  };
 
   return (
     <>
@@ -138,14 +111,15 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
         data-test-subj="savedViews-popover"
         button={
           <EuiButton
-            onClick={togglePopover}
+            onClick={togglePopoverAndLoad}
             data-test-subj="savedViews-openPopover"
             iconType="arrowDown"
             iconSide="right"
             color="text"
+            isLoading={isFetchingCurrentView}
           >
             {currentView
-              ? currentView.name
+              ? currentView.attributes.name
               : i18n.translate('xpack.infra.savedView.unknownView', {
                   defaultMessage: 'No view selected',
                 })}
@@ -168,19 +142,11 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
             data-test-subj="savedViews-updateView"
             iconType="refresh"
             onClick={goToUpdateView}
-            isDisabled={!currentView || currentView.id === '0'}
+            isDisabled={!currentView || currentView.attributes.isStatic}
             label={i18n.translate('xpack.infra.savedView.updateView', {
               defaultMessage: 'Update view',
             })}
           />
-          <EuiListGroupItem
-            data-test-subj="savedViews-loadView"
-            iconType="importAction"
-            onClick={goToLoadView}
-            label={i18n.translate('xpack.infra.savedView.loadView', {
-              defaultMessage: 'Load view',
-            })}
-          />
           <EuiListGroupItem
             data-test-subj="savedViews-saveNewView"
             iconType="save"
@@ -193,9 +159,9 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
       </EuiPopover>
       {isCreateModalOpen && (
         <UpsertViewModal
-          isInvalid={isInvalid}
+          isSaving={isCreatingView}
           onClose={closeCreateModal}
-          onSave={save}
+          onSave={handleCreateView}
           title={
             <FormattedMessage
               defaultMessage="Save View"
@@ -206,11 +172,11 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
       )}
       {isUpdateModalOpen && (
         <UpsertViewModal
-          isInvalid={isInvalid}
+          isSaving={isUpdatingView}
           onClose={closeUpdateModal}
-          onSave={update}
-          initialName={currentView.name}
-          initialIncludeTime={Boolean(currentView.time)}
+          onSave={handleUpdateView}
+          initialName={currentView?.attributes.name}
+          initialIncludeTime={Boolean(currentView?.attributes.time)}
           title={
             <FormattedMessage
               defaultMessage="Update View"
@@ -219,47 +185,16 @@ export function SavedViewsToolbarControls<ViewState>(props: Props<ViewState>) {
           }
         />
       )}
-      {isLoadModalOpen && (
-        <SavedViewListModal<any>
-          currentView={currentView}
-          views={views}
-          onClose={closeLoadModal}
-          setView={setCurrentView}
-        />
-      )}
       {isManageFlyoutOpen && (
-        <SavedViewManageViewsFlyout<ViewState>
-          sourceIsLoading={sourceIsLoading}
-          loading={loading}
+        <ManageViewsFlyout
+          loading={isFetchingViews}
           views={views}
-          onMakeDefaultView={makeDefault}
-          onDeleteView={deleteView}
+          onMakeDefaultView={onSetDefaultView}
+          onDeleteView={onDeleteView}
           onClose={closeManageFlyout}
-          setView={setCurrentView}
+          onSwitchView={onSwitchView}
         />
       )}
     </>
   );
 }
-
-const getErrorToast = (type: 'create' | 'find', msg?: string) => {
-  if (type === 'create') {
-    return {
-      toastLifeTimeMs: 3000,
-      title:
-        msg ||
-        i18n.translate('xpack.infra.savedView.errorOnCreate.title', {
-          defaultMessage: `An error occured saving view.`,
-        }),
-    };
-  } else if (type === 'find') {
-    return {
-      toastLifeTimeMs: 3000,
-      title:
-        msg ||
-        i18n.translate('xpack.infra.savedView.findError.title', {
-          defaultMessage: `An error occurred while loading views.`,
-        }),
-    };
-  }
-};
diff --git a/x-pack/plugins/infra/public/components/saved_views/upsert_modal.tsx b/x-pack/plugins/infra/public/components/saved_views/upsert_modal.tsx
index fa2fc3777ca902..08476357cec01c 100644
--- a/x-pack/plugins/infra/public/components/saved_views/upsert_modal.tsx
+++ b/x-pack/plugins/infra/public/components/saved_views/upsert_modal.tsx
@@ -19,29 +19,36 @@ import {
   EuiFieldText,
   EuiSpacer,
   EuiSwitch,
+  EuiSwitchEvent,
   EuiText,
 } from '@elastic/eui';
-import { EuiSwitchEvent } from '@elastic/eui';
+import { NonEmptyString } from '@kbn/io-ts-utils';
 
 interface Props {
-  isInvalid: boolean;
   onClose(): void;
-  onSave(name: string, shouldIncludeTime: boolean): void;
+  onSave(name: NonEmptyString, shouldIncludeTime: boolean): void;
+  isSaving: boolean;
   initialName?: string;
   initialIncludeTime?: boolean;
   title: React.ReactNode;
 }
 
+const nameLabel = i18n.translate('xpack.infra.waffle.savedViews.viewNamePlaceholder', {
+  defaultMessage: 'Name',
+});
+
 export const UpsertViewModal = ({
   onClose,
   onSave,
-  isInvalid,
+  isSaving,
   initialName = '',
   initialIncludeTime = false,
   title,
 }: Props) => {
   const [viewName, setViewName] = useState(initialName);
-  const [includeTime, setIncludeTime] = useState(initialIncludeTime);
+  const [shouldIncludeTime, setIncludeTime] = useState(initialIncludeTime);
+
+  const trimmedName = viewName.trim() as NonEmptyString;
 
   const handleNameChange: React.ChangeEventHandler<HTMLInputElement> = (e) => {
     setViewName(e.target.value);
@@ -52,7 +59,7 @@ export const UpsertViewModal = ({
   };
 
   const saveView = () => {
-    onSave(viewName, includeTime);
+    onSave(trimmedName, shouldIncludeTime);
   };
 
   return (
@@ -62,16 +69,11 @@ export const UpsertViewModal = ({
       </EuiModalHeader>
       <EuiModalBody>
         <EuiFieldText
-          isInvalid={isInvalid}
-          placeholder={i18n.translate('xpack.infra.waffle.savedViews.viewNamePlaceholder', {
-            defaultMessage: 'Name',
-          })}
+          placeholder={nameLabel}
           data-test-subj="savedViewName"
           value={viewName}
           onChange={handleNameChange}
-          aria-label={i18n.translate('xpack.infra.waffle.savedViews.viewNamePlaceholder', {
-            defaultMessage: 'Name',
-          })}
+          aria-label={nameLabel}
         />
         <EuiSpacer size="xl" />
         <EuiSwitch
@@ -82,7 +84,7 @@ export const UpsertViewModal = ({
               id="xpack.infra.waffle.savedViews.includeTimeFilterLabel"
             />
           }
-          checked={includeTime}
+          checked={shouldIncludeTime}
           onChange={handleTimeCheckChange}
         />
         <EuiSpacer size="s" />
@@ -101,9 +103,9 @@ export const UpsertViewModal = ({
           />
         </EuiButtonEmpty>
         <EuiButton
-          color="primary"
-          disabled={viewName.length === 0}
+          disabled={trimmedName.length === 0}
           fill
+          isLoading={isSaving}
           onClick={saveView}
           data-test-subj="createSavedViewButton"
         >
diff --git a/x-pack/plugins/infra/public/components/saved_views/view_list_modal.tsx b/x-pack/plugins/infra/public/components/saved_views/view_list_modal.tsx
deleted file mode 100644
index 43ca2776b284d9..00000000000000
--- a/x-pack/plugins/infra/public/components/saved_views/view_list_modal.tsx
+++ /dev/null
@@ -1,103 +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, { useCallback, useState, useMemo } from 'react';
-
-import { EuiButtonEmpty, EuiModalFooter, EuiButton, EuiSpacer } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { EuiModal, EuiModalHeader, EuiModalHeaderTitle, EuiModalBody } from '@elastic/eui';
-import { EuiSelectable } from '@elastic/eui';
-import { EuiSelectableOption } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { SavedView } from '../../containers/saved_view/saved_view';
-
-interface Props<ViewState> {
-  views: Array<SavedView<ViewState>>;
-  onClose(): void;
-  setView(viewState: ViewState): void;
-  currentView?: ViewState;
-}
-
-export function SavedViewListModal<ViewState extends { id: string; name: string }>({
-  onClose,
-  views,
-  setView,
-  currentView,
-}: Props<ViewState>) {
-  const [options, setOptions] = useState<EuiSelectableOption[] | null>(null);
-
-  const onChange = useCallback((opts: EuiSelectableOption[]) => {
-    setOptions(opts);
-  }, []);
-
-  const loadView = useCallback(() => {
-    if (!options) {
-      onClose();
-      return;
-    }
-
-    const selected = options.find((o) => o.checked);
-    if (!selected) {
-      onClose();
-      return;
-    }
-    setView(views.find((v) => v.id === selected.key)!);
-    onClose();
-  }, [options, views, setView, onClose]);
-
-  const defaultOptions = useMemo<EuiSelectableOption[]>(() => {
-    return views.map((v) => ({
-      label: v.name,
-      key: v.id,
-      checked: currentView?.id === v.id ? 'on' : undefined,
-    }));
-  }, [views, currentView]);
-
-  return (
-    <EuiModal onClose={onClose} data-test-subj="savedViews-loadModal">
-      <EuiModalHeader>
-        <EuiModalHeaderTitle>
-          <FormattedMessage
-            defaultMessage="Select a view to load"
-            id="xpack.infra.waffle.savedView.selectViewHeader"
-          />
-        </EuiModalHeaderTitle>
-      </EuiModalHeader>
-      <EuiModalBody>
-        <EuiSelectable
-          singleSelection
-          searchable
-          options={options || defaultOptions}
-          onChange={onChange}
-          searchProps={{
-            placeholder: i18n.translate('xpack.infra.savedView.searchPlaceholder', {
-              defaultMessage: 'Search for saved views',
-            }),
-          }}
-          listProps={{ bordered: true }}
-          data-test-subj="savedViews-loadList"
-        >
-          {(list, search) => (
-            <>
-              {search}
-              <EuiSpacer size="m" />
-              {list}
-            </>
-          )}
-        </EuiSelectable>
-      </EuiModalBody>
-      <EuiModalFooter>
-        <EuiButtonEmpty data-test-subj="cancelSavedViewModal" onClick={onClose}>
-          <FormattedMessage defaultMessage="Cancel" id="xpack.infra.openView.cancelButton" />
-        </EuiButtonEmpty>
-        <EuiButton fill color="primary" data-test-subj="loadSavedViewModal" onClick={loadView}>
-          <FormattedMessage defaultMessage="Load view" id="xpack.infra.openView.loadButton" />
-        </EuiButton>
-      </EuiModalFooter>
-    </EuiModal>
-  );
-}
diff --git a/x-pack/plugins/infra/public/containers/react_query_provider.tsx b/x-pack/plugins/infra/public/containers/react_query_provider.tsx
new file mode 100644
index 00000000000000..050575dcc054ab
--- /dev/null
+++ b/x-pack/plugins/infra/public/containers/react_query_provider.tsx
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import { QueryClient, QueryClientConfig, QueryClientProvider } from '@tanstack/react-query';
+import merge from 'lodash/merge';
+import { EuiButtonIcon } from '@elastic/eui';
+import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
+
+const DEFAULT_CONFIG = {
+  defaultOptions: {
+    queries: { keepPreviousData: true, refetchOnWindowFocus: false },
+  },
+};
+
+interface ProviderProps {
+  children: React.ReactNode;
+  config?: QueryClientConfig;
+}
+
+export function ReactQueryProvider({ children, config = {} }: ProviderProps) {
+  const [queryClient] = useState(() => new QueryClient(merge(DEFAULT_CONFIG, config)));
+
+  return (
+    <QueryClientProvider client={queryClient}>
+      <HideableReactQueryDevTools />
+      {children}
+    </QueryClientProvider>
+  );
+}
+
+function HideableReactQueryDevTools() {
+  const [isHidden, setIsHidden] = useState(false);
+
+  return !isHidden ? (
+    <div>
+      <EuiButtonIcon
+        iconType="cross"
+        color="primary"
+        style={{ zIndex: 99999, position: 'fixed', bottom: '40px', left: '40px' }}
+        onClick={() => setIsHidden(!isHidden)}
+        aria-label="Disable React Query Dev Tools"
+      />
+      <ReactQueryDevtools initialIsOpen={false} />
+    </div>
+  ) : null;
+}
diff --git a/x-pack/plugins/infra/public/hooks/use_inventory_views.ts b/x-pack/plugins/infra/public/hooks/use_inventory_views.ts
new file mode 100644
index 00000000000000..a75e8beaf3f653
--- /dev/null
+++ b/x-pack/plugins/infra/public/hooks/use_inventory_views.ts
@@ -0,0 +1,262 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import * as rt from 'io-ts';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { constant, identity } from 'fp-ts/lib/function';
+
+import {
+  QueryObserverBaseResult,
+  UseMutateAsyncFunction,
+  UseMutateFunction,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from '@tanstack/react-query';
+import { useUiTracker } from '@kbn/observability-plugin/public';
+
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core-http-browser';
+import { MetricsSourceConfigurationResponse } from '../../common/metrics_sources';
+import {
+  CreateInventoryViewAttributesRequestPayload,
+  UpdateInventoryViewAttributesRequestPayload,
+} from '../../common/http_api/latest';
+import type { InventoryView } from '../../common/inventory_views';
+import { useKibanaContextForPlugin } from './use_kibana';
+import { useUrlState } from '../utils/use_url_state';
+import { useSavedViewsNotifier } from './use_saved_views_notifier';
+import { useSourceContext } from '../containers/metrics_source';
+
+interface UpdateViewParams {
+  id: string;
+  attributes: UpdateInventoryViewAttributesRequestPayload;
+}
+
+export interface UseInventoryViewsResult {
+  views?: InventoryView[];
+  currentView?: InventoryView | null;
+  createView: UseMutateAsyncFunction<
+    InventoryView,
+    ServerError,
+    CreateInventoryViewAttributesRequestPayload
+  >;
+  deleteViewById: UseMutateFunction<null, ServerError, string, MutationContext>;
+  fetchViews: QueryObserverBaseResult<InventoryView[]>['refetch'];
+  updateViewById: UseMutateAsyncFunction<InventoryView, ServerError, UpdateViewParams>;
+  switchViewById: (id: InventoryViewId) => void;
+  setDefaultViewById: UseMutateFunction<
+    MetricsSourceConfigurationResponse,
+    ServerError,
+    string,
+    MutationContext
+  >;
+  isCreatingView: boolean;
+  isFetchingCurrentView: boolean;
+  isFetchingViews: boolean;
+  isUpdatingView: boolean;
+}
+
+type ServerError = IHttpFetchError<ResponseErrorBody>;
+
+interface MutationContext {
+  id?: string;
+  previousViews?: InventoryView[];
+}
+
+const queryKeys = {
+  find: ['inventory-views-find'] as const,
+  get: ['inventory-views-get'] as const,
+  getById: (id: string) => ['inventory-views-get', id] as const,
+};
+
+export const useInventoryViews = (): UseInventoryViewsResult => {
+  const { inventoryViews } = useKibanaContextForPlugin().services;
+  const trackMetric = useUiTracker({ app: 'infra_metrics' });
+
+  const queryClient = useQueryClient();
+  const { source, updateSourceConfiguration } = useSourceContext();
+
+  const defaultViewId = source?.configuration.inventoryDefaultView ?? '0';
+
+  const [currentViewId, switchViewById] = useUrlState<InventoryViewId>({
+    defaultState: defaultViewId,
+    decodeUrlState,
+    encodeUrlState,
+    urlStateKey: 'inventoryViewId',
+    writeDefaultState: true,
+  });
+
+  const notify = useSavedViewsNotifier();
+
+  const {
+    data: views,
+    refetch: fetchViews,
+    isFetching: isFetchingViews,
+  } = useQuery({
+    queryKey: queryKeys.find,
+    queryFn: () => inventoryViews.client.findInventoryViews(),
+    enabled: false, // We will manually fetch the list when necessary
+    placeholderData: [], // Use a default empty array instead of undefined
+    onError: (error: ServerError) => notify.getViewFailure(error.body?.message ?? error.message),
+    onSuccess: (data) => {
+      const prefix = data.length >= 1000 ? 'over' : 'under';
+      trackMetric({ metric: `${prefix}_1000_saved_objects_for_inventory_view` });
+    },
+  });
+
+  const { data: currentView, isFetching: isFetchingCurrentView } = useQuery({
+    queryKey: queryKeys.getById(currentViewId),
+    queryFn: ({ queryKey: [, id] }) => inventoryViews.client.getInventoryView(id),
+    onError: (error: ServerError) => {
+      notify.getViewFailure(error.body?.message ?? error.message);
+      switchViewById(defaultViewId);
+    },
+    placeholderData: null,
+  });
+
+  const { mutate: setDefaultViewById } = useMutation<
+    MetricsSourceConfigurationResponse,
+    ServerError,
+    string,
+    MutationContext
+  >({
+    mutationFn: (id) => updateSourceConfiguration({ inventoryDefaultView: id }),
+    /**
+     * To provide a quick feedback, we perform an optimistic update on the list
+     * when updating the default view.
+     * 1. Cancel any outgoing refetches (so they don't overwrite our optimistic update)
+     * 2. Snapshot the previous views list
+     * 3. Optimistically update the list with new default view and store in cache
+     * 4. Return a context object with the snapshotted views
+     */
+    onMutate: async (id) => {
+      await queryClient.cancelQueries({ queryKey: queryKeys.find }); // 1
+      const previousViews = queryClient.getQueryData<InventoryView[]>(queryKeys.find); // 2
+      const updatedViews = getListWithUpdatedDefault(id, previousViews); // 3
+      queryClient.setQueryData(queryKeys.find, updatedViews);
+      return { previousViews }; // 4
+    },
+    // If the mutation fails but doesn't retrigger the error, use the context returned from onMutate to roll back
+    onSuccess: (data, _id, context) => {
+      if (!data && context?.previousViews) {
+        return queryClient.setQueryData(queryKeys.find, context.previousViews);
+      }
+      return queryClient.invalidateQueries({ queryKey: queryKeys.get });
+    },
+  });
+
+  const { mutateAsync: createView, isLoading: isCreatingView } = useMutation<
+    InventoryView,
+    ServerError,
+    CreateInventoryViewAttributesRequestPayload
+  >({
+    mutationFn: (attributes) => inventoryViews.client.createInventoryView(attributes),
+    onError: (error) => {
+      notify.upsertViewFailure(error.body?.message ?? error.message);
+    },
+    onSuccess: (createdView) => {
+      queryClient.setQueryData(queryKeys.getById(createdView.id), createdView); // Store in cache created view
+      switchViewById(createdView.id); // Update current view and url state
+    },
+  });
+
+  const { mutateAsync: updateViewById, isLoading: isUpdatingView } = useMutation<
+    InventoryView,
+    ServerError,
+    UpdateViewParams
+  >({
+    mutationFn: ({ id, attributes }) => inventoryViews.client.updateInventoryView(id, attributes),
+    onError: (error) => {
+      notify.upsertViewFailure(error.body?.message ?? error.message);
+    },
+    onSuccess: (updatedView) => {
+      queryClient.setQueryData(queryKeys.getById(updatedView.id), updatedView); // Store in cache updated view
+    },
+  });
+
+  const { mutate: deleteViewById } = useMutation<null, ServerError, string, MutationContext>({
+    mutationFn: (id: string) => inventoryViews.client.deleteInventoryView(id),
+    /**
+     * To provide a quick feedback, we perform an optimistic update on the list
+     * when deleting a view.
+     * 1. Cancel any outgoing refetches (so they don't overwrite our optimistic update)
+     * 2. Snapshot the previous views list
+     * 3. Optimistically update the list removing the view and store in cache
+     * 4. Return a context object with the snapshotted views
+     */
+    onMutate: async (id) => {
+      await queryClient.cancelQueries({ queryKey: queryKeys.find }); // 1
+
+      const previousViews = queryClient.getQueryData<InventoryView[]>(queryKeys.find); // 2
+
+      const updatedViews = getListWithoutDeletedView(id, previousViews); // 3
+      queryClient.setQueryData(queryKeys.find, updatedViews);
+
+      return { previousViews }; // 4
+    },
+    // If the mutation fails, use the context returned from onMutate to roll back
+    onError: (error, _id, context) => {
+      notify.deleteViewFailure(error.body?.message ?? error.message);
+      if (context?.previousViews) {
+        queryClient.setQueryData(queryKeys.find, context.previousViews);
+      }
+    },
+    onSuccess: (_data, id) => {
+      // If the deleted view was the current one, switch to the default view
+      if (currentView?.id === id) {
+        switchViewById(defaultViewId);
+      }
+    },
+    onSettled: () => {
+      fetchViews(); // Invalidate views list cache and refetch views
+    },
+  });
+
+  return {
+    // Values
+    views,
+    currentView,
+    // Actions about updating view
+    createView,
+    deleteViewById,
+    fetchViews,
+    updateViewById,
+    switchViewById,
+    setDefaultViewById,
+    // Status flags
+    isCreatingView,
+    isFetchingCurrentView,
+    isFetchingViews,
+    isUpdatingView,
+  };
+};
+
+const inventoryViewIdRT = rt.string;
+type InventoryViewId = rt.TypeOf<typeof inventoryViewIdRT>;
+
+const encodeUrlState = inventoryViewIdRT.encode;
+const decodeUrlState = (value: unknown) => {
+  const state = pipe(inventoryViewIdRT.decode(value), fold(constant(undefined), identity));
+  return state;
+};
+
+/**
+ * Helpers
+ */
+const getListWithUpdatedDefault = (id: string, views: InventoryView[] = []) => {
+  return views.map((view) => ({
+    ...view,
+    attributes: {
+      ...view.attributes,
+      isDefault: view.id === id,
+    },
+  }));
+};
+
+const getListWithoutDeletedView = (id: string, views: InventoryView[] = []) => {
+  return views.filter((view) => view.id !== id);
+};
diff --git a/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts b/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
index 6250d20750e296..322ab47b7f459f 100644
--- a/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
+++ b/x-pack/plugins/infra/public/hooks/use_lens_attributes.ts
@@ -74,7 +74,13 @@ export const useLensAttributes = ({
     return visualizationAttributes;
   }, [dataView, formulaAPI, options, type, visualizationType]);
 
-  const injectFilters = (data: { filters: Filter[]; query: Query }): LensAttributes | null => {
+  const injectFilters = ({
+    filters,
+    query = { language: 'kuery', query: '' },
+  }: {
+    filters: Filter[];
+    query?: Query;
+  }): LensAttributes | null => {
     if (!attributes) {
       return null;
     }
@@ -82,8 +88,8 @@ export const useLensAttributes = ({
       ...attributes,
       state: {
         ...attributes.state,
-        query: data.query,
-        filters: [...attributes.state.filters, ...data.filters],
+        query,
+        filters: [...attributes.state.filters, ...filters],
       },
     };
   };
@@ -95,7 +101,7 @@ export const useLensAttributes = ({
   }: {
     timeRange: TimeRange;
     filters: Filter[];
-    query: Query;
+    query?: Query;
   }) => {
     return {
       openInLens: {
diff --git a/x-pack/plugins/infra/public/hooks/use_metrics_explorer_views.ts b/x-pack/plugins/infra/public/hooks/use_metrics_explorer_views.ts
new file mode 100644
index 00000000000000..34a3666b5c0e0b
--- /dev/null
+++ b/x-pack/plugins/infra/public/hooks/use_metrics_explorer_views.ts
@@ -0,0 +1,263 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import * as rt from 'io-ts';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { constant, identity } from 'fp-ts/lib/function';
+
+import {
+  QueryObserverBaseResult,
+  UseMutateAsyncFunction,
+  UseMutateFunction,
+  useMutation,
+  useQuery,
+  useQueryClient,
+} from '@tanstack/react-query';
+import { useUiTracker } from '@kbn/observability-plugin/public';
+
+import { IHttpFetchError, ResponseErrorBody } from '@kbn/core-http-browser';
+import { MetricsSourceConfigurationResponse } from '../../common/metrics_sources';
+import {
+  CreateMetricsExplorerViewAttributesRequestPayload,
+  UpdateMetricsExplorerViewAttributesRequestPayload,
+} from '../../common/http_api/latest';
+import { MetricsExplorerView } from '../../common/metrics_explorer_views';
+import { useKibanaContextForPlugin } from './use_kibana';
+import { useUrlState } from '../utils/use_url_state';
+import { useSavedViewsNotifier } from './use_saved_views_notifier';
+import { useSourceContext } from '../containers/metrics_source';
+
+interface UpdateViewParams {
+  id: string;
+  attributes: UpdateMetricsExplorerViewAttributesRequestPayload;
+}
+
+export interface UseMetricsExplorerViewsResult {
+  views?: MetricsExplorerView[];
+  currentView?: MetricsExplorerView | null;
+  createView: UseMutateAsyncFunction<
+    MetricsExplorerView,
+    ServerError,
+    CreateMetricsExplorerViewAttributesRequestPayload
+  >;
+  deleteViewById: UseMutateFunction<null, ServerError, string, MutationContext>;
+  fetchViews: QueryObserverBaseResult<MetricsExplorerView[]>['refetch'];
+  updateViewById: UseMutateAsyncFunction<MetricsExplorerView, ServerError, UpdateViewParams>;
+  switchViewById: (id: MetricsExplorerViewId) => void;
+  setDefaultViewById: UseMutateFunction<
+    MetricsSourceConfigurationResponse,
+    ServerError,
+    string,
+    MutationContext
+  >;
+  isCreatingView: boolean;
+  isFetchingCurrentView: boolean;
+  isFetchingViews: boolean;
+  isUpdatingView: boolean;
+}
+
+type ServerError = IHttpFetchError<ResponseErrorBody>;
+
+interface MutationContext {
+  id?: string;
+  previousViews?: MetricsExplorerView[];
+}
+
+const queryKeys = {
+  find: ['metrics-explorer-views-find'] as const,
+  get: ['metrics-explorer-views-get'] as const,
+  getById: (id: string) => ['metrics-explorer-views-get', id] as const,
+};
+
+export const useMetricsExplorerViews = (): UseMetricsExplorerViewsResult => {
+  const { metricsExplorerViews } = useKibanaContextForPlugin().services;
+  const trackMetric = useUiTracker({ app: 'infra_metrics' });
+
+  const queryClient = useQueryClient();
+  const { source, updateSourceConfiguration } = useSourceContext();
+
+  const defaultViewId = source?.configuration.metricsExplorerDefaultView ?? '0';
+
+  const [currentViewId, switchViewById] = useUrlState<MetricsExplorerViewId>({
+    defaultState: defaultViewId,
+    decodeUrlState,
+    encodeUrlState,
+    urlStateKey: 'metricsExplorerViewId',
+    writeDefaultState: true,
+  });
+
+  const notify = useSavedViewsNotifier();
+
+  const {
+    data: views,
+    refetch: fetchViews,
+    isFetching: isFetchingViews,
+  } = useQuery({
+    queryKey: queryKeys.find,
+    queryFn: () => metricsExplorerViews.client.findMetricsExplorerViews(),
+    enabled: false, // We will manually fetch the list when necessary
+    placeholderData: [], // Use a default empty array instead of undefined
+    onError: (error: ServerError) => notify.getViewFailure(error.body?.message ?? error.message),
+    onSuccess: (data) => {
+      const prefix = data.length >= 1000 ? 'over' : 'under';
+      trackMetric({ metric: `${prefix}_1000_saved_objects_for_metrics_explorer_view` });
+    },
+  });
+
+  const { data: currentView, isFetching: isFetchingCurrentView } = useQuery({
+    queryKey: queryKeys.getById(currentViewId),
+    queryFn: ({ queryKey: [, id] }) => metricsExplorerViews.client.getMetricsExplorerView(id),
+    onError: (error: ServerError) => {
+      notify.getViewFailure(error.body?.message ?? error.message);
+      switchViewById(defaultViewId);
+    },
+    placeholderData: null,
+  });
+
+  const { mutate: setDefaultViewById } = useMutation<
+    MetricsSourceConfigurationResponse,
+    ServerError,
+    string,
+    MutationContext
+  >({
+    mutationFn: (id) => updateSourceConfiguration({ metricsExplorerDefaultView: id }),
+    /**
+     * To provide a quick feedback, we perform an optimistic update on the list
+     * when updating the default view.
+     * 1. Cancel any outgoing refetches (so they don't overwrite our optimistic update)
+     * 2. Snapshot the previous views list
+     * 3. Optimistically update the list with new default view and store in cache
+     * 4. Return a context object with the snapshotted views
+     */
+    onMutate: async (id) => {
+      await queryClient.cancelQueries({ queryKey: queryKeys.find }); // 1
+      const previousViews = queryClient.getQueryData<MetricsExplorerView[]>(queryKeys.find); // 2
+      const updatedViews = getListWithUpdatedDefault(id, previousViews); // 3
+      queryClient.setQueryData(queryKeys.find, updatedViews);
+      return { previousViews }; // 4
+    },
+    // If the mutation fails but doesn't retrigger the error, use the context returned from onMutate to roll back
+    onSuccess: (data, _id, context) => {
+      if (!data && context?.previousViews) {
+        return queryClient.setQueryData(queryKeys.find, context.previousViews);
+      }
+      return queryClient.invalidateQueries({ queryKey: queryKeys.get });
+    },
+  });
+
+  const { mutateAsync: createView, isLoading: isCreatingView } = useMutation<
+    MetricsExplorerView,
+    ServerError,
+    CreateMetricsExplorerViewAttributesRequestPayload
+  >({
+    mutationFn: (attributes) => metricsExplorerViews.client.createMetricsExplorerView(attributes),
+    onError: (error) => {
+      notify.upsertViewFailure(error.body?.message ?? error.message);
+    },
+    onSuccess: (createdView) => {
+      queryClient.setQueryData(queryKeys.getById(createdView.id), createdView); // Store in cache created view
+      switchViewById(createdView.id); // Update current view and url state
+    },
+  });
+
+  const { mutateAsync: updateViewById, isLoading: isUpdatingView } = useMutation<
+    MetricsExplorerView,
+    ServerError,
+    UpdateViewParams
+  >({
+    mutationFn: ({ id, attributes }) =>
+      metricsExplorerViews.client.updateMetricsExplorerView(id, attributes),
+    onError: (error) => {
+      notify.upsertViewFailure(error.body?.message ?? error.message);
+    },
+    onSuccess: (updatedView) => {
+      queryClient.setQueryData(queryKeys.getById(updatedView.id), updatedView); // Store in cache updated view
+    },
+  });
+
+  const { mutate: deleteViewById } = useMutation<null, ServerError, string, MutationContext>({
+    mutationFn: (id: string) => metricsExplorerViews.client.deleteMetricsExplorerView(id),
+    /**
+     * To provide a quick feedback, we perform an optimistic update on the list
+     * when deleting a view.
+     * 1. Cancel any outgoing refetches (so they don't overwrite our optimistic update)
+     * 2. Snapshot the previous views list
+     * 3. Optimistically update the list removing the view and store in cache
+     * 4. Return a context object with the snapshotted views
+     */
+    onMutate: async (id) => {
+      await queryClient.cancelQueries({ queryKey: queryKeys.find }); // 1
+
+      const previousViews = queryClient.getQueryData<MetricsExplorerView[]>(queryKeys.find); // 2
+
+      const updatedViews = getListWithoutDeletedView(id, previousViews); // 3
+      queryClient.setQueryData(queryKeys.find, updatedViews);
+
+      return { previousViews }; // 4
+    },
+    // If the mutation fails, use the context returned from onMutate to roll back
+    onError: (error, _id, context) => {
+      notify.deleteViewFailure(error.body?.message ?? error.message);
+      if (context?.previousViews) {
+        queryClient.setQueryData(queryKeys.find, context.previousViews);
+      }
+    },
+    onSuccess: (_data, id) => {
+      // If the deleted view was the current one, switch to the default view
+      if (currentView?.id === id) {
+        switchViewById(defaultViewId);
+      }
+    },
+    onSettled: () => {
+      fetchViews(); // Invalidate views list cache and refetch views
+    },
+  });
+
+  return {
+    // Values
+    views,
+    currentView,
+    // Actions about updating view
+    createView,
+    deleteViewById,
+    fetchViews,
+    updateViewById,
+    switchViewById,
+    setDefaultViewById,
+    // Status flags
+    isCreatingView,
+    isFetchingCurrentView,
+    isFetchingViews,
+    isUpdatingView,
+  };
+};
+
+const metricsExplorerViewIdRT = rt.string;
+type MetricsExplorerViewId = rt.TypeOf<typeof metricsExplorerViewIdRT>;
+
+const encodeUrlState = metricsExplorerViewIdRT.encode;
+const decodeUrlState = (value: unknown) => {
+  const state = pipe(metricsExplorerViewIdRT.decode(value), fold(constant(undefined), identity));
+  return state;
+};
+
+/**
+ * Helpers
+ */
+const getListWithUpdatedDefault = (id: string, views: MetricsExplorerView[] = []) => {
+  return views.map((view) => ({
+    ...view,
+    attributes: {
+      ...view.attributes,
+      isDefault: view.id === id,
+    },
+  }));
+};
+
+const getListWithoutDeletedView = (id: string, views: MetricsExplorerView[] = []) => {
+  return views.filter((view) => view.id !== id);
+};
diff --git a/x-pack/plugins/infra/public/hooks/use_saved_views_notifier.ts b/x-pack/plugins/infra/public/hooks/use_saved_views_notifier.ts
new file mode 100644
index 00000000000000..b7b8822e3ec14e
--- /dev/null
+++ b/x-pack/plugins/infra/public/hooks/use_saved_views_notifier.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { useKibanaContextForPlugin } from './use_kibana';
+
+export const useSavedViewsNotifier = () => {
+  const { notifications } = useKibanaContextForPlugin();
+
+  const deleteViewFailure = (message?: string) => {
+    notifications.toasts.danger({
+      toastLifeTimeMs: 3000,
+      title:
+        message ||
+        i18n.translate('xpack.infra.savedView.errorOnDelete.title', {
+          defaultMessage: `An error occured deleting the view.`,
+        }),
+    });
+  };
+
+  const getViewFailure = (message?: string) => {
+    notifications.toasts.danger({
+      toastLifeTimeMs: 3000,
+      title:
+        message ||
+        i18n.translate('xpack.infra.savedView.findError.title', {
+          defaultMessage: `An error occurred while loading views.`,
+        }),
+    });
+  };
+
+  const upsertViewFailure = (message?: string) => {
+    notifications.toasts.danger({
+      toastLifeTimeMs: 3000,
+      title:
+        message ||
+        i18n.translate('xpack.infra.savedView.errorOnCreate.title', {
+          defaultMessage: `An error occured saving view.`,
+        }),
+    });
+  };
+
+  return {
+    deleteViewFailure,
+    getViewFailure,
+    upsertViewFailure,
+  };
+};
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
index 34e536aaf37d2b..2355812e277d50 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/chart/lens_wrapper.tsx
@@ -19,7 +19,7 @@ export interface LensWrapperProps {
   id: string;
   attributes: LensAttributes | null;
   dateRange: TimeRange;
-  query: Query;
+  query?: Query;
   filters: Filter[];
   extraActions: Action[];
   lastReloadRequestTime?: number;
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx
index 89eebeefd240e9..afb1181103d9d4 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/kpis/tile.tsx
@@ -77,22 +77,18 @@ export const Tile = ({
     visualizationType: 'metricChart',
   });
 
-  const hostsFilterQuery = useMemo(() => {
-    return createHostsFilter(
-      hostNodes.map((p) => p.name),
-      dataView
-    );
+  const filters = useMemo(() => {
+    return [
+      createHostsFilter(
+        hostNodes.map((p) => p.name),
+        dataView
+      ),
+    ];
   }, [hostNodes, dataView]);
 
-  const filters = useMemo(
-    () => [...searchCriteria.filters, ...searchCriteria.panelFilters, ...[hostsFilterQuery]],
-    [hostsFilterQuery, searchCriteria.filters, searchCriteria.panelFilters]
-  );
-
   const extraActionOptions = getExtraActions({
     timeRange: searchCriteria.dateRange,
     filters,
-    query: searchCriteria.query,
   });
 
   const handleBrushEnd = ({ range }: BrushTriggerEvent['data']) => {
@@ -156,7 +152,6 @@ export const Tile = ({
             lastReloadRequestTime={afterLoadedState.lastReloadRequestTime}
             dateRange={afterLoadedState.dateRange}
             filters={afterLoadedState.filters}
-            query={afterLoadedState.query}
             onBrushEnd={handleBrushEnd}
             loading={loading}
           />
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx
index f81228957107ae..1ef66e96f8abc2 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metric_chart.tsx
@@ -60,22 +60,18 @@ export const MetricChart = ({ title, type, breakdownSize }: MetricChartProps) =>
     visualizationType: 'lineChart',
   });
 
-  const hostsFilterQuery = useMemo(() => {
-    return createHostsFilter(
-      currentPage.map((p) => p.name),
-      dataView
-    );
+  const filters = useMemo(() => {
+    return [
+      createHostsFilter(
+        currentPage.map((p) => p.name),
+        dataView
+      ),
+    ];
   }, [currentPage, dataView]);
 
-  const filters = [
-    ...afterLoadedState.filters,
-    ...afterLoadedState.panelFilters,
-    ...[hostsFilterQuery],
-  ];
   const extraActionOptions = getExtraActions({
     timeRange: afterLoadedState.dateRange,
     filters,
-    query: afterLoadedState.query,
   });
 
   const extraActions: Action[] = [extraActionOptions.openInLens];
@@ -132,7 +128,6 @@ export const MetricChart = ({ title, type, breakdownSize }: MetricChartProps) =>
           lastReloadRequestTime={afterLoadedState.lastReloadRequestTime}
           dateRange={afterLoadedState.dateRange}
           filters={filters}
-          query={afterLoadedState.query}
           onBrushEnd={handleBrushEnd}
           loading={loading}
           hasTitle
diff --git a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metrics_grid.tsx b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metrics_grid.tsx
index 7f3dac7a3af163..b61ba46aa2c207 100644
--- a/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metrics_grid.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/hosts/components/tabs/metrics/metrics_grid.tsx
@@ -64,7 +64,7 @@ const CHARTS_IN_ORDER: Array<Pick<MetricChartProps, 'title' | 'type'> & { fullRo
 
 export const MetricsGrid = React.memo(() => {
   return (
-    <EuiFlexGrid columns={2} gutterSize="s">
+    <EuiFlexGrid columns={2} gutterSize="s" data-test-subj="hostsView-metricChart">
       {CHARTS_IN_ORDER.map(({ fullRow, ...chartProp }) => (
         <EuiFlexItem key={chartProp.type} style={fullRow ? { gridColumn: '1/-1' } : {}}>
           <MetricChart breakdownSize={DEFAULT_BREAKDOWN_SIZE} {...chartProp} />
diff --git a/x-pack/plugins/infra/public/pages/metrics/index.tsx b/x-pack/plugins/infra/public/pages/metrics/index.tsx
index 37f2a8bbbf01ed..df66dc5eb88ba6 100644
--- a/x-pack/plugins/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/index.tsx
@@ -10,8 +10,6 @@ import { i18n } from '@kbn/i18n';
 import React, { useContext } from 'react';
 import { RouteComponentProps, Switch } from 'react-router-dom';
 import { Route } from '@kbn/shared-ux-router';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 
 import { EuiErrorBoundary, EuiHeaderLinks, EuiHeaderLink } from '@elastic/eui';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
@@ -20,11 +18,7 @@ import { useLinkProps } from '@kbn/observability-plugin/public';
 import { MetricsSourceConfigurationProperties } from '../../../common/metrics_sources';
 import { HelpCenterContent } from '../../components/help_center_content';
 import { useReadOnlyBadge } from '../../hooks/use_readonly_badge';
-import {
-  MetricsExplorerOptionsContainer,
-  useMetricsExplorerOptionsContainerContext,
-  DEFAULT_METRICS_EXPLORER_VIEW_STATE,
-} from './metrics_explorer/hooks/use_metrics_explorer_options';
+import { MetricsExplorerOptionsContainer } from './metrics_explorer/hooks/use_metrics_explorer_options';
 import { WithMetricsExplorerOptionsUrlState } from '../../containers/metrics_explorer/with_metrics_explorer_options_url_state';
 import { MetricsExplorerPage } from './metrics_explorer';
 import { SnapshotPage } from './inventory_view';
@@ -36,13 +30,13 @@ import { WaffleOptionsProvider } from './inventory_view/hooks/use_waffle_options
 import { WaffleTimeProvider } from './inventory_view/hooks/use_waffle_time';
 import { WaffleFiltersProvider } from './inventory_view/hooks/use_waffle_filters';
 import { MetricsAlertDropdown } from '../../alerting/common/components/metrics_alert_dropdown';
-import { SavedViewProvider } from '../../containers/saved_view/saved_view';
 import { AlertPrefillProvider } from '../../alerting/use_alert_prefill';
 import { InfraMLCapabilitiesProvider } from '../../containers/ml/infra_ml_capabilities';
 import { AnomalyDetectionFlyout } from './inventory_view/components/ml/anomaly_detection/anomaly_detection_flyout';
 import { HeaderActionMenuContext } from '../../utils/header_action_menu_provider';
 import { CreateDerivedIndexPattern, useSourceContext } from '../../containers/metrics_source';
 import { NotFoundPage } from '../404';
+import { ReactQueryProvider } from '../../containers/react_query_provider';
 
 const ADD_DATA_LABEL = i18n.translate('xpack.infra.metricsHeaderAddDataButtonLabel', {
   defaultMessage: 'Add data',
@@ -51,7 +45,6 @@ const ADD_DATA_LABEL = i18n.translate('xpack.infra.metricsHeaderAddDataButtonLab
 export const InfrastructurePage = ({ match }: RouteComponentProps) => {
   const uiCapabilities = useKibana().services.application?.capabilities;
   const { setHeaderActionMenu, theme$ } = useContext(HeaderActionMenuContext);
-  const queryClient = new QueryClient();
 
   const settingsTabTitle = i18n.translate('xpack.infra.metrics.settingsTabTitle', {
     defaultMessage: 'Settings',
@@ -74,8 +67,7 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
         <WaffleOptionsProvider>
           <WaffleTimeProvider>
             <WaffleFiltersProvider>
-              <QueryClientProvider client={queryClient}>
-                <ReactQueryDevtools initialIsOpen={false} />
+              <ReactQueryProvider>
                 <InfraMLCapabilitiesProvider>
                   <HelpCenterContent
                     feedbackLink="https://discuss.elastic.co/c/metrics"
@@ -122,7 +114,7 @@ export const InfrastructurePage = ({ match }: RouteComponentProps) => {
                     <Route render={() => <NotFoundPage title="Infrastructure" />} />
                   </Switch>
                 </InfraMLCapabilitiesProvider>
-              </QueryClientProvider>
+              </ReactQueryProvider>
             </WaffleFiltersProvider>
           </WaffleTimeProvider>
         </WaffleOptionsProvider>
@@ -136,19 +128,12 @@ const PageContent = (props: {
   createDerivedIndexPattern: CreateDerivedIndexPattern;
 }) => {
   const { createDerivedIndexPattern, configuration } = props;
-  const { options } = useMetricsExplorerOptionsContainerContext();
 
   return (
-    <SavedViewProvider
-      shouldLoadDefault={options.source === 'default'}
-      viewType={'metrics-explorer-view'}
-      defaultViewState={DEFAULT_METRICS_EXPLORER_VIEW_STATE}
-    >
-      <MetricsExplorerPage
-        derivedIndexPattern={createDerivedIndexPattern()}
-        source={configuration}
-        {...props}
-      />
-    </SavedViewProvider>
+    <MetricsExplorerPage
+      derivedIndexPattern={createDerivedIndexPattern()}
+      source={configuration}
+      {...props}
+    />
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
index 373a6a563fee92..9827c866b1424e 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout.tsx
@@ -36,7 +36,6 @@ import { LegendControls } from './waffle/legend_controls';
 import { TryItButton } from '../../../../components/try_it_button';
 
 interface Props {
-  shouldLoadDefault: boolean;
   currentView: SavedView<any> | null;
   reload: () => Promise<any>;
   interval: string;
@@ -52,186 +51,173 @@ interface LegendControlOptions {
 
 const HOSTS_LINK_LOCAL_STORAGE_KEY = 'inventoryUI:hostsLinkClicked';
 
-export const Layout = React.memo(
-  ({ shouldLoadDefault, currentView, reload, interval, nodes, loading }: Props) => {
-    const [showLoading, setShowLoading] = useState(true);
-    const {
-      metric,
-      groupBy,
-      sort,
-      nodeType,
-      changeView,
-      view,
-      autoBounds,
-      boundsOverride,
-      legend,
-      changeBoundsOverride,
-      changeAutoBounds,
-      changeLegend,
-    } = useWaffleOptionsContext();
-    const { currentTime, jumpToTime, isAutoReloading } = useWaffleTimeContext();
-    const { applyFilterQuery } = useWaffleFiltersContext();
-    const legendPalette = legend?.palette ?? DEFAULT_LEGEND.palette;
-    const legendSteps = legend?.steps ?? DEFAULT_LEGEND.steps;
-    const legendReverseColors = legend?.reverseColors ?? DEFAULT_LEGEND.reverseColors;
-
-    const [hostsLinkClicked, setHostsLinkClicked] = useLocalStorage<boolean>(
-      HOSTS_LINK_LOCAL_STORAGE_KEY,
-      false
-    );
-    const hostsLinkClickedRef = useRef<boolean | undefined>(hostsLinkClicked);
-
-    const options = {
-      formatter: InfraFormatterType.percent,
-      formatTemplate: '{{value}}',
-      legend: createLegend(legendPalette, legendSteps, legendReverseColors),
-      metric,
-      sort,
-      groupBy,
-    };
-
-    useInterval(
-      () => {
-        if (!loading) {
-          jumpToTime(Date.now());
-        }
-      },
-      isAutoReloading ? 5000 : null
-    );
-
-    const dataBounds = calculateBoundsFromNodes(nodes);
-    const bounds = autoBounds ? dataBounds : boundsOverride;
-    /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    const formatter = useCallback(createInventoryMetricFormatter(options.metric), [options.metric]);
-    const { onViewChange } = useWaffleViewState();
-
-    useEffect(() => {
-      if (currentView) {
-        onViewChange(currentView);
+export const Layout = React.memo(({ currentView, reload, interval, nodes, loading }: Props) => {
+  const [showLoading, setShowLoading] = useState(true);
+  const {
+    metric,
+    groupBy,
+    sort,
+    nodeType,
+    changeView,
+    view,
+    autoBounds,
+    boundsOverride,
+    legend,
+    changeBoundsOverride,
+    changeAutoBounds,
+    changeLegend,
+  } = useWaffleOptionsContext();
+  const { currentTime, jumpToTime, isAutoReloading } = useWaffleTimeContext();
+  const { applyFilterQuery } = useWaffleFiltersContext();
+  const legendPalette = legend?.palette ?? DEFAULT_LEGEND.palette;
+  const legendSteps = legend?.steps ?? DEFAULT_LEGEND.steps;
+  const legendReverseColors = legend?.reverseColors ?? DEFAULT_LEGEND.reverseColors;
+
+  const [hostsLinkClicked, setHostsLinkClicked] = useLocalStorage<boolean>(
+    HOSTS_LINK_LOCAL_STORAGE_KEY,
+    false
+  );
+  const hostsLinkClickedRef = useRef<boolean | undefined>(hostsLinkClicked);
+
+  const options = {
+    formatter: InfraFormatterType.percent,
+    formatTemplate: '{{value}}',
+    legend: createLegend(legendPalette, legendSteps, legendReverseColors),
+    metric,
+    sort,
+    groupBy,
+  };
+
+  useInterval(
+    () => {
+      if (!loading) {
+        jumpToTime(Date.now());
       }
-    }, [currentView, onViewChange]);
-
-    useEffect(() => {
-      // load snapshot data after default view loaded, unless we're not loading a view
-      if (currentView != null || !shouldLoadDefault) {
-        reload();
-      }
-
-      /**
-       * INFO: why disable exhaustive-deps
-       * We need to wait on the currentView not to be null because it is loaded async and could change the view state.
-       * We don't actually need to watch the value of currentView though, since the view state will be synched up by the
-       * changing params in the reload method so we should only "watch" the reload method.
-       *
-       * TODO: Should refactor this in the future to make it more clear where all the view state is coming
-       * from and it's precedence [query params, localStorage, defaultView, out of the box view]
-       */
-      /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    }, [reload, shouldLoadDefault]);
-
-    useEffect(() => {
-      setShowLoading(true);
-    }, [options.metric, nodeType]);
-
-    useEffect(() => {
-      const hasNodes = nodes && nodes.length;
-      // Don't show loading screen when we're auto-reloading
-      setShowLoading(!hasNodes);
-    }, [nodes]);
-
-    const handleLegendControlChange = useCallback(
-      (opts: LegendControlOptions) => {
-        changeBoundsOverride(opts.bounds);
-        changeAutoBounds(opts.auto);
-        changeLegend(opts.legend);
-      },
-      [changeBoundsOverride, changeAutoBounds, changeLegend]
-    );
-
-    return (
-      <>
-        <PageContent>
-          <EuiFlexGroup direction="column" gutterSize="s">
-            <TopActionContainer grow={false}>
-              <EuiFlexGroup justifyContent="spaceBetween" alignItems="center" gutterSize="m">
-                <Toolbar nodeType={nodeType} currentTime={currentTime} />
-                <EuiFlexGroup
-                  responsive={false}
-                  css={css`
-                    margin: 0;
-                    justify-content: flex-end;
-                  `}
-                >
-                  {view === 'map' && (
-                    <EuiFlexItem grow={false}>
-                      <LegendControls
-                        options={legend != null ? legend : DEFAULT_LEGEND}
-                        dataBounds={dataBounds}
-                        bounds={bounds}
-                        autoBounds={autoBounds}
-                        boundsOverride={boundsOverride}
-                        onChange={handleLegendControlChange}
-                      />
-                    </EuiFlexItem>
-                  )}
+    },
+    isAutoReloading ? 5000 : null
+  );
+
+  const dataBounds = calculateBoundsFromNodes(nodes);
+  const bounds = autoBounds ? dataBounds : boundsOverride;
+  /* eslint-disable-next-line react-hooks/exhaustive-deps */
+  const formatter = useCallback(createInventoryMetricFormatter(options.metric), [options.metric]);
+  const { onViewChange } = useWaffleViewState();
+
+  useEffect(() => {
+    if (currentView) {
+      onViewChange(currentView);
+    }
+  }, [currentView, onViewChange]);
+
+  useEffect(() => {
+    // load snapshot data after default view loaded, unless we're not loading a view
+    if (currentView != null) {
+      reload();
+    }
+  }, [currentView, reload]);
+
+  useEffect(() => {
+    setShowLoading(true);
+  }, [options.metric, nodeType]);
+
+  useEffect(() => {
+    const hasNodes = nodes && nodes.length;
+    // Don't show loading screen when we're auto-reloading
+    setShowLoading(!hasNodes);
+  }, [nodes]);
+
+  const handleLegendControlChange = useCallback(
+    (opts: LegendControlOptions) => {
+      changeBoundsOverride(opts.bounds);
+      changeAutoBounds(opts.auto);
+      changeLegend(opts.legend);
+    },
+    [changeBoundsOverride, changeAutoBounds, changeLegend]
+  );
+
+  return (
+    <>
+      <PageContent>
+        <EuiFlexGroup direction="column" gutterSize="s">
+          <TopActionContainer grow={false}>
+            <EuiFlexGroup justifyContent="spaceBetween" alignItems="center" gutterSize="m">
+              <Toolbar nodeType={nodeType} currentTime={currentTime} />
+              <EuiFlexGroup
+                responsive={false}
+                css={css`
+                  margin: 0;
+                  justify-content: flex-end;
+                `}
+              >
+                {view === 'map' && (
                   <EuiFlexItem grow={false}>
-                    <ViewSwitcher view={view} onChange={changeView} />
+                    <LegendControls
+                      options={legend != null ? legend : DEFAULT_LEGEND}
+                      dataBounds={dataBounds}
+                      bounds={bounds}
+                      autoBounds={autoBounds}
+                      boundsOverride={boundsOverride}
+                      onChange={handleLegendControlChange}
+                    />
                   </EuiFlexItem>
-                </EuiFlexGroup>
+                )}
+                <EuiFlexItem grow={false}>
+                  <ViewSwitcher view={view} onChange={changeView} />
+                </EuiFlexItem>
               </EuiFlexGroup>
-            </TopActionContainer>
-            <EuiFlexItem grow={false}>
-              {!hostsLinkClickedRef.current && nodeType === 'host' && (
-                <TryItButton
-                  data-test-subj="inventory-hostsView-link"
-                  label={i18n.translate('xpack.infra.layout.hostsLandingPageLink', {
-                    defaultMessage: 'Introducing a new Hosts analysis experience',
-                  })}
-                  link={{
-                    app: 'metrics',
-                    pathname: '/hosts',
-                  }}
-                  experimental
-                  onClick={() => {
-                    setHostsLinkClicked(true);
-                  }}
+            </EuiFlexGroup>
+          </TopActionContainer>
+          <EuiFlexItem grow={false}>
+            {!hostsLinkClickedRef.current && nodeType === 'host' && (
+              <TryItButton
+                data-test-subj="inventory-hostsView-link"
+                label={i18n.translate('xpack.infra.layout.hostsLandingPageLink', {
+                  defaultMessage: 'Introducing a new Hosts analysis experience',
+                })}
+                link={{
+                  app: 'metrics',
+                  pathname: '/hosts',
+                }}
+                experimental
+                onClick={() => {
+                  setHostsLinkClicked(true);
+                }}
+              />
+            )}
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+            css={css`
+              position: relative;
+              flex: 1 1 auto;
+            `}
+          >
+            <AutoSizer bounds>
+              {({ bounds: { height = 0 } }) => (
+                <NodesOverview
+                  nodes={nodes}
+                  options={options}
+                  nodeType={nodeType}
+                  loading={loading}
+                  showLoading={showLoading}
+                  reload={reload}
+                  onDrilldown={applyFilterQuery}
+                  currentTime={currentTime}
+                  view={view}
+                  autoBounds={autoBounds}
+                  boundsOverride={boundsOverride}
+                  formatter={formatter}
+                  bottomMargin={height}
                 />
               )}
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-              css={css`
-                position: relative;
-                flex: 1 1 auto;
-              `}
-            >
-              <AutoSizer bounds>
-                {({ bounds: { height = 0 } }) => (
-                  <NodesOverview
-                    nodes={nodes}
-                    options={options}
-                    nodeType={nodeType}
-                    loading={loading}
-                    showLoading={showLoading}
-                    reload={reload}
-                    onDrilldown={applyFilterQuery}
-                    currentTime={currentTime}
-                    view={view}
-                    autoBounds={autoBounds}
-                    boundsOverride={boundsOverride}
-                    formatter={formatter}
-                    bottomMargin={height}
-                  />
-                )}
-              </AutoSizer>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </PageContent>
-        <BottomDrawer interval={interval} formatter={formatter} view={view} nodeType={nodeType} />
-      </>
-    );
-  }
-);
+            </AutoSizer>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </PageContent>
+      <BottomDrawer interval={interval} formatter={formatter} view={view} nodeType={nodeType} />
+    </>
+  );
+});
 
 const TopActionContainer = euiStyled(EuiFlexItem)`
   padding: ${(props) => `${props.theme.eui.euiSizeM} 0`};
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout_view.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout_view.tsx
index af9c9ab5e2b303..f2ea500a98fd14 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout_view.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/layout_view.tsx
@@ -6,8 +6,8 @@
  */
 
 import React from 'react';
+import { useInventoryViews } from '../../../../hooks/use_inventory_views';
 import { SnapshotNode } from '../../../../../common/http_api';
-import { useSavedViewContext } from '../../../../containers/saved_view/saved_view';
 import { Layout } from './layout';
 
 interface Props {
@@ -18,6 +18,6 @@ interface Props {
 }
 
 export const LayoutView = (props: Props) => {
-  const { shouldLoadDefault, currentView } = useSavedViewContext();
-  return <Layout shouldLoadDefault={shouldLoadDefault} currentView={currentView} {...props} />;
+  const { currentView } = useInventoryViews();
+  return <Layout currentView={currentView} {...props} />;
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/saved_views.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/saved_views.tsx
index 484c0a38f4d065..4547b0dbb01471 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/saved_views.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/components/saved_views.tsx
@@ -6,10 +6,42 @@
  */
 
 import React from 'react';
+import { useInventoryViews } from '../../../../hooks/use_inventory_views';
 import { SavedViewsToolbarControls } from '../../../../components/saved_views/toolbar_control';
-import { useWaffleViewState } from '../hooks/use_waffle_view_state';
+import { useWaffleViewState, WaffleViewState } from '../hooks/use_waffle_view_state';
 
 export const SavedViews = () => {
   const { viewState } = useWaffleViewState();
-  return <SavedViewsToolbarControls viewState={viewState} />;
+  const {
+    currentView,
+    views,
+    isFetchingViews,
+    isFetchingCurrentView,
+    isCreatingView,
+    isUpdatingView,
+    createView,
+    deleteViewById,
+    fetchViews,
+    updateViewById,
+    switchViewById,
+    setDefaultViewById,
+  } = useInventoryViews();
+
+  return (
+    <SavedViewsToolbarControls<WaffleViewState>
+      currentView={currentView}
+      views={views}
+      isFetchingViews={isFetchingViews}
+      isFetchingCurrentView={isFetchingCurrentView}
+      isCreatingView={isCreatingView}
+      isUpdatingView={isUpdatingView}
+      onCreateView={createView}
+      onDeleteView={deleteViewById}
+      onUpdateView={updateViewById}
+      onLoadViews={fetchViews}
+      onSetDefaultView={setDefaultViewById}
+      onSwitchView={switchViewById}
+      viewState={viewState}
+    />
+  );
 };
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts
index 02a2144f1282e1..6e685a6cc105fb 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/hooks/use_waffle_view_state.ts
@@ -65,30 +65,32 @@ export const useWaffleViewState = () => {
   };
 
   const onViewChange = useCallback(
-    (newState: WaffleViewState) => {
+    (newState) => {
+      const attributes = newState.attributes as WaffleViewState;
+
       setWaffleOptionsState({
-        sort: newState.sort,
-        metric: newState.metric,
-        groupBy: newState.groupBy,
-        nodeType: newState.nodeType,
-        view: newState.view,
-        customOptions: newState.customOptions,
-        customMetrics: newState.customMetrics,
-        boundsOverride: newState.boundsOverride,
-        autoBounds: newState.autoBounds,
-        accountId: newState.accountId,
-        region: newState.region,
-        legend: newState.legend,
-        timelineOpen: newState.timelineOpen,
+        sort: attributes.sort,
+        metric: attributes.metric,
+        groupBy: attributes.groupBy,
+        nodeType: attributes.nodeType,
+        view: attributes.view,
+        customOptions: attributes.customOptions,
+        customMetrics: attributes.customMetrics,
+        boundsOverride: attributes.boundsOverride,
+        autoBounds: attributes.autoBounds,
+        accountId: attributes.accountId,
+        region: attributes.region,
+        legend: attributes.legend,
+        timelineOpen: attributes.timelineOpen,
       });
 
-      if (newState.time) {
+      if (attributes.time) {
         setWaffleTimeState({
-          currentTime: newState.time,
-          isAutoReloading: newState.autoReload,
+          currentTime: attributes.time,
+          isAutoReloading: attributes.autoReload,
         });
       }
-      setWaffleFiltersState(newState.filterQuery);
+      setWaffleFiltersState(attributes.filterQuery);
     },
     [setWaffleOptionsState, setWaffleTimeState, setWaffleFiltersState]
   );
diff --git a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
index 922f0cdfaaaa81..6c97172a30f82b 100644
--- a/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/inventory_view/index.tsx
@@ -16,9 +16,6 @@ import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { useSourceContext } from '../../../containers/metrics_source';
 import { useMetricsBreadcrumbs } from '../../../hooks/use_metrics_breadcrumbs';
 import { LayoutView } from './components/layout_view';
-import { SavedViewProvider } from '../../../containers/saved_view/saved_view';
-import { DEFAULT_WAFFLE_VIEW_STATE } from './hooks/use_waffle_view_state';
-import { useWaffleOptionsContext } from './hooks/use_waffle_options';
 import { MetricsPageTemplate } from '../page_template';
 import { inventoryTitle } from '../../../translations';
 import { SavedViews } from './components/saved_views';
@@ -32,7 +29,6 @@ export const SnapshotPage = () => {
 
   useTrackPageview({ app: 'infra_metrics', path: 'inventory' });
   useTrackPageview({ app: 'infra_metrics', path: 'inventory', delay: 15000 });
-  const { source: optionsSource } = useWaffleOptionsContext();
 
   useMetricsBreadcrumbs([
     {
@@ -60,36 +56,30 @@ export const SnapshotPage = () => {
   return (
     <EuiErrorBoundary>
       <div className={APP_WRAPPER_CLASS}>
-        <SavedViewProvider
-          shouldLoadDefault={optionsSource === 'default'}
-          viewType={'inventory-view'}
-          defaultViewState={DEFAULT_WAFFLE_VIEW_STATE}
+        <MetricsPageTemplate
+          hasData={metricIndicesExist}
+          pageHeader={{
+            pageTitle: inventoryTitle,
+            rightSideItems: [<SavedViews />, <SurveyKubernetes />],
+          }}
+          pageSectionProps={{
+            contentProps: {
+              css: css`
+                ${fullHeightContentStyles};
+                padding-bottom: 0;
+              `,
+            },
+          }}
         >
-          <MetricsPageTemplate
-            hasData={metricIndicesExist}
-            pageHeader={{
-              pageTitle: inventoryTitle,
-              rightSideItems: [<SavedViews />, <SurveyKubernetes />],
-            }}
-            pageSectionProps={{
-              contentProps: {
-                css: css`
-                  ${fullHeightContentStyles};
-                  padding-bottom: 0;
-                `,
-              },
-            }}
-          >
-            <SnapshotContainer
-              render={({ loading, nodes, reload, interval }) => (
-                <>
-                  <FilterBar interval={interval} />
-                  <LayoutView loading={loading} nodes={nodes} reload={reload} interval={interval} />
-                </>
-              )}
-            />
-          </MetricsPageTemplate>
-        </SavedViewProvider>
+          <SnapshotContainer
+            render={({ loading, nodes, reload, interval }) => (
+              <>
+                <FilterBar interval={interval} />
+                <LayoutView loading={loading} nodes={nodes} reload={reload} interval={interval} />
+              </>
+            )}
+          />
+        </MetricsPageTemplate>
       </div>
     </EuiErrorBoundary>
   );
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/saved_views.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/saved_views.tsx
new file mode 100644
index 00000000000000..2d329f121f0081
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/components/saved_views.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 React from 'react';
+import { useMetricsExplorerViews } from '../../../../hooks/use_metrics_explorer_views';
+import { SavedViewsToolbarControls } from '../../../../components/saved_views/toolbar_control';
+import { MetricExplorerViewState } from '../hooks/use_metric_explorer_state';
+
+interface Props {
+  viewState: MetricExplorerViewState;
+}
+
+export const SavedViews = ({ viewState }: Props) => {
+  const {
+    currentView,
+    views,
+    isFetchingViews,
+    isFetchingCurrentView,
+    isCreatingView,
+    isUpdatingView,
+    createView,
+    deleteViewById,
+    fetchViews,
+    updateViewById,
+    switchViewById,
+    setDefaultViewById,
+  } = useMetricsExplorerViews();
+
+  return (
+    <SavedViewsToolbarControls<MetricExplorerViewState>
+      currentView={currentView}
+      views={views}
+      isFetchingViews={isFetchingViews}
+      isFetchingCurrentView={isFetchingCurrentView}
+      isCreatingView={isCreatingView}
+      isUpdatingView={isUpdatingView}
+      onCreateView={createView}
+      onDeleteView={deleteViewById}
+      onUpdateView={updateViewById}
+      onLoadViews={fetchViews}
+      onSetDefaultView={setDefaultViewById}
+      onSwitchView={switchViewById}
+      viewState={viewState}
+    />
+  );
+};
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
index a9a46110941746..bc098e441eb295 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/hooks/use_metric_explorer_state.ts
@@ -8,6 +8,7 @@
 import DateMath from '@kbn/datemath';
 import { useCallback, useEffect } from 'react';
 import { DataViewBase } from '@kbn/es-query';
+import { MetricsExplorerView } from '../../../../../common/metrics_explorer_views';
 import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
 import {
   MetricsExplorerMetric,
@@ -124,19 +125,19 @@ export const useMetricsExplorerState = (
   );
 
   const onViewStateChange = useCallback(
-    (vs: MetricExplorerViewState) => {
-      if (vs.chartOptions) {
-        setChartOptions(vs.chartOptions);
+    (view: MetricsExplorerView) => {
+      if (view.attributes.chartOptions) {
+        setChartOptions(view.attributes.chartOptions as MetricsExplorerChartOptions);
       }
-      if (vs.currentTimerange) {
+      if (view.attributes.currentTimerange) {
         // if this is the "Default View" view, don't update the time range to the view's time range,
         // this way it will use the global Kibana time or the default time already set
-        if (vs.id !== '0') {
-          setTimeRange(vs.currentTimerange);
+        if (!view.attributes.isStatic) {
+          setTimeRange(view.attributes.currentTimerange as MetricsExplorerTimeOptions);
         }
       }
-      if (vs.options) {
-        setOptions(vs.options);
+      if (view.attributes.options) {
+        setOptions(view.attributes.options as MetricsExplorerOptions);
       }
     },
     [setChartOptions, setOptions, setTimeRange]
diff --git a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
index d62d6ea1e82b16..07d5e210c46a1b 100644
--- a/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
+++ b/x-pack/plugins/infra/public/pages/metrics/metrics_explorer/index.tsx
@@ -9,6 +9,7 @@ import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState } from 'react';
 import { useTrackPageview } from '@kbn/observability-plugin/public';
+import { useMetricsExplorerViews } from '../../../hooks/use_metrics_explorer_views';
 import { MetricsSourceConfigurationProperties } from '../../../../common/metrics_sources';
 import { useMetricsBreadcrumbs } from '../../../hooks/use_metrics_breadcrumbs';
 import { NoData } from '../../../components/empty_states';
@@ -16,11 +17,10 @@ import { MetricsExplorerCharts } from './components/charts';
 import { MetricsExplorerToolbar } from './components/toolbar';
 import { useMetricsExplorerState } from './hooks/use_metric_explorer_state';
 import { useSourceContext } from '../../../containers/metrics_source';
-import { useSavedViewContext } from '../../../containers/saved_view/saved_view';
 import { MetricsPageTemplate } from '../page_template';
 import { metricsExplorerTitle } from '../../../translations';
-import { SavedViewsToolbarControls } from '../../../components/saved_views/toolbar_control';
 import { DerivedIndexPattern } from '../../../containers/metrics_source';
+import { SavedViews } from './components/saved_views';
 interface MetricsExplorerPageProps {
   source: MetricsSourceConfigurationProperties;
   derivedIndexPattern: DerivedIndexPattern;
@@ -45,7 +45,7 @@ export const MetricsExplorerPage = ({ source, derivedIndexPattern }: MetricsExpl
     onViewStateChange,
     refresh,
   } = useMetricsExplorerState(source, derivedIndexPattern, enabled);
-  const { currentView, shouldLoadDefault } = useSavedViewContext();
+  const { currentView } = useMetricsExplorerViews();
 
   useTrackPageview({ app: 'infra_metrics', path: 'metrics_explorer' });
   useTrackPageview({ app: 'infra_metrics', path: 'metrics_explorer', delay: 15000 });
@@ -58,11 +58,11 @@ export const MetricsExplorerPage = ({ source, derivedIndexPattern }: MetricsExpl
   }, [currentView, onViewStateChange]);
 
   useEffect(() => {
-    if (currentView != null || !shouldLoadDefault) {
+    if (currentView != null) {
       // load metrics explorer data after default view loaded, unless we're not isLoading a view
       setEnabled(true);
     }
-  }, [currentView, shouldLoadDefault]);
+  }, [currentView]);
 
   useMetricsBreadcrumbs([
     {
@@ -70,21 +70,19 @@ export const MetricsExplorerPage = ({ source, derivedIndexPattern }: MetricsExpl
     },
   ]);
 
+  const viewState = {
+    options,
+    chartOptions,
+    currentTimerange: timeRange,
+  };
+
   return (
     <EuiErrorBoundary>
       <MetricsPageTemplate
         hasData={metricIndicesExist}
         pageHeader={{
           pageTitle: metricsExplorerTitle,
-          rightSideItems: [
-            <SavedViewsToolbarControls
-              viewState={{
-                options,
-                chartOptions,
-                currentTimerange: timeRange,
-              }}
-            />,
-          ],
+          rightSideItems: [<SavedViews viewState={viewState} />],
         }}
       >
         <MetricsExplorerToolbar
diff --git a/x-pack/plugins/infra/public/services/inventory_views/inventory_views_client.ts b/x-pack/plugins/infra/public/services/inventory_views/inventory_views_client.ts
index a72dd8c7fefbdf..eeabd15e60a4bb 100644
--- a/x-pack/plugins/infra/public/services/inventory_views/inventory_views_client.ts
+++ b/x-pack/plugins/infra/public/services/inventory_views/inventory_views_client.ts
@@ -68,7 +68,9 @@ export class InventoryViewsClient implements IInventoryViewsClient {
         ),
       })
       .catch((error) => {
-        throw new UpsertInventoryViewError(`Failed to create new inventory view : ${error}`);
+        throw new UpsertInventoryViewError(
+          `Failed to create new inventory view: ${error.body?.message ?? error.message}`
+        );
       });
 
     const { data } = decodeOrThrow(
@@ -92,7 +94,9 @@ export class InventoryViewsClient implements IInventoryViewsClient {
       })
       .catch((error) => {
         throw new UpsertInventoryViewError(
-          `Failed to update inventory view "${inventoryViewId}": ${error}`
+          `Failed to update inventory view "${inventoryViewId}": ${
+            error.body?.message ?? error.message
+          }`
         );
       });
 
diff --git a/x-pack/plugins/infra/public/services/inventory_views/types.ts b/x-pack/plugins/infra/public/services/inventory_views/types.ts
index 2a690c4cc6c2ef..573c144e9c4415 100644
--- a/x-pack/plugins/infra/public/services/inventory_views/types.ts
+++ b/x-pack/plugins/infra/public/services/inventory_views/types.ts
@@ -6,7 +6,11 @@
  */
 
 import { HttpStart } from '@kbn/core/public';
-import { InventoryView, InventoryViewAttributes } from '../../../common/inventory_views';
+import {
+  CreateInventoryViewAttributesRequestPayload,
+  UpdateInventoryViewAttributesRequestPayload,
+} from '../../../common/http_api/latest';
+import type { InventoryView } from '../../../common/inventory_views';
 
 export type InventoryViewsServiceSetup = void;
 
@@ -22,11 +26,11 @@ export interface IInventoryViewsClient {
   findInventoryViews(): Promise<InventoryView[]>;
   getInventoryView(inventoryViewId: string): Promise<InventoryView>;
   createInventoryView(
-    inventoryViewAttributes: Partial<InventoryViewAttributes>
+    inventoryViewAttributes: CreateInventoryViewAttributesRequestPayload
   ): Promise<InventoryView>;
   updateInventoryView(
     inventoryViewId: string,
-    inventoryViewAttributes: Partial<InventoryViewAttributes>
+    inventoryViewAttributes: UpdateInventoryViewAttributesRequestPayload
   ): Promise<InventoryView>;
   deleteInventoryView(inventoryViewId: string): Promise<null>;
 }
diff --git a/x-pack/plugins/infra/public/services/metrics_explorer_views/metrics_explorer_views_client.ts b/x-pack/plugins/infra/public/services/metrics_explorer_views/metrics_explorer_views_client.ts
index d37d2fc81b31dc..788a8789abe73c 100644
--- a/x-pack/plugins/infra/public/services/metrics_explorer_views/metrics_explorer_views_client.ts
+++ b/x-pack/plugins/infra/public/services/metrics_explorer_views/metrics_explorer_views_client.ts
@@ -73,7 +73,7 @@ export class MetricsExplorerViewsClient implements IMetricsExplorerViewsClient {
       })
       .catch((error) => {
         throw new UpsertMetricsExplorerViewError(
-          `Failed to create new metrics explorer view: ${error}`
+          `Failed to create new metrics explorer view: ${error.body?.message ?? error.message}`
         );
       });
 
@@ -102,7 +102,9 @@ export class MetricsExplorerViewsClient implements IMetricsExplorerViewsClient {
       })
       .catch((error) => {
         throw new UpsertMetricsExplorerViewError(
-          `Failed to update metrics explorer view "${metricsExplorerViewId}": ${error}`
+          `Failed to update metrics explorer view "${metricsExplorerViewId}": ${
+            error.body?.message ?? error.message
+          }`
         );
       });
 
diff --git a/x-pack/plugins/infra/server/lib/infra_ml/metrics_hosts_anomalies.ts b/x-pack/plugins/infra/server/lib/infra_ml/metrics_hosts_anomalies.ts
index 1e307dae8e5b79..5aa53c67544f56 100644
--- a/x-pack/plugins/infra/server/lib/infra_ml/metrics_hosts_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/infra_ml/metrics_hosts_anomalies.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 import { InfraRequestHandlerContext } from '../../types';
 import { TracingSpan, startTracingSpan } from '../../../common/performance_tracing';
 import { fetchMlJob, MappedAnomalyHit, InfluencerFilter } from './common';
-import { getJobId, metricsHostsJobTypes, ANOMALY_THRESHOLD } from '../../../common/infra_ml';
+import { getJobId, metricsHostsJobTypes } from '../../../common/infra_ml';
 import { Sort, Pagination } from '../../../common/http_api/infra_ml';
 import type { MlSystem, MlAnomalyDetectors } from '../../types';
 import { isMlPrivilegesError } from './errors';
@@ -74,7 +75,7 @@ export async function getMetricsHostsAnomalies({
 }: {
   context: Required<InfraRequestHandlerContext>;
   sourceId: string;
-  anomalyThreshold: ANOMALY_THRESHOLD;
+  anomalyThreshold: ML_ANOMALY_THRESHOLD;
   startTime: number;
   endTime: number;
   metric: 'memory_usage' | 'network_in' | 'network_out' | undefined;
@@ -172,7 +173,7 @@ const parseAnomalyResult = (anomaly: MappedAnomalyHit, jobId: string) => {
 
 async function fetchMetricsHostsAnomalies(
   mlSystem: MlSystem,
-  anomalyThreshold: ANOMALY_THRESHOLD,
+  anomalyThreshold: ML_ANOMALY_THRESHOLD,
   jobIds: string[],
   startTime: number,
   endTime: number,
diff --git a/x-pack/plugins/infra/server/lib/infra_ml/metrics_k8s_anomalies.ts b/x-pack/plugins/infra/server/lib/infra_ml/metrics_k8s_anomalies.ts
index 00635caee96fc8..81d2300604688e 100644
--- a/x-pack/plugins/infra/server/lib/infra_ml/metrics_k8s_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/infra_ml/metrics_k8s_anomalies.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 import { InfraRequestHandlerContext } from '../../types';
 import { TracingSpan, startTracingSpan } from '../../../common/performance_tracing';
 import { fetchMlJob, MappedAnomalyHit, InfluencerFilter } from './common';
-import { getJobId, metricsK8SJobTypes, ANOMALY_THRESHOLD } from '../../../common/infra_ml';
+import { getJobId, metricsK8SJobTypes } from '../../../common/infra_ml';
 import { Sort, Pagination } from '../../../common/http_api/infra_ml';
 import type { MlSystem, MlAnomalyDetectors } from '../../types';
 import { isMlPrivilegesError } from './errors';
@@ -74,7 +75,7 @@ export async function getMetricK8sAnomalies({
 }: {
   context: Required<InfraRequestHandlerContext>;
   sourceId: string;
-  anomalyThreshold: ANOMALY_THRESHOLD;
+  anomalyThreshold: ML_ANOMALY_THRESHOLD;
   startTime: number;
   endTime: number;
   metric: 'memory_usage' | 'network_in' | 'network_out' | undefined;
@@ -168,7 +169,7 @@ const parseAnomalyResult = (anomaly: MappedAnomalyHit, jobId: string) => {
 
 async function fetchMetricK8sAnomalies(
   mlSystem: MlSystem,
-  anomalyThreshold: ANOMALY_THRESHOLD,
+  anomalyThreshold: ML_ANOMALY_THRESHOLD,
   jobIds: string[],
   startTime: number,
   endTime: number,
diff --git a/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_hosts_anomalies.ts b/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_hosts_anomalies.ts
index 9c0f4313c6bdbc..2d1efebc516666 100644
--- a/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_hosts_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_hosts_anomalies.ts
@@ -6,8 +6,8 @@
  */
 
 import * as rt from 'io-ts';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 import { TIEBREAKER_FIELD } from '../../../../common/constants';
-import { ANOMALY_THRESHOLD } from '../../../../common/infra_ml';
 import { commonSearchSuccessResponseFieldsRT } from '../../../utils/elasticsearch_runtime_types';
 import {
   createJobIdsFilters,
@@ -38,7 +38,7 @@ export const createMetricsHostsAnomaliesQuery = ({
   jobQuery,
 }: {
   jobIds: string[];
-  anomalyThreshold: ANOMALY_THRESHOLD;
+  anomalyThreshold: ML_ANOMALY_THRESHOLD;
   startTime: number;
   endTime: number;
   sort: Sort;
diff --git a/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_k8s_anomalies.ts b/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_k8s_anomalies.ts
index 23592aad2e3224..83375ae1e8d2bb 100644
--- a/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_k8s_anomalies.ts
+++ b/x-pack/plugins/infra/server/lib/infra_ml/queries/metrics_k8s_anomalies.ts
@@ -6,8 +6,8 @@
  */
 
 import * as rt from 'io-ts';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils/anomaly_threshold';
 import { TIEBREAKER_FIELD } from '../../../../common/constants';
-import { ANOMALY_THRESHOLD } from '../../../../common/infra_ml';
 import { commonSearchSuccessResponseFieldsRT } from '../../../utils/elasticsearch_runtime_types';
 import {
   createJobIdsFilters,
@@ -38,7 +38,7 @@ export const createMetricsK8sAnomaliesQuery = ({
   jobQuery,
 }: {
   jobIds: string[];
-  anomalyThreshold: ANOMALY_THRESHOLD;
+  anomalyThreshold: ML_ANOMALY_THRESHOLD;
   startTime: number;
   endTime: number;
   sort: Sort;
diff --git a/x-pack/plugins/infra/server/routes/inventory_views/create_inventory_view.ts b/x-pack/plugins/infra/server/routes/inventory_views/create_inventory_view.ts
index 90bb47d8a2d767..d2df0a0f96f655 100644
--- a/x-pack/plugins/infra/server/routes/inventory_views/create_inventory_view.ts
+++ b/x-pack/plugins/infra/server/routes/inventory_views/create_inventory_view.ts
@@ -9,6 +9,7 @@ import { isBoom } from '@hapi/boom';
 import { createValidationFunction } from '../../../common/runtime_types';
 import {
   createInventoryViewRequestPayloadRT,
+  inventoryViewRequestQueryRT,
   inventoryViewResponsePayloadRT,
   INVENTORY_VIEW_URL,
 } from '../../../common/http_api/latest';
@@ -24,15 +25,16 @@ export const initCreateInventoryViewRoute = ({
       path: INVENTORY_VIEW_URL,
       validate: {
         body: createValidationFunction(createInventoryViewRequestPayloadRT),
+        query: createValidationFunction(inventoryViewRequestQueryRT),
       },
     },
     async (_requestContext, request, response) => {
-      const { body } = request;
+      const { body, query } = request;
       const [, , { inventoryViews }] = await getStartServices();
       const inventoryViewsClient = inventoryViews.getScopedClient(request);
 
       try {
-        const inventoryView = await inventoryViewsClient.create(body.attributes);
+        const inventoryView = await inventoryViewsClient.update(null, body.attributes, query);
 
         return response.custom({
           statusCode: 201,
diff --git a/x-pack/plugins/infra/server/routes/metrics_explorer_views/create_metrics_explorer_view.ts b/x-pack/plugins/infra/server/routes/metrics_explorer_views/create_metrics_explorer_view.ts
index 948dd757e7e015..d02ed1208eb111 100644
--- a/x-pack/plugins/infra/server/routes/metrics_explorer_views/create_metrics_explorer_view.ts
+++ b/x-pack/plugins/infra/server/routes/metrics_explorer_views/create_metrics_explorer_view.ts
@@ -9,6 +9,7 @@ import { isBoom } from '@hapi/boom';
 import { createValidationFunction } from '../../../common/runtime_types';
 import {
   createMetricsExplorerViewRequestPayloadRT,
+  metricsExplorerViewRequestQueryRT,
   metricsExplorerViewResponsePayloadRT,
   METRICS_EXPLORER_VIEW_URL,
 } from '../../../common/http_api/latest';
@@ -24,15 +25,20 @@ export const initCreateMetricsExplorerViewRoute = ({
       path: METRICS_EXPLORER_VIEW_URL,
       validate: {
         body: createValidationFunction(createMetricsExplorerViewRequestPayloadRT),
+        query: createValidationFunction(metricsExplorerViewRequestQueryRT),
       },
     },
     async (_requestContext, request, response) => {
-      const { body } = request;
+      const { body, query } = request;
       const [, , { metricsExplorerViews }] = await getStartServices();
       const metricsExplorerViewsClient = metricsExplorerViews.getScopedClient(request);
 
       try {
-        const metricsExplorerView = await metricsExplorerViewsClient.create(body.attributes);
+        const metricsExplorerView = await metricsExplorerViewsClient.update(
+          null,
+          body.attributes,
+          query
+        );
 
         return response.custom({
           statusCode: 201,
diff --git a/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.mock.ts b/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.mock.ts
index 9d832f8502104f..5b21a4e43d267b 100644
--- a/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.mock.ts
+++ b/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.mock.ts
@@ -11,6 +11,5 @@ export const createInventoryViewsClientMock = (): jest.Mocked<IInventoryViewsCli
   delete: jest.fn(),
   find: jest.fn(),
   get: jest.fn(),
-  create: jest.fn(),
   update: jest.fn(),
 });
diff --git a/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.test.ts b/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.test.ts
index 5d5b253045de45..7ec614dbbfe22a 100644
--- a/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.test.ts
+++ b/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.test.ts
@@ -15,10 +15,7 @@ import { createInfraSourcesMock } from '../../lib/sources/mocks';
 import { inventoryViewSavedObjectName } from '../../saved_objects/inventory_view';
 import { InventoryViewsClient } from './inventory_views_client';
 import { createInventoryViewMock } from '../../../common/inventory_views/inventory_view.mock';
-import {
-  CreateInventoryViewAttributesRequestPayload,
-  UpdateInventoryViewAttributesRequestPayload,
-} from '../../../common/http_api/latest';
+import { UpdateInventoryViewAttributesRequestPayload } from '../../../common/http_api/latest';
 
 describe('InventoryViewsClient class', () => {
   const mockFindInventoryList = (savedObjectsClient: jest.Mocked<SavedObjectsClientContract>) => {
@@ -115,45 +112,6 @@ describe('InventoryViewsClient class', () => {
     expect(inventoryView).toEqual(inventoryViewMock);
   });
 
-  describe('.create', () => {
-    it('generate a new inventory view', async () => {
-      const { inventoryViewsClient, savedObjectsClient } = createInventoryViewsClient();
-
-      const inventoryViewMock = createInventoryViewMock('new_id', {
-        name: 'New view',
-        isStatic: false,
-      } as InventoryViewAttributes);
-
-      mockFindInventoryList(savedObjectsClient);
-
-      savedObjectsClient.create.mockResolvedValue({
-        ...inventoryViewMock,
-        type: inventoryViewSavedObjectName,
-        references: [],
-      });
-
-      const inventoryView = await inventoryViewsClient.create({
-        name: 'New view',
-      } as CreateInventoryViewAttributesRequestPayload);
-
-      expect(savedObjectsClient.create).toHaveBeenCalled();
-      expect(inventoryView).toEqual(inventoryViewMock);
-    });
-
-    it('throws an error when a conflicting name is given', async () => {
-      const { inventoryViewsClient, savedObjectsClient } = createInventoryViewsClient();
-
-      mockFindInventoryList(savedObjectsClient);
-
-      await expect(
-        async () =>
-          await inventoryViewsClient.create({
-            name: 'Custom',
-          } as CreateInventoryViewAttributesRequestPayload)
-      ).rejects.toThrow('A view with that name already exists.');
-    });
-  });
-
   describe('.update', () => {
     it('update an existing inventory view by id', async () => {
       const { inventoryViewsClient, infraSources, savedObjectsClient } =
@@ -171,7 +129,7 @@ describe('InventoryViewsClient class', () => {
 
       infraSources.getSourceConfiguration.mockResolvedValue(basicTestSourceConfiguration);
 
-      savedObjectsClient.update.mockResolvedValue({
+      savedObjectsClient.create.mockResolvedValue({
         ...inventoryViewMock,
         type: inventoryViewSavedObjectName,
         references: [],
@@ -185,7 +143,7 @@ describe('InventoryViewsClient class', () => {
         {}
       );
 
-      expect(savedObjectsClient.update).toHaveBeenCalled();
+      expect(savedObjectsClient.create).toHaveBeenCalled();
       expect(inventoryView).toEqual(inventoryViewMock);
     });
 
diff --git a/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.ts b/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.ts
index c32da344354b62..5efce009da4103 100644
--- a/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.ts
+++ b/x-pack/plugins/infra/server/services/inventory_views/inventory_views_client.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-import type {
+import {
   Logger,
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsUpdateResponse,
+  SavedObjectsUtils,
 } from '@kbn/core/server';
 import Boom from '@hapi/boom';
 import {
@@ -50,6 +51,7 @@ export class InventoryViewsClient implements IInventoryViewsClient {
     const defaultView = InventoryViewsClient.createStaticView(
       sourceConfiguration.configuration.inventoryDefaultView
     );
+
     const views = inventoryViewSavedObject.saved_objects.map((savedObject) =>
       this.mapSavedObjectToInventoryView(
         savedObject,
@@ -95,37 +97,26 @@ export class InventoryViewsClient implements IInventoryViewsClient {
     );
   }
 
-  public async create(
-    attributes: CreateInventoryViewAttributesRequestPayload
-  ): Promise<InventoryView> {
-    this.logger.debug(`Trying to create inventory view ...`);
-
-    // Validate there is not a view with the same name
-    await this.assertNameConflict(attributes.name);
-
-    const inventoryViewSavedObject = await this.savedObjectsClient.create(
-      inventoryViewSavedObjectName,
-      attributes
-    );
-
-    return this.mapSavedObjectToInventoryView(inventoryViewSavedObject);
-  }
-
   public async update(
-    inventoryViewId: string,
+    inventoryViewId: string | null,
     attributes: CreateInventoryViewAttributesRequestPayload,
     query: InventoryViewRequestQuery
   ): Promise<InventoryView> {
     this.logger.debug(`Trying to update inventory view with id "${inventoryViewId}"...`);
 
+    const viewId = inventoryViewId ?? SavedObjectsUtils.generateId();
+
     // Validate there is not a view with the same name
-    await this.assertNameConflict(attributes.name, [inventoryViewId]);
+    await this.assertNameConflict(attributes.name, [viewId]);
 
     const sourceId = query.sourceId ?? InventoryViewsClient.DEFAULT_SOURCE_ID;
 
     const [sourceConfiguration, inventoryViewSavedObject] = await Promise.all([
       this.infraSources.getSourceConfiguration(this.savedObjectsClient, sourceId),
-      this.savedObjectsClient.update(inventoryViewSavedObjectName, inventoryViewId, attributes),
+      this.savedObjectsClient.create(inventoryViewSavedObjectName, attributes, {
+        id: viewId,
+        overwrite: true,
+      }),
     ]);
 
     return this.mapSavedObjectToInventoryView(
diff --git a/x-pack/plugins/infra/server/services/inventory_views/types.ts b/x-pack/plugins/infra/server/services/inventory_views/types.ts
index 3e023b77af6c26..2537203d1754cd 100644
--- a/x-pack/plugins/infra/server/services/inventory_views/types.ts
+++ b/x-pack/plugins/infra/server/services/inventory_views/types.ts
@@ -11,7 +11,6 @@ import type {
   SavedObjectsServiceStart,
 } from '@kbn/core/server';
 import type {
-  CreateInventoryViewAttributesRequestPayload,
   InventoryViewRequestQuery,
   UpdateInventoryViewAttributesRequestPayload,
 } from '../../../common/http_api/latest';
@@ -34,11 +33,8 @@ export interface IInventoryViewsClient {
   delete(inventoryViewId: string): Promise<{}>;
   find(query: InventoryViewRequestQuery): Promise<InventoryView[]>;
   get(inventoryViewId: string, query: InventoryViewRequestQuery): Promise<InventoryView>;
-  create(
-    inventoryViewAttributes: CreateInventoryViewAttributesRequestPayload
-  ): Promise<InventoryView>;
   update(
-    inventoryViewId: string,
+    inventoryViewId: string | null,
     inventoryViewAttributes: UpdateInventoryViewAttributesRequestPayload,
     query: InventoryViewRequestQuery
   ): Promise<InventoryView>;
diff --git a/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.mock.ts b/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.mock.ts
index 82a8cba3f6427e..a19b8847adee16 100644
--- a/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.mock.ts
+++ b/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.mock.ts
@@ -12,6 +12,5 @@ export const createMetricsExplorerViewsClientMock =
     delete: jest.fn(),
     find: jest.fn(),
     get: jest.fn(),
-    create: jest.fn(),
     update: jest.fn(),
   });
diff --git a/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.test.ts b/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.test.ts
index c903e9af360f89..791b7366f086c7 100644
--- a/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.test.ts
+++ b/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.test.ts
@@ -15,10 +15,7 @@ import { createInfraSourcesMock } from '../../lib/sources/mocks';
 import { metricsExplorerViewSavedObjectName } from '../../saved_objects/metrics_explorer_view';
 import { MetricsExplorerViewsClient } from './metrics_explorer_views_client';
 import { createMetricsExplorerViewMock } from '../../../common/metrics_explorer_views/metrics_explorer_view.mock';
-import {
-  CreateMetricsExplorerViewAttributesRequestPayload,
-  UpdateMetricsExplorerViewAttributesRequestPayload,
-} from '../../../common/http_api/latest';
+import { UpdateMetricsExplorerViewAttributesRequestPayload } from '../../../common/http_api/latest';
 
 describe('MetricsExplorerViewsClient class', () => {
   const mockFindMetricsExplorerList = (
@@ -118,45 +115,6 @@ describe('MetricsExplorerViewsClient class', () => {
     expect(metricsExplorerView).toEqual(metricsExplorerViewMock);
   });
 
-  describe('.create', () => {
-    it('generate a new metrics explorer view', async () => {
-      const { metricsExplorerViewsClient, savedObjectsClient } = createMetricsExplorerViewsClient();
-
-      const metricsExplorerViewMock = createMetricsExplorerViewMock('new_id', {
-        name: 'New view',
-        isStatic: false,
-      } as MetricsExplorerViewAttributes);
-
-      mockFindMetricsExplorerList(savedObjectsClient);
-
-      savedObjectsClient.create.mockResolvedValue({
-        ...metricsExplorerViewMock,
-        type: metricsExplorerViewSavedObjectName,
-        references: [],
-      });
-
-      const metricsExplorerView = await metricsExplorerViewsClient.create({
-        name: 'New view',
-      } as CreateMetricsExplorerViewAttributesRequestPayload);
-
-      expect(savedObjectsClient.create).toHaveBeenCalled();
-      expect(metricsExplorerView).toEqual(metricsExplorerViewMock);
-    });
-
-    it('throws an error when a conflicting name is given', async () => {
-      const { metricsExplorerViewsClient, savedObjectsClient } = createMetricsExplorerViewsClient();
-
-      mockFindMetricsExplorerList(savedObjectsClient);
-
-      await expect(
-        async () =>
-          await metricsExplorerViewsClient.create({
-            name: 'Custom',
-          } as CreateMetricsExplorerViewAttributesRequestPayload)
-      ).rejects.toThrow('A view with that name already exists.');
-    });
-  });
-
   describe('.update', () => {
     it('update an existing metrics explorer view by id', async () => {
       const { metricsExplorerViewsClient, infraSources, savedObjectsClient } =
@@ -174,7 +132,7 @@ describe('MetricsExplorerViewsClient class', () => {
 
       infraSources.getSourceConfiguration.mockResolvedValue(basicTestSourceConfiguration);
 
-      savedObjectsClient.update.mockResolvedValue({
+      savedObjectsClient.create.mockResolvedValue({
         ...metricsExplorerViewMock,
         type: metricsExplorerViewSavedObjectName,
         references: [],
@@ -188,7 +146,7 @@ describe('MetricsExplorerViewsClient class', () => {
         {}
       );
 
-      expect(savedObjectsClient.update).toHaveBeenCalled();
+      expect(savedObjectsClient.create).toHaveBeenCalled();
       expect(metricsExplorerView).toEqual(metricsExplorerViewMock);
     });
 
diff --git a/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.ts b/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.ts
index 1ba34456d88a8c..e2dd15940bb193 100644
--- a/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.ts
+++ b/x-pack/plugins/infra/server/services/metrics_explorer_views/metrics_explorer_views_client.ts
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-import type {
+import {
   Logger,
   SavedObject,
   SavedObjectsClientContract,
   SavedObjectsUpdateResponse,
+  SavedObjectsUtils,
 } from '@kbn/core/server';
 import Boom from '@hapi/boom';
 import {
@@ -98,24 +99,8 @@ export class MetricsExplorerViewsClient implements IMetricsExplorerViewsClient {
     );
   }
 
-  public async create(
-    attributes: CreateMetricsExplorerViewAttributesRequestPayload
-  ): Promise<MetricsExplorerView> {
-    this.logger.debug(`Trying to create metrics explorer view ...`);
-
-    // Validate there is not a view with the same name
-    await this.assertNameConflict(attributes.name);
-
-    const metricsExplorerViewSavedObject = await this.savedObjectsClient.create(
-      metricsExplorerViewSavedObjectName,
-      attributes
-    );
-
-    return this.mapSavedObjectToMetricsExplorerView(metricsExplorerViewSavedObject);
-  }
-
   public async update(
-    metricsExplorerViewId: string,
+    metricsExplorerViewId: string | null,
     attributes: CreateMetricsExplorerViewAttributesRequestPayload,
     query: MetricsExplorerViewRequestQuery
   ): Promise<MetricsExplorerView> {
@@ -123,18 +108,19 @@ export class MetricsExplorerViewsClient implements IMetricsExplorerViewsClient {
       `Trying to update metrics explorer view with id "${metricsExplorerViewId}"...`
     );
 
+    const viewId = metricsExplorerViewId ?? SavedObjectsUtils.generateId();
+
     // Validate there is not a view with the same name
-    await this.assertNameConflict(attributes.name, [metricsExplorerViewId]);
+    await this.assertNameConflict(attributes.name, [viewId]);
 
     const sourceId = query.sourceId ?? MetricsExplorerViewsClient.DEFAULT_SOURCE_ID;
 
     const [sourceConfiguration, metricsExplorerViewSavedObject] = await Promise.all([
       this.infraSources.getSourceConfiguration(this.savedObjectsClient, sourceId),
-      this.savedObjectsClient.update(
-        metricsExplorerViewSavedObjectName,
-        metricsExplorerViewId,
-        attributes
-      ),
+      this.savedObjectsClient.create(metricsExplorerViewSavedObjectName, attributes, {
+        id: viewId,
+        overwrite: true,
+      }),
     ]);
 
     return this.mapSavedObjectToMetricsExplorerView(
diff --git a/x-pack/plugins/infra/server/services/metrics_explorer_views/types.ts b/x-pack/plugins/infra/server/services/metrics_explorer_views/types.ts
index 0e64aaa83d27ec..851cdf3ad77f0e 100644
--- a/x-pack/plugins/infra/server/services/metrics_explorer_views/types.ts
+++ b/x-pack/plugins/infra/server/services/metrics_explorer_views/types.ts
@@ -11,7 +11,6 @@ import type {
   SavedObjectsServiceStart,
 } from '@kbn/core/server';
 import type {
-  CreateMetricsExplorerViewAttributesRequestPayload,
   MetricsExplorerViewRequestQuery,
   UpdateMetricsExplorerViewAttributesRequestPayload,
 } from '../../../common/http_api/latest';
@@ -37,11 +36,8 @@ export interface IMetricsExplorerViewsClient {
     metricsExplorerViewId: string,
     query: MetricsExplorerViewRequestQuery
   ): Promise<MetricsExplorerView>;
-  create(
-    metricsExplorerViewAttributes: CreateMetricsExplorerViewAttributesRequestPayload
-  ): Promise<MetricsExplorerView>;
   update(
-    metricsExplorerViewId: string,
+    metricsExplorerViewId: string | null,
     metricsExplorerViewAttributes: UpdateMetricsExplorerViewAttributesRequestPayload,
     query: MetricsExplorerViewRequestQuery
   ): Promise<MetricsExplorerView>;
diff --git a/x-pack/plugins/infra/tsconfig.json b/x-pack/plugins/infra/tsconfig.json
index 76cbce409ce2f5..2f86464b357fb2 100644
--- a/x-pack/plugins/infra/tsconfig.json
+++ b/x-pack/plugins/infra/tsconfig.json
@@ -63,6 +63,7 @@
     "@kbn/observability-alert-details",
     "@kbn/observability-shared-plugin",
     "@kbn/ui-theme",
+    "@kbn/ml-anomaly-utils",
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/plugins/lens/common/constants.ts b/x-pack/plugins/lens/common/constants.ts
index 1495410cdb14c6..8838b974ac4dca 100644
--- a/x-pack/plugins/lens/common/constants.ts
+++ b/x-pack/plugins/lens/common/constants.ts
@@ -8,6 +8,7 @@
 import rison from '@kbn/rison';
 import type { RefreshInterval, TimeRange } from '@kbn/data-plugin/common/query';
 import type { Filter } from '@kbn/es-query';
+import { i18n } from '@kbn/i18n';
 
 export const PLUGIN_ID = 'lens';
 export const APP_ID = 'lens';
@@ -88,3 +89,7 @@ export function getEditPath(
 export function getFullPath(id?: string) {
   return `/app/${PLUGIN_ID}${id ? getEditPath(id) : getBasePath()}`;
 }
+
+export const LENS_APP_NAME = i18n.translate('xpack.lens.queryInput.appName', {
+  defaultMessage: 'Lens',
+});
diff --git a/x-pack/plugins/lens/kibana.jsonc b/x-pack/plugins/lens/kibana.jsonc
index 2db1d1ee9a8893..394ac6fb8bd06b 100644
--- a/x-pack/plugins/lens/kibana.jsonc
+++ b/x-pack/plugins/lens/kibana.jsonc
@@ -35,7 +35,7 @@
       "expressionXY",
       "eventAnnotation",
       "unifiedSearch",
-      "unifiedFieldList"
+      "unifiedFieldList",
     ],
     "optionalPlugins": [
       "expressionLegacyMetricVis",
@@ -53,7 +53,8 @@
       "kibanaReact",
       "embeddable",
       "fieldFormats",
-      "charts"
+      "charts",
+      "visualizationUiComponents"
     ],
     "extraPublicDirs": [
       "common/constants"
diff --git a/x-pack/plugins/lens/public/app_plugin/types.ts b/x-pack/plugins/lens/public/app_plugin/types.ts
index 0db73da1161322..8fd5a750a5205c 100644
--- a/x-pack/plugins/lens/public/app_plugin/types.ts
+++ b/x-pack/plugins/lens/public/app_plugin/types.ts
@@ -8,7 +8,7 @@
 import type { History } from 'history';
 import type { OnSaveProps } from '@kbn/saved-objects-plugin/public';
 import { Observable } from 'rxjs';
-import { SpacesApi } from '@kbn/spaces-plugin/public';
+import type { SpacesApi } from '@kbn/spaces-plugin/public';
 import type { TimeRange } from '@kbn/es-query';
 import type {
   ApplicationStart,
@@ -43,8 +43,8 @@ import type { EmbeddableEditorState, EmbeddableStateTransfer } from '@kbn/embedd
 import type { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
 import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type { ChartsPluginSetup } from '@kbn/charts-plugin/public';
-import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
-import { DocLinksStart } from '@kbn/core-doc-links-browser';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { DocLinksStart } from '@kbn/core-doc-links-browser';
 import type { SharePluginStart } from '@kbn/share-plugin/public';
 import type {
   DatasourceMap,
@@ -57,9 +57,9 @@ import type {
 import type { LensAttributeService } from '../lens_attribute_service';
 import type { LensEmbeddableInput } from '../embeddable/embeddable';
 import type { LensInspector } from '../lens_inspector_service';
-import { IndexPatternServiceAPI } from '../data_views_service/service';
-import { Document } from '../persistence/saved_object_store';
-import { type LensAppLocator, LensAppLocatorParams } from '../../common/locator/locator';
+import type { IndexPatternServiceAPI } from '../data_views_service/service';
+import type { Document } from '../persistence/saved_object_store';
+import type { LensAppLocator, LensAppLocatorParams } from '../../common/locator/locator';
 
 export interface RedirectToOriginProps {
   input?: LensEmbeddableInput;
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.tsx
index 4f7842ee125c4e..c43bf5d0c68bb1 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_editor.tsx
@@ -27,6 +27,7 @@ import {
   EuiButtonIcon,
 } from '@elastic/eui';
 import ReactDOM from 'react-dom';
+import { NameInput } from '@kbn/visualization-ui-components/public';
 import type { FormBasedDimensionEditorProps } from './dimension_panel';
 import type { OperationSupportMatrix } from './operation_support';
 import { deleteColumn, GenericIndexPatternColumn } from '../form_based';
@@ -68,7 +69,6 @@ import {
 } from './dimensions_editor_helpers';
 import type { TemporaryState } from './dimensions_editor_helpers';
 import { FieldInput } from './field_input';
-import { NameInput } from '../../../shared_components';
 import { ParamEditorProps } from '../operations/definitions';
 import { WrappingHelpPopover } from '../help_popover';
 import { isColumn } from '../operations/definitions/helpers';
@@ -784,6 +784,13 @@ export function DimensionEditor(props: DimensionEditorProps) {
                 incompleteColumn={
                   layer.incompleteColumns ? layer.incompleteColumns[referenceId] : undefined
                 }
+                onResetIncomplete={() => {
+                  updateLayer({
+                    ...layer,
+                    // clean up the incomplete column data for the referenced id
+                    incompleteColumns: { ...layer.incompleteColumns, [referenceId]: null },
+                  });
+                }}
                 onDeleteColumn={() => {
                   updateLayer(
                     deleteColumn({
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/field_select.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/field_select.tsx
index 93c6e74e6fb418..74f5d94ab2754a 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/field_select.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/field_select.tsx
@@ -11,13 +11,13 @@ import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiComboBoxOptionOption, EuiComboBoxProps } from '@elastic/eui';
 import { useExistingFieldsReader } from '@kbn/unified-field-list-plugin/public';
-import type { OperationType } from '../form_based';
-import type { OperationSupportMatrix } from './operation_support';
 import {
   FieldOption,
   FieldOptionValue,
   FieldPicker,
-} from '../../../shared_components/field_picker';
+} from '@kbn/visualization-ui-components/public';
+import type { OperationType } from '../form_based';
+import type { OperationSupportMatrix } from './operation_support';
 import { fieldContainsData } from '../../../shared_components';
 import type { IndexPattern } from '../../../types';
 import { getFieldType } from '../pure_utils';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/filtering.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/filtering.tsx
index 13db26af121086..31caf495ecaa40 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/filtering.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/filtering.tsx
@@ -7,10 +7,13 @@
 import React, { useCallback } from 'react';
 import { isEqual } from 'lodash';
 import type { Query } from '@kbn/es-query';
+import { validateQuery, FilterQueryInput } from '@kbn/visualization-ui-components/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { LENS_APP_NAME } from '../../../../common/constants';
 import { GenericIndexPatternColumn, operationDefinitionMap } from '../operations';
 import type { FormBasedLayer } from '../types';
-import { validateQuery, FilterQueryInput } from '../../../shared_components';
 import type { IndexPattern } from '../../../types';
+import { LensAppServices } from '../../../app_plugin/types';
 
 export function setFilter(columnId: string, layer: FormBasedLayer, query: Query | undefined) {
   return {
@@ -51,6 +54,8 @@ export function Filtering({
     [columnId, indexPattern, inputFilter, layer, updateLayer]
   );
 
+  const lensServices = useKibana<LensAppServices>().services;
+
   const selectedOperation = operationDefinitionMap[selectedColumn.operationType];
 
   if (!selectedOperation.filterable) {
@@ -61,8 +66,10 @@ export function Filtering({
     <FilterQueryInput
       helpMessage={helpMessage}
       onChange={onChange}
-      indexPattern={indexPattern}
+      dataView={indexPattern}
       inputFilter={inputFilter}
+      queryInputServices={lensServices}
+      appName={LENS_APP_NAME}
     />
   );
 }
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
index 62770711a62df7..fc2c4bfa8ae27f 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
@@ -8,9 +8,9 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiComboBox, EuiSpacer, EuiRange, EuiFieldText } from '@elastic/eui';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import { GenericIndexPatternColumn } from '../form_based';
 import { isColumnFormatted } from '../operations/definitions/helpers';
-import { useDebouncedValue } from '../../../shared_components';
 
 const supportedFormats: Record<string, { title: string; defaultDecimals?: number }> = {
   number: {
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.test.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.test.tsx
index cb50049e3fbec6..74a43f3e7db219 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.test.tsx
@@ -65,6 +65,7 @@ describe('reference editor', () => {
       onChooseField: jest.fn(),
       onChooseFunction: jest.fn(),
       onDeleteColumn: jest.fn(),
+      onResetIncomplete: jest.fn(),
       columnId: 'ref',
       paramEditorUpdater,
       selectionStyle: 'full' as const,
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.tsx
index fa918b07eb29d6..53fe225d4d926d 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/reference_editor.tsx
@@ -92,6 +92,7 @@ export interface ReferenceEditorProps {
   ) => void;
   onChooseField: (choice: FieldChoiceWithOperationType) => void;
   onDeleteColumn: () => void;
+  onResetIncomplete: () => void;
   onChooseFunction: (operationType: string, field?: IndexPatternField) => void;
 
   // Services
@@ -116,6 +117,7 @@ export const ReferenceEditor = (props: ReferenceEditorProps) => {
     functionLabel,
     onChooseField,
     onDeleteColumn,
+    onResetIncomplete,
     onChooseFunction,
     fieldLabel,
     operationDefinitionMap,
@@ -261,6 +263,10 @@ export const ReferenceEditor = (props: ReferenceEditorProps) => {
                 }
 
                 const operationType = choices[0].value!;
+                // When it has an incomplete state, make sure to clear it up before updating
+                if (incompleteColumn) {
+                  onResetIncomplete();
+                }
                 if (column?.operationType === operationType) {
                   return;
                 }
diff --git a/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx b/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx
index dbe6fcafd0ed08..323e2a39398406 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/form_based.tsx
@@ -22,7 +22,7 @@ import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
 import { ChartsPluginSetup } from '@kbn/charts-plugin/public';
 import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import { FormattedMessage } from '@kbn/i18n-react';
-import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { EuiButton } from '@elastic/eui';
 import type { SharePluginStart } from '@kbn/share-plugin/public';
 import type { DraggingIdentifier } from '@kbn/dom-drag-drop';
@@ -599,18 +599,32 @@ export function getFormBasedDatasource({
       const { onChangeIndexPattern, ...otherProps } = props;
       render(
         <KibanaThemeProvider theme$={core.theme.theme$}>
-          <LayerPanel
-            onChangeIndexPattern={(indexPatternId) => {
-              triggerActionOnIndexPatternChange({
-                indexPatternId,
-                state: props.state,
-                layerId: props.layerId,
-                uiActions,
-              });
-              onChangeIndexPattern(indexPatternId, DATASOURCE_ID, props.layerId);
-            }}
-            {...otherProps}
-          />
+          <I18nProvider>
+            <KibanaContextProvider
+              services={{
+                ...core,
+                data,
+                dataViews,
+                fieldFormats,
+                charts,
+                unifiedSearch,
+                share,
+              }}
+            >
+              <LayerPanel
+                onChangeIndexPattern={(indexPatternId) => {
+                  triggerActionOnIndexPatternChange({
+                    indexPatternId,
+                    state: props.state,
+                    layerId: props.layerId,
+                    uiActions,
+                  });
+                  onChangeIndexPattern(indexPatternId, DATASOURCE_ID, props.layerId);
+                }}
+                {...otherProps}
+              />
+            </KibanaContextProvider>
+          </I18nProvider>
         </KibanaThemeProvider>,
         domElement
       );
diff --git a/x-pack/plugins/lens/public/datasources/form_based/layer_settings.tsx b/x-pack/plugins/lens/public/datasources/form_based/layer_settings.tsx
index c79bc41dd7dd74..aa5137a4aec097 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/layer_settings.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/layer_settings.tsx
@@ -5,104 +5,17 @@
  * 2.0.
  */
 
-import {
-  EuiFormRow,
-  EuiRange,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiBetaBadge,
-  EuiText,
-  EuiLink,
-  EuiSpacer,
-  useEuiTheme,
-  EuiToolTip,
-} from '@elastic/eui';
+import { EuiFormRow, EuiBetaBadge, EuiLink, EuiSpacer, EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { RandomSamplingSlider } from '@kbn/random-sampling';
 import type { DatasourceLayerSettingsProps } from '../../types';
 import type { FormBasedPrivateState } from './types';
 import { isSamplingValueEnabled } from './utils';
-import { TooltipWrapper } from '../../shared_components';
 
 const samplingValues = [0.00001, 0.0001, 0.001, 0.01, 0.1, 1];
-interface SamplingSliderProps {
-  values: number[];
-  currentValue: number | undefined;
-  disabled: boolean;
-  disabledReason: string;
-  onChange: (value: number) => void;
-  'data-test-subj'?: string;
-}
-/**
- * Stub for a shared component
- */
-function SamplingSlider({
-  values,
-  currentValue,
-  disabled,
-  disabledReason,
-  onChange,
-  'data-test-subj': dataTestSubj,
-}: SamplingSliderProps) {
-  const { euiTheme } = useEuiTheme();
-  const samplingIndex = values.findIndex((v) => v === currentValue);
-  const currentSamplingIndex = samplingIndex > -1 ? samplingIndex : values.length - 1;
-  return (
-    <TooltipWrapper
-      tooltipContent={disabledReason}
-      condition={disabled}
-      delay="regular"
-      display="block"
-    >
-      <EuiFlexGroup gutterSize="none">
-        <EuiFlexItem grow={false}>
-          <EuiText
-            color={disabled ? euiTheme.colors.disabledText : euiTheme.colors.subduedText}
-            size="xs"
-          >
-            <FormattedMessage
-              id="xpack.lens.indexPattern.randomSampling.performanceLabel"
-              defaultMessage="Performance"
-            />
-          </EuiText>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiRange
-            data-test-subj={dataTestSubj}
-            value={currentSamplingIndex}
-            disabled={disabled}
-            onChange={(e) => {
-              onChange(values[Number(e.currentTarget.value)]);
-            }}
-            showInput={false}
-            showRange={false}
-            showTicks
-            step={1}
-            min={0}
-            max={values.length - 1}
-            ticks={values.map((v, i) => ({
-              label: `${v * 100}%`.slice(Number.isInteger(v * 100) ? 0 : 1),
-              value: i,
-            }))}
-          />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiText
-            color={disabled ? euiTheme.colors.disabledText : euiTheme.colors.subduedText}
-            size="xs"
-          >
-            <FormattedMessage
-              id="xpack.lens.indexPattern.randomSampling.accuracyLabel"
-              defaultMessage="Accuracy"
-            />
-          </EuiText>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </TooltipWrapper>
-  );
-}
 
 export function LayerSettingsPanel({
   state,
@@ -113,6 +26,7 @@ export function LayerSettingsPanel({
   const currentValue = isSamplingValueDisabled
     ? samplingValues[samplingValues.length - 1]
     : state.layers[layerId].sampling;
+
   return (
     <EuiFormRow
       display="rowCompressed"
@@ -167,7 +81,7 @@ export function LayerSettingsPanel({
         </>
       }
     >
-      <SamplingSlider
+      <RandomSamplingSlider
         disabled={isSamplingValueDisabled}
         disabledReason={i18n.translate('xpack.lens.indexPattern.randomSampling.disabledMessage', {
           defaultMessage:
diff --git a/x-pack/plugins/lens/public/datasources/form_based/layerpanel.test.tsx b/x-pack/plugins/lens/public/datasources/form_based/layerpanel.test.tsx
index 684cdd4db88a0d..f9d0dc9d8b9fb5 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/layerpanel.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/layerpanel.test.tsx
@@ -8,13 +8,15 @@
 import React, { MouseEvent } from 'react';
 import { FormBasedPrivateState } from './types';
 import { FormBasedLayerPanelProps, LayerPanel } from './layerpanel';
-import { shallowWithIntl as shallow } from '@kbn/test-jest-helpers';
-import { ShallowWrapper } from 'enzyme';
+import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
+import { ReactWrapper } from 'enzyme';
 import { EuiSelectable } from '@elastic/eui';
 import { DataViewsList } from '@kbn/unified-search-plugin/public/dataview_picker/dataview_list';
 import { ChangeIndexPattern } from '../../shared_components/dataview_picker/dataview_picker';
 import { getFieldByNameFactory } from './pure_helpers';
 import { TermsIndexPatternColumn } from './operations';
+import { act } from 'react-dom/test-utils';
+import { TriggerButton } from '../../shared_components/dataview_picker/trigger';
 
 jest.mock('@kbn/unified-search-plugin/public', () => {
   const actual = jest.requireActual('@kbn/unified-search-plugin/public');
@@ -227,18 +229,16 @@ describe('Layer Data Panel', () => {
     };
   });
 
-  function getIndexPatternPickerList(instance: ShallowWrapper) {
+  function getIndexPatternPickerList(instance: ReactWrapper) {
     return instance
       .find(ChangeIndexPattern)
       .first()
-      .dive()
       .find(DataViewsList)
       .first()
-      .dive()
       .find(EuiSelectable);
   }
 
-  function selectIndexPatternPickerOption(instance: ShallowWrapper, selectedLabel: string) {
+  function selectIndexPatternPickerOption(instance: ReactWrapper, selectedLabel: string) {
     const event = {} as MouseEvent;
     const options: IndexPatternPickerOption[] = getIndexPatternPickerOptions(instance).map(
       (option: IndexPatternPickerOption) =>
@@ -250,12 +250,17 @@ describe('Layer Data Panel', () => {
     return getIndexPatternPickerList(instance).prop('onChange')!(options, event, selectedOption);
   }
 
-  function getIndexPatternPickerOptions(instance: ShallowWrapper) {
+  function getIndexPatternPickerOptions(instance: ReactWrapper) {
     return getIndexPatternPickerList(instance).prop('options');
   }
 
   it('should list all index patterns', () => {
-    const instance = shallow(<LayerPanel {...defaultProps} />);
+    const instance = mount(<LayerPanel {...defaultProps} />);
+
+    act(() => {
+      instance.find(TriggerButton).prop('togglePopover')();
+    });
+    instance.update();
 
     expect(
       getIndexPatternPickerOptions(instance)!.map(
@@ -265,9 +270,16 @@ describe('Layer Data Panel', () => {
   });
 
   it('should switch data panel to target index pattern', () => {
-    const instance = shallow(<LayerPanel {...defaultProps} />);
+    const instance = mount(<LayerPanel {...defaultProps} />);
+
+    act(() => {
+      instance.find(TriggerButton).prop('togglePopover')();
+    });
+    instance.update();
 
-    selectIndexPatternPickerOption(instance, 'my-compatible-pattern');
+    act(() => {
+      selectIndexPatternPickerOption(instance, 'my-compatible-pattern');
+    });
 
     expect(defaultProps.onChangeIndexPattern).toHaveBeenCalledWith('3');
   });
diff --git a/x-pack/plugins/lens/public/datasources/form_based/layerpanel.tsx b/x-pack/plugins/lens/public/datasources/form_based/layerpanel.tsx
index 5832f8094a8560..dce7474578e1ac 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/layerpanel.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/layerpanel.tsx
@@ -6,14 +6,13 @@
  */
 
 import React from 'react';
-import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { useEuiTheme } from '@elastic/eui';
-import { DatasourceLayerPanelProps } from '../../types';
-import { FormBasedPrivateState } from './types';
+import { RandomSamplingIcon } from '@kbn/random-sampling';
+import type { DatasourceLayerPanelProps } from '../../types';
+import type { FormBasedPrivateState } from './types';
 import { ChangeIndexPattern } from '../../shared_components/dataview_picker/dataview_picker';
 import { getSamplingValue } from './utils';
-import { RandomSamplingIcon } from './sampling_icon';
 
 export interface FormBasedLayerPanelProps extends DatasourceLayerPanelProps<FormBasedPrivateState> {
   state: FormBasedPrivateState;
@@ -62,22 +61,20 @@ export function LayerPanel({
       : {};
 
   return (
-    <I18nProvider>
-      <ChangeIndexPattern
-        data-test-subj="indexPattern-switcher"
-        trigger={{
-          label: indexPattern?.name || notFoundTitleLabel,
-          title: indexPattern?.title || notFoundTitleLabel,
-          'data-test-subj': 'lns_layerIndexPatternLabel',
-          size: 's',
-          fontWeight: 'normal',
-          ...extraIconLabelProps,
-        }}
-        indexPatternId={layer.indexPatternId}
-        indexPatternRefs={indexPatternRefs}
-        isMissingCurrent={!indexPattern}
-        onChangeIndexPattern={onChangeIndexPattern}
-      />
-    </I18nProvider>
+    <ChangeIndexPattern
+      data-test-subj="indexPattern-switcher"
+      trigger={{
+        label: indexPattern?.name || notFoundTitleLabel,
+        title: indexPattern?.title || notFoundTitleLabel,
+        'data-test-subj': 'lns_layerIndexPatternLabel',
+        size: 's',
+        fontWeight: 'normal',
+        ...extraIconLabelProps,
+      }}
+      indexPatternId={layer.indexPatternId}
+      indexPatternRefs={indexPatternRefs}
+      isMissingCurrent={!indexPattern}
+      onChangeIndexPattern={onChangeIndexPattern}
+    />
   );
 }
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/date_histogram.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/date_histogram.tsx
index c9f872c6b509e3..66822218085474 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/date_histogram.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/date_histogram.tsx
@@ -29,12 +29,12 @@ import {
 } from '@kbn/data-plugin/public';
 import { extendedBoundsToAst, intervalOptions } from '@kbn/data-plugin/common';
 import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { TooltipWrapper } from '@kbn/visualization-ui-components/public';
 import { updateColumnParam } from '../layer_helpers';
 import { OperationDefinition, ParamEditorProps } from '.';
 import { FieldBasedIndexPatternColumn } from './column_types';
 import { getInvalidFieldMessage, getSafeName } from './helpers';
 import { FormBasedLayer } from '../../types';
-import { TooltipWrapper } from '../../../../shared_components';
 
 const { isValidInterval } = search.aggs;
 const autoInterval = 'auto';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filter_popover.test.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filter_popover.test.tsx
index 4b57750819ab48..b2ea1c81e2cabd 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filter_popover.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filter_popover.test.tsx
@@ -13,7 +13,7 @@ import { createMockedIndexPattern } from '../../../mocks';
 import { FilterPopover } from './filter_popover';
 import { LabelInput } from '../shared_components';
 import { QueryStringInput } from '@kbn/unified-search-plugin/public';
-import { QueryInput } from '../../../../../shared_components';
+import { QueryInput } from '@kbn/visualization-ui-components/public';
 
 jest.mock('.', () => ({
   isQueryValid: () => true,
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filter_popover.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filter_popover.tsx
index 924abc6ede9844..d38a09714e7d39 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filter_popover.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filter_popover.tsx
@@ -12,10 +12,13 @@ import { EuiPopover, EuiSpacer } from '@elastic/eui';
 import type { Query } from '@kbn/es-query';
 // Need to keep it separate to make it work Jest mocks in dimension_panel tests
 // import { QueryInput } from '../../../../shared_components/query_input';
-import { isQueryValid, QueryInput } from '../../../../../shared_components';
+import { isQueryValid, QueryInput } from '@kbn/visualization-ui-components/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { LENS_APP_NAME } from '../../../../../../common/constants';
 import { IndexPattern } from '../../../../../types';
 import { FilterValue, defaultLabel } from '.';
 import { LabelInput } from '../shared_components';
+import { LensAppServices } from '../../../../../app_plugin/types';
 
 export const FilterPopover = ({
   filter,
@@ -60,7 +63,7 @@ export const FilterPopover = ({
       <QueryInput
         isInvalid={!isQueryValid(filter.input, indexPattern)}
         value={filter.input}
-        indexPattern={
+        dataView={
           indexPattern.id
             ? { type: 'id', value: indexPattern.id }
             : { type: 'title', value: indexPattern.title }
@@ -70,6 +73,8 @@ export const FilterPopover = ({
         onSubmit={() => {
           if (inputRef.current) inputRef.current.focus();
         }}
+        appName={LENS_APP_NAME}
+        services={useKibana<LensAppServices>().services}
       />
       <EuiSpacer size="s" />
       <LabelInput
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filters.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filters.tsx
index 67f3af575f7db3..d26b8808a47c96 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filters.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/filters/filters.tsx
@@ -15,11 +15,11 @@ import type { AggFunctionsMapping } from '@kbn/data-plugin/public';
 import { queryFilterToAst } from '@kbn/data-plugin/common';
 import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
 import {
+  NewBucketButton,
   DragDropBuckets,
   DraggableBucketContainer,
   isQueryValid,
-  NewBucketButton,
-} from '../../../../../shared_components';
+} from '@kbn/visualization-ui-components/public';
 import { IndexPattern } from '../../../../../types';
 import { updateColumnParam } from '../../layer_helpers';
 import type { OperationDefinition } from '..';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile.tsx
index 2c507cee5ffcde..c7eedacd862166 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile.tsx
@@ -15,6 +15,7 @@ import {
   ExpressionAstExpressionBuilder,
   ExpressionAstFunctionBuilder,
 } from '@kbn/expressions-plugin/public';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import { OperationDefinition } from '.';
 import {
   getFormatFromPreviousColumn,
@@ -27,7 +28,6 @@ import {
 } from './helpers';
 import { FieldBasedIndexPatternColumn } from './column_types';
 import { adjustTimeScaleLabelSuffix } from '../time_scale_utils';
-import { useDebouncedValue } from '../../../../shared_components';
 import { FormRow } from './shared_components';
 import { getColumnReducedTimeRangeError } from '../../reduced_time_range_utils';
 import { getGroupByKey, groupByKey } from './get_group_by_key';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx
index 0f44acb92de49f..daf15d06b0c64f 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx
@@ -10,6 +10,7 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { AggFunctionsMapping } from '@kbn/data-plugin/public';
 import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import { OperationDefinition } from '.';
 import {
   getFormatFromPreviousColumn,
@@ -22,7 +23,6 @@ import {
 } from './helpers';
 import { FieldBasedIndexPatternColumn } from './column_types';
 import { adjustTimeScaleLabelSuffix } from '../time_scale_utils';
-import { useDebouncedValue } from '../../../../shared_components';
 import { FormRow } from './shared_components';
 import { getColumnReducedTimeRangeError } from '../../reduced_time_range_utils';
 
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/ranges/advanced_editor.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/ranges/advanced_editor.tsx
index c3212642e0064f..f9366bdbd780f4 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/ranges/advanced_editor.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/ranges/advanced_editor.tsx
@@ -27,8 +27,8 @@ import {
   DragDropBuckets,
   DraggableBucketContainer,
   NewBucketButton,
-  useDebounceWithOptions,
-} from '../../../../../shared_components';
+} from '@kbn/visualization-ui-components/public';
+import { useDebounceWithOptions } from '../../../../../shared_components';
 import { RangeTypeLens, isValidRange } from './ranges';
 import { FROM_PLACEHOLDER, TO_PLACEHOLDER, TYPING_DEBOUNCE_TIME } from './constants';
 import { LabelInput } from '../shared_components';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/ranges/ranges.test.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/ranges/ranges.test.tsx
index 509fdf81877571..8972a78b5d9f7f 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/ranges/ranges.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/ranges/ranges.test.tsx
@@ -26,7 +26,7 @@ import {
   SLICES,
 } from './constants';
 import { RangePopover } from './advanced_editor';
-import { DragDropBuckets } from '../../../../../shared_components';
+import { DragDropBuckets } from '@kbn/visualization-ui-components/public';
 import { getFieldByNameFactory } from '../../../pure_helpers';
 import { IndexPattern } from '../../../../../types';
 
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/shared_components/label_input.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/shared_components/label_input.tsx
index ded5298a938796..c1ae44ba260637 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/shared_components/label_input.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/shared_components/label_input.tsx
@@ -8,7 +8,7 @@
 import React, { useRef } from 'react';
 import { EuiFieldText, keys } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useDebouncedValue } from '../../../../../shared_components';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 
 export const LabelInput = ({
   value,
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/static_value.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/static_value.tsx
index 5292fac547b601..d491b084f811d3 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/static_value.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/static_value.tsx
@@ -7,6 +7,7 @@
 import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import { OperationDefinition } from '.';
 import {
   ReferenceBasedIndexPatternColumn,
@@ -14,7 +15,6 @@ import {
   ValueFormatConfig,
 } from './column_types';
 import type { IndexPattern } from '../../../../types';
-import { useDebouncedValue } from '../../../../shared_components';
 import { getFormatFromPreviousColumn, isValidNumber } from './helpers';
 import { getColumnOrder } from '../layer_helpers';
 
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/field_inputs.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/field_inputs.tsx
index 88e67ee404b60a..40fd5a63eae35c 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/field_inputs.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/field_inputs.tsx
@@ -8,14 +8,14 @@
 import React, { useCallback, useMemo } from 'react';
 import { htmlIdGenerator } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { IndexPattern } from '../../../../../types';
 import {
+  useDebouncedValue,
   DragDropBuckets,
   FieldsBucketContainer,
   NewBucketButton,
-  useDebouncedValue,
   DraggableBucketContainer,
-} from '../../../../../shared_components';
+} from '@kbn/visualization-ui-components/public';
+import { IndexPattern } from '../../../../../types';
 import { FieldSelect } from '../../../dimension_panel/field_select';
 import type { TermsIndexPatternColumn } from './types';
 import type { OperationSupportMatrix } from '../../../dimension_panel';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/include_exclude_options.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/include_exclude_options.tsx
index 9a2af1474fd469..dc9e76a931b21c 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/include_exclude_options.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/include_exclude_options.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { uniq } from 'lodash';
 import { EuiComboBox, EuiFormRow, EuiSpacer, EuiSwitch, EuiFieldText, EuiText } from '@elastic/eui';
 import type { DatatableRow } from '@kbn/expressions-plugin/common';
-import { useDebouncedValue } from '../../../../../shared_components';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 
 export interface IncludeExcludeOptions {
   label: string;
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/index.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/index.tsx
index 32d26cff1b12fa..e676075309fb09 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/index.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/index.tsx
@@ -800,6 +800,7 @@ The top values of a specified field ranked by the chosen metric.
               }}
               column={currentColumn.params.orderAgg}
               incompleteColumn={incompleteColumn}
+              onResetIncomplete={() => setIncompleteColumn(undefined)}
               onDeleteColumn={() => {
                 throw new Error('Should not be called');
               }}
diff --git a/x-pack/plugins/lens/public/datasources/form_based/utils.tsx b/x-pack/plugins/lens/public/datasources/form_based/utils.tsx
index c136aab767b65b..e967a468dc8513 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/utils.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/utils.tsx
@@ -25,6 +25,7 @@ import {
 } from '@kbn/data-plugin/public';
 
 import { estypes } from '@elastic/elasticsearch';
+import { isQueryValid } from '@kbn/visualization-ui-components/public';
 import type { DateRange } from '../../../common/types';
 import type {
   FramePublicAPI,
@@ -58,7 +59,6 @@ import { mergeLayer } from './state_helpers';
 import { supportsRarityRanking } from './operations/definitions/terms';
 import { DEFAULT_MAX_DOC_COUNT } from './operations/definitions/terms/constants';
 import { getOriginalId } from '../../../common/expressions/datatable/transpose_helpers';
-import { isQueryValid } from '../../shared_components';
 import { ReducedSamplingSectionEntries } from './info_badges';
 
 function isMinOrMaxColumn(
diff --git a/x-pack/plugins/lens/public/datasources/text_based/field_select.test.tsx b/x-pack/plugins/lens/public/datasources/text_based/field_select.test.tsx
index 2a8e63da1b0e16..bd84ce529ea6da 100644
--- a/x-pack/plugins/lens/public/datasources/text_based/field_select.test.tsx
+++ b/x-pack/plugins/lens/public/datasources/text_based/field_select.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { FieldPicker, FieldOptionValue } from '../../shared_components/field_picker';
+import { FieldPicker, FieldOptionValue } from '@kbn/visualization-ui-components/public';
 
 import { type FieldOptionCompatible, FieldSelect, FieldSelectProps } from './field_select';
 import { shallowWithIntl as shallow } from '@kbn/test-jest-helpers';
diff --git a/x-pack/plugins/lens/public/datasources/text_based/field_select.tsx b/x-pack/plugins/lens/public/datasources/text_based/field_select.tsx
index 5ca4f1e341ad9b..9dc2d5115c03db 100644
--- a/x-pack/plugins/lens/public/datasources/text_based/field_select.tsx
+++ b/x-pack/plugins/lens/public/datasources/text_based/field_select.tsx
@@ -9,7 +9,11 @@ import React, { useMemo } from 'react';
 import { EuiComboBoxOptionOption, EuiComboBoxProps } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { DatatableColumn } from '@kbn/expressions-plugin/public';
-import { FieldPicker, FieldOptionValue, FieldOption } from '../../shared_components/field_picker';
+import {
+  FieldPicker,
+  FieldOptionValue,
+  FieldOption,
+} from '@kbn/visualization-ui-components/public';
 import type { TextBasedLayerColumn } from './types';
 import type { DataType } from '../../types';
 
diff --git a/x-pack/plugins/lens/public/datasources/text_based/layerpanel.tsx b/x-pack/plugins/lens/public/datasources/text_based/layerpanel.tsx
index 62f99cbfb42d9d..3ce8c333114ffa 100644
--- a/x-pack/plugins/lens/public/datasources/text_based/layerpanel.tsx
+++ b/x-pack/plugins/lens/public/datasources/text_based/layerpanel.tsx
@@ -6,7 +6,6 @@
  */
 
 import React from 'react';
-import { I18nProvider } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { DatasourceLayerPanelProps } from '../../types';
 import { TextBasedPrivateState } from './types';
@@ -24,21 +23,19 @@ export function LayerPanel({ state, layerId, dataViews }: TextBasedLayerPanelPro
     defaultMessage: 'Data view not found',
   });
   return (
-    <I18nProvider>
-      <ChangeIndexPattern
-        data-test-subj="textBasedLanguages-switcher"
-        trigger={{
-          label: dataView?.name || dataView?.title || notFoundTitleLabel,
-          title: dataView?.title || notFoundTitleLabel,
-          size: 's',
-          fontWeight: 'normal',
-          isDisabled: true,
-        }}
-        indexPatternId={layer.index}
-        indexPatternRefs={dataViews.indexPatternRefs}
-        isMissingCurrent={!dataView}
-        onChangeIndexPattern={() => {}}
-      />
-    </I18nProvider>
+    <ChangeIndexPattern
+      data-test-subj="textBasedLanguages-switcher"
+      trigger={{
+        label: dataView?.name || dataView?.title || notFoundTitleLabel,
+        title: dataView?.title || notFoundTitleLabel,
+        size: 's',
+        fontWeight: 'normal',
+        isDisabled: true,
+      }}
+      indexPatternId={layer.index}
+      indexPatternRefs={dataViews.indexPatternRefs}
+      isMissingCurrent={!dataView}
+      onChangeIndexPattern={() => {}}
+    />
   );
 }
diff --git a/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx b/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx
index c3da573af34338..1ac8da1d241f6e 100644
--- a/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx
+++ b/x-pack/plugins/lens/public/datasources/text_based/text_based_languages.tsx
@@ -17,7 +17,7 @@ import { EuiFormRow } from '@elastic/eui';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import type { ExpressionsStart, DatatableColumnType } from '@kbn/expressions-plugin/public';
 import type { DataViewsPublicPluginStart, DataView } from '@kbn/data-views-plugin/public';
-import { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { euiThemeVars } from '@kbn/ui-theme';
 import {
   DatasourceDimensionEditorProps,
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
index 1873e563f05a34..6c8e5e527f5560 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
@@ -21,6 +21,7 @@ import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
 import { euiThemeVars } from '@kbn/ui-theme';
 import { DragDropIdentifier, ReorderProvider, DropType } from '@kbn/dom-drag-drop';
+import { DimensionButton } from '@kbn/visualization-ui-components/public';
 import { LayerType } from '../../../../common/types';
 import { LayerActions } from './layer_actions';
 import { IndexPatternServiceAPI } from '../../../data_views_service/service';
@@ -38,7 +39,6 @@ import { LayerSettings } from './layer_settings';
 import { LayerPanelProps, ActiveDimensionState } from './types';
 import { DimensionContainer } from './dimension_container';
 import { EmptyDimensionButton } from './buttons/empty_dimension_button';
-import { DimensionButton } from './buttons/dimension_button';
 import { DraggableDimensionButton } from './buttons/draggable_dimension_button';
 import { useFocusUpdate } from './use_focus_update';
 import {
@@ -561,7 +561,7 @@ export function LayerPanel(
                               className="lnsLayerPanel__dimension"
                               accessorConfig={accessorConfig}
                               label={columnLabelMap?.[accessorConfig.columnId] ?? ''}
-                              group={group}
+                              groupLabel={group.groupLabel}
                               onClick={(id: string) => {
                                 setActiveDimension({
                                   isNew: false,
@@ -573,7 +573,10 @@ export function LayerPanel(
                                 props.onRemoveDimension({ columnId: id, layerId });
                                 removeButtonRef(id);
                               }}
-                              message={messages[0]}
+                              message={{
+                                severity: messages[0]?.severity,
+                                content: messages[0]?.shortMessage || messages[0]?.longMessage,
+                              }}
                             >
                               {layerDatasource ? (
                                 <NativeRenderer
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/types.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/types.ts
index ca47938710b11a..933ed2002b8324 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/types.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/types.ts
@@ -17,6 +17,7 @@ import {
   VisualizationMap,
   UserMessagesGetter,
 } from '../../../types';
+
 export interface ConfigPanelWrapperProps {
   framePublicAPI: FramePublicAPI;
   datasourceMap: DatasourceMap;
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/custom_icons.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/custom_icons.tsx
deleted file mode 100644
index 173cf9e06a8f90..00000000000000
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/custom_icons.tsx
+++ /dev/null
@@ -1,46 +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.
- */
-
-// NOTICE — all this can be removed when https://github.com/elastic/eui/pull/6550 gets pulled into Kibana
-
-import React from 'react';
-
-import { EuiIconProps } from '@elastic/eui';
-
-export const IconError = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="16"
-    height="16"
-    viewBox="0 0 16 16"
-    aria-labelledby={titleId}
-    fill="none"
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path
-      fillRule="evenodd"
-      d="M10 1a1 1 0 0 1 .707.293l4 4A1 1 0 0 1 15 6v5a1 1 0 0 1-.293.707l-4 4A1 1 0 0 1 10 16H5a1 1 0 0 1-.707-.293l-4-4A1 1 0 0 1 0 11V6a1 1 0 0 1 .293-.707l4-4A1 1 0 0 1 5 1h5ZM4.146 5.146a.5.5 0 0 1 .708 0L7.5 7.793l2.646-2.647a.5.5 0 0 1 .708.708L8.207 8.5l2.647 2.646a.5.5 0 0 1-.708.708L7.5 9.207l-2.646 2.647a.5.5 0 0 1-.708-.708L6.793 8.5 4.146 5.854a.5.5 0 0 1 0-.708Z"
-    />
-  </svg>
-);
-
-export const IconWarning = ({ title, titleId, ...props }: Omit<EuiIconProps, 'type'>) => (
-  <svg
-    xmlns="http://www.w3.org/2000/svg"
-    width="16"
-    height="16"
-    viewBox="0 0 16 16"
-    aria-labelledby={titleId}
-    fill="none"
-    {...props}
-  >
-    {title ? <title id={titleId}>{title}</title> : null}
-    <path d="m8.55 9.502.35-3.507a.905.905 0 1 0-1.8 0l.35 3.507a.552.552 0 0 0 1.1 0ZM9 12a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z" />
-    <path d="M8.864 1.496a1 1 0 0 0-1.728 0l-7 12A1 1 0 0 0 1 15h14a1 1 0 0 0 .864-1.504l-7-12ZM1 14 8 2l7 12H1Z" />
-  </svg>
-);
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/message_list.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/message_list.tsx
index 0cbb33248358ac..ebf221e9a4832a 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/message_list.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/message_list.tsx
@@ -20,7 +20,6 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { css, SerializedStyles } from '@emotion/react';
-import { IconError, IconWarning } from '../custom_icons';
 import { UserMessage } from '../../../types';
 
 export const MessageList = ({
@@ -85,14 +84,14 @@ export const MessageList = ({
           >
             {errorCount > 0 && (
               <>
-                <EuiIcon type={IconError} />
+                <EuiIcon type="error" />
                 {errorCount}
               </>
             )}
             {warningCount > 0 && (
               <>
                 <EuiIcon
-                  type={IconWarning}
+                  type="alert"
                   css={css`
                     margin-left: 4px;
                   `}
@@ -116,9 +115,9 @@ export const MessageList = ({
             <EuiFlexGroup gutterSize="s" responsive={false}>
               <EuiFlexItem grow={false}>
                 {message.severity === 'error' ? (
-                  <EuiIcon type={IconError} color="danger" />
+                  <EuiIcon type="error" color="danger" />
                 ) : (
-                  <EuiIcon type={IconWarning} color="warning" />
+                  <EuiIcon type="alert" color="warning" />
                 )}
               </EuiFlexItem>
               <EuiFlexItem grow={1} className="lnsWorkspaceWarningList__description">
diff --git a/x-pack/plugins/lens/public/shared_components/axis/title/axis_title_settings.tsx b/x-pack/plugins/lens/public/shared_components/axis/title/axis_title_settings.tsx
index d46b99cd817d5a..5b88455a28e5c9 100644
--- a/x-pack/plugins/lens/public/shared_components/axis/title/axis_title_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/axis/title/axis_title_settings.tsx
@@ -8,8 +8,9 @@
 import React, { useCallback, useMemo } from 'react';
 import { EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import type { AxesSettingsConfig } from '../../../visualizations/xy/types';
-import { type LabelMode, useDebouncedValue, VisLabel } from '../..';
+import { type LabelMode, VisLabel } from '../..';
 
 type AxesSettingsConfigKeys = keyof AxesSettingsConfig;
 
diff --git a/x-pack/plugins/lens/public/shared_components/coloring/utils.ts b/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
index 5ccd144e74628c..dc9383a2cb561a 100644
--- a/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
+++ b/x-pack/plugins/lens/public/shared_components/coloring/utils.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import chroma from 'chroma-js';
+import { chroma } from '@kbn/visualization-ui-components/public';
 import { euiLightVars, euiDarkVars } from '@kbn/ui-theme';
 import { isColorDark } from '@elastic/eui';
 
diff --git a/x-pack/plugins/lens/public/shared_components/dataview_picker/trigger.tsx b/x-pack/plugins/lens/public/shared_components/dataview_picker/trigger.tsx
index 038b1d5aec960f..1efd517fc88d1b 100644
--- a/x-pack/plugins/lens/public/shared_components/dataview_picker/trigger.tsx
+++ b/x-pack/plugins/lens/public/shared_components/dataview_picker/trigger.tsx
@@ -29,6 +29,7 @@ export type ChangeIndexPatternTriggerProps = ToolbarButtonProps &
 
 function TriggerLabel({ label, icon }: TriggerLabelProps) {
   const { euiTheme } = useEuiTheme();
+
   if (!icon) {
     return <>{label}</>;
   }
diff --git a/x-pack/plugins/lens/public/shared_components/index.ts b/x-pack/plugins/lens/public/shared_components/index.ts
index 95000c5c4248b3..16c88a8d50389d 100644
--- a/x-pack/plugins/lens/public/shared_components/index.ts
+++ b/x-pack/plugins/lens/public/shared_components/index.ts
@@ -9,16 +9,7 @@ export type { ToolbarPopoverProps } from './toolbar_popover';
 export { ToolbarPopover } from './toolbar_popover';
 export { LegendSettingsPopover } from './legend/legend_settings_popover';
 export { PalettePicker } from './palette_picker';
-export { FieldPicker, TruncatedLabel } from './field_picker';
-export type { FieldOption, FieldOptionValue } from './field_picker';
 export { ChangeIndexPattern, fieldContainsData } from './dataview_picker';
-export { QueryInput, isQueryValid, validateQuery } from './query_input';
-export {
-  NewBucketButton,
-  DraggableBucketContainer,
-  DragDropBuckets,
-  FieldsBucketContainer,
-} from './drag_drop_bucket';
 export { RangeInputField } from './range_input_field';
 export {
   AxisBoundsControl,
@@ -28,17 +19,11 @@ export {
   getDataBounds,
   axisExtentConfigToExpression,
 } from './axis/extent';
-export { TooltipWrapper } from './tooltip_wrapper';
 export * from './coloring';
-export { useDebouncedValue } from './debounced_value';
 export * from './helpers';
 export { LegendActionPopover } from './legend/action/legend_action_popover';
-export { NameInput } from './name_input';
 export { ValueLabelsSettings } from './value_labels_settings';
 export { AxisTitleSettings } from './axis/title/axis_title_settings';
 export { AxisTicksSettings } from './axis/ticks/axis_ticks_settings';
-export { DimensionEditorSection } from './dimension_section';
-export { FilterQueryInput } from './filter_query_input';
 export * from './static_header';
 export * from './vis_label';
-export { IconSelect } from './icon_select/icon_select';
diff --git a/x-pack/plugins/lens/public/shared_components/legend/layout/columns_number_setting.tsx b/x-pack/plugins/lens/public/shared_components/legend/layout/columns_number_setting.tsx
index c0db8ce10a7b37..4ffc7c4066115d 100644
--- a/x-pack/plugins/lens/public/shared_components/legend/layout/columns_number_setting.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend/layout/columns_number_setting.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
-import { useDebouncedValue } from '../../debounced_value';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 
 export const DEFAULT_FLOATING_COLUMNS = 1;
 
diff --git a/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx b/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
index 49f03b505283c9..cfd42ed41c7cdf 100644
--- a/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
@@ -17,11 +17,11 @@ import {
 import { Position, VerticalAlignment, HorizontalAlignment } from '@elastic/charts';
 import { ToolbarButtonProps } from '@kbn/kibana-react-plugin/public';
 import { LegendSize } from '@kbn/visualizations-plugin/public';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import { ToolbarPopover } from '../toolbar_popover';
 import { LegendLocationSettings } from './location/legend_location_settings';
 import { ColumnsNumberSetting } from './layout/columns_number_setting';
 import { LegendSizeSettings } from './size/legend_size_settings';
-import { useDebouncedValue } from '../debounced_value';
 
 export interface LegendSettingsPopoverProps {
   /**
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index 6d24931032274d..1ee21390dc9849 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -45,6 +45,7 @@ import type {
   DragContextState,
   DropType,
 } from '@kbn/dom-drag-drop';
+import type { AccessorConfig } from '@kbn/visualization-ui-components/public';
 import type { DateRange, LayerType, SortingHint } from '../common/types';
 import type {
   LensSortActionData,
@@ -804,21 +805,6 @@ export type VisualizationDimensionEditorProps<T = unknown> = VisualizationConfig
   panelRef: MutableRefObject<HTMLDivElement | null>;
 };
 
-export interface AccessorConfig {
-  columnId: string;
-  triggerIconType?:
-    | 'color'
-    | 'disabled'
-    | 'colorBy'
-    | 'none'
-    | 'invisible'
-    | 'aggregate'
-    | 'custom';
-  customIcon?: IconType;
-  color?: string;
-  palette?: string[] | Array<{ color: string; stop: number }>;
-}
-
 export type VisualizationDimensionGroupConfig = SharedDimensionProps & {
   groupLabel: string;
   dimensionEditorGroupLabel?: string;
diff --git a/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor_addtional_section.tsx b/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor_addtional_section.tsx
index 19bcfcbabd5364..0ab29526c939a6 100644
--- a/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor_addtional_section.tsx
+++ b/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor_addtional_section.tsx
@@ -10,10 +10,10 @@ import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
 import { EuiFormRow, EuiFieldText, EuiText, useEuiTheme, EuiComboBox } from '@elastic/eui';
 import { PaletteRegistry } from '@kbn/coloring';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import type { VisualizationDimensionEditorProps } from '../../../types';
 import type { DatatableVisualizationState } from '../visualization';
 
-import { useDebouncedValue } from '../../../shared_components';
 import type { ColumnState } from '../../../../common/expressions';
 
 import {
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
index c886eaa360ec26..4406cea21b2743 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
@@ -25,8 +25,9 @@ import {
 } from '@kbn/coloring';
 import { GaugeTicksPositions, GaugeColorModes } from '@kbn/expression-gauge-plugin/common';
 import { getMaxValue, getMinValue } from '@kbn/expression-gauge-plugin/public';
+import { TooltipWrapper } from '@kbn/visualization-ui-components/public';
 import { isNumericFieldForDatatable } from '../../../common/expressions/datatable/utils';
-import { applyPaletteParams, PalettePanelContainer, TooltipWrapper } from '../../shared_components';
+import { applyPaletteParams, PalettePanelContainer } from '../../shared_components';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import type { GaugeVisualizationState } from './constants';
 import { defaultPaletteParams } from './palette_config';
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
index 81f4c8f6d1170b..f9b9b01d3d72b8 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
@@ -9,8 +9,9 @@ import React, { memo, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import type { GaugeLabelMajorMode } from '@kbn/expression-gauge-plugin/common';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import type { VisualizationToolbarProps } from '../../../types';
-import { ToolbarPopover, useDebouncedValue, VisLabel } from '../../../shared_components';
+import { ToolbarPopover, VisLabel } from '../../../shared_components';
 import './gauge_config_panel.scss';
 import type { GaugeVisualizationState } from '../constants';
 
diff --git a/x-pack/plugins/lens/public/visualizations/heatmap/toolbar_component.tsx b/x-pack/plugins/lens/public/visualizations/heatmap/toolbar_component.tsx
index 7cf23904f69378..2ccf66520d24e3 100644
--- a/x-pack/plugins/lens/public/visualizations/heatmap/toolbar_component.tsx
+++ b/x-pack/plugins/lens/public/visualizations/heatmap/toolbar_component.tsx
@@ -11,13 +11,13 @@ import { Position } from '@elastic/charts';
 import { i18n } from '@kbn/i18n';
 import { LegendSize } from '@kbn/visualizations-plugin/public';
 import { EuiIconAxisLeft, EuiIconAxisBottom } from '@kbn/chart-icons';
+import { TooltipWrapper } from '@kbn/visualization-ui-components/public';
 import type { VisualizationToolbarProps } from '../../types';
 import {
   LegendSettingsPopover,
   ToolbarPopover,
   ValueLabelsSettings,
   AxisTitleSettings,
-  TooltipWrapper,
   AxisTicksSettings,
 } from '../../shared_components';
 import type { HeatmapVisualizationState } from './types';
diff --git a/x-pack/plugins/lens/public/visualizations/legacy_metric/metric_config_panel/appearance_options_popover.tsx b/x-pack/plugins/lens/public/visualizations/legacy_metric/metric_config_panel/appearance_options_popover.tsx
index b5ce24e030d573..3d92f9cee94284 100644
--- a/x-pack/plugins/lens/public/visualizations/legacy_metric/metric_config_panel/appearance_options_popover.tsx
+++ b/x-pack/plugins/lens/public/visualizations/legacy_metric/metric_config_panel/appearance_options_popover.tsx
@@ -7,7 +7,8 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { ToolbarPopover, TooltipWrapper } from '../../../shared_components';
+import { TooltipWrapper } from '@kbn/visualization-ui-components/public';
+import { ToolbarPopover } from '../../../shared_components';
 import { TitlePositionOptions } from './title_position_option';
 import { FramePublicAPI } from '../../../types';
 import type { LegacyMetricState } from '../../../../common/types';
diff --git a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx
index 346b89666dc220..0442505da8c0d6 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx
+++ b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx
@@ -27,7 +27,7 @@ import { EuiColorPickerOutput } from '@elastic/eui/src/components/color_picker/c
 import { createMockFramePublicAPI } from '../../mocks';
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { euiLightVars } from '@kbn/ui-theme';
-import { DebouncedInput } from '../../shared_components/debounced_input';
+import { DebouncedInput } from '@kbn/visualization-ui-components/public';
 import { DatasourcePublicAPI } from '../..';
 import { CollapseFunction } from '../../../common/expressions';
 
diff --git a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
index a1180e0055eb26..f0903af0108899 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
@@ -33,13 +33,13 @@ import {
 import { getDataBoundsForPalette } from '@kbn/expression-metric-vis-plugin/public';
 import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { css } from '@emotion/react';
-import { isNumericFieldForDatatable } from '../../../common/expressions/datatable/utils';
 import {
-  applyPaletteParams,
-  PalettePanelContainer,
+  DebouncedInput,
   useDebouncedValue,
   IconSelect,
-} from '../../shared_components';
+} from '@kbn/visualization-ui-components/public';
+import { isNumericFieldForDatatable } from '../../../common/expressions/datatable/utils';
+import { applyPaletteParams, PalettePanelContainer } from '../../shared_components';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import { defaultNumberPaletteParams, defaultPercentagePaletteParams } from './palette_config';
 import {
@@ -49,7 +49,6 @@ import {
   showingBar,
 } from './visualization';
 import { CollapseSetting } from '../../shared_components/collapse_setting';
-import { DebouncedInput } from '../../shared_components/debounced_input';
 import { iconsSet } from './icon_set';
 
 export type SupportingVisType = 'none' | 'bar' | 'trendline';
diff --git a/x-pack/plugins/lens/public/visualizations/metric/icon_set.ts b/x-pack/plugins/lens/public/visualizations/metric/icon_set.ts
index c21e6809dd0b4a..9626979e649664 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/icon_set.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/icon_set.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { AvailableMetricIcon } from '@kbn/expression-metric-vis-plugin/common';
-import { IconSet } from '../../shared_components/icon_select/icon_select';
+import { type IconSet } from '@kbn/visualization-ui-components/public';
 
 export const iconsSet: IconSet<AvailableMetricIcon> = [
   {
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar.tsx
index 342bb0a30d576c..1ee4ee0be28c3b 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/toolbar.tsx
+++ b/x-pack/plugins/lens/public/visualizations/metric/toolbar.tsx
@@ -8,8 +8,9 @@
 import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFormRow, EuiFieldText } from '@elastic/eui';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import { VisualizationToolbarProps } from '../../types';
-import { ToolbarPopover, useDebouncedValue } from '../../shared_components';
+import { ToolbarPopover } from '../../shared_components';
 import { MetricVisualizationState } from './visualization';
 
 export function Toolbar(props: VisualizationToolbarProps<MetricVisualizationState>) {
diff --git a/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx b/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx
index b4b0b159a27119..3db46936980022 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx
+++ b/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx
@@ -16,6 +16,7 @@ import { LayoutDirection } from '@elastic/charts';
 import { euiLightVars, euiThemeVars } from '@kbn/ui-theme';
 import { KibanaThemeProvider } from '@kbn/kibana-react-plugin/public';
 import { IconChartMetric } from '@kbn/chart-icons';
+import { AccessorConfig } from '@kbn/visualization-ui-components/public';
 import { CollapseFunction } from '../../../common/expressions';
 import type { LayerType } from '../../../common/types';
 import { layerTypes } from '../../../common/layer_types';
@@ -24,7 +25,6 @@ import { getSuggestions } from './suggestions';
 import {
   Visualization,
   OperationMetadata,
-  AccessorConfig,
   VisualizationConfigProps,
   VisualizationDimensionGroupConfig,
   Suggestion,
diff --git a/x-pack/plugins/lens/public/visualizations/partition/toolbar.tsx b/x-pack/plugins/lens/public/visualizations/partition/toolbar.tsx
index 8f5d9e11bead9b..f25a97d7d75006 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/toolbar.tsx
+++ b/x-pack/plugins/lens/public/visualizations/partition/toolbar.tsx
@@ -22,17 +22,13 @@ import {
 import type { Position } from '@elastic/charts';
 import type { PaletteRegistry } from '@kbn/coloring';
 import { LegendSize } from '@kbn/visualizations-plugin/public';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import { DEFAULT_PERCENT_DECIMALS } from './constants';
 import { PartitionChartsMeta } from './partition_charts_meta';
 import { PieLayerState, PieVisualizationState, SharedPieLayerState } from '../../../common/types';
 import { LegendDisplay } from '../../../common/constants';
 import { VisualizationDimensionEditorProps, VisualizationToolbarProps } from '../../types';
-import {
-  ToolbarPopover,
-  LegendSettingsPopover,
-  useDebouncedValue,
-  PalettePicker,
-} from '../../shared_components';
+import { ToolbarPopover, LegendSettingsPopover, PalettePicker } from '../../shared_components';
 import { getDefaultVisualValuesForLayer } from '../../shared_components/datasource_default_values';
 import { shouldShowValuesInLegend } from './render_helpers';
 import { CollapseSetting } from '../../shared_components/collapse_setting';
diff --git a/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx b/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx
index ca6216f3838b0d..8d7ccc0ca7e6d5 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx
+++ b/x-pack/plugins/lens/public/visualizations/partition/visualization.tsx
@@ -16,11 +16,11 @@ import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
 import { EuiSpacer } from '@elastic/eui';
 import { PartitionVisConfiguration } from '@kbn/visualizations-plugin/common/convert_to_lens';
 import { LayerTypes } from '@kbn/expression-xy-plugin/public';
+import { AccessorConfig } from '@kbn/visualization-ui-components/public';
 import type { FormBasedPersistedState } from '../../datasources/form_based/types';
 import type {
   Visualization,
   OperationMetadata,
-  AccessorConfig,
   VisualizationDimensionGroupConfig,
   Suggestion,
   VisualizeEditorContext,
diff --git a/x-pack/plugins/lens/public/visualizations/xy/annotations/helpers.tsx b/x-pack/plugins/lens/public/visualizations/xy/annotations/helpers.tsx
index c63fc226907c5a..6174017f3054b4 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/annotations/helpers.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/annotations/helpers.tsx
@@ -16,8 +16,9 @@ import {
 import { EventAnnotationConfig } from '@kbn/event-annotation-plugin/common';
 import { IconChartBarAnnotations } from '@kbn/chart-icons';
 import { LayerTypes } from '@kbn/expression-xy-plugin/public';
+import type { AccessorConfig } from '@kbn/visualization-ui-components/public';
 import { isDraggedDataViewField } from '../../../utils';
-import type { FramePublicAPI, Visualization, AccessorConfig } from '../../../types';
+import type { FramePublicAPI, Visualization } from '../../../types';
 import { isHorizontalChart } from '../state_helpers';
 import { annotationsIconSet } from '../xy_config_panel/annotations_config_panel/icon_set';
 import type { XYState, XYDataLayerConfig, XYAnnotationLayerConfig, XYLayerConfig } from '../types';
diff --git a/x-pack/plugins/lens/public/visualizations/xy/color_assignment.ts b/x-pack/plugins/lens/public/visualizations/xy/color_assignment.ts
index 1416797ad80141..9fefea76a9d309 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/color_assignment.ts
+++ b/x-pack/plugins/lens/public/visualizations/xy/color_assignment.ts
@@ -14,7 +14,8 @@ import {
   defaultAnnotationRangeColor,
   isRangeAnnotationConfig,
 } from '@kbn/event-annotation-plugin/public';
-import type { AccessorConfig, FramePublicAPI } from '../../types';
+import type { AccessorConfig } from '@kbn/visualization-ui-components/public';
+import type { FramePublicAPI } from '../../types';
 import { getColumnToLabelMap } from './state_helpers';
 import { FormatFactory } from '../../../common/types';
 import { isDataLayer, isReferenceLayer, isAnnotationsLayer } from './visualization_helpers';
diff --git a/x-pack/plugins/lens/public/visualizations/xy/reference_line_helpers.tsx b/x-pack/plugins/lens/public/visualizations/xy/reference_line_helpers.tsx
index e53c371303739b..d850925261ae2f 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/reference_line_helpers.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/reference_line_helpers.tsx
@@ -10,7 +10,8 @@ import { i18n } from '@kbn/i18n';
 import { Datatable } from '@kbn/expressions-plugin/public';
 import { IconChartBarReferenceLine } from '@kbn/chart-icons';
 import { LayerTypes } from '@kbn/expression-xy-plugin/public';
-import type { DatasourceLayers, FramePublicAPI, Visualization, AccessorConfig } from '../../types';
+import type { AccessorConfig } from '@kbn/visualization-ui-components/public';
+import type { DatasourceLayers, FramePublicAPI, Visualization } from '../../types';
 import { groupAxesByType } from './axes_configuration';
 import { isHorizontalChart, isPercentageSeries, isStackedChart } from './state_helpers';
 import type {
diff --git a/x-pack/plugins/lens/public/visualizations/xy/state_helpers.ts b/x-pack/plugins/lens/public/visualizations/xy/state_helpers.ts
index ab20281a81d539..2f8caef2b895e5 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/state_helpers.ts
+++ b/x-pack/plugins/lens/public/visualizations/xy/state_helpers.ts
@@ -11,7 +11,7 @@ import type { SavedObjectReference } from '@kbn/core/public';
 import { isQueryAnnotationConfig } from '@kbn/event-annotation-plugin/public';
 import { i18n } from '@kbn/i18n';
 import { VisualizeFieldContext } from '@kbn/ui-actions-plugin/public';
-import { validateQuery } from '../../shared_components';
+import { validateQuery } from '@kbn/visualization-ui-components/public';
 import { DataViewsState } from '../../state_management';
 import type { FramePublicAPI, DatasourcePublicAPI, VisualizeEditorContext } from '../../types';
 import {
diff --git a/x-pack/plugins/lens/public/visualizations/xy/to_expression.ts b/x-pack/plugins/lens/public/visualizations/xy/to_expression.ts
index 85bd512fa44809..3074fc57fd7029 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/to_expression.ts
+++ b/x-pack/plugins/lens/public/visualizations/xy/to_expression.ts
@@ -49,7 +49,6 @@ import type {
 } from './types';
 import type { OperationMetadata, DatasourcePublicAPI, DatasourceLayers } from '../../types';
 import { getColumnToLabelMap } from './state_helpers';
-import { hasIcon } from '../../shared_components/icon_select/icon_select';
 import { defaultReferenceLineColor } from './color_assignment';
 import { getDefaultVisualValuesForLayer } from '../../shared_components/datasource_default_values';
 import {
@@ -64,6 +63,7 @@ import {
   hasNumericHistogramDimension,
 } from '../../shared_components';
 import type { CollapseExpressionFunction } from '../../../common/expressions';
+import { hasIcon } from './xy_config_panel/shared/marker_decoration_settings';
 
 export const getSortedAccessors = (
   datasource: DatasourcePublicAPI | undefined,
diff --git a/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx b/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx
index 1ecd9adbd8cc54..db0b441a5bad38 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/visualization.tsx
@@ -21,6 +21,7 @@ import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import { LayerTypes } from '@kbn/expression-xy-plugin/public';
+import type { AccessorConfig } from '@kbn/visualization-ui-components/public';
 import { generateId } from '../../id_generator';
 import {
   isDraggedDataViewField,
@@ -36,13 +37,7 @@ import {
   DimensionEditor,
 } from './xy_config_panel/dimension_editor';
 import { LayerHeader, LayerHeaderContent } from './xy_config_panel/layer_header';
-import type {
-  Visualization,
-  AccessorConfig,
-  FramePublicAPI,
-  Suggestion,
-  UserMessage,
-} from '../../types';
+import type { Visualization, FramePublicAPI, Suggestion, UserMessage } from '../../types';
 import type { FormBasedPersistedState } from '../../datasources/form_based/types';
 import {
   type State,
@@ -561,13 +556,27 @@ export const getXyVisualization = ({
     render(
       <KibanaThemeProvider theme$={kibanaTheme.theme$}>
         <I18nProvider>
-          <LayerHeaderContent
-            {...otherProps}
-            onChangeIndexPattern={(indexPatternId) => {
-              // TODO: should it trigger an action as in the datasource?
-              onChangeIndexPattern(indexPatternId);
+          <KibanaContextProvider
+            services={{
+              appName: 'lens',
+              storage,
+              uiSettings: core.uiSettings,
+              data,
+              fieldFormats,
+              savedObjects: core.savedObjects,
+              docLinks: core.docLinks,
+              http: core.http,
+              unifiedSearch,
             }}
-          />
+          >
+            <LayerHeaderContent
+              {...otherProps}
+              onChangeIndexPattern={(indexPatternId) => {
+                // TODO: should it trigger an action as in the datasource?
+                onChangeIndexPattern(indexPatternId);
+              }}
+            />
+          </KibanaContextProvider>
         </I18nProvider>
       </KibanaThemeProvider>,
       domElement
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/annotations_panel.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/annotations_panel.tsx
index 54ae5fc640bc40..9cb5f4d64079ea 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/annotations_panel.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/annotations_panel.tsx
@@ -25,20 +25,19 @@ import {
 import moment from 'moment';
 import { useExistingFieldsReader } from '@kbn/unified-field-list-plugin/public';
 import {
+  IconSelectSetting,
   FieldOption,
   FieldOptionValue,
   FieldPicker,
-} from '../../../../shared_components/field_picker';
-import { FormatFactory } from '../../../../../common/types';
-import {
-  DimensionEditorSection,
   NameInput,
   useDebouncedValue,
-} from '../../../../shared_components';
+  DimensionEditorSection,
+  ColorPicker,
+} from '@kbn/visualization-ui-components/public';
+import { FormatFactory } from '../../../../../common/types';
 import { isHorizontalChart } from '../../state_helpers';
 import { defaultAnnotationLabel, defaultRangeAnnotationLabel } from '../../annotations/helpers';
-import { ColorPicker } from '../color_picker';
-import { IconSelectSetting, TextDecorationSetting } from '../shared/marker_decoration_settings';
+import { TextDecorationSetting } from '../shared/marker_decoration_settings';
 import { LineStyleSettings } from '../shared/line_style_settings';
 import { updateLayer } from '..';
 import { annotationsIconSet } from './icon_set';
@@ -216,12 +215,9 @@ export const AnnotationsPanel = (
         {!isRange && (
           <>
             <IconSelectSetting
-              setConfig={setAnnotations}
+              setIcon={(icon) => setAnnotations({ icon })}
               defaultIcon="triangle"
-              currentConfig={{
-                axisMode: 'bottom',
-                ...currentAnnotation,
-              }}
+              currentIcon={currentAnnotation?.icon}
               customIconSet={annotationsIconSet}
             />
             <TextDecorationSetting
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/icon_set.ts b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/icon_set.ts
index 436bb84b92e7bd..3e67cd8e5c14e3 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/icon_set.ts
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/icon_set.ts
@@ -8,7 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { AvailableAnnotationIcon } from '@kbn/event-annotation-plugin/common';
 import { IconTriangle, IconCircle } from '@kbn/chart-icons';
-import { IconSet } from '../../../../shared_components/icon_select/icon_select';
+import { type IconSet } from '@kbn/visualization-ui-components/public';
 
 export const annotationsIconSet: IconSet<AvailableAnnotationIcon> = [
   {
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/query_annotation_panel.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/query_annotation_panel.tsx
index 00f0013c92822a..e502efe559597e 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/query_annotation_panel.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/query_annotation_panel.tsx
@@ -13,12 +13,15 @@ import React from 'react';
 import { useExistingFieldsReader } from '@kbn/unified-field-list-plugin/public';
 import {
   FieldOption,
+  FilterQueryInput,
   FieldOptionValue,
   FieldPicker,
-  FilterQueryInput,
-} from '../../../../shared_components';
+} from '@kbn/visualization-ui-components/public';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { LENS_APP_NAME } from '../../../../../common/constants';
 import type { FramePublicAPI } from '../../../../types';
 import type { XYState, XYAnnotationLayerConfig } from '../../types';
+import { LensAppServices } from '../../../../app_plugin/types';
 
 export const defaultQuery: Query = {
   query: '',
@@ -85,7 +88,9 @@ export const ConfigPanelQueryAnnotation = ({
             onChange({ filter: { type: 'kibana_query', ...query } });
           }}
           data-test-subj="lnsXY-annotation-query-based-query-input"
-          indexPattern={currentIndexPattern}
+          dataView={currentIndexPattern}
+          appName={LENS_APP_NAME}
+          queryInputServices={useKibana<LensAppServices>().services}
         />
       </EuiFormRow>
 
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/tooltip_annotation_panel.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/tooltip_annotation_panel.tsx
index d3f68686c3bac6..12b2926fa7b14b 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/tooltip_annotation_panel.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/annotations_config_panel/tooltip_annotation_panel.tsx
@@ -10,17 +10,19 @@ import { i18n } from '@kbn/i18n';
 import React, { useCallback, useMemo } from 'react';
 import { QueryPointEventAnnotationConfig } from '@kbn/event-annotation-plugin/common';
 import { useExistingFieldsReader } from '@kbn/unified-field-list-plugin/public';
-import type { IndexPattern } from '../../../../types';
 import {
   FieldOption,
   FieldOptionValue,
   FieldPicker,
+} from '@kbn/visualization-ui-components/public';
+import {
   useDebouncedValue,
   NewBucketButton,
   DragDropBuckets,
   DraggableBucketContainer,
   FieldsBucketContainer,
-} from '../../../../shared_components';
+} from '@kbn/visualization-ui-components/public';
+import type { IndexPattern } from '../../../../types';
 
 export const MAX_TOOLTIP_FIELDS_SIZE = 2;
 
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
index 2d7471958ee92f..e83899cdbf926f 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
@@ -17,10 +17,10 @@ import {
   EuiIconAxisRight,
   EuiIconAxisTop,
 } from '@kbn/chart-icons';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 import { isHorizontalChart } from '../state_helpers';
 import {
   ToolbarPopover,
-  useDebouncedValue,
   AxisTitleSettings,
   AxisBoundsControl,
   AxisTicksSettings,
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/dimension_editor.tsx
index 802d73d3457186..f5d19edd81c5e5 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/dimension_editor.tsx
@@ -10,12 +10,13 @@ import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow, htmlIdGenerator } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
 import type { DatatableUtilitiesService } from '@kbn/data-plugin/common';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
+import { ColorPicker } from '@kbn/visualization-ui-components/public';
 import type { VisualizationDimensionEditorProps } from '../../../types';
 import { State, XYState, XYDataLayerConfig, YConfig, YAxisMode } from '../types';
 import { FormatFactory } from '../../../../common/types';
 import { getSeriesColor, isHorizontalChart } from '../state_helpers';
-import { ColorPicker } from './color_picker';
-import { PalettePicker, useDebouncedValue } from '../../../shared_components';
+import { PalettePicker } from '../../../shared_components';
 import { getDataLayers, isAnnotationsLayer, isReferenceLayer } from '../visualization_helpers';
 import { ReferenceLinePanel } from './reference_line_config_panel';
 import { AnnotationsPanel } from './annotations_config_panel';
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/index.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/index.tsx
index 4342ecac699540..e0b4ab1ae16693 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/index.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/index.tsx
@@ -11,6 +11,7 @@ import { Position, ScaleType } from '@elastic/charts';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { AxisExtentConfig } from '@kbn/expression-xy-plugin/common';
 import { LegendSize } from '@kbn/visualizations-plugin/public';
+import { TooltipWrapper } from '@kbn/visualization-ui-components/public';
 import type { LegendSettingsPopoverProps } from '../../../shared_components/legend/legend_settings_popover';
 import type { VisualizationToolbarProps, FramePublicAPI } from '../../../types';
 import { State, XYState, AxesSettingsConfig } from '../types';
@@ -20,7 +21,6 @@ import { AxisSettingsPopover } from './axis_settings_popover';
 import { getAxesConfiguration, getXDomain, GroupsConfiguration } from '../axes_configuration';
 import { VisualOptionsPopover } from './visual_options_popover';
 import { getScaleType } from '../to_expression';
-import { TooltipWrapper } from '../../../shared_components';
 import { getDefaultVisualValuesForLayer } from '../../../shared_components/datasource_default_values';
 import { getDataLayers } from '../visualization_helpers';
 
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/icon_set.ts b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/icon_set.ts
index d64fde37ebd25f..73d53b566002da 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/icon_set.ts
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/icon_set.ts
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { AvailableReferenceLineIcon } from '@kbn/expression-xy-plugin/common';
-import { IconSet } from '../../../../shared_components/icon_select/icon_select';
+import { type IconSet } from '@kbn/visualization-ui-components/public';
 
 export const referenceLineIconsSet: IconSet<AvailableReferenceLineIcon> = [
   {
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx
index d3907a28fecac9..d160777eeaa4d7 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx
@@ -10,17 +10,19 @@ import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
 import { FillStyle } from '@kbn/expression-xy-plugin/common';
+import {
+  useDebouncedValue,
+  IconSelectSetting,
+  ColorPicker,
+} from '@kbn/visualization-ui-components/public';
 import type { VisualizationDimensionEditorProps } from '../../../../types';
 import { State, XYState, XYReferenceLineLayerConfig, YConfig } from '../../types';
 import { FormatFactory } from '../../../../../common/types';
 
-import { ColorPicker } from '../color_picker';
 import { updateLayer } from '..';
-import { useDebouncedValue } from '../../../../shared_components';
 import { idPrefix } from '../dimension_editor';
 import { isHorizontalChart } from '../../state_helpers';
 import {
-  IconSelectSetting,
   MarkerDecorationPosition,
   TextDecorationSetting,
 } from '../shared/marker_decoration_settings';
@@ -77,8 +79,8 @@ export const ReferenceLinePanel = (
     <>
       <TextDecorationSetting setConfig={setConfig} currentConfig={localConfig} />
       <IconSelectSetting
-        setConfig={setConfig}
-        currentConfig={localConfig}
+        setIcon={(icon) => setConfig({ icon })}
+        currentIcon={localConfig?.icon}
         customIconSet={referenceLineIconsSet}
       />
       <MarkerDecorationPosition
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/shared/marker_decoration_settings.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/shared/marker_decoration_settings.tsx
index 8b7fba475dc2ee..2ea03f2cf98840 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/shared/marker_decoration_settings.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/shared/marker_decoration_settings.tsx
@@ -9,16 +9,15 @@ import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButtonGroup, EuiFormRow } from '@elastic/eui';
 import { IconPosition } from '@kbn/expression-xy-plugin/common';
+import { TooltipWrapper } from '@kbn/visualization-ui-components/public';
 import { YAxisMode } from '../../types';
 
-import { TooltipWrapper } from '../../../../shared_components';
-import {
-  hasIcon,
-  IconSelect,
-  IconSet,
-} from '../../../../shared_components/icon_select/icon_select';
 import { idPrefix } from '../dimension_editor';
 
+export function hasIcon(icon: string | undefined): icon is string {
+  return icon != null && icon !== 'empty';
+}
+
 interface LabelConfigurationOptions {
   isHorizontal: boolean;
   axisMode?: YAxisMode;
@@ -188,37 +187,6 @@ export function TextDecorationSetting<Icon extends string = string>({
   );
 }
 
-export function IconSelectSetting<Icon extends string = string>({
-  currentConfig,
-  setConfig,
-  customIconSet,
-  defaultIcon = 'empty',
-}: {
-  currentConfig?: MarkerDecorationConfig<Icon>;
-  setConfig: (config: MarkerDecorationConfig<Icon>) => void;
-  customIconSet: IconSet<Icon>;
-  defaultIcon?: string;
-}) {
-  return (
-    <EuiFormRow
-      display="columnCompressed"
-      fullWidth
-      label={i18n.translate('xpack.lens.xyChart.lineMarker.icon', {
-        defaultMessage: 'Icon decoration',
-      })}
-    >
-      <IconSelect
-        defaultIcon={defaultIcon}
-        customIconSet={customIconSet}
-        value={currentConfig?.icon}
-        onChange={(newIcon) => {
-          setConfig({ icon: newIcon });
-        }}
-      />
-    </EuiFormRow>
-  );
-}
-
 export function MarkerDecorationPosition<Icon extends string = string>({
   currentConfig,
   setConfig,
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/fill_opacity_option.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/fill_opacity_option.tsx
index 236fc4c9eec7fa..fa991c9fbc292c 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/fill_opacity_option.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/fill_opacity_option.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiRange } from '@elastic/eui';
-import { useDebouncedValue } from '../../../../shared_components';
+import { useDebouncedValue } from '@kbn/visualization-ui-components/public';
 
 export interface FillOpacityOptionProps {
   /**
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/index.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/index.tsx
index e1f995393ee7e6..cac7df703159bc 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/index.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/index.tsx
@@ -7,7 +7,8 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { ToolbarPopover, TooltipWrapper, ValueLabelsSettings } from '../../../../shared_components';
+import { TooltipWrapper } from '@kbn/visualization-ui-components/public';
+import { ToolbarPopover, ValueLabelsSettings } from '../../../../shared_components';
 import { MissingValuesOptions } from './missing_values_option';
 import { LineCurveOption } from './line_curve_option';
 import { FillOpacityOption } from './fill_opacity_option';
diff --git a/x-pack/plugins/lens/readme.md b/x-pack/plugins/lens/readme.md
index b3768ba0b25402..334ab844c4308a 100644
--- a/x-pack/plugins/lens/readme.md
+++ b/x-pack/plugins/lens/readme.md
@@ -229,7 +229,8 @@ Run all tests from the `x-pack` root directory
   - Run `node scripts/functional_tests_server`
   - Run `node ../scripts/functional_test_runner.js --config ./test/functional/apps/lens/group1/config.ts`
   - Run `node ../scripts/functional_test_runner.js --config ./test/functional/apps/lens/group2/config.ts`
-  - Run `node ../scripts/functional_test_runner.js --config ./test/functional/apps/lens/group3/config.ts`
+  - ...
+  - Run `node ../scripts/functional_test_runner.js --config ./test/functional/apps/lens/group6/config.ts`
 - API Functional tests:
   - Run `node scripts/functional_tests_server`
   - Run `node ../scripts/functional_test_runner.js --config ./test/api_integration/config.ts --grep=Lens`
diff --git a/x-pack/plugins/lens/tsconfig.json b/x-pack/plugins/lens/tsconfig.json
index 291804ddd0c108..20a5add716eac1 100644
--- a/x-pack/plugins/lens/tsconfig.json
+++ b/x-pack/plugins/lens/tsconfig.json
@@ -39,6 +39,7 @@
     "@kbn/expression-xy-plugin",
     "@kbn/unified-search-plugin",
     "@kbn/unified-field-list-plugin",
+    "@kbn/random-sampling",
     "@kbn/rison",
     "@kbn/i18n",
     "@kbn/field-types",
@@ -65,6 +66,7 @@
     "@kbn/safer-lodash-set",
     "@kbn/shared-ux-router",
     "@kbn/dom-drag-drop",
+    "@kbn/visualization-ui-components",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/maps/common/content_management/v1/cm_services.ts b/x-pack/plugins/maps/common/content_management/v1/cm_services.ts
index 5ea8008f532257..65d2e3082da7d5 100644
--- a/x-pack/plugins/maps/common/content_management/v1/cm_services.ts
+++ b/x-pack/plugins/maps/common/content_management/v1/cm_services.ts
@@ -6,24 +6,12 @@
  */
 import { schema } from '@kbn/config-schema';
 import type { ContentManagementServicesDefinition as ServicesDefinition } from '@kbn/object-versioning';
-
-const apiError = schema.object({
-  error: schema.string(),
-  message: schema.string(),
-  statusCode: schema.number(),
-  metadata: schema.object({}, { unknowns: 'allow' }),
-});
-
-const referenceSchema = schema.object(
-  {
-    name: schema.maybe(schema.string()),
-    type: schema.string(),
-    id: schema.string(),
-  },
-  { unknowns: 'forbid' }
-);
-
-const referencesSchema = schema.arrayOf(referenceSchema);
+import {
+  savedObjectSchema,
+  objectTypeToGetResultSchema,
+  createOptionsSchemas,
+  createResultSchema,
+} from '@kbn/content-management-utils';
 
 const mapAttributesSchema = schema.object(
   {
@@ -36,48 +24,19 @@ const mapAttributesSchema = schema.object(
   { unknowns: 'forbid' }
 );
 
-const mapSavedObjectSchema = schema.object(
-  {
-    id: schema.string(),
-    type: schema.string(),
-    version: schema.maybe(schema.string()),
-    createdAt: schema.maybe(schema.string()),
-    updatedAt: schema.maybe(schema.string()),
-    error: schema.maybe(apiError),
-    attributes: mapAttributesSchema,
-    references: referencesSchema,
-    namespaces: schema.maybe(schema.arrayOf(schema.string())),
-    originId: schema.maybe(schema.string()),
-  },
-  { unknowns: 'allow' }
-);
+const mapSavedObjectSchema = savedObjectSchema(mapAttributesSchema);
 
-const getResultSchema = schema.object(
-  {
-    item: mapSavedObjectSchema,
-    meta: schema.object(
-      {
-        outcome: schema.oneOf([
-          schema.literal('exactMatch'),
-          schema.literal('aliasMatch'),
-          schema.literal('conflict'),
-        ]),
-        aliasTargetId: schema.maybe(schema.string()),
-        aliasPurpose: schema.maybe(
-          schema.oneOf([
-            schema.literal('savedObjectConversion'),
-            schema.literal('savedObjectImport'),
-          ])
-        ),
-      },
-      { unknowns: 'forbid' }
-    ),
-  },
-  { unknowns: 'forbid' }
+const searchOptionsSchema = schema.maybe(
+  schema.object(
+    {
+      onlyTitle: schema.maybe(schema.boolean()),
+    },
+    { unknowns: 'forbid' }
+  )
 );
 
 const createOptionsSchema = schema.object({
-  references: schema.maybe(referencesSchema),
+  references: schema.maybe(createOptionsSchemas.references),
 });
 
 // Content management service definition.
@@ -86,7 +45,7 @@ export const serviceDefinition: ServicesDefinition = {
   get: {
     out: {
       result: {
-        schema: getResultSchema,
+        schema: objectTypeToGetResultSchema(mapSavedObjectSchema),
       },
     },
   },
@@ -101,12 +60,7 @@ export const serviceDefinition: ServicesDefinition = {
     },
     out: {
       result: {
-        schema: schema.object(
-          {
-            item: mapSavedObjectSchema,
-          },
-          { unknowns: 'forbid' }
-        ),
+        schema: createResultSchema(mapSavedObjectSchema),
       },
     },
   },
@@ -123,14 +77,7 @@ export const serviceDefinition: ServicesDefinition = {
   search: {
     in: {
       options: {
-        schema: schema.maybe(
-          schema.object(
-            {
-              onlyTitle: schema.maybe(schema.boolean()),
-            },
-            { unknowns: 'forbid' }
-          )
-        ),
+        schema: searchOptionsSchema,
       },
     },
   },
diff --git a/x-pack/plugins/ml/common/constants/anomalies.ts b/x-pack/plugins/ml/common/constants/anomalies.ts
deleted file mode 100644
index 3c031f28f4d3f7..00000000000000
--- a/x-pack/plugins/ml/common/constants/anomalies.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-/**
- * Labels displayed in the ML UI to indicate the severity of the anomaly according
- * to the normalized anomaly score.
- */
-export enum ANOMALY_SEVERITY {
-  /**
-   * Anomalies are displayed as critical severity when the score is greater than or equal to 75.
-   */
-  CRITICAL = 'critical',
-
-  /**
-   * Anomalies are displayed as major severity when the score is greater than or equal to 50 and less than 75.
-   */
-  MAJOR = 'major',
-
-  /**
-   * Anomalies are displayed as minor severity when the score is greater than or equal to 25 and less than 50.
-   */
-  MINOR = 'minor',
-
-  /**
-   * Anomalies are displayed as warning severity when the score is greater than or equal to 3 and less than 25.
-   * Note in some parts of the UI, warning severity is used when the score is greater than or equal to 0.
-   */
-  WARNING = 'warning',
-
-  /**
-   * Anomalies are displayed as low severity in some parts of the ML UI when the score is greater than or equal to 0 and less than 3.
-   */
-  LOW = 'low',
-
-  /**
-   * Anomalies are displayed as unknown severity if the anomaly score is not known.
-   */
-  UNKNOWN = 'unknown',
-}
-
-/**
- * Anomaly score numeric thresholds to indicate the severity of the anomaly.
- */
-export enum ANOMALY_THRESHOLD {
-  /**
-   * Threshold at which anomalies are labelled in the UI as critical.
-   */
-  CRITICAL = 75,
-
-  /**
-   * Threshold at which anomalies are labelled in the UI as major.
-   */
-  MAJOR = 50,
-
-  /**
-   * Threshold at which anomalies are labelled in the UI as minor.
-   */
-  MINOR = 25,
-
-  /**
-   * Threshold at which anomalies are labelled in the UI as warning.
-   */
-  WARNING = 3,
-
-  /**
-   * Threshold at which anomalies are labelled in the UI as low.
-   */
-  LOW = 0,
-}
-
-/**
- * RGB hex codes used to indicate the severity of an anomaly according to its anomaly score.
- */
-export const SEVERITY_COLORS = {
-  /**
-   * Color used in the UI to indicate a critical anomaly, with a score greater than or equal to 75.
-   */
-  CRITICAL: '#fe5050',
-
-  /**
-   * Color used in the UI to indicate a major anomaly, with a score greater than or equal to 50 and less than 75 .
-   */
-  MAJOR: '#fba740',
-
-  /**
-   * Color used in the UI to indicate a minor anomaly, with a score greater than or equal to 25 and less than 50.
-   */
-  MINOR: '#fdec25',
-
-  /**
-   * Color used in the UI to indicate a warning anomaly, with a score greater than or equal to 3 and less than 25.
-   * Note in some parts of the UI, warning severity is used when the score is greater than or equal to 0.
-   */
-  WARNING: '#8bc8fb',
-
-  /**
-   * Color used in some parts of the UI to indicate a low severity anomaly, with a score greater than or equal to 0 and less than 3.
-   */
-  LOW: '#d2e9f7',
-
-  /**
-   * Color used in the UI to indicate an anomaly for which the score is unknown.
-   */
-  BLANK: '#ffffff',
-};
-
-export const SEVERITY_COLOR_RAMP = [
-  {
-    stop: ANOMALY_THRESHOLD.LOW,
-    color: SEVERITY_COLORS.WARNING,
-  },
-  {
-    stop: ANOMALY_THRESHOLD.MINOR,
-    color: SEVERITY_COLORS.MINOR,
-  },
-  {
-    stop: ANOMALY_THRESHOLD.MAJOR,
-    color: SEVERITY_COLORS.MAJOR,
-  },
-  {
-    stop: ANOMALY_THRESHOLD.CRITICAL,
-    color: SEVERITY_COLORS.CRITICAL,
-  },
-];
-
-export const ANOMALY_RESULT_TYPE = {
-  BUCKET: 'bucket',
-  RECORD: 'record',
-  INFLUENCER: 'influencer',
-} as const;
-
-export const PARTITION_FIELDS = ['partition_field', 'over_field', 'by_field'] as const;
-export const JOB_ID = 'job_id';
-export const PARTITION_FIELD_VALUE = 'partition_field_value';
diff --git a/x-pack/plugins/ml/common/index.ts b/x-pack/plugins/ml/common/index.ts
index b540c4d3751f13..90e1501d6da81c 100644
--- a/x-pack/plugins/ml/common/index.ts
+++ b/x-pack/plugins/ml/common/index.ts
@@ -7,13 +7,6 @@
 
 export { ES_CLIENT_TOTAL_HITS_RELATION } from './types/es_client';
 export type { ChartData } from './types/field_histograms';
-export {
-  ANOMALY_SEVERITY,
-  ANOMALY_THRESHOLD,
-  SEVERITY_COLOR_RAMP,
-  SEVERITY_COLORS,
-} from './constants/anomalies';
-export { getSeverityColor, getSeverityType } from './util/anomaly_utils';
 export { composeValidators, patternValidator } from './util/validators';
 export { isRuntimeMappings, isRuntimeField } from './util/runtime_field_utils';
 export type { RuntimeMappings } from './types/fields';
diff --git a/x-pack/plugins/ml/common/types/alerts.ts b/x-pack/plugins/ml/common/types/alerts.ts
index 0a6e7813db3470..267096e105ef62 100644
--- a/x-pack/plugins/ml/common/types/alerts.ts
+++ b/x-pack/plugins/ml/common/types/alerts.ts
@@ -6,8 +6,7 @@
  */
 
 import type { RuleTypeParams, Rule } from '@kbn/alerting-plugin/common';
-import { AnomalyResultType } from './anomalies';
-import { ANOMALY_RESULT_TYPE } from '../constants/anomalies';
+import { type MlAnomalyResultType, ML_ANOMALY_RESULT_TYPE } from '@kbn/ml-anomaly-utils';
 
 export type PreviewResultsKeys = 'record_results' | 'bucket_results' | 'influencer_results';
 export type TopHitsResultsKeys = 'top_record_hits' | 'top_bucket_hits' | 'top_influencer_hits';
@@ -34,7 +33,7 @@ export interface PreviewResponse {
 }
 
 interface BaseAnomalyAlertDoc {
-  result_type: AnomalyResultType;
+  result_type: MlAnomalyResultType;
   job_id: string;
   /**
    * Rounded score
@@ -46,7 +45,7 @@ interface BaseAnomalyAlertDoc {
 }
 
 export interface RecordAnomalyAlertDoc extends BaseAnomalyAlertDoc {
-  result_type: typeof ANOMALY_RESULT_TYPE.RECORD;
+  result_type: typeof ML_ANOMALY_RESULT_TYPE.RECORD;
   function: string;
   field_name?: string;
   by_field_name?: string;
@@ -60,7 +59,7 @@ export interface RecordAnomalyAlertDoc extends BaseAnomalyAlertDoc {
 }
 
 export interface BucketAnomalyAlertDoc extends BaseAnomalyAlertDoc {
-  result_type: typeof ANOMALY_RESULT_TYPE.BUCKET;
+  result_type: typeof ML_ANOMALY_RESULT_TYPE.BUCKET;
   start: number;
   end: number;
   timestamp_epoch: number;
@@ -68,7 +67,7 @@ export interface BucketAnomalyAlertDoc extends BaseAnomalyAlertDoc {
 }
 
 export interface InfluencerAnomalyAlertDoc extends BaseAnomalyAlertDoc {
-  result_type: typeof ANOMALY_RESULT_TYPE.INFLUENCER;
+  result_type: typeof ML_ANOMALY_RESULT_TYPE.INFLUENCER;
   influencer_field_name: string;
   influencer_field_value: string | number;
   influencer_score: number;
@@ -77,15 +76,15 @@ export interface InfluencerAnomalyAlertDoc extends BaseAnomalyAlertDoc {
 export type AlertHitDoc = RecordAnomalyAlertDoc | BucketAnomalyAlertDoc | InfluencerAnomalyAlertDoc;
 
 export function isRecordAnomalyAlertDoc(arg: any): arg is RecordAnomalyAlertDoc {
-  return arg.hasOwnProperty('result_type') && arg.result_type === ANOMALY_RESULT_TYPE.RECORD;
+  return arg.hasOwnProperty('result_type') && arg.result_type === ML_ANOMALY_RESULT_TYPE.RECORD;
 }
 
 export function isBucketAnomalyAlertDoc(arg: any): arg is BucketAnomalyAlertDoc {
-  return arg.hasOwnProperty('result_type') && arg.result_type === ANOMALY_RESULT_TYPE.BUCKET;
+  return arg.hasOwnProperty('result_type') && arg.result_type === ML_ANOMALY_RESULT_TYPE.BUCKET;
 }
 
 export function isInfluencerAnomalyAlertDoc(arg: any): arg is InfluencerAnomalyAlertDoc {
-  return arg.hasOwnProperty('result_type') && arg.result_type === ANOMALY_RESULT_TYPE.INFLUENCER;
+  return arg.hasOwnProperty('result_type') && arg.result_type === ML_ANOMALY_RESULT_TYPE.INFLUENCER;
 }
 
 export type MlAnomalyDetectionAlertParams = {
@@ -94,7 +93,7 @@ export type MlAnomalyDetectionAlertParams = {
     groupIds?: string[];
   };
   severity: number;
-  resultType: AnomalyResultType;
+  resultType: MlAnomalyResultType;
   includeInterim: boolean;
   lookbackInterval: string | null | undefined;
   topNBuckets: number | null | undefined;
diff --git a/x-pack/plugins/ml/common/types/annotations.ts b/x-pack/plugins/ml/common/types/annotations.ts
index 50d7c2d3fcd2b0..6962371eddbf75 100644
--- a/x-pack/plugins/ml/common/types/annotations.ts
+++ b/x-pack/plugins/ml/common/types/annotations.ts
@@ -59,17 +59,17 @@
 //     ]
 // }
 
-import { PartitionFieldsType } from './anomalies';
+import { MlPartitionFieldsType } from '@kbn/ml-anomaly-utils';
 import { ANNOTATION_TYPE } from '../constants/annotations';
 
 export type AnnotationFieldName = 'partition_field_name' | 'over_field_name' | 'by_field_name';
 export type AnnotationFieldValue = 'partition_field_value' | 'over_field_value' | 'by_field_value';
 
-export function getAnnotationFieldName(fieldType: PartitionFieldsType): AnnotationFieldName {
+export function getAnnotationFieldName(fieldType: MlPartitionFieldsType): AnnotationFieldName {
   return `${fieldType}_name` as AnnotationFieldName;
 }
 
-export function getAnnotationFieldValue(fieldType: PartitionFieldsType): AnnotationFieldValue {
+export function getAnnotationFieldValue(fieldType: MlPartitionFieldsType): AnnotationFieldValue {
   return `${fieldType}_value` as AnnotationFieldValue;
 }
 
diff --git a/x-pack/plugins/ml/common/types/custom_urls.ts b/x-pack/plugins/ml/common/types/custom_urls.ts
deleted file mode 100644
index 340d3f8b07d141..00000000000000
--- a/x-pack/plugins/ml/common/types/custom_urls.ts
+++ /dev/null
@@ -1,39 +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 { isPopulatedObject } from '@kbn/ml-is-populated-object';
-import { AnomalyRecordDoc } from './anomalies';
-
-/**
- * Base Interface for basic custom URL.
- */
-export interface BaseUrlConfig {
-  url_name: string;
-  url_value: string;
-}
-
-export interface KibanaUrlConfig extends BaseUrlConfig {
-  time_range?: string;
-}
-
-export interface KibanaUrlConfigWithTimeRange extends BaseUrlConfig {
-  time_range: string;
-}
-
-export type UrlConfig = BaseUrlConfig | KibanaUrlConfig;
-
-export interface CustomUrlAnomalyRecordDoc extends AnomalyRecordDoc {
-  earliest: string;
-  latest: string;
-}
-
-export function isKibanaUrlConfigWithTimeRange(arg: unknown): arg is KibanaUrlConfigWithTimeRange {
-  return (
-    isPopulatedObject(arg, ['url_name', 'url_value', 'time_range']) &&
-    typeof arg.time_range === 'string'
-  );
-}
diff --git a/x-pack/plugins/ml/common/types/data_frame_analytics.ts b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
index cba66124bab4b7..499c6c45650544 100644
--- a/x-pack/plugins/ml/common/types/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
@@ -10,8 +10,8 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
 
 import { EsErrorBody } from '@kbn/ml-error-utils';
+import type { MlUrlConfig } from '@kbn/ml-anomaly-utils';
 import { ANALYSIS_CONFIG_TYPE } from '../constants/data_frame_analytics';
-import type { UrlConfig } from './custom_urls';
 
 export interface DeleteDataFrameAnalyticsWithIndexStatus {
   success: boolean;
@@ -59,7 +59,7 @@ export interface ClassificationAnalysis {
 
 export type AnalysisConfig = estypes.MlDataframeAnalysisContainer;
 export interface DataFrameAnalyticsMeta {
-  custom_urls?: UrlConfig[];
+  custom_urls?: MlUrlConfig[];
   [key: string]: any;
 }
 export interface DataFrameAnalyticsConfig
diff --git a/x-pack/plugins/ml/common/types/detector_rules.ts b/x-pack/plugins/ml/common/types/detector_rules.ts
index 787cb2350c4fc2..f49ff21092e66f 100644
--- a/x-pack/plugins/ml/common/types/detector_rules.ts
+++ b/x-pack/plugins/ml/common/types/detector_rules.ts
@@ -5,23 +5,28 @@
  * 2.0.
  */
 
-import { ACTION, FILTER_TYPE, APPLIES_TO, OPERATOR } from '../constants/detector_rule';
+import {
+  ML_DETECTOR_RULE_ACTION,
+  ML_DETECTOR_RULE_FILTER_TYPE,
+  ML_DETECTOR_RULE_APPLIES_TO,
+  ML_DETECTOR_RULE_OPERATOR,
+} from '@kbn/ml-anomaly-utils';
 
 export interface DetectorRuleScope {
   [id: string]: {
     filter_id: string;
-    filter_type: FILTER_TYPE;
+    filter_type: ML_DETECTOR_RULE_FILTER_TYPE;
   };
 }
 
 export interface DetectorRuleCondition {
-  applies_to: APPLIES_TO;
-  operator: OPERATOR;
+  applies_to: ML_DETECTOR_RULE_APPLIES_TO;
+  operator: ML_DETECTOR_RULE_OPERATOR;
   value: number;
 }
 
 export interface DetectorRule {
-  actions: ACTION[];
+  actions: ML_DETECTOR_RULE_ACTION[];
   scope?: DetectorRuleScope;
   conditions?: DetectorRuleCondition[];
 }
diff --git a/x-pack/plugins/ml/common/types/results.ts b/x-pack/plugins/ml/common/types/results.ts
index 3fda97b5740b13..388c27c17b5dd7 100644
--- a/x-pack/plugins/ml/common/types/results.ts
+++ b/x-pack/plugins/ml/common/types/results.ts
@@ -8,10 +8,9 @@
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { LineAnnotationDatum, RectAnnotationDatum } from '@elastic/charts';
 import type { ErrorType } from '@kbn/ml-error-utils';
-import type { EntityField } from '../util/anomaly_utils';
+import type { MlEntityField, MlRecordForInfluencer } from '@kbn/ml-anomaly-utils';
 import type { Datafeed, JobId, ModelSnapshot } from './anomaly_detection_jobs';
 import { ES_AGGREGATION, ML_JOB_AGGREGATION } from '../constants/aggregation_types';
-import type { RecordForInfluencer } from './anomalies';
 
 export interface GetStoppedPartitionResult {
   jobs: string[] | Record<string, string[]>;
@@ -85,7 +84,7 @@ export interface SeriesConfigWithMetadata extends SeriesConfig {
   bucketSpanSeconds: number;
   detectorLabel?: string;
   fieldName: string;
-  entityFields: EntityField[];
+  entityFields: MlEntityField[];
   infoTooltip?: InfoTooltip;
   loading?: boolean;
   chartData?: ChartPoint[] | null;
@@ -112,10 +111,10 @@ export interface InfoTooltip {
   jobId: JobId;
   aggregationInterval?: string;
   chartFunction: string;
-  entityFields: EntityField[];
+  entityFields: MlEntityField[];
 }
 
-export interface ChartRecord extends RecordForInfluencer {
+export interface ChartRecord extends MlRecordForInfluencer {
   function: string;
 }
 
diff --git a/x-pack/plugins/ml/common/types/storage.ts b/x-pack/plugins/ml/common/types/storage.ts
index ddc32cf7d24db2..cb80b17bda5831 100644
--- a/x-pack/plugins/ml/common/types/storage.ts
+++ b/x-pack/plugins/ml/common/types/storage.ts
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import { type FrozenTierPreference } from '@kbn/ml-date-picker';
-
-import { EntityFieldType } from './anomalies';
+import type { MlEntityFieldType } from '@kbn/ml-anomaly-utils';
+import type { FrozenTierPreference } from '@kbn/ml-date-picker';
 
 export const ML_ENTITY_FIELDS_CONFIG = 'ml.singleMetricViewer.partitionFields' as const;
 export const ML_APPLY_TIME_RANGE_CONFIG = 'ml.jobSelectorFlyout.applyTimeRange';
@@ -38,7 +37,7 @@ export type PartitionFieldConfig =
   | undefined;
 
 export type PartitionFieldsConfig =
-  | Partial<Record<EntityFieldType, PartitionFieldConfig>>
+  | Partial<Record<MlEntityFieldType, PartitionFieldConfig>>
   | undefined;
 
 export type ApplyTimeRangeConfig = boolean | undefined;
diff --git a/x-pack/plugins/ml/common/util/job_utils.ts b/x-pack/plugins/ml/common/util/job_utils.ts
index dd68ef6d59d83e..d465a844b3ec73 100644
--- a/x-pack/plugins/ml/common/util/job_utils.ts
+++ b/x-pack/plugins/ml/common/util/job_utils.ts
@@ -17,6 +17,7 @@ import type { SerializableRecord } from '@kbn/utility-types';
 import { FilterStateStore } from '@kbn/es-query';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { isDefined } from '@kbn/ml-is-defined';
+import type { MlEntityField } from '@kbn/ml-anomaly-utils';
 import { ALLOWED_DATA_UNITS, JOB_ID_MAX_LENGTH } from '../constants/validation';
 import { parseInterval } from './parse_interval';
 import { maxLengthValidator } from './validators';
@@ -28,7 +29,6 @@ import type {
   Job,
   JobId,
 } from '../types/anomaly_detection_jobs';
-import type { EntityField } from './anomaly_utils';
 import type { MlServerLimits } from '../types/ml_server_info';
 import type { JobValidationMessage, JobValidationMessageId } from '../constants/messages';
 import { ES_AGGREGATION, ML_JOB_AGGREGATION } from '../constants/aggregation_types';
@@ -283,7 +283,7 @@ export function getPartitioningFieldNames(job: CombinedJob, detectorIndex: numbe
 export function isModelPlotEnabled(
   job: Job,
   detectorIndex: number,
-  entityFields?: EntityField[]
+  entityFields?: MlEntityField[]
 ): boolean {
   // Check if model_plot_config is enabled.
   let isEnabled = job.model_plot_config?.enabled ?? false;
diff --git a/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx b/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
index 980abb23e659d6..f9fdfb17b319c2 100644
--- a/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
+++ b/x-pack/plugins/ml/public/alerting/ml_anomaly_alert_trigger.tsx
@@ -11,6 +11,7 @@ import useMount from 'react-use/lib/useMount';
 import { i18n } from '@kbn/i18n';
 import { RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
 import { isDefined } from '@kbn/ml-is-defined';
+import { ML_ANOMALY_RESULT_TYPE, ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils';
 import { JobSelectorControl } from './job_selector';
 import { useMlKibana } from '../application/contexts/kibana';
 import { jobsApiProvider } from '../application/services/ml_api_service/jobs';
@@ -19,12 +20,10 @@ import { SeverityControl } from '../application/components/severity_control';
 import { ResultTypeSelector } from './result_type_selector';
 import { alertingApiProvider } from '../application/services/ml_api_service/alerting';
 import { PreviewAlertCondition } from './preview_alert_condition';
-import { ANOMALY_THRESHOLD } from '../../common';
 import {
   MlAnomalyDetectionAlertAdvancedSettings,
   MlAnomalyDetectionAlertParams,
 } from '../../common/types/alerts';
-import { ANOMALY_RESULT_TYPE } from '../../common/constants/anomalies';
 import { InterimResultsControl } from './interim_results_control';
 import { ConfigValidator } from './config_validator';
 import { CombinedJobWithStats } from '../../common/types/anomaly_detection_jobs';
@@ -88,11 +87,11 @@ const MlAnomalyAlertTrigger: FC<MlAnomalyAlertTriggerProps> = ({
   }, [jobsAndGroupIds]);
 
   const availableResultTypes = useMemo(() => {
-    if (jobConfigs.length === 0) return Object.values(ANOMALY_RESULT_TYPE);
+    if (jobConfigs.length === 0) return Object.values(ML_ANOMALY_RESULT_TYPE);
 
     return (jobConfigs ?? []).some((v) => Boolean(v.analysis_config?.influencers?.length))
-      ? Object.values(ANOMALY_RESULT_TYPE)
-      : [ANOMALY_RESULT_TYPE.BUCKET, ANOMALY_RESULT_TYPE.RECORD];
+      ? Object.values(ML_ANOMALY_RESULT_TYPE)
+      : [ML_ANOMALY_RESULT_TYPE.BUCKET, ML_ANOMALY_RESULT_TYPE.RECORD];
   }, [jobConfigs]);
 
   useEffect(
@@ -109,8 +108,8 @@ const MlAnomalyAlertTrigger: FC<MlAnomalyAlertTriggerProps> = ({
     if (Object.keys(rest).length === 0) {
       setRuleProperty('params', {
         // Set defaults
-        severity: ANOMALY_THRESHOLD.CRITICAL,
-        resultType: ANOMALY_RESULT_TYPE.BUCKET,
+        severity: ML_ANOMALY_THRESHOLD.CRITICAL,
+        resultType: ML_ANOMALY_RESULT_TYPE.BUCKET,
         includeInterim: false,
         // Preserve job selection
         jobSelection,
diff --git a/x-pack/plugins/ml/public/alerting/result_type_selector.tsx b/x-pack/plugins/ml/public/alerting/result_type_selector.tsx
index 892eb8ada73dc1..98a1fdca91422e 100644
--- a/x-pack/plugins/ml/public/alerting/result_type_selector.tsx
+++ b/x-pack/plugins/ml/public/alerting/result_type_selector.tsx
@@ -8,13 +8,12 @@
 import { EuiCard, EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import React, { FC, useMemo } from 'react';
-import { ANOMALY_RESULT_TYPE } from '../../common/constants/anomalies';
-import { AnomalyResultType } from '../../common/types/anomalies';
+import { type MlAnomalyResultType, ML_ANOMALY_RESULT_TYPE } from '@kbn/ml-anomaly-utils';
 
 export interface ResultTypeSelectorProps {
-  value: AnomalyResultType | undefined;
-  availableOption: AnomalyResultType[];
-  onChange: (value: AnomalyResultType) => void;
+  value: MlAnomalyResultType | undefined;
+  availableOption: MlAnomalyResultType[];
+  onChange: (value: MlAnomalyResultType) => void;
 }
 
 export const ResultTypeSelector: FC<ResultTypeSelectorProps> = React.memo(
@@ -22,7 +21,7 @@ export const ResultTypeSelector: FC<ResultTypeSelectorProps> = React.memo(
     const resultTypeOptions = useMemo(() => {
       return [
         {
-          value: ANOMALY_RESULT_TYPE.BUCKET,
+          value: ML_ANOMALY_RESULT_TYPE.BUCKET,
           title: <FormattedMessage id="xpack.ml.bucketResultType.title" defaultMessage="Bucket" />,
           description: (
             <FormattedMessage
@@ -32,7 +31,7 @@ export const ResultTypeSelector: FC<ResultTypeSelectorProps> = React.memo(
           ),
         },
         {
-          value: ANOMALY_RESULT_TYPE.RECORD,
+          value: ML_ANOMALY_RESULT_TYPE.RECORD,
           title: <FormattedMessage id="xpack.ml.recordResultType.title" defaultMessage="Record" />,
           description: (
             <FormattedMessage
@@ -42,7 +41,7 @@ export const ResultTypeSelector: FC<ResultTypeSelectorProps> = React.memo(
           ),
         },
         {
-          value: ANOMALY_RESULT_TYPE.INFLUENCER,
+          value: ML_ANOMALY_RESULT_TYPE.INFLUENCER,
           title: (
             <FormattedMessage
               id="xpack.ml.influencerResultType.title"
diff --git a/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.tsx b/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.tsx
index 5153f3267013ce..a4ad715547c9fc 100644
--- a/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.tsx
+++ b/x-pack/plugins/ml/public/application/components/annotations/annotation_flyout/index.tsx
@@ -29,6 +29,7 @@ import {
 import { CommonProps } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { type MlPartitionFieldsType, ML_PARTITION_FIELDS } from '@kbn/ml-anomaly-utils';
 import {
   ANNOTATION_MAX_LENGTH_CHARS,
   ANNOTATION_EVENT_USER,
@@ -46,8 +47,6 @@ import {
   getAnnotationFieldName,
   getAnnotationFieldValue,
 } from '../../../../../common/types/annotations';
-import { PartitionFieldsType } from '../../../../../common/types/anomalies';
-import { PARTITION_FIELDS } from '../../../../../common/constants/anomalies';
 import { MlAnnotationUpdatesContext } from '../../../contexts/ml/ml_annotation_updates_context';
 
 interface ViewableDetector {
@@ -219,7 +218,7 @@ export class AnnotationFlyoutUI extends Component<CommonProps & Props> {
     if (this.state.applyAnnotationToSeries && chartDetails?.entityData?.entities) {
       chartDetails.entityData.entities.forEach((entity: Entity) => {
         const { fieldName, fieldValue } = entity;
-        const fieldType = entity.fieldType as PartitionFieldsType;
+        const fieldType = entity.fieldType as MlPartitionFieldsType;
         annotation[getAnnotationFieldName(fieldType)] = fieldName;
         annotation[getAnnotationFieldValue(fieldType)] = fieldValue;
       });
@@ -228,7 +227,7 @@ export class AnnotationFlyoutUI extends Component<CommonProps & Props> {
     // if unchecked, remove all the partitions before indexing
     if (!this.state.applyAnnotationToSeries) {
       delete annotation.detector_index;
-      PARTITION_FIELDS.forEach((fieldType) => {
+      ML_PARTITION_FIELDS.forEach((fieldType) => {
         delete annotation[getAnnotationFieldName(fieldType)];
         delete annotation[getAnnotationFieldValue(fieldType)];
       });
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js b/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js
index c8381726ee86af..c7ba114c0dfc52 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/anomalies_table_columns.js
@@ -27,7 +27,7 @@ import { InfluencersCell } from './influencers_cell';
 import { LinksMenu } from './links_menu';
 import { checkPermission } from '../../capabilities/check_capabilities';
 import { mlFieldFormatService } from '../../services/field_format_service';
-import { isRuleSupported, isMultiBucketAnomaly } from '../../../../common/util/anomaly_utils';
+import { isRuleSupported, isMultiBucketAnomaly } from '@kbn/ml-anomaly-utils';
 import { formatValue } from '../../formatters/format_value';
 import { INFLUENCERS_LIMIT, ANOMALIES_TABLE_TABS } from './anomalies_table_constants';
 import { SeverityCell } from './severity_cell';
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.tsx b/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.tsx
index 10cba37c6e2829..556dd5c810d842 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.tsx
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details.tsx
@@ -27,11 +27,10 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
+import { getSeverity, type MlAnomaliesTableRecordExtended } from '@kbn/ml-anomaly-utils';
 
-import { getSeverity } from '../../../../common/util/anomaly_utils';
 import { MAX_CHARS } from './anomalies_table_constants';
 import type { CategoryDefinition } from '../../services/ml_api_service/results';
-import { AnomaliesTableRecordExtended } from '../../../../common/types/anomalies';
 import { EntityCellFilter } from '../entity_cell';
 import { ExplorerJob } from '../../explorer/explorer_utils';
 
@@ -42,7 +41,7 @@ import {
 } from './anomaly_details_utils';
 
 interface Props {
-  anomaly: AnomaliesTableRecordExtended;
+  anomaly: MlAnomaliesTableRecordExtended;
   examples: string[];
   definition: CategoryDefinition;
   isAggregatedData: boolean;
@@ -118,7 +117,7 @@ export const AnomalyDetails: FC<Props> = ({
 };
 
 const Contents: FC<{
-  anomaly: AnomaliesTableRecordExtended;
+  anomaly: MlAnomaliesTableRecordExtended;
   isAggregatedData: boolean;
   filter: EntityCellFilter;
   influencersLimit: number;
@@ -166,7 +165,7 @@ const Contents: FC<{
   );
 };
 
-const Description: FC<{ anomaly: AnomaliesTableRecordExtended }> = ({ anomaly }) => {
+const Description: FC<{ anomaly: MlAnomaliesTableRecordExtended }> = ({ anomaly }) => {
   const source = anomaly.source;
 
   let anomalyDescription = i18n.translate('xpack.ml.anomaliesTable.anomalyDetails.anomalyInLabel', {
@@ -235,7 +234,7 @@ const Description: FC<{ anomaly: AnomaliesTableRecordExtended }> = ({ anomaly })
 };
 
 const Details: FC<{
-  anomaly: AnomaliesTableRecordExtended;
+  anomaly: MlAnomaliesTableRecordExtended;
   isAggregatedData: boolean;
   filter: EntityCellFilter;
   job: ExplorerJob;
@@ -280,7 +279,7 @@ const Details: FC<{
 };
 
 const Influencers: FC<{
-  anomaly: AnomaliesTableRecordExtended;
+  anomaly: MlAnomaliesTableRecordExtended;
   influencersLimit: number;
   influencerFilter: EntityCellFilter;
 }> = ({ anomaly, influencersLimit, influencerFilter }) => {
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details_utils.tsx b/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details_utils.tsx
index fd798f53fd68ba..a9e33df7140d20 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details_utils.tsx
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/anomaly_details_utils.tsx
@@ -18,19 +18,17 @@ import {
   EuiSpacer,
   EuiLink,
 } from '@elastic/eui';
-import { EntityCell, EntityCellFilter } from '../entity_cell';
-import { formatHumanReadableDateTimeSeconds } from '../../../../common/util/date_utils';
 import {
+  getAnomalyScoreExplanationImpactValue,
+  getSeverityColor,
   showActualForFunction,
   showTypicalForFunction,
-} from '../../../../common/util/anomaly_utils';
-import { AnomaliesTableRecord, MLAnomalyDoc } from '../../../../common/types/anomalies';
-import { formatValue } from '../../formatters/format_value';
+} from '@kbn/ml-anomaly-utils';
+import type { MlAnomaliesTableRecord, MLAnomalyDoc } from '@kbn/ml-anomaly-utils';
 import { ML_JOB_AGGREGATION } from '../../../../common/constants/aggregation_types';
-import {
-  getAnomalyScoreExplanationImpactValue,
-  getSeverityColor,
-} from '../../../../common/util/anomaly_utils';
+import { EntityCell, EntityCellFilter } from '../entity_cell';
+import { formatHumanReadableDateTimeSeconds } from '../../../../common/util/date_utils';
+import { formatValue } from '../../formatters/format_value';
 import { useMlKibana } from '../../contexts/kibana';
 
 const TIME_FIELD_NAME = 'timestamp';
@@ -68,7 +66,7 @@ export function getInfluencersItems(
 }
 
 export const DetailsItems: FC<{
-  anomaly: AnomaliesTableRecord;
+  anomaly: MlAnomaliesTableRecord;
   filter: EntityCellFilter;
   modelPlotEnabled: boolean;
 }> = ({ anomaly, filter, modelPlotEnabled }) => {
@@ -328,7 +326,7 @@ export const DetailsItems: FC<{
   );
 };
 
-export const AnomalyExplanationDetails: FC<{ anomaly: AnomaliesTableRecord }> = ({ anomaly }) => {
+export const AnomalyExplanationDetails: FC<{ anomaly: MlAnomaliesTableRecord }> = ({ anomaly }) => {
   const {
     services: { docLinks },
   } = useMlKibana();
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/get_query_string_for_influencers.ts b/x-pack/plugins/ml/public/application/components/anomalies_table/get_query_string_for_influencers.ts
index 670f7d83333ae5..87d0a7b8f3117d 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/get_query_string_for_influencers.ts
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/get_query_string_for_influencers.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import type { AnomaliesTableRecord } from '../../../../common/types/anomalies';
+import type { MlAnomaliesTableRecord } from '@kbn/ml-anomaly-utils';
 
 export function getQueryStringForInfluencers(
-  influencers: AnomaliesTableRecord['influencers'] = [],
+  influencers: MlAnomaliesTableRecord['influencers'] = [],
   entityName?: string
 ) {
   return influencers
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.tsx b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.tsx
index d5bb4a6f8b4691..63b87ec9cb2462 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.tsx
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.tsx
@@ -22,6 +22,13 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { ES_FIELD_TYPES } from '@kbn/field-types';
 import { MAPS_APP_LOCATOR } from '@kbn/maps-plugin/public';
+import {
+  isCategorizationAnomaly,
+  isRuleSupported,
+  type MlCustomUrlAnomalyRecordDoc,
+  type MlKibanaUrlConfig,
+  type MlAnomaliesTableRecord,
+} from '@kbn/ml-anomaly-utils';
 import { mlJobService } from '../../services/job_service';
 import { getDataViewIdFromName } from '../../util/index_utils';
 import { getInitialAnomaliesLayers, getInitialSourceIndexFieldLayers } from '../../../maps/util';
@@ -41,27 +48,21 @@ import {
   getDateFormatTz,
   SourceIndicesWithGeoFields,
 } from '../../explorer/explorer_utils';
-import { isCategorizationAnomaly, isRuleSupported } from '../../../../common/util/anomaly_utils';
 import { checkPermission } from '../../capabilities/check_capabilities';
-import type {
-  CustomUrlAnomalyRecordDoc,
-  KibanaUrlConfig,
-} from '../../../../common/types/custom_urls';
 import type { TimeRangeBounds } from '../../util/time_buckets';
 import { useMlKibana } from '../../contexts/kibana';
 // @ts-ignore
 import { getFieldTypeFromMapping } from '../../services/mapping_service';
-import type { AnomaliesTableRecord } from '../../../../common/types/anomalies';
 import { getQueryStringForInfluencers } from './get_query_string_for_influencers';
 import { getFiltersForDSLQuery } from '../../../../common/util/job_utils';
 interface LinksMenuProps {
-  anomaly: AnomaliesTableRecord;
+  anomaly: MlAnomaliesTableRecord;
   bounds: TimeRangeBounds;
   showMapsLink: boolean;
   showViewSeriesLink: boolean;
   isAggregatedData: boolean;
   interval: 'day' | 'hour' | 'second';
-  showRuleEditorFlyout: (anomaly: AnomaliesTableRecord) => void;
+  showRuleEditorFlyout: (anomaly: MlAnomaliesTableRecord) => void;
   onItemClick: () => void;
   sourceIndicesWithGeoFields: SourceIndicesWithGeoFields;
 }
@@ -83,7 +84,7 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
     return mlJobService.getJob(props.anomaly.jobId);
   }, [props.anomaly.jobId]);
 
-  const getAnomaliesMapsLink = async (anomaly: AnomaliesTableRecord) => {
+  const getAnomaliesMapsLink = async (anomaly: MlAnomaliesTableRecord) => {
     const index = job.datafeed_config.indices[0];
     const dataViewId = await getDataViewIdFromName(index);
 
@@ -121,7 +122,7 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
   };
 
   const getAnomalySourceMapsLink = async (
-    anomaly: AnomaliesTableRecord,
+    anomaly: MlAnomaliesTableRecord,
     sourceIndicesWithGeoFields: SourceIndicesWithGeoFields
   ) => {
     const index = job.datafeed_config.indices[0];
@@ -287,7 +288,7 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(props.anomaly)]);
 
-  const openCustomUrl = (customUrl: KibanaUrlConfig) => {
+  const openCustomUrl = (customUrl: MlKibanaUrlConfig) => {
     const { anomaly, interval, isAggregatedData } = props;
 
     // eslint-disable-next-line no-console
@@ -295,7 +296,7 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
 
     // If url_value contains $earliest$ and $latest$ tokens, add in times to the source record.
     // Create a copy of the record as we are adding properties into it.
-    const record = cloneDeep(anomaly.source) as CustomUrlAnomalyRecordDoc;
+    const record = cloneDeep(anomaly.source) as MlCustomUrlAnomalyRecordDoc;
     const timestamp = record.timestamp;
     const configuredUrlValue = customUrl.url_value;
     const timeRangeInterval =
@@ -376,7 +377,7 @@ export const LinksMenuUI = (props: LinksMenuProps) => {
     } else {
       // Replace any tokens in the configured url_value with values from the source record,
       // and then open link in a new tab/window.
-      const urlPath = getUrlForRecord(customUrl, record as CustomUrlAnomalyRecordDoc);
+      const urlPath = getUrlForRecord(customUrl, record as MlCustomUrlAnomalyRecordDoc);
       openCustomUrlWindow(urlPath, customUrl, basePath);
     }
   };
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/severity_cell/severity_cell.tsx b/x-pack/plugins/ml/public/application/components/anomalies_table/severity_cell/severity_cell.tsx
index 555110e4a3e4d9..83425988354102 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/severity_cell/severity_cell.tsx
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/severity_cell/severity_cell.tsx
@@ -7,10 +7,7 @@
 
 import React, { FC, memo } from 'react';
 import { EuiHealth, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import {
-  getSeverityColor,
-  getFormattedSeverityScore,
-} from '../../../../../common/util/anomaly_utils';
+import { getSeverityColor, getFormattedSeverityScore } from '@kbn/ml-anomaly-utils';
 
 interface SeverityCellProps {
   /**
diff --git a/x-pack/plugins/ml/public/application/components/controls/select_severity/select_severity.tsx b/x-pack/plugins/ml/public/application/components/controls/select_severity/select_severity.tsx
index dfc95c9f0659a8..53ce6b5d1cb3ca 100644
--- a/x-pack/plugins/ml/public/application/components/controls/select_severity/select_severity.tsx
+++ b/x-pack/plugins/ml/public/application/components/controls/select_severity/select_severity.tsx
@@ -15,9 +15,7 @@ import { EuiHealth, EuiSpacer, EuiSuperSelect, EuiText, EuiSuperSelectProps } fr
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { usePageUrlState } from '@kbn/ml-url-state';
-
-import { getSeverityColor } from '../../../../../common/util/anomaly_utils';
-import { ANOMALY_THRESHOLD } from '../../../../../common';
+import { getSeverityColor, ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils';
 
 const warningLabel: string = i18n.translate('xpack.ml.controls.selectSeverity.warningLabel', {
   defaultMessage: 'warning',
@@ -33,10 +31,10 @@ const criticalLabel: string = i18n.translate('xpack.ml.controls.selectSeverity.c
 });
 
 const optionsMap = {
-  [warningLabel]: ANOMALY_THRESHOLD.LOW,
-  [minorLabel]: ANOMALY_THRESHOLD.MINOR,
-  [majorLabel]: ANOMALY_THRESHOLD.MAJOR,
-  [criticalLabel]: ANOMALY_THRESHOLD.CRITICAL,
+  [warningLabel]: ML_ANOMALY_THRESHOLD.LOW,
+  [minorLabel]: ML_ANOMALY_THRESHOLD.MINOR,
+  [majorLabel]: ML_ANOMALY_THRESHOLD.MAJOR,
+  [criticalLabel]: ML_ANOMALY_THRESHOLD.CRITICAL,
 };
 
 export interface TableSeverityPageUrlState {
@@ -52,24 +50,24 @@ export interface TableSeverity {
 
 export const SEVERITY_OPTIONS: TableSeverity[] = [
   {
-    val: ANOMALY_THRESHOLD.LOW,
+    val: ML_ANOMALY_THRESHOLD.LOW,
     display: warningLabel,
-    color: getSeverityColor(ANOMALY_THRESHOLD.LOW),
+    color: getSeverityColor(ML_ANOMALY_THRESHOLD.LOW),
   },
   {
-    val: ANOMALY_THRESHOLD.MINOR,
+    val: ML_ANOMALY_THRESHOLD.MINOR,
     display: minorLabel,
-    color: getSeverityColor(ANOMALY_THRESHOLD.MINOR),
+    color: getSeverityColor(ML_ANOMALY_THRESHOLD.MINOR),
   },
   {
-    val: ANOMALY_THRESHOLD.MAJOR,
+    val: ML_ANOMALY_THRESHOLD.MAJOR,
     display: majorLabel,
-    color: getSeverityColor(ANOMALY_THRESHOLD.MAJOR),
+    color: getSeverityColor(ML_ANOMALY_THRESHOLD.MAJOR),
   },
   {
-    val: ANOMALY_THRESHOLD.CRITICAL,
+    val: ML_ANOMALY_THRESHOLD.CRITICAL,
     display: criticalLabel,
-    color: getSeverityColor(ANOMALY_THRESHOLD.CRITICAL),
+    color: getSeverityColor(ML_ANOMALY_THRESHOLD.CRITICAL),
   },
 ];
 
diff --git a/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/editor.tsx b/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/editor.tsx
index 523f59c32f2249..45ccd9bc7ecdd3 100644
--- a/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/editor.tsx
+++ b/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/editor.tsx
@@ -27,13 +27,13 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { DataView } from '@kbn/data-views-plugin/public';
+import type { MlUrlConfig } from '@kbn/ml-anomaly-utils';
 import { CustomUrlSettings, isValidCustomUrlSettingsTimeRange } from './utils';
 import { isValidLabel } from '../../../util/custom_url_utils';
 import { type DataFrameAnalyticsConfig } from '../../../../../common/types/data_frame_analytics';
 import { type Job } from '../../../../../common/types/anomaly_detection_jobs';
 
 import { TIME_RANGE_TYPE, TimeRangeType, URL_TYPE } from './constants';
-import { UrlConfig } from '../../../../../common/types/custom_urls';
 import { CustomTimeRangePicker } from './custom_time_range_picker';
 import { useMlKibana } from '../../../contexts/kibana';
 import { getDropDownOptions } from './get_dropdown_options';
@@ -64,7 +64,7 @@ function getLinkToOptions() {
 interface CustomUrlEditorProps {
   customUrl: CustomUrlSettings | undefined;
   setEditCustomUrl: (url: CustomUrlSettings) => void;
-  savedCustomUrls: UrlConfig[];
+  savedCustomUrls: MlUrlConfig[];
   dashboards: Array<{ id: string; title: string }>;
   dataViewListItems: DataViewListItem[];
   showTimeRangeSelector?: boolean;
diff --git a/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/list.tsx b/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/list.tsx
index b9a299b17edab2..33ab2765f7fa02 100644
--- a/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/list.tsx
+++ b/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/list.tsx
@@ -20,6 +20,7 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { MlUrlConfig, MlKibanaUrlConfig } from '@kbn/ml-anomaly-utils';
 import { useMlKibana } from '../../../contexts/kibana';
 import { isValidLabel, openCustomUrlWindow } from '../../../util/custom_url_utils';
 import { getTestUrl } from './utils';
@@ -27,10 +28,9 @@ import { getTestUrl } from './utils';
 import { parseInterval } from '../../../../../common/util/parse_interval';
 import { type DataFrameAnalyticsConfig } from '../../../../../common/types/data_frame_analytics';
 import { TIME_RANGE_TYPE } from './constants';
-import { UrlConfig, KibanaUrlConfig } from '../../../../../common/types/custom_urls';
 import { Job, isAnomalyDetectionJob } from '../../../../../common/types/anomaly_detection_jobs';
 
-function isValidTimeRange(timeRange: KibanaUrlConfig['time_range']): boolean {
+function isValidTimeRange(timeRange: MlKibanaUrlConfig['time_range']): boolean {
   // Allow empty timeRange string, which gives the 'auto' behaviour.
   if (timeRange === undefined || timeRange.length === 0 || timeRange === TIME_RANGE_TYPE.AUTO) {
     return true;
@@ -42,8 +42,8 @@ function isValidTimeRange(timeRange: KibanaUrlConfig['time_range']): boolean {
 
 export interface CustomUrlListProps {
   job: Job | DataFrameAnalyticsConfig;
-  customUrls: UrlConfig[];
-  onChange: (customUrls: UrlConfig[]) => void;
+  customUrls: MlUrlConfig[];
+  onChange: (customUrls: MlUrlConfig[]) => void;
 }
 
 /*
@@ -91,9 +91,9 @@ export const CustomUrlList: FC<CustomUrlListProps> = ({
 
       const timeRange = e.target.value;
       if (timeRange !== undefined && timeRange.length > 0) {
-        (customUrls[index] as KibanaUrlConfig).time_range = timeRange;
+        (customUrls[index] as MlKibanaUrlConfig).time_range = timeRange;
       } else {
-        delete (customUrls[index] as KibanaUrlConfig).time_range;
+        delete (customUrls[index] as MlKibanaUrlConfig).time_range;
       }
       setCustomUrls([...customUrls]);
     }
@@ -144,7 +144,7 @@ export const CustomUrlList: FC<CustomUrlListProps> = ({
       : [];
 
     // Validate the time range.
-    const timeRange = (customUrl as KibanaUrlConfig).time_range;
+    const timeRange = (customUrl as MlKibanaUrlConfig).time_range;
     const isInvalidTimeRange = !isValidTimeRange(timeRange);
     const invalidIntervalError = isInvalidTimeRange
       ? [
@@ -223,7 +223,7 @@ export const CustomUrlList: FC<CustomUrlListProps> = ({
                 isInvalid={isInvalidTimeRange}
               >
                 <EuiFieldText
-                  value={(customUrl as KibanaUrlConfig).time_range || ''}
+                  value={(customUrl as MlKibanaUrlConfig).time_range || ''}
                   isInvalid={isInvalidTimeRange}
                   placeholder={TIME_RANGE_TYPE.AUTO}
                   onChange={(e) => onTimeRangeChange(e, index)}
diff --git a/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/utils.ts b/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/utils.ts
index f8ee16456e92a6..31c4f81545dcb3 100644
--- a/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/utils.ts
+++ b/x-pack/plugins/ml/public/application/components/custom_urls/custom_url_editor/utils.ts
@@ -16,12 +16,12 @@ import type { DataView, DataViewField } from '@kbn/data-views-plugin/common';
 import { isFilterPinned, Filter } from '@kbn/es-query';
 import { DataViewListItem } from '@kbn/data-views-plugin/common';
 import { TimeRange as EsQueryTimeRange } from '@kbn/es-query';
+import type { MlKibanaUrlConfig, MlUrlConfig } from '@kbn/ml-anomaly-utils';
 import { DEFAULT_RESULTS_FIELD } from '../../../../../common/constants/data_frame_analytics';
 import {
   isDataFrameAnalyticsConfigs,
   type DataFrameAnalyticsConfig,
 } from '../../../../../common/types/data_frame_analytics';
-import { KibanaUrlConfig } from '../../../../../common/types/custom_urls';
 import { categoryFieldTypes } from '../../../../../common/util/fields_utils';
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 
@@ -39,7 +39,6 @@ import { ml } from '../../../services/ml_api_service';
 import { escapeForElasticsearchQuery } from '../../../util/string_utils';
 import { getSavedObjectsClient, getDashboard } from '../../../util/dependency_cache';
 
-import { UrlConfig } from '../../../../../common/types/custom_urls';
 import {
   CombinedJob,
   Job,
@@ -197,7 +196,7 @@ export function isValidCustomUrlSettingsTimeRange(timeRangeSettings: TimeRange):
 
 export function isValidCustomUrlSettings(
   settings: CustomUrlSettings,
-  savedCustomUrls: UrlConfig[]
+  savedCustomUrls: MlUrlConfig[]
 ): boolean {
   let isValid = isValidLabel(settings.label, savedCustomUrls);
   if (isValid === true) {
@@ -206,7 +205,7 @@ export function isValidCustomUrlSettings(
   return isValid;
 }
 
-export function buildCustomUrlFromSettings(settings: CustomUrlSettings): Promise<UrlConfig> {
+export function buildCustomUrlFromSettings(settings: CustomUrlSettings): Promise<MlUrlConfig> {
   // Dashboard URL returns a Promise as a query is made to obtain the full dashboard config.
   // So wrap the other two return types in a Promise for consistent return type.
   if (settings.type === URL_TYPE.KIBANA_DASHBOARD) {
@@ -237,7 +236,7 @@ function getUrlRangeFromSettings(settings: CustomUrlSettings) {
   };
 }
 
-async function buildDashboardUrlFromSettings(settings: CustomUrlSettings): Promise<UrlConfig> {
+async function buildDashboardUrlFromSettings(settings: CustomUrlSettings): Promise<MlUrlConfig> {
   // Get the complete list of attributes for the selected dashboard (query, filters).
   const { dashboardId, queryFieldNames } = settings.kibanaSettings ?? {};
 
@@ -352,7 +351,7 @@ function buildDiscoverUrlFromSettings(settings: CustomUrlSettings) {
 
   const urlValue = `discover#/?_g=${_g}&_a=${_a}`;
 
-  const urlToAdd: KibanaUrlConfig = {
+  const urlToAdd: MlKibanaUrlConfig = {
     url_name: settings.label,
     url_value: urlValue,
     time_range: TIME_RANGE_TYPE.AUTO,
@@ -389,7 +388,7 @@ function buildAppStateQueryParam(queryFieldNames: string[]) {
 // Builds the full URL for testing out a custom URL configuration, which
 // may contain dollar delimited partition / influencer entity tokens and
 // drilldown time range settings.
-async function getAnomalyDetectionJobTestUrl(job: Job, customUrl: UrlConfig): Promise<string> {
+async function getAnomalyDetectionJobTestUrl(job: Job, customUrl: MlUrlConfig): Promise<string> {
   const interval = parseInterval(job.analysis_config.bucket_span);
   const bucketSpanSecs = interval !== null ? interval.asSeconds() : 0;
 
@@ -479,7 +478,7 @@ async function getAnomalyDetectionJobTestUrl(job: Job, customUrl: UrlConfig): Pr
 
 async function getDataFrameAnalyticsTestUrl(
   job: DataFrameAnalyticsConfig,
-  customUrl: UrlConfig,
+  customUrl: MlUrlConfig,
   currentTimeFilter?: EsQueryTimeRange
 ): Promise<string> {
   // By default, return configured url_value. Look to substitute any dollar-delimited
@@ -522,7 +521,7 @@ async function getDataFrameAnalyticsTestUrl(
 
 export function getTestUrl(
   job: Job | DataFrameAnalyticsConfig,
-  customUrl: UrlConfig,
+  customUrl: MlUrlConfig,
   currentTimeFilter?: EsQueryTimeRange
 ) {
   if (isDataFrameAnalyticsConfigs(job)) {
diff --git a/x-pack/plugins/ml/public/application/components/custom_urls/custom_urls.tsx b/x-pack/plugins/ml/public/application/components/custom_urls/custom_urls.tsx
index 4f9ad5245cf91f..aed4ed646972c6 100644
--- a/x-pack/plugins/ml/public/application/components/custom_urls/custom_urls.tsx
+++ b/x-pack/plugins/ml/public/application/components/custom_urls/custom_urls.tsx
@@ -26,6 +26,7 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { DataViewListItem } from '@kbn/data-views-plugin/common';
+import type { MlUrlConfig } from '@kbn/ml-anomaly-utils';
 import { MlKibanaReactContextValue } from '../../contexts/kibana';
 import { CustomUrlEditor, CustomUrlList } from './custom_url_editor';
 import {
@@ -40,7 +41,6 @@ import {
   loadDataViewListItems,
 } from '../../jobs/jobs_list/components/edit_job_flyout/edit_utils';
 import { openCustomUrlWindow } from '../../util/custom_url_utils';
-import { UrlConfig } from '../../../../common/types/custom_urls';
 import type { CustomUrlsWrapperProps } from './custom_urls_wrapper';
 import { isAnomalyDetectionJob } from '../../../../common/types/anomaly_detection_jobs';
 import { isDataFrameAnalyticsConfigs } from '../../../../common/types/data_frame_analytics';
@@ -48,7 +48,7 @@ import { isDataFrameAnalyticsConfigs } from '../../../../common/types/data_frame
 const MAX_NUMBER_DASHBOARDS = 1000;
 
 interface CustomUrlsState {
-  customUrls: UrlConfig[];
+  customUrls: MlUrlConfig[];
   dashboards: Array<{ id: string; title: string }>;
   dataViewListItems: DataViewListItem[];
   editorOpen: boolean;
diff --git a/x-pack/plugins/ml/public/application/components/custom_urls/custom_urls_wrapper.tsx b/x-pack/plugins/ml/public/application/components/custom_urls/custom_urls_wrapper.tsx
index 175b16dca74eab..b24ad3d5e7e058 100644
--- a/x-pack/plugins/ml/public/application/components/custom_urls/custom_urls_wrapper.tsx
+++ b/x-pack/plugins/ml/public/application/components/custom_urls/custom_urls_wrapper.tsx
@@ -6,16 +6,16 @@
  */
 
 import React, { FC } from 'react';
+import type { MlUrlConfig } from '@kbn/ml-anomaly-utils';
 import { useMlKibana } from '../../contexts/kibana';
 import { Job } from '../../../../common/types/anomaly_detection_jobs';
-import { UrlConfig } from '../../../../common/types/custom_urls';
 import { type DataFrameAnalyticsConfig } from '../../../../common/types/data_frame_analytics';
 import { CustomUrls } from './custom_urls';
 
 export interface CustomUrlsWrapperProps {
   job: Job | DataFrameAnalyticsConfig;
-  jobCustomUrls: UrlConfig[];
-  setCustomUrls: (customUrls: UrlConfig[]) => void;
+  jobCustomUrls: MlUrlConfig[];
+  setCustomUrls: (customUrls: MlUrlConfig[]) => void;
   editMode?: 'inline' | 'modal';
 }
 
diff --git a/x-pack/plugins/ml/public/application/components/custom_urls/is_valid_custom_urls.ts b/x-pack/plugins/ml/public/application/components/custom_urls/is_valid_custom_urls.ts
index ed45f966a54eb6..d1509ef32dd995 100644
--- a/x-pack/plugins/ml/public/application/components/custom_urls/is_valid_custom_urls.ts
+++ b/x-pack/plugins/ml/public/application/components/custom_urls/is_valid_custom_urls.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
+import { type MlUrlConfig, isMlKibanaUrlConfigWithTimeRange } from '@kbn/ml-anomaly-utils';
 import { isValidLabel, isValidTimeRange } from '../../util/custom_url_utils';
-import { UrlConfig, isKibanaUrlConfigWithTimeRange } from '../../../../common/types/custom_urls';
 
-export function isValidCustomUrls(customUrls: UrlConfig[]) {
+export function isValidCustomUrls(customUrls: MlUrlConfig[]) {
   if (customUrls === undefined || customUrls.length === 0) {
     return true;
   }
@@ -20,7 +20,7 @@ export function isValidCustomUrls(customUrls: UrlConfig[]) {
     const otherUrls = [...customUrls];
     otherUrls.splice(index, 1); // Don't compare label with itself.
     let itemValid = isValidLabel(label, otherUrls);
-    if (itemValid === true && isKibanaUrlConfigWithTimeRange(customUrl)) {
+    if (itemValid === true && isMlKibanaUrlConfigWithTimeRange(customUrl)) {
       // Validate the time range.
       const timeRange = customUrl.time_range;
       itemValid = isValidTimeRange(timeRange);
diff --git a/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.tsx b/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.tsx
index defe64583e9276..3e3ca7d4729ca6 100644
--- a/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.tsx
+++ b/x-pack/plugins/ml/public/application/components/entity_cell/entity_cell.tsx
@@ -10,9 +10,9 @@ import React, { FC } from 'react';
 import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
+import { ML_ENTITY_FIELD_OPERATIONS } from '@kbn/ml-anomaly-utils';
 import { EMPTY_FIELD_VALUE_LABEL } from '../../timeseriesexplorer/components/entity_control/entity_control';
 import { MLCATEGORY } from '../../../../common/constants/field_types';
-import { ENTITY_FIELD_OPERATIONS } from '../../../../common/util/anomaly_utils';
 import { blurButtonOnClick } from '../../util/component_utils';
 
 export type EntityCellFilter = (
@@ -44,7 +44,7 @@ function getAddFilter({ entityName, entityValue, filter }: EntityCellProps) {
           data-test-subj={`mlAnomaliesTableEntityCellAddFilterButton-${entityValue}`}
           className="filter-button"
           onClick={blurButtonOnClick(() => {
-            filter(entityName, entityValue, ENTITY_FIELD_OPERATIONS.ADD);
+            filter(entityName, entityValue, ML_ENTITY_FIELD_OPERATIONS.ADD);
           })}
           iconType="plusInCircle"
           aria-label={i18n.translate('xpack.ml.anomaliesTable.entityCell.addFilterAriaLabel', {
@@ -72,7 +72,7 @@ function getRemoveFilter({ entityName, entityValue, filter }: EntityCellProps) {
           data-test-subj={`mlAnomaliesTableEntityCellRemoveFilterButton-${entityValue}`}
           className="filter-button"
           onClick={blurButtonOnClick(() => {
-            filter(entityName, entityValue, ENTITY_FIELD_OPERATIONS.REMOVE);
+            filter(entityName, entityValue, ML_ENTITY_FIELD_OPERATIONS.REMOVE);
           })}
           iconType="minusInCircle"
           aria-label={i18n.translate('xpack.ml.anomaliesTable.entityCell.removeFilterAriaLabel', {
diff --git a/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.tsx b/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.tsx
index 456c8e8719dd36..e78d2a5fc68b96 100644
--- a/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.tsx
+++ b/x-pack/plugins/ml/public/application/components/influencers_list/influencers_list.tsx
@@ -14,8 +14,8 @@ import React, { FC } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { getSeverity, getFormattedSeverityScore } from '@kbn/ml-anomaly-utils';
 import { abbreviateWholeNumber } from '../../formatters/abbreviate_whole_number';
-import { getSeverity, getFormattedSeverityScore } from '../../../../common/util/anomaly_utils';
 import { EntityCell, EntityCellFilter } from '../entity_cell';
 
 export interface InfluencerValueData {
diff --git a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
index 790b69f7ebdd0e..c6364b93fbf49c 100644
--- a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
+++ b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { getSeverityType } from '@kbn/ml-anomaly-utils';
 import { MlResultsService } from '../../../services/results_service';
 import { CombinedJobWithStats } from '../../../../../common/types/anomaly_detection_jobs';
-import { getSeverityType } from '../../../../../common/util/anomaly_utils';
 import { Anomaly } from '../../../jobs/new_job/common/results_loader/results_loader';
 import { LineChartPoint } from '../../../jobs/new_job/common/chart_loader/chart_loader';
 
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/actions_section.js b/x-pack/plugins/ml/public/application/components/rule_editor/actions_section.js
index 63dec27aabd466..8f45fa7f573647 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/actions_section.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/actions_section.js
@@ -21,7 +21,7 @@ import {
   EuiText,
 } from '@elastic/eui';
 
-import { ACTION } from '../../../../common/constants/detector_rule';
+import { ML_DETECTOR_RULE_ACTION } from '@kbn/ml-anomaly-utils';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 export function ActionsSection({ actions, onSkipResultChange, onSkipModelUpdateChange }) {
@@ -46,7 +46,7 @@ export function ActionsSection({ actions, onSkipResultChange, onSkipModelUpdateC
                 defaultMessage="Skip result (recommended)"
               />
             }
-            checked={actions.indexOf(ACTION.SKIP_RESULT) > -1}
+            checked={actions.indexOf(ML_DETECTOR_RULE_ACTION.SKIP_RESULT) > -1}
             onChange={onSkipResultChange}
           />
         </EuiFlexItem>
@@ -77,7 +77,7 @@ export function ActionsSection({ actions, onSkipResultChange, onSkipModelUpdateC
                 defaultMessage="Skip model update"
               />
             }
-            checked={actions.indexOf(ACTION.SKIP_MODEL_UPDATE) > -1}
+            checked={actions.indexOf(ML_DETECTOR_RULE_ACTION.SKIP_MODEL_UPDATE) > -1}
             onChange={onSkipModelUpdateChange}
           />
         </EuiFlexItem>
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/actions_section.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/actions_section.test.js
index 37315b61c2d027..b99a0066600f63 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/actions_section.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/actions_section.test.js
@@ -5,11 +5,12 @@
  * 2.0.
  */
 
-import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 
+import { shallowWithIntl } from '@kbn/test-jest-helpers';
+import { ML_DETECTOR_RULE_ACTION } from '@kbn/ml-anomaly-utils';
+
 import { ActionsSection } from './actions_section';
-import { ACTION } from '../../../../common/constants/detector_rule';
 
 describe('ActionsSection', () => {
   const onSkipResultChange = jest.fn(() => {});
@@ -34,7 +35,7 @@ describe('ActionsSection', () => {
   test('renders with skip_result selected', () => {
     const props = {
       ...requiredProps,
-      actions: [ACTION.SKIP_RESULT],
+      actions: [ML_DETECTOR_RULE_ACTION.SKIP_RESULT],
     };
 
     const component = shallowWithIntl(<ActionsSection {...props} />);
@@ -45,7 +46,7 @@ describe('ActionsSection', () => {
   test('renders with skip_result and skip_model_update selected', () => {
     const component = shallowWithIntl(
       <ActionsSection
-        actions={[ACTION.SKIP_RESULT, ACTION.SKIP_MODEL_UPDATE]}
+        actions={[ML_DETECTOR_RULE_ACTION.SKIP_RESULT, ML_DETECTOR_RULE_ACTION.SKIP_MODEL_UPDATE]}
         onSkipResultChange={() => {}}
         onSkipModelUpdateChange={() => {}}
       />
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.js b/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.js
index a6e87e4bd5af24..3857a97c3c9e7a 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.js
@@ -23,24 +23,25 @@ import {
   EuiFieldNumber,
 } from '@elastic/eui';
 
-import { APPLIES_TO, OPERATOR } from '../../../../common/constants/detector_rule';
-import { appliesToText, operatorToText } from './utils';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { ML_DETECTOR_RULE_APPLIES_TO, ML_DETECTOR_RULE_OPERATOR } from '@kbn/ml-anomaly-utils';
+
+import { appliesToText, operatorToText } from './utils';
 
 export class ConditionExpression extends Component {
   static propTypes = {
     index: PropTypes.number.isRequired,
     appliesTo: PropTypes.oneOf([
-      APPLIES_TO.ACTUAL,
-      APPLIES_TO.TYPICAL,
-      APPLIES_TO.DIFF_FROM_TYPICAL,
+      ML_DETECTOR_RULE_APPLIES_TO.ACTUAL,
+      ML_DETECTOR_RULE_APPLIES_TO.TYPICAL,
+      ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL,
     ]),
     operator: PropTypes.oneOf([
-      OPERATOR.LESS_THAN,
-      OPERATOR.LESS_THAN_OR_EQUAL,
-      OPERATOR.GREATER_THAN,
-      OPERATOR.GREATER_THAN_OR_EQUAL,
+      ML_DETECTOR_RULE_OPERATOR.LESS_THAN,
+      ML_DETECTOR_RULE_OPERATOR.LESS_THAN_OR_EQUAL,
+      ML_DETECTOR_RULE_OPERATOR.GREATER_THAN,
+      ML_DETECTOR_RULE_OPERATOR.GREATER_THAN_OR_EQUAL,
     ]),
     value: PropTypes.number.isRequired,
     updateCondition: PropTypes.func.isRequired,
@@ -111,11 +112,17 @@ export class ConditionExpression extends Component {
             value={this.props.appliesTo}
             onChange={this.changeAppliesTo}
             options={[
-              { value: APPLIES_TO.ACTUAL, text: appliesToText(APPLIES_TO.ACTUAL) },
-              { value: APPLIES_TO.TYPICAL, text: appliesToText(APPLIES_TO.TYPICAL) },
               {
-                value: APPLIES_TO.DIFF_FROM_TYPICAL,
-                text: appliesToText(APPLIES_TO.DIFF_FROM_TYPICAL),
+                value: ML_DETECTOR_RULE_APPLIES_TO.ACTUAL,
+                text: appliesToText(ML_DETECTOR_RULE_APPLIES_TO.ACTUAL),
+              },
+              {
+                value: ML_DETECTOR_RULE_APPLIES_TO.TYPICAL,
+                text: appliesToText(ML_DETECTOR_RULE_APPLIES_TO.TYPICAL),
+              },
+              {
+                value: ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL,
+                text: appliesToText(ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL),
               },
             ]}
           />
@@ -140,15 +147,21 @@ export class ConditionExpression extends Component {
                 value={this.props.operator}
                 onChange={this.changeOperator}
                 options={[
-                  { value: OPERATOR.LESS_THAN, text: operatorToText(OPERATOR.LESS_THAN) },
                   {
-                    value: OPERATOR.LESS_THAN_OR_EQUAL,
-                    text: operatorToText(OPERATOR.LESS_THAN_OR_EQUAL),
+                    value: ML_DETECTOR_RULE_OPERATOR.LESS_THAN,
+                    text: operatorToText(ML_DETECTOR_RULE_OPERATOR.LESS_THAN),
+                  },
+                  {
+                    value: ML_DETECTOR_RULE_OPERATOR.LESS_THAN_OR_EQUAL,
+                    text: operatorToText(ML_DETECTOR_RULE_OPERATOR.LESS_THAN_OR_EQUAL),
+                  },
+                  {
+                    value: ML_DETECTOR_RULE_OPERATOR.GREATER_THAN,
+                    text: operatorToText(ML_DETECTOR_RULE_OPERATOR.GREATER_THAN),
                   },
-                  { value: OPERATOR.GREATER_THAN, text: operatorToText(OPERATOR.GREATER_THAN) },
                   {
-                    value: OPERATOR.GREATER_THAN_OR_EQUAL,
-                    text: operatorToText(OPERATOR.GREATER_THAN_OR_EQUAL),
+                    value: ML_DETECTOR_RULE_OPERATOR.GREATER_THAN_OR_EQUAL,
+                    text: operatorToText(ML_DETECTOR_RULE_OPERATOR.GREATER_THAN_OR_EQUAL),
                   },
                 ]}
               />
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
index 087a23b2fce901..a0f9eedddf5d67 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/condition_expression.test.js
@@ -11,8 +11,9 @@ jest.mock('../../services/job_service', () => 'mlJobService');
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 
+import { ML_DETECTOR_RULE_APPLIES_TO, ML_DETECTOR_RULE_OPERATOR } from '@kbn/ml-anomaly-utils';
+
 import { ConditionExpression } from './condition_expression';
-import { APPLIES_TO, OPERATOR } from '../../../../common/constants/detector_rule';
 
 describe('ConditionExpression', () => {
   const updateCondition = jest.fn(() => {});
@@ -38,8 +39,8 @@ describe('ConditionExpression', () => {
   test('renders with appliesTo, operator and value supplied', () => {
     const props = {
       ...requiredProps,
-      appliesTo: APPLIES_TO.DIFF_FROM_TYPICAL,
-      operator: OPERATOR.GREATER_THAN,
+      appliesTo: ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL,
+      operator: ML_DETECTOR_RULE_OPERATOR.GREATER_THAN,
       value: 123,
     };
 
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
index 07e6282451b2ba..01cf0a035e9d3a 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/conditions_section.test.js
@@ -11,9 +11,10 @@ jest.mock('../../services/job_service', () => 'mlJobService');
 import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 
+import { ML_DETECTOR_RULE_APPLIES_TO, ML_DETECTOR_RULE_OPERATOR } from '@kbn/ml-anomaly-utils';
+
 import { ConditionsSection } from './conditions_section';
 import { getNewConditionDefaults } from './utils';
-import { APPLIES_TO, OPERATOR } from '../../../../common/constants/detector_rule';
 
 describe('ConditionsSectionExpression', () => {
   const addCondition = jest.fn(() => {});
@@ -21,8 +22,8 @@ describe('ConditionsSectionExpression', () => {
   const deleteCondition = jest.fn(() => {});
 
   const testCondition = {
-    applies_to: APPLIES_TO.TYPICAL,
-    operator: OPERATOR.GREATER_THAN_OR_EQUAL,
+    applies_to: ML_DETECTOR_RULE_APPLIES_TO.TYPICAL,
+    operator: ML_DETECTOR_RULE_OPERATOR.GREATER_THAN_OR_EQUAL,
     value: 1.23,
   };
 
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
index 668907c010108e..907933ad290c3e 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/rule_editor_flyout.js
@@ -31,7 +31,12 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { extractErrorMessage } from '@kbn/ml-error-utils';
+import {
+  ML_DETECTOR_RULE_ACTION,
+  ML_DETECTOR_RULE_CONDITIONS_NOT_SUPPORTED_FUNCTIONS,
+} from '@kbn/ml-anomaly-utils';
 
 import { DetectorDescriptionList } from './components/detector_description_list';
 import { ActionsSection } from './actions_section';
@@ -48,12 +53,7 @@ import {
   addItemToFilter,
 } from './utils';
 
-import {
-  ACTION,
-  CONDITIONS_NOT_SUPPORTED_FUNCTIONS,
-} from '../../../../common/constants/detector_rule';
 import { getPartitioningFieldNames } from '../../../../common/util/job_utils';
-import { withKibana } from '@kbn/kibana-react-plugin/public';
 import { mlJobService } from '../../services/job_service';
 import { ml } from '../../services/ml_api_service';
 
@@ -202,9 +202,9 @@ class RuleEditorFlyoutUI extends Component {
     const checked = e.target.checked;
     this.setState((prevState) => {
       const actions = [...prevState.rule.actions];
-      const idx = actions.indexOf(ACTION.SKIP_RESULT);
+      const idx = actions.indexOf(ML_DETECTOR_RULE_ACTION.SKIP_RESULT);
       if (idx === -1 && checked) {
-        actions.push(ACTION.SKIP_RESULT);
+        actions.push(ML_DETECTOR_RULE_ACTION.SKIP_RESULT);
       } else if (idx > -1 && !checked) {
         actions.splice(idx, 1);
       }
@@ -219,9 +219,9 @@ class RuleEditorFlyoutUI extends Component {
     const checked = e.target.checked;
     this.setState((prevState) => {
       const actions = [...prevState.rule.actions];
-      const idx = actions.indexOf(ACTION.SKIP_MODEL_UPDATE);
+      const idx = actions.indexOf(ML_DETECTOR_RULE_ACTION.SKIP_MODEL_UPDATE);
       if (idx === -1 && checked) {
-        actions.push(ACTION.SKIP_MODEL_UPDATE);
+        actions.push(ML_DETECTOR_RULE_ACTION.SKIP_MODEL_UPDATE);
       } else if (idx > -1 && !checked) {
         actions.splice(idx, 1);
       }
@@ -551,7 +551,7 @@ class RuleEditorFlyoutUI extends Component {
       const hasPartitioningFields =
         this.partitioningFieldNames && this.partitioningFieldNames.length > 0;
       const conditionSupported =
-        CONDITIONS_NOT_SUPPORTED_FUNCTIONS.indexOf(anomaly.source.function) === -1;
+        ML_DETECTOR_RULE_CONDITIONS_NOT_SUPPORTED_FUNCTIONS.indexOf(anomaly.source.function) === -1;
       const conditionsText = i18n.translate(
         'xpack.ml.ruleEditor.ruleEditorFlyout.conditionsDescription',
         {
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.js b/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.js
index e2e3782aeb82f0..7286c2c9b9067b 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.js
@@ -22,10 +22,11 @@ import {
   EuiSelect,
 } from '@elastic/eui';
 
-import { FILTER_TYPE } from '../../../../common/constants/detector_rule';
-import { filterTypeToText } from './utils';
+import { ML_DETECTOR_RULE_FILTER_TYPE } from '@kbn/ml-anomaly-utils';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { filterTypeToText } from './utils';
+
 function getFilterListOptions(filterListIds) {
   return filterListIds.map((filterId) => ({ value: filterId, text: filterId }));
 }
@@ -87,8 +88,14 @@ export class ScopeExpression extends Component {
                 value={filterType}
                 onChange={this.onChangeFilterType}
                 options={[
-                  { value: FILTER_TYPE.INCLUDE, text: filterTypeToText(FILTER_TYPE.INCLUDE) },
-                  { value: FILTER_TYPE.EXCLUDE, text: filterTypeToText(FILTER_TYPE.EXCLUDE) },
+                  {
+                    value: ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE,
+                    text: filterTypeToText(ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE),
+                  },
+                  {
+                    value: ML_DETECTOR_RULE_FILTER_TYPE.EXCLUDE,
+                    text: filterTypeToText(ML_DETECTOR_RULE_FILTER_TYPE.EXCLUDE),
+                  },
                 ]}
               />
             </EuiFlexItem>
@@ -168,7 +175,10 @@ export class ScopeExpression extends Component {
 ScopeExpression.propTypes = {
   fieldName: PropTypes.string.isRequired,
   filterId: PropTypes.string,
-  filterType: PropTypes.oneOf([FILTER_TYPE.INCLUDE, FILTER_TYPE.EXCLUDE]),
+  filterType: PropTypes.oneOf([
+    ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE,
+    ML_DETECTOR_RULE_FILTER_TYPE.EXCLUDE,
+  ]),
   enabled: PropTypes.bool.isRequired,
   filterListIds: PropTypes.array.isRequired,
   updateScope: PropTypes.func.isRequired,
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
index 68ce65ea2c8478..99212675829bb6 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/scope_expression.test.js
@@ -8,11 +8,12 @@
 // Mock the mlJobService that is imported for saving rules.
 jest.mock('../../services/job_service', () => 'mlJobService');
 
-import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 
+import { shallowWithIntl } from '@kbn/test-jest-helpers';
+import { ML_DETECTOR_RULE_FILTER_TYPE } from '@kbn/ml-anomaly-utils';
+
 import { ScopeExpression } from './scope_expression';
-import { FILTER_TYPE } from '../../../../common/constants/detector_rule';
 
 describe('ScopeExpression', () => {
   const testFilterListIds = ['web_domains', 'safe_domains', 'uk_domains'];
@@ -52,7 +53,7 @@ describe('ScopeExpression', () => {
       ...requiredProps,
       filterListIds: testFilterListIds,
       filterId: 'safe_domains',
-      filterType: FILTER_TYPE.INCLUDE,
+      filterType: ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE,
       enabled: true,
     };
 
@@ -66,7 +67,7 @@ describe('ScopeExpression', () => {
       ...requiredProps,
       filterListIds: testFilterListIds,
       filterId: 'safe_domains',
-      filterType: FILTER_TYPE.INCLUDE,
+      filterType: ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE,
       enabled: false,
     };
 
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
index 145f3d5d532561..05d480291185bb 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/scope_section.test.js
@@ -16,11 +16,12 @@ jest.mock('../../capabilities/check_capabilities', () => ({
   checkPermission: (privilege) => mockCheckPermission(privilege),
 }));
 
-import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 
+import { shallowWithIntl } from '@kbn/test-jest-helpers';
+import { ML_DETECTOR_RULE_FILTER_TYPE } from '@kbn/ml-anomaly-utils';
+
 import { ScopeSection } from './scope_section';
-import { FILTER_TYPE } from '../../../../common/constants/detector_rule';
 
 describe('ScopeSection', () => {
   const testFilterListIds = ['web_domains', 'safe_domains', 'uk_domains'];
@@ -28,7 +29,7 @@ describe('ScopeSection', () => {
   const testScope = {
     domain: {
       filter_id: 'uk_domains',
-      filter_type: FILTER_TYPE.INCLUDE,
+      filter_type: ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE,
       enabled: true,
     },
   };
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.js
index c97886ae996016..04d23affa1e2be 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.js
@@ -15,20 +15,21 @@ import React, { Component } from 'react';
 
 import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiLink, EuiText } from '@elastic/eui';
 
-import { APPLIES_TO } from '../../../../../common/constants/detector_rule';
-import { formatValue } from '../../../formatters/format_value';
-import { getAppliesToValueFromAnomaly } from '../utils';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { ML_DETECTOR_RULE_APPLIES_TO } from '@kbn/ml-anomaly-utils';
+
+import { formatValue } from '../../../formatters/format_value';
+import { getAppliesToValueFromAnomaly } from '../utils';
 
 export class EditConditionLink extends Component {
   static propTypes = {
     conditionIndex: PropTypes.number.isRequired,
     conditionValue: PropTypes.number.isRequired,
     appliesTo: PropTypes.oneOf([
-      APPLIES_TO.ACTUAL,
-      APPLIES_TO.TYPICAL,
-      APPLIES_TO.DIFF_FROM_TYPICAL,
+      ML_DETECTOR_RULE_APPLIES_TO.ACTUAL,
+      ML_DETECTOR_RULE_APPLIES_TO.TYPICAL,
+      ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL,
     ]),
     anomaly: PropTypes.object.isRequired,
     updateConditionValue: PropTypes.func.isRequired,
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
index d8f8f4d5d8f517..ddcffadcacbb38 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/edit_condition_link.test.js
@@ -7,11 +7,12 @@
 
 jest.mock('../../../services/job_service', () => 'mlJobService');
 
-import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 
+import { shallowWithIntl } from '@kbn/test-jest-helpers';
+import { ML_DETECTOR_RULE_APPLIES_TO } from '@kbn/ml-anomaly-utils';
+
 import { EditConditionLink } from './edit_condition_link';
-import { APPLIES_TO } from '../../../../../common/constants/detector_rule';
 
 function prepareTest(updateConditionValueFn, appliesTo) {
   const anomaly = {
@@ -41,22 +42,25 @@ describe('EditConditionLink', () => {
   const updateConditionValue = jest.fn(() => {});
 
   test(`renders for a condition using actual`, () => {
-    const wrapper = prepareTest(updateConditionValue, APPLIES_TO.ACTUAL);
+    const wrapper = prepareTest(updateConditionValue, ML_DETECTOR_RULE_APPLIES_TO.ACTUAL);
     expect(wrapper).toMatchSnapshot();
   });
 
   test(`renders for a condition using typical`, () => {
-    const wrapper = prepareTest(updateConditionValue, APPLIES_TO.TYPICAL);
+    const wrapper = prepareTest(updateConditionValue, ML_DETECTOR_RULE_APPLIES_TO.TYPICAL);
     expect(wrapper).toMatchSnapshot();
   });
 
   test(`renders for a condition using diff from typical`, () => {
-    const wrapper = prepareTest(updateConditionValue, APPLIES_TO.DIFF_FROM_TYPICAL);
+    const wrapper = prepareTest(
+      updateConditionValue,
+      ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL
+    );
     expect(wrapper).toMatchSnapshot();
   });
 
   test('calls updateConditionValue on clicking update link', () => {
-    const wrapper = prepareTest(updateConditionValue, APPLIES_TO.ACTUAL);
+    const wrapper = prepareTest(updateConditionValue, ML_DETECTOR_RULE_APPLIES_TO.ACTUAL);
     const instance = wrapper.instance();
     instance.onUpdateClick();
     wrapper.update();
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
index 6f019d973cc8d3..6d5b2e38346d33 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/rule_action_panel.test.js
@@ -29,11 +29,12 @@ jest.mock('../../../services/ml_api_service', () => ({
   },
 }));
 
-import { shallowWithIntl } from '@kbn/test-jest-helpers';
 import React from 'react';
 
+import { shallowWithIntl } from '@kbn/test-jest-helpers';
+import { ML_DETECTOR_RULE_ACTION } from '@kbn/ml-anomaly-utils';
+
 import { RuleActionPanel } from './rule_action_panel';
-import { ACTION } from '../../../../../common/constants/detector_rule';
 
 describe('RuleActionPanel', () => {
   const job = {
@@ -44,7 +45,7 @@ describe('RuleActionPanel', () => {
           detector_description: 'mean response time',
           custom_rules: [
             {
-              actions: [ACTION.SKIP_RESULT],
+              actions: [ML_DETECTOR_RULE_ACTION.SKIP_RESULT],
               conditions: [
                 {
                   applies_to: 'actual',
@@ -54,7 +55,7 @@ describe('RuleActionPanel', () => {
               ],
             },
             {
-              actions: [ACTION.SKIP_MODEL_UPDATE],
+              actions: [ML_DETECTOR_RULE_ACTION.SKIP_MODEL_UPDATE],
               scope: {
                 airline: {
                   filter_id: 'eu-airlines',
@@ -63,7 +64,7 @@ describe('RuleActionPanel', () => {
               },
             },
             {
-              actions: [ACTION.SKIP_MODEL_UPDATE],
+              actions: [ML_DETECTOR_RULE_ACTION.SKIP_MODEL_UPDATE],
               scope: {
                 airline: {
                   filter_id: 'eu-airlines',
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/utils.js b/x-pack/plugins/ml/public/application/components/rule_editor/utils.js
index e4e5940873255c..fd51ccd7b6b3cb 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/utils.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/utils.js
@@ -5,37 +5,38 @@
  * 2.0.
  */
 
+import { cloneDeep } from 'lodash';
+
+import { i18n } from '@kbn/i18n';
 import {
-  ACTION,
-  APPLIES_TO,
-  FILTER_TYPE,
-  OPERATOR,
-} from '../../../../common/constants/detector_rule';
+  ML_DETECTOR_RULE_ACTION,
+  ML_DETECTOR_RULE_APPLIES_TO,
+  ML_DETECTOR_RULE_FILTER_TYPE,
+  ML_DETECTOR_RULE_OPERATOR,
+} from '@kbn/ml-anomaly-utils';
 
-import { cloneDeep } from 'lodash';
 import { ml } from '../../services/ml_api_service';
 import { mlJobService } from '../../services/job_service';
-import { i18n } from '@kbn/i18n';
 import { processCreatedBy } from '../../../../common/util/job_utils';
 
 export function getNewConditionDefaults() {
   return {
-    applies_to: APPLIES_TO.ACTUAL,
-    operator: OPERATOR.LESS_THAN,
+    applies_to: ML_DETECTOR_RULE_APPLIES_TO.ACTUAL,
+    operator: ML_DETECTOR_RULE_OPERATOR.LESS_THAN,
     value: 1,
   };
 }
 
 export function getNewRuleDefaults() {
   return {
-    actions: [ACTION.SKIP_RESULT],
+    actions: [ML_DETECTOR_RULE_ACTION.SKIP_RESULT],
     conditions: [],
   };
 }
 
 export function getScopeFieldDefaults(filterListIds) {
   const defaults = {
-    filter_type: FILTER_TYPE.INCLUDE,
+    filter_type: ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE,
     enabled: false, // UI-only property to show field as enabled in Scope section.
   };
 
@@ -191,7 +192,7 @@ export function buildRuleDescription(rule) {
       actionsText += ' AND ';
     }
     switch (action) {
-      case ACTION.SKIP_RESULT:
+      case ML_DETECTOR_RULE_ACTION.SKIP_RESULT:
         actionsText += i18n.translate('xpack.ml.ruleEditor.ruleDescription.resultActionTypeText', {
           defaultMessage: 'result',
           description:
@@ -199,7 +200,7 @@ export function buildRuleDescription(rule) {
             'xpack.ml.ruleEditor.ruleDescription.conditionsText + xpack.ml.ruleEditor.ruleDescription.filtersText',
         });
         break;
-      case ACTION.SKIP_MODEL_UPDATE:
+      case ML_DETECTOR_RULE_ACTION.SKIP_MODEL_UPDATE:
         actionsText += i18n.translate(
           'xpack.ml.ruleEditor.ruleDescription.modelUpdateActionTypeText',
           {
@@ -273,9 +274,9 @@ export function buildRuleDescription(rule) {
 
 export function filterTypeToText(filterType) {
   switch (filterType) {
-    case FILTER_TYPE.INCLUDE:
+    case ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE:
       return i18n.translate('xpack.ml.ruleEditor.includeFilterTypeText', { defaultMessage: 'in' });
-    case FILTER_TYPE.EXCLUDE:
+    case ML_DETECTOR_RULE_FILTER_TYPE.EXCLUDE:
       return i18n.translate('xpack.ml.ruleEditor.excludeFilterTypeText', {
         defaultMessage: 'not in',
       });
@@ -287,16 +288,16 @@ export function filterTypeToText(filterType) {
 
 export function appliesToText(appliesTo) {
   switch (appliesTo) {
-    case APPLIES_TO.ACTUAL:
+    case ML_DETECTOR_RULE_APPLIES_TO.ACTUAL:
       return i18n.translate('xpack.ml.ruleEditor.actualAppliesTypeText', {
         defaultMessage: 'actual',
       });
-    case APPLIES_TO.TYPICAL:
+    case ML_DETECTOR_RULE_APPLIES_TO.TYPICAL:
       return i18n.translate('xpack.ml.ruleEditor.typicalAppliesTypeText', {
         defaultMessage: 'typical',
       });
 
-    case APPLIES_TO.DIFF_FROM_TYPICAL:
+    case ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL:
       return i18n.translate('xpack.ml.ruleEditor.diffFromTypicalAppliesTypeText', {
         defaultMessage: 'diff from typical',
       });
@@ -308,22 +309,22 @@ export function appliesToText(appliesTo) {
 
 export function operatorToText(operator) {
   switch (operator) {
-    case OPERATOR.LESS_THAN:
+    case ML_DETECTOR_RULE_OPERATOR.LESS_THAN:
       return i18n.translate('xpack.ml.ruleEditor.lessThanOperatorTypeText', {
         defaultMessage: 'less than',
       });
 
-    case OPERATOR.LESS_THAN_OR_EQUAL:
+    case ML_DETECTOR_RULE_OPERATOR.LESS_THAN_OR_EQUAL:
       return i18n.translate('xpack.ml.ruleEditor.lessThanOrEqualToOperatorTypeText', {
         defaultMessage: 'less than or equal to',
       });
 
-    case OPERATOR.GREATER_THAN:
+    case ML_DETECTOR_RULE_OPERATOR.GREATER_THAN:
       return i18n.translate('xpack.ml.ruleEditor.greaterThanOperatorTypeText', {
         defaultMessage: 'greater than',
       });
 
-    case OPERATOR.GREATER_THAN_OR_EQUAL:
+    case ML_DETECTOR_RULE_OPERATOR.GREATER_THAN_OR_EQUAL:
       return i18n.translate('xpack.ml.ruleEditor.greaterThanOrEqualToOperatorTypeText', {
         defaultMessage: 'greater than or equal to',
       });
@@ -350,13 +351,13 @@ export function getAppliesToValueFromAnomaly(anomaly, appliesTo) {
   }
 
   switch (appliesTo) {
-    case APPLIES_TO.ACTUAL:
+    case ML_DETECTOR_RULE_APPLIES_TO.ACTUAL:
       return actualValue;
 
-    case APPLIES_TO.TYPICAL:
+    case ML_DETECTOR_RULE_APPLIES_TO.TYPICAL:
       return typicalValue;
 
-    case APPLIES_TO.DIFF_FROM_TYPICAL:
+    case ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL:
       if (actual !== undefined && typical !== undefined) {
         return Math.abs(actualValue - typicalValue);
       }
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/utils.test.js b/x-pack/plugins/ml/public/application/components/rule_editor/utils.test.js
index 9fd375376c1615..62a6895ce10060 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/utils.test.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/utils.test.js
@@ -5,50 +5,51 @@
  * 2.0.
  */
 
-import { isValidRule, buildRuleDescription, getAppliesToValueFromAnomaly } from './utils';
 import {
-  ACTION,
-  APPLIES_TO,
-  OPERATOR,
-  FILTER_TYPE,
-} from '../../../../common/constants/detector_rule';
+  ML_DETECTOR_RULE_ACTION,
+  ML_DETECTOR_RULE_APPLIES_TO,
+  ML_DETECTOR_RULE_OPERATOR,
+  ML_DETECTOR_RULE_FILTER_TYPE,
+} from '@kbn/ml-anomaly-utils';
+
+import { isValidRule, buildRuleDescription, getAppliesToValueFromAnomaly } from './utils';
 
 describe('ML - rule editor utils', () => {
   const ruleWithCondition = {
-    actions: [ACTION.SKIP_RESULT],
+    actions: [ML_DETECTOR_RULE_ACTION.SKIP_RESULT],
     conditions: [
       {
-        applies_to: APPLIES_TO.ACTUAL,
-        operator: OPERATOR.GREATER_THAN,
+        applies_to: ML_DETECTOR_RULE_APPLIES_TO.ACTUAL,
+        operator: ML_DETECTOR_RULE_OPERATOR.GREATER_THAN,
         value: 10,
       },
     ],
   };
 
   const ruleWithScope = {
-    actions: [ACTION.SKIP_RESULT],
+    actions: [ML_DETECTOR_RULE_ACTION.SKIP_RESULT],
     scope: {
       instance: {
         filter_id: 'test_aws_instances',
-        filter_type: FILTER_TYPE.INCLUDE,
+        filter_type: ML_DETECTOR_RULE_FILTER_TYPE.INCLUDE,
         enabled: true,
       },
     },
   };
 
   const ruleWithConditionAndScope = {
-    actions: [ACTION.SKIP_RESULT],
+    actions: [ML_DETECTOR_RULE_ACTION.SKIP_RESULT],
     conditions: [
       {
-        applies_to: APPLIES_TO.TYPICAL,
-        operator: OPERATOR.LESS_THAN,
+        applies_to: ML_DETECTOR_RULE_APPLIES_TO.TYPICAL,
+        operator: ML_DETECTOR_RULE_OPERATOR.LESS_THAN,
         value: 100,
       },
     ],
     scope: {
       instance: {
         filter_id: 'test_aws_instances',
-        filter_type: FILTER_TYPE.EXCLUDE,
+        filter_type: ML_DETECTOR_RULE_FILTER_TYPE.EXCLUDE,
         enabled: true,
       },
     },
@@ -72,8 +73,8 @@ describe('ML - rule editor utils', () => {
         actions: [],
         conditions: [
           {
-            applies_to: APPLIES_TO.TYPICAL,
-            operator: OPERATOR.LESS_THAN,
+            applies_to: ML_DETECTOR_RULE_APPLIES_TO.TYPICAL,
+            operator: ML_DETECTOR_RULE_OPERATOR.LESS_THAN,
             value: 100,
           },
         ],
@@ -84,7 +85,7 @@ describe('ML - rule editor utils', () => {
 
     test('returns false for a rule with no scope or conditions', () => {
       const ruleWithNoScopeOrCondition = {
-        actions: [ACTION.SKIP_RESULT],
+        actions: [ML_DETECTOR_RULE_ACTION.SKIP_RESULT],
       };
 
       expect(isValidRule(ruleWithNoScopeOrCondition)).toBe(false);
@@ -112,15 +113,17 @@ describe('ML - rule editor utils', () => {
     };
 
     test('returns expected actual value from an anomaly', () => {
-      expect(getAppliesToValueFromAnomaly(anomaly, APPLIES_TO.ACTUAL)).toBe(210);
+      expect(getAppliesToValueFromAnomaly(anomaly, ML_DETECTOR_RULE_APPLIES_TO.ACTUAL)).toBe(210);
     });
 
     test('returns expected typical value from an anomaly', () => {
-      expect(getAppliesToValueFromAnomaly(anomaly, APPLIES_TO.TYPICAL)).toBe(1.23);
+      expect(getAppliesToValueFromAnomaly(anomaly, ML_DETECTOR_RULE_APPLIES_TO.TYPICAL)).toBe(1.23);
     });
 
     test('returns expected diff from typical value from an anomaly', () => {
-      expect(getAppliesToValueFromAnomaly(anomaly, APPLIES_TO.DIFF_FROM_TYPICAL)).toBe(208.77);
+      expect(
+        getAppliesToValueFromAnomaly(anomaly, ML_DETECTOR_RULE_APPLIES_TO.DIFF_FROM_TYPICAL)
+      ).toBe(208.77);
     });
   });
 });
diff --git a/x-pack/plugins/ml/public/application/components/severity_control/severity_control.tsx b/x-pack/plugins/ml/public/application/components/severity_control/severity_control.tsx
index 1ac6fc5ff46deb..7c5424446967a0 100644
--- a/x-pack/plugins/ml/public/application/components/severity_control/severity_control.tsx
+++ b/x-pack/plugins/ml/public/application/components/severity_control/severity_control.tsx
@@ -15,7 +15,7 @@ import {
   EuiRange,
   EuiRangeProps,
 } from '@elastic/eui';
-import { ANOMALY_THRESHOLD } from '../../../../common';
+import { ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils';
 
 export interface SeveritySelectorProps {
   value: number | undefined;
@@ -27,22 +27,22 @@ const MAX_ANOMALY_SCORE = 100;
 export const SeverityControl: FC<SeveritySelectorProps> = React.memo(({ value, onChange }) => {
   const levels: EuiRangeProps['levels'] = [
     {
-      min: ANOMALY_THRESHOLD.LOW,
-      max: ANOMALY_THRESHOLD.MINOR,
+      min: ML_ANOMALY_THRESHOLD.LOW,
+      max: ML_ANOMALY_THRESHOLD.MINOR,
       color: '#8BC8FB',
     },
     {
-      min: ANOMALY_THRESHOLD.MINOR,
-      max: ANOMALY_THRESHOLD.MAJOR,
+      min: ML_ANOMALY_THRESHOLD.MINOR,
+      max: ML_ANOMALY_THRESHOLD.MAJOR,
       color: '#FDEC25',
     },
     {
-      min: ANOMALY_THRESHOLD.MAJOR,
-      max: ANOMALY_THRESHOLD.CRITICAL,
+      min: ML_ANOMALY_THRESHOLD.MAJOR,
+      max: ML_ANOMALY_THRESHOLD.CRITICAL,
       color: '#FBA740',
     },
     {
-      min: ANOMALY_THRESHOLD.CRITICAL,
+      min: ML_ANOMALY_THRESHOLD.CRITICAL,
       max: MAX_ANOMALY_SCORE,
       color: '#FE5050',
     },
@@ -52,7 +52,7 @@ export const SeverityControl: FC<SeveritySelectorProps> = React.memo(({ value, o
     defaultMessage: 'Severity',
   });
 
-  const resultValue = value ?? ANOMALY_THRESHOLD.LOW;
+  const resultValue = value ?? ML_ANOMALY_THRESHOLD.LOW;
 
   const ticks = new Array(5).fill(null).map((x, i) => {
     const v = i * 25;
@@ -70,7 +70,7 @@ export const SeverityControl: FC<SeveritySelectorProps> = React.memo(({ value, o
             prepend={label}
             value={resultValue}
             onChange={(e) => onChange(Number(e.target.value))}
-            min={ANOMALY_THRESHOLD.LOW}
+            min={ML_ANOMALY_THRESHOLD.LOW}
             max={MAX_ANOMALY_SCORE}
           />
         </EuiFlexItem>
@@ -78,7 +78,7 @@ export const SeverityControl: FC<SeveritySelectorProps> = React.memo(({ value, o
           <EuiRange
             className={'mlSeverityControl'}
             fullWidth
-            min={ANOMALY_THRESHOLD.LOW}
+            min={ML_ANOMALY_THRESHOLD.LOW}
             max={MAX_ANOMALY_SCORE}
             value={resultValue}
             onChange={(e) => onChange(Number(e.currentTarget.value))}
diff --git a/x-pack/plugins/ml/public/application/components/technical_preview_badge/technical_preview_badge.tsx b/x-pack/plugins/ml/public/application/components/technical_preview_badge/technical_preview_badge.tsx
index a216a7ce7fc756..95f1a0d54b10a5 100644
--- a/x-pack/plugins/ml/public/application/components/technical_preview_badge/technical_preview_badge.tsx
+++ b/x-pack/plugins/ml/public/application/components/technical_preview_badge/technical_preview_badge.tsx
@@ -11,13 +11,13 @@ import { EuiBetaBadge } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 
-export const TechnicalPreviewBadge: FC = () => {
+export const TechnicalPreviewBadge: FC<{ compressed?: boolean }> = ({ compressed = false }) => {
   return (
     <EuiBetaBadge
       label={i18n.translate('xpack.ml.navMenu.trainedModelsTabBetaLabel', {
         defaultMessage: 'Technical preview',
       })}
-      size="m"
+      size={compressed ? 's' : 'm'}
       color="hollow"
       tooltipContent={i18n.translate('xpack.ml.navMenu.trainedModelsTabBetaTooltipContent', {
         defaultMessage:
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
index 3a2c0c0d3cf692..f59ce67aa62e9b 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/expandable_section/expandable_section_results.tsx
@@ -24,8 +24,8 @@ import {
 } from '@elastic/eui';
 
 import type { DataView } from '@kbn/data-views-plugin/public';
+import type { MlKibanaUrlConfig } from '@kbn/ml-anomaly-utils';
 
-import type { KibanaUrlConfig } from '../../../../../../../common/types/custom_urls';
 import type { DataGridItem } from '../../../../../components/data_grid';
 import {
   isClassificationAnalysis,
@@ -229,7 +229,7 @@ export const ExpandableSectionResults: FC<ExpandableSectionResultsProps> = ({
     [indexData?.visibleColumns, discoverLocator, dataViewId, resultsField, tableItems, data]
   );
 
-  const openCustomUrl = (item: DataGridItem, customUrl: KibanaUrlConfig) => {
+  const openCustomUrl = (item: DataGridItem, customUrl: MlKibanaUrlConfig) => {
     // Replace any tokens in the configured url_value with values from the source record and open link in a new tab/window.
     const urlPath = replaceTokensInDFAUrlValue(
       customUrl,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
index 4730dea72dd7a7..8855c674e34c68 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_edit/edit_action_flyout.tsx
@@ -28,6 +28,8 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
+import type { MlUrlConfig } from '@kbn/ml-anomaly-utils';
+
 import { useMlKibana, useMlApiContext } from '../../../../../contexts/kibana';
 import { ml } from '../../../../../services/ml_api_service';
 import { useToastNotificationService } from '../../../../../services/toast_notification_service';
@@ -41,7 +43,6 @@ import {
   UpdateDataFrameAnalyticsConfig,
   type DataFrameAnalyticsConfig,
 } from '../../../../../../../common/types/data_frame_analytics';
-import type { UrlConfig } from '../../../../../../../common/types/custom_urls';
 
 import { EditAction } from './use_edit_action';
 import { CustomUrlsWrapper, isValidCustomUrls } from '../../../../../components/custom_urls';
@@ -62,7 +63,7 @@ export const EditActionFlyout: FC<Required<EditAction>> = ({ closeFlyout, item }
   const [mmlValidationError, setMmlValidationError] = useState<string | undefined>();
   const [maxNumThreads, setMaxNumThreads] = useState<number | undefined>(config.max_num_threads);
   const [activeTabId, setActiveTabId] = useState<string>('job-details');
-  const [customUrls, setCustomUrls] = useState<UrlConfig[]>([]);
+  const [customUrls, setCustomUrls] = useState<MlUrlConfig[]>([]);
   const [analyticsJob, setAnalyticsJob] = useState<DataFrameAnalyticsConfig | undefined>();
 
   const {
diff --git a/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx b/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
index 3edfcd9842a18b..c6ab5e52f5ef72 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/anomalies_map.tsx
@@ -26,13 +26,13 @@ import {
 } from '@kbn/maps-plugin/common';
 import { EMSTermJoinConfig } from '@kbn/maps-plugin/public';
 import { isDefined } from '@kbn/ml-is-defined';
+import type { MlAnomaliesTableRecord } from '@kbn/ml-anomaly-utils';
 import { useMlKibana } from '../contexts/kibana';
 import { MlEmbeddedMapComponent } from '../components/ml_embedded_map';
-import { AnomaliesTableRecord } from '../../../common/types/anomalies';
 
 const MAX_ENTITY_VALUES = 3;
 
-function getAnomalyRows(anomalies: AnomaliesTableRecord[], jobId: string) {
+function getAnomalyRows(anomalies: MlAnomaliesTableRecord[], jobId: string) {
   const anomalyRows: Record<string, { count: number; entityValue: string; max_severity: number }> =
     {};
   for (let i = 0; i < anomalies.length; i++) {
@@ -58,7 +58,7 @@ function getAnomalyRows(anomalies: AnomaliesTableRecord[], jobId: string) {
 }
 
 export const getChoroplethAnomaliesLayer = (
-  anomalies: AnomaliesTableRecord[],
+  anomalies: MlAnomaliesTableRecord[],
   { layerId, field, jobId }: MLEMSTermJoinConfig
 ): VectorLayerDescriptor => {
   return {
@@ -131,7 +131,7 @@ export const getChoroplethAnomaliesLayer = (
 };
 
 interface Props {
-  anomalies: AnomaliesTableRecord[];
+  anomalies: MlAnomaliesTableRecord[];
   jobIds: string[];
 }
 
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/components/explorer_chart_label/entity_filter/entity_filter.tsx b/x-pack/plugins/ml/public/application/explorer/explorer_charts/components/explorer_chart_label/entity_filter/entity_filter.tsx
index 15822d74d08d5c..1ac6644a14d4ed 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/components/explorer_chart_label/entity_filter/entity_filter.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/components/explorer_chart_label/entity_filter/entity_filter.tsx
@@ -8,10 +8,7 @@ import React, { FC } from 'react';
 import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
-import {
-  ENTITY_FIELD_OPERATIONS,
-  EntityFieldOperation,
-} from '../../../../../../../common/util/anomaly_utils';
+import { ML_ENTITY_FIELD_OPERATIONS, MlEntityFieldOperation } from '@kbn/ml-anomaly-utils';
 import { blurButtonOnClick } from '../../../../../util/component_utils';
 import './_entity_filter.scss';
 
@@ -19,7 +16,7 @@ interface EntityFilterProps {
   onFilter: (params: {
     influencerFieldName: string;
     influencerFieldValue: string;
-    action: EntityFieldOperation;
+    action: MlEntityFieldOperation;
   }) => void;
   influencerFieldName: string;
   influencerFieldValue: string;
@@ -46,7 +43,7 @@ export const EntityFilter: FC<EntityFilterProps> = ({
             onFilter({
               influencerFieldName,
               influencerFieldValue,
-              action: ENTITY_FIELD_OPERATIONS.ADD,
+              action: ML_ENTITY_FIELD_OPERATIONS.ADD,
             });
           })}
           iconType="plusInCircle"
@@ -71,7 +68,7 @@ export const EntityFilter: FC<EntityFilterProps> = ({
             onFilter({
               influencerFieldName,
               influencerFieldValue,
-              action: ENTITY_FIELD_OPERATIONS.REMOVE,
+              action: ML_ENTITY_FIELD_OPERATIONS.REMOVE,
             });
           })}
           iconType="minusInCircle"
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
index 3d58a7a571c4a8..f2f59f220d7d7d 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_anomalies_container.tsx
@@ -11,13 +11,13 @@ import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import type { TimefilterContract } from '@kbn/data-plugin/public';
 import { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type { MlEntityFieldOperation } from '@kbn/ml-anomaly-utils';
 import { ExplorerChartsContainer } from './explorer_charts_container';
 import {
   SelectSeverityUI,
   TableSeverity,
 } from '../../components/controls/select_severity/select_severity';
 import type { TimeBuckets } from '../../util/time_buckets';
-import type { EntityFieldOperation } from '../../../../common/util/anomaly_utils';
 import type { ExplorerChartsData } from './explorer_charts_container_service';
 import type { MlLocator } from '../../../../common/types/locator';
 
@@ -30,7 +30,11 @@ interface ExplorerAnomaliesContainerProps {
   mlLocator: MlLocator;
   timeBuckets: TimeBuckets;
   timefilter: TimefilterContract;
-  onSelectEntity: (fieldName: string, fieldValue: string, operation: EntityFieldOperation) => void;
+  onSelectEntity: (
+    fieldName: string,
+    fieldValue: string,
+    operation: MlEntityFieldOperation
+  ) => void;
   showSelectedInterval?: boolean;
   chartsService: ChartsPluginStart;
   timeRange: { from: string; to: string } | undefined;
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_config_builder.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_config_builder.js
index 7d723995e3ac4a..c97e73960dcdd1 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_config_builder.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_config_builder.js
@@ -11,7 +11,7 @@
  */
 
 import { parseInterval } from '../../../../common/util/parse_interval';
-import { getEntityFieldList } from '../../../../common/util/anomaly_utils';
+import { getEntityFieldList } from '@kbn/ml-anomaly-utils';
 import { buildConfigFromDetector } from '../../util/chart_config_builder';
 import { mlJobService } from '../../services/job_service';
 import { mlFunctionToESAggregation } from '../../../../common/util/job_utils';
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js
index 204a4f3677579f..8242130f993f58 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_distribution.js
@@ -24,7 +24,7 @@ import {
   getFormattedSeverityScore,
   getSeverityColor,
   getSeverityWithLow,
-} from '../../../../common/util/anomaly_utils';
+} from '@kbn/ml-anomaly-utils';
 import {
   getChartType,
   getTickValues,
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
index 3f367d189762da..8fe832cb6afc8a 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_single_metric.js
@@ -24,7 +24,7 @@ import {
   getFormattedSeverityScore,
   getSeverityColor,
   getSeverityWithLow,
-} from '../../../../common/util/anomaly_utils';
+} from '@kbn/ml-anomaly-utils';
 import {
   LINE_CHART_ANOMALY_RADIUS,
   MULTI_BUCKET_SYMBOL_SIZE,
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts b/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
index 6ab5a04fdde650..d5b57075a16e29 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/map_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { FIELD_ORIGIN, LAYER_TYPE, STYLE_TYPE } from '@kbn/maps-plugin/common';
-import { SEVERITY_COLOR_RAMP } from '../../../../common';
+import { ML_SEVERITY_COLOR_RAMP } from '@kbn/ml-anomaly-utils';
 import { AnomaliesTableData } from '../explorer_utils';
 
 const FEATURE = 'Feature';
@@ -115,7 +115,7 @@ export const getMLAnomaliesActualLayer = (anomalies: any) => {
         fillColor: {
           type: STYLE_TYPE.DYNAMIC,
           options: {
-            customColorRamp: SEVERITY_COLOR_RAMP,
+            customColorRamp: ML_SEVERITY_COLOR_RAMP,
             field: {
               name: 'record_score',
               origin: FIELD_ORIGIN.SOURCE,
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_utils.ts b/x-pack/plugins/ml/public/application/explorer/explorer_utils.ts
index f0f26a39184386..f6744dbd272b06 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_utils.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_utils.ts
@@ -18,12 +18,17 @@ import { asyncForEach } from '@kbn/std';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
 import type { DataViewsContract } from '@kbn/data-views-plugin/public';
 import { extractErrorMessage } from '@kbn/ml-error-utils';
+import {
+  getEntityFieldList,
+  type MlEntityField,
+  type MlInfluencer,
+  type MlRecordForInfluencer,
+} from '@kbn/ml-anomaly-utils';
 
 import {
   ANNOTATIONS_TABLE_DEFAULT_QUERY_SIZE,
   ANOMALIES_TABLE_DEFAULT_QUERY_SIZE,
 } from '../../../common/constants/search';
-import { EntityField, getEntityFieldList } from '../../../common/util/anomaly_utils';
 import { getDataViewIdFromName } from '../util/index_utils';
 import { ML_JOB_AGGREGATION } from '../../../common/constants/aggregation_types';
 import {
@@ -49,8 +54,6 @@ import { MlResultsService } from '../services/results_service';
 import { InfluencersFilterQuery } from '../../../common/types/es_client';
 import { TimeRangeBounds } from '../util/time_buckets';
 import { Annotations, AnnotationsTable } from '../../../common/types/annotations';
-import { Influencer } from '../../../common/types/anomalies';
-import { RecordForInfluencer } from '../services/results_service/results_service';
 
 export interface ExplorerJob {
   id: string;
@@ -108,7 +111,7 @@ export interface AnomaliesTableData {
   jobIds: string[];
 }
 
-export interface ChartRecord extends RecordForInfluencer {
+export interface ChartRecord extends MlRecordForInfluencer {
   function: string;
 }
 
@@ -191,7 +194,7 @@ export async function loadFilteredTopInfluencers(
 
   // Add the influencers from the top scoring anomalies.
   records.forEach((record) => {
-    const influencersByName: Influencer[] = record.influencers || [];
+    const influencersByName: MlInfluencer[] = record.influencers || [];
     influencersByName.forEach((influencer) => {
       const fieldName = influencer.influencer_field_name;
       const fieldValues = influencer.influencer_field_values;
@@ -208,7 +211,7 @@ export async function loadFilteredTopInfluencers(
     uniqValuesByName[fieldName] = uniq(fieldValues);
   });
 
-  const filterInfluencers: EntityField[] = [];
+  const filterInfluencers: MlEntityField[] = [];
   Object.keys(uniqValuesByName).forEach((fieldName) => {
     // Find record influencers with the same field name as the clicked on cell(s).
     const matchingFieldName = influencers.find((influencer) => {
@@ -321,7 +324,7 @@ export function getSelectionTimeRange(
 export function getSelectionInfluencers(
   selectedCells: AppStateSelectedCells | undefined | null,
   fieldName: string
-): EntityField[] {
+): MlEntityField[] {
   if (
     !!selectedCells &&
     selectedCells.type !== SWIMLANE_TYPE.OVERALL &&
diff --git a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
index a34c968eecfe45..cbff2587ccf4c7 100644
--- a/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/swimlane_container.tsx
@@ -36,9 +36,13 @@ import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { ChartsPluginStart, useActiveCursor } from '@kbn/charts-plugin/public';
 import { css } from '@emotion/react';
+import {
+  getFormattedSeverityScore,
+  ML_ANOMALY_THRESHOLD,
+  ML_SEVERITY_COLORS,
+} from '@kbn/ml-anomaly-utils';
 import { SwimLanePagination } from './swimlane_pagination';
 import { AppStateSelectedCells, OverallSwimlaneData, ViewBySwimLaneData } from './explorer_utils';
-import { ANOMALY_THRESHOLD, SEVERITY_COLORS } from '../../../common';
 import { TimeBuckets as TimeBucketsClass } from '../util/time_buckets';
 import { SWIMLANE_TYPE, SwimlaneType } from './explorer_constants';
 import { mlEscape } from '../util/string_utils';
@@ -60,9 +64,6 @@ declare global {
   }
 }
 
-function getFormattedSeverityScore(score: number): string {
-  return String(parseInt(String(score), 10));
-}
 /**
  * Ignore insignificant resize, e.g. browser scrollbar appearance.
  */
@@ -456,29 +457,29 @@ export const SwimlaneContainer: FC<SwimlaneProps> = ({
                           type: 'bands',
                           bands: [
                             {
-                              start: ANOMALY_THRESHOLD.LOW,
-                              end: ANOMALY_THRESHOLD.WARNING,
-                              color: SEVERITY_COLORS.LOW,
+                              start: ML_ANOMALY_THRESHOLD.LOW,
+                              end: ML_ANOMALY_THRESHOLD.WARNING,
+                              color: ML_SEVERITY_COLORS.LOW,
                             },
                             {
-                              start: ANOMALY_THRESHOLD.WARNING,
-                              end: ANOMALY_THRESHOLD.MINOR,
-                              color: SEVERITY_COLORS.WARNING,
+                              start: ML_ANOMALY_THRESHOLD.WARNING,
+                              end: ML_ANOMALY_THRESHOLD.MINOR,
+                              color: ML_SEVERITY_COLORS.WARNING,
                             },
                             {
-                              start: ANOMALY_THRESHOLD.MINOR,
-                              end: ANOMALY_THRESHOLD.MAJOR,
-                              color: SEVERITY_COLORS.MINOR,
+                              start: ML_ANOMALY_THRESHOLD.MINOR,
+                              end: ML_ANOMALY_THRESHOLD.MAJOR,
+                              color: ML_SEVERITY_COLORS.MINOR,
                             },
                             {
-                              start: ANOMALY_THRESHOLD.MAJOR,
-                              end: ANOMALY_THRESHOLD.CRITICAL,
-                              color: SEVERITY_COLORS.MAJOR,
+                              start: ML_ANOMALY_THRESHOLD.MAJOR,
+                              end: ML_ANOMALY_THRESHOLD.CRITICAL,
+                              color: ML_SEVERITY_COLORS.MAJOR,
                             },
                             {
-                              start: ANOMALY_THRESHOLD.CRITICAL,
+                              start: ML_ANOMALY_THRESHOLD.CRITICAL,
                               end: Infinity,
-                              color: SEVERITY_COLORS.CRITICAL,
+                              color: ML_SEVERITY_COLORS.CRITICAL,
                             },
                           ],
                         }}
diff --git a/x-pack/plugins/ml/public/application/formatters/format_value.test.ts b/x-pack/plugins/ml/public/application/formatters/format_value.test.ts
index 57f78c1267765a..b91e1c7934c9d4 100644
--- a/x-pack/plugins/ml/public/application/formatters/format_value.test.ts
+++ b/x-pack/plugins/ml/public/application/formatters/format_value.test.ts
@@ -6,11 +6,11 @@
  */
 
 import moment from 'moment-timezone';
-import { AnomalyRecordDoc } from '../../../common/types/anomalies';
+import { MlAnomalyRecordDoc } from '@kbn/ml-anomaly-utils';
 import { formatValue } from './format_value';
 
 describe('ML - formatValue formatter', () => {
-  const timeOfWeekRecord: AnomalyRecordDoc = {
+  const timeOfWeekRecord: MlAnomalyRecordDoc = {
     job_id: 'gallery_time_of_week',
     result_type: 'record',
     probability: 0.012818,
@@ -27,7 +27,7 @@ describe('ML - formatValue formatter', () => {
     function_description: 'time',
   };
 
-  const timeOfDayRecord: AnomalyRecordDoc = {
+  const timeOfDayRecord: MlAnomalyRecordDoc = {
     job_id: 'gallery_time_of_day',
     result_type: 'record',
     probability: 0.012818,
diff --git a/x-pack/plugins/ml/public/application/formatters/format_value.ts b/x-pack/plugins/ml/public/application/formatters/format_value.ts
index f08e6382120a42..5af8b1bd40e43d 100644
--- a/x-pack/plugins/ml/public/application/formatters/format_value.ts
+++ b/x-pack/plugins/ml/public/application/formatters/format_value.ts
@@ -13,7 +13,8 @@
  */
 
 import moment from 'moment';
-import { AnomalyRecordDoc } from '../../../common/types/anomalies';
+import { MlAnomalyRecordDoc } from '@kbn/ml-anomaly-utils';
+
 const SIGFIGS_IF_ROUNDING = 3; // Number of sigfigs to use for values < 10
 
 // Formats the value of an actual or typical field from a machine learning anomaly record.
@@ -28,7 +29,7 @@ export function formatValue(
   value: number[] | number,
   mlFunction: string,
   fieldFormat?: any,
-  record?: AnomalyRecordDoc
+  record?: MlAnomalyRecordDoc
 ) {
   // actual and typical values in anomaly record results will be arrays.
   // Unless the array is multi-valued (as it will be for multi-variate analyses such as lat_long),
@@ -58,7 +59,7 @@ export function formatSingleValue(
   value: number,
   mlFunction?: string,
   fieldFormat?: any,
-  record?: AnomalyRecordDoc
+  record?: MlAnomalyRecordDoc
 ) {
   if (value === undefined || value === null) {
     return '';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
index 2d282563367573..d1c03647910641 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/job_creator.ts
@@ -11,8 +11,8 @@ import { ES_FIELD_TYPES } from '@kbn/field-types';
 import type { Query } from '@kbn/es-query';
 import type { DataView } from '@kbn/data-views-plugin/public';
 import { addExcludeFrozenToQuery } from '@kbn/ml-query-utils';
+import { MlUrlConfig } from '@kbn/ml-anomaly-utils';
 import { SavedSearchSavedObject } from '../../../../../../common/types/kibana';
-import { UrlConfig } from '../../../../../../common/types/custom_urls';
 import { IndexPatternTitle } from '../../../../../../common/types/kibana';
 import {
   ML_JOB_AGGREGATION,
@@ -717,12 +717,12 @@ export class JobCreator {
     return this._getCustomSetting('created_by') as CREATED_BY_LABEL | null;
   }
 
-  public set customUrls(customUrls: UrlConfig[] | null) {
+  public set customUrls(customUrls: MlUrlConfig[] | null) {
     this._setCustomSetting('custom_urls', customUrls);
   }
 
-  public get customUrls(): UrlConfig[] | null {
-    return this._getCustomSetting('custom_urls') as UrlConfig[] | null;
+  public get customUrls(): MlUrlConfig[] | null {
+    return this._getCustomSetting('custom_urls') as MlUrlConfig[] | null;
   }
 
   public get formattedJobJson() {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
index 772a385ed60a04..e36f02a96eda29 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
@@ -6,17 +6,21 @@
  */
 
 import { BehaviorSubject, lastValueFrom } from 'rxjs';
-import { JobCreatorType, isMultiMetricJobCreator } from '../job_creator';
-import { mlResultsService, ModelPlotOutputResults } from '../../../../services/results_service';
-import { TimeBuckets } from '../../../../util/time_buckets';
-import { getSeverityType } from '../../../../../../common/util/anomaly_utils';
+
+import { getSeverityType, ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils';
+
 import { parseInterval } from '../../../../../../common/util/parse_interval';
-import { ANOMALY_SEVERITY } from '../../../../../../common/constants/anomalies';
-import { getScoresByRecord } from './searches';
-import { ChartLoader } from '../chart_loader';
 import { JOB_TYPE } from '../../../../../../common/constants/new_job';
 import { ES_AGGREGATION } from '../../../../../../common/constants/aggregation_types';
 
+import { mlResultsService, ModelPlotOutputResults } from '../../../../services/results_service';
+import { TimeBuckets } from '../../../../util/time_buckets';
+
+import { JobCreatorType, isMultiMetricJobCreator } from '../job_creator';
+import { ChartLoader } from '../chart_loader';
+
+import { getScoresByRecord } from './searches';
+
 export interface Results {
   progress: number;
   model: Record<number, ModelItem[]>;
@@ -33,7 +37,7 @@ export interface ModelItem {
 export interface Anomaly {
   time: number;
   value: number;
-  severity: ANOMALY_SEVERITY;
+  severity: ML_ANOMALY_SEVERITY;
 }
 
 const emptyModelItem = {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/anomalies.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/anomalies.tsx
index f40d5bbd5b0139..74d3e57fa7e6be 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/anomalies.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/anomalies.tsx
@@ -7,9 +7,8 @@
 
 import React, { Fragment, FC } from 'react';
 import { AnnotationDomainType, LineAnnotation } from '@elastic/charts';
+import { getSeverityColor, ML_ANOMALY_THRESHOLD } from '@kbn/ml-anomaly-utils';
 import { Anomaly } from '../../../../common/results_loader';
-import { getSeverityColor } from '../../../../../../../../common/util/anomaly_utils';
-import { ANOMALY_THRESHOLD } from '../../../../../../../../common/constants/anomalies';
 
 interface Props {
   anomalyData?: Anomaly[];
@@ -61,35 +60,35 @@ export const Anomalies: FC<Props> = ({ anomalyData }) => {
         id="low"
         domainType={AnnotationDomainType.XDomain}
         dataValues={severities.low}
-        style={getAnomalyStyle(ANOMALY_THRESHOLD.LOW)}
+        style={getAnomalyStyle(ML_ANOMALY_THRESHOLD.LOW)}
         hideTooltips={true}
       />
       <LineAnnotation
         id="warning"
         domainType={AnnotationDomainType.XDomain}
         dataValues={severities.warning}
-        style={getAnomalyStyle(ANOMALY_THRESHOLD.WARNING)}
+        style={getAnomalyStyle(ML_ANOMALY_THRESHOLD.WARNING)}
         hideTooltips={true}
       />
       <LineAnnotation
         id="minor"
         domainType={AnnotationDomainType.XDomain}
         dataValues={severities.minor}
-        style={getAnomalyStyle(ANOMALY_THRESHOLD.MINOR)}
+        style={getAnomalyStyle(ML_ANOMALY_THRESHOLD.MINOR)}
         hideTooltips={true}
       />
       <LineAnnotation
         id="major"
         domainType={AnnotationDomainType.XDomain}
         dataValues={severities.major}
-        style={getAnomalyStyle(ANOMALY_THRESHOLD.MAJOR)}
+        style={getAnomalyStyle(ML_ANOMALY_THRESHOLD.MAJOR)}
         hideTooltips={true}
       />
       <LineAnnotation
         id="critical"
         domainType={AnnotationDomainType.XDomain}
         dataValues={severities.critical}
-        style={getAnomalyStyle(ANOMALY_THRESHOLD.CRITICAL)}
+        style={getAnomalyStyle(ML_ANOMALY_THRESHOLD.CRITICAL)}
         hideTooltips={true}
       />
     </Fragment>
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/custom_urls_selection.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/custom_urls_selection.tsx
index 8c483d505aca0b..cbdda03eef4f1f 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/custom_urls_selection.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/job_details_step/components/additional_section/components/custom_urls/custom_urls_selection.tsx
@@ -6,8 +6,8 @@
  */
 
 import React, { FC, useContext } from 'react';
+import type { MlUrlConfig } from '@kbn/ml-anomaly-utils';
 import { CustomUrls } from '../../../../../../../../../components/custom_urls/custom_urls';
-import { UrlConfig } from '../../../../../../../../../../../common/types/custom_urls';
 import { JobCreatorContext } from '../../../../../job_creator_context';
 import { Description } from './description';
 import { CombinedJob } from '../../../../../../../../../../../common/types/anomaly_detection_jobs';
@@ -15,7 +15,7 @@ import { CombinedJob } from '../../../../../../../../../../../common/types/anoma
 export const CustomUrlsSelection: FC = () => {
   const { jobCreator, jobCreatorUpdate } = useContext(JobCreatorContext);
 
-  const setCustomUrls = (customUrls: UrlConfig[]) => {
+  const setCustomUrls = (customUrls: MlUrlConfig[]) => {
     jobCreator.customUrls = customUrls;
     jobCreatorUpdate();
   };
diff --git a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
index a6a9e111988228..9c68f6d4f7aec7 100644
--- a/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
+++ b/x-pack/plugins/ml/public/application/management/jobs_list/components/insufficient_license_page.tsx
@@ -10,7 +10,14 @@ import React, { FC } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { CoreStart } from '@kbn/core/public';
 
-import { EuiEmptyPrompt, EuiLink, EuiPageContent_Deprecated as EuiPageContent } from '@elastic/eui';
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPageTemplate,
+  EuiText,
+} from '@elastic/eui';
 
 interface Props {
   basePath: CoreStart['http']['basePath'];
@@ -18,41 +25,63 @@ interface Props {
 
 export const InsufficientLicensePage: FC<Props> = ({ basePath }) => (
   <>
-    <EuiPageContent
-      verticalPosition="center"
-      horizontalPosition="center"
-      color="danger"
+    <EuiPageTemplate.EmptyPrompt
+      title={
+        <h2>
+          <FormattedMessage
+            id="xpack.ml.management.jobsList.insufficientLicenseLabel"
+            defaultMessage="Machine learning is a subscription feature"
+          />
+        </h2>
+      }
       data-test-subj="mlPageInsufficientLicense"
-    >
-      <EuiEmptyPrompt
-        iconType="warning"
-        title={
-          <h2>
-            <FormattedMessage
-              id="xpack.ml.management.jobsList.insufficientLicenseLabel"
-              defaultMessage="Upgrade for subscription features"
-            />
-          </h2>
-        }
-        body={
-          <p>
-            <FormattedMessage
-              id="xpack.ml.management.jobsList.insufficientLicenseDescription"
-              defaultMessage="To use these machine learning features, you must {link}."
-              values={{
-                link: (
-                  <EuiLink href={`${basePath.get()}/app/management/stack/license_management/home`}>
-                    <FormattedMessage
-                      id="xpack.ml.management.jobsList.insufficientLicenseDescription.link"
-                      defaultMessage="start a trial or upgrade your subscription"
-                    />
-                  </EuiLink>
-                ),
-              }}
-            />
-          </p>
-        }
-      />
-    </EuiPageContent>
+      body={
+        <EuiFlexGroup direction="column">
+          <EuiFlexItem>
+            <EuiText color="subdued">
+              <p>
+                <FormattedMessage
+                  id="xpack.ml.management.jobsList.insufficientLicenseDescription"
+                  defaultMessage="Select an option to unlock it."
+                />
+              </p>
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiFlexGroup justifyContent="center">
+              <EuiFlexItem grow={false}>
+                <EuiButtonEmpty
+                  data-test-subj="license-prompt-upgrade"
+                  key="upgrade-subscription-button"
+                  target="_blank"
+                  href="https://www.elastic.co/subscriptions"
+                >
+                  <FormattedMessage
+                    id="xpack.ml.management.jobsList.insufficientLicenseDescription.SubscriptionLink"
+                    defaultMessage="Upgrade your subscription"
+                  />
+                </EuiButtonEmpty>
+                ,
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiButton
+                  fill
+                  data-test-subj="license-prompt-trial"
+                  key="start-trial-button"
+                  target="_blank"
+                  href={`${basePath.get()}/app/management/stack/license_management/home`}
+                >
+                  <FormattedMessage
+                    id="xpack.ml.management.jobsList.insufficientLicenseDescription.startTrialLink"
+                    defaultMessage="Start trial"
+                  />
+                </EuiButton>
+                ,
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      }
+    />
   </>
 );
diff --git a/x-pack/plugins/ml/public/application/model_management/models_list.tsx b/x-pack/plugins/ml/public/application/model_management/models_list.tsx
index 391136f3f2adac..80c8bef6971f58 100644
--- a/x-pack/plugins/ml/public/application/model_management/models_list.tsx
+++ b/x-pack/plugins/ml/public/application/model_management/models_list.tsx
@@ -39,6 +39,7 @@ import {
   CURATED_MODEL_TYPE,
   MODEL_STATE,
 } from '@kbn/ml-trained-models-utils/src/constants/trained_models';
+import { TechnicalPreviewBadge } from '../components/technical_preview_badge';
 import { useModelActions } from './model_actions';
 import { ModelsTableToConfigMapping } from '.';
 import { ModelsBarStats, StatsBar } from '../components/stats_bar';
@@ -407,6 +408,16 @@ export const ModelsList: FC<Props> = ({
       sortable: false,
       truncateText: false,
       'data-test-subj': 'mlModelsTableColumnDescription',
+      render: (description: string) => {
+        if (!description) return null;
+        const isTechPreview = description.includes('(Tech Preview)');
+        return (
+          <>
+            {description.replace('(Tech Preview)', '')}
+            {isTechPreview ? <TechnicalPreviewBadge compressed /> : null}
+          </>
+        );
+      },
     },
     {
       field: ModelsTableToConfigMapping.type,
diff --git a/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx b/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
index 99c3f3ff38a688..3fa54aa4abe561 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
@@ -14,6 +14,7 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { EuiThemeProvider as StyledComponentsThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { useUrlState } from '@kbn/ml-url-state';
 import { useTimefilter } from '@kbn/ml-date-picker';
+import { ML_JOB_ID } from '@kbn/ml-anomaly-utils';
 import { ML_PAGES } from '../../../locator';
 import { NavigateToPath, useMlKibana } from '../../contexts/kibana';
 
@@ -33,7 +34,6 @@ import { useJobSelection } from '../../components/job_selector/use_job_selection
 import { useTableInterval } from '../../components/controls/select_interval';
 import { useTableSeverity } from '../../components/controls/select_severity';
 import { getBreadcrumbWithUrlForApp } from '../breadcrumbs';
-import { JOB_ID } from '../../../../common/constants/anomalies';
 import { MlAnnotationUpdatesContext } from '../../contexts/ml/ml_annotation_updates_context';
 import { AnnotationUpdatesService } from '../../services/annotations_service';
 import { useTimeBuckets } from '../../components/custom_hooks/use_time_buckets';
@@ -139,7 +139,7 @@ const ExplorerUrlStateManager: FC<ExplorerUrlStateManagerProps> = ({ jobsWithTim
     try {
       const fetchedStoppedPartitions = await ml.results.getCategoryStoppedPartitions(
         selectedJobIds,
-        JOB_ID
+        ML_JOB_ID
       );
       if (
         fetchedStoppedPartitions &&
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 6a0f3c8c692b0b..676927365e5819 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
@@ -11,18 +11,19 @@ import type { TimeRange } from '@kbn/es-query';
 import type { TimefilterContract } from '@kbn/data-plugin/public';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
 import { isDefined } from '@kbn/ml-is-defined';
-import type { RecordForInfluencer } from './results_service/results_service';
-import type { EntityField } from '../../../common/util/anomaly_utils';
+import type { MlEntityField, MlRecordForInfluencer } from '@kbn/ml-anomaly-utils';
 import type { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
-import type { MlApiServices } from './ml_api_service';
-import type { MlResultsService } from './results_service';
+import type { InfluencersFilterQuery } from '../../../common/types/es_client';
+import type { SeriesConfigWithMetadata } from '../../../common/types/results';
+
 import { ExplorerChartsData } from '../explorer/explorer_charts/explorer_charts_container_service';
 import type { TimeRangeBounds } from '../util/time_buckets';
 import type { AppStateSelectedCells } from '../explorer/explorer_utils';
-import type { InfluencersFilterQuery } from '../../../common/types/es_client';
-import type { SeriesConfigWithMetadata } from '../../../common/types/results';
 import { SWIM_LANE_LABEL_WIDTH } from '../explorer/swimlane_container';
 
+import type { MlApiServices } from './ml_api_service';
+import type { MlResultsService } from './results_service';
+
 const MAX_CHARTS_PER_ROW = 4;
 const OPTIMAL_CHART_WIDTH = 550;
 
@@ -71,10 +72,10 @@ export class AnomalyExplorerChartsService {
     jobIds: string[],
     earliestMs: number,
     latestMs: number,
-    influencers: EntityField[] = [],
+    influencers: MlEntityField[] = [],
     selectedCells: AppStateSelectedCells | undefined | null,
     influencersFilterQuery: InfluencersFilterQuery
-  ): Observable<RecordForInfluencer[]> {
+  ): Observable<MlRecordForInfluencer[]> {
     if (!selectedCells && influencers.length === 0 && influencersFilterQuery === undefined) {
       of([]);
     }
@@ -90,12 +91,12 @@ export class AnomalyExplorerChartsService {
         influencersFilterQuery
       )
       .pipe(
-        mapObservable((resp): RecordForInfluencer[] => {
+        mapObservable((resp): MlRecordForInfluencer[] => {
           if (isPopulatedObject(selectedCells) || influencersFilterQuery !== undefined) {
             return resp.records;
           }
 
-          return [] as RecordForInfluencer[];
+          return [] as MlRecordForInfluencer[];
         })
       );
   }
@@ -106,7 +107,7 @@ export class AnomalyExplorerChartsService {
     selectedEarliestMs: number,
     selectedLatestMs: number,
     influencerFilterQuery?: InfluencersFilterQuery,
-    influencers?: EntityField[],
+    influencers?: MlEntityField[],
     severity = 0,
     maxSeries?: number
   ): Observable<ExplorerChartsData> {
diff --git a/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts b/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
index 38bf80be1ffed8..11c8a65262a4f7 100644
--- a/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
+++ b/x-pack/plugins/ml/public/application/services/anomaly_timeline_service.ts
@@ -9,6 +9,7 @@ import { IUiSettingsClient } from '@kbn/core/public';
 import type { TimeRange } from '@kbn/es-query';
 import { TimefilterContract, UI_SETTINGS } from '@kbn/data-plugin/public';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
+import type { MlEntityField } from '@kbn/ml-anomaly-utils';
 import {
   getBoundsRoundedToInterval,
   TimeBuckets,
@@ -23,7 +24,6 @@ import {
 } from '../explorer/explorer_utils';
 import { OVERALL_LABEL, VIEW_BY_JOB_LABEL } from '../explorer/explorer_constants';
 import { MlResultsService } from './results_service';
-import { EntityField } from '../../../common/util/anomaly_utils';
 import { InfluencersFilterQuery } from '../../../common/types/es_client';
 
 /**
@@ -260,7 +260,7 @@ export class AnomalyTimelineService {
     perPage: number,
     fromPage: number,
     bucketInterval: TimeBucketsInterval,
-    selectionInfluencers: EntityField[],
+    selectionInfluencers: MlEntityField[],
     influencersFilterQuery: InfluencersFilterQuery
   ) {
     const selectedJobIds = selectedJobs.map((d) => d.id);
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
index bbc2f366054833..ee74bedb795ac2 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/results.ts
@@ -6,26 +6,33 @@
  */
 
 // Service for obtaining data for the ML Results dashboards.
+
 import { useMemo } from 'react';
 import type { ESSearchRequest, ESSearchResponse } from '@kbn/es-types';
-import { HttpService } from '../http_service';
-import { useMlKibana } from '../../contexts/kibana';
-
-import type { CriteriaField } from '../results_service';
-import { basePath } from '.';
-import { JOB_ID, PARTITION_FIELD_VALUE } from '../../../../common/constants/anomalies';
+import type { MlEntityField } from '@kbn/ml-anomaly-utils';
+
+import {
+  type MlAnomalyRecordDoc,
+  MLAnomalyDoc,
+  ML_JOB_ID,
+  ML_PARTITION_FIELD_VALUE,
+} from '@kbn/ml-anomaly-utils';
 import type {
   GetStoppedPartitionResult,
   GetDatafeedResultsChartDataResult,
 } from '../../../../common/types/results';
 import type { JobId } from '../../../../common/types/anomaly_detection_jobs';
-import type { PartitionFieldsDefinition } from '../results_service/result_service_rx';
 import type { PartitionFieldsConfig } from '../../../../common/types/storage';
-import type { AnomalyRecordDoc, MLAnomalyDoc } from '../../../../common/types/anomalies';
-import type { EntityField } from '../../../../common/util/anomaly_utils';
 import type { InfluencersFilterQuery } from '../../../../common/types/es_client';
 import type { ExplorerChartsData } from '../../../../common/types/results';
 
+import { useMlKibana } from '../../contexts/kibana';
+import type { HttpService } from '../http_service';
+import type { CriteriaField } from '../results_service';
+import type { PartitionFieldsDefinition } from '../results_service/result_service_rx';
+
+import { basePath } from '.';
+
 export interface CategoryDefinition {
   categoryId: number;
   terms: string;
@@ -37,7 +44,7 @@ export const resultsApiProvider = (httpService: HttpService) => ({
   getAnomaliesTableData(
     jobIds: string[],
     criteriaFields: string[],
-    influencers: EntityField[],
+    influencers: MlEntityField[],
     aggregationInterval: string,
     threshold: number,
     earliestMs: number,
@@ -148,7 +155,7 @@ export const resultsApiProvider = (httpService: HttpService) => ({
 
   getCategoryStoppedPartitions(
     jobIds: string[],
-    fieldToBucket?: typeof JOB_ID | typeof PARTITION_FIELD_VALUE
+    fieldToBucket?: typeof ML_JOB_ID | typeof ML_PARTITION_FIELD_VALUE
   ) {
     const body = JSON.stringify({
       jobIds,
@@ -176,7 +183,7 @@ export const resultsApiProvider = (httpService: HttpService) => ({
 
   getAnomalyCharts$(
     jobIds: string[],
-    influencers: EntityField[],
+    influencers: MlEntityField[],
     threshold: number,
     earliestMs: number,
     latestMs: number,
@@ -221,7 +228,7 @@ export const resultsApiProvider = (httpService: HttpService) => ({
       interval,
       functionDescription,
     });
-    return httpService.http$<{ success: boolean; records: AnomalyRecordDoc[] }>({
+    return httpService.http$<{ success: boolean; records: MlAnomalyRecordDoc[] }>({
       path: `${basePath()}/results/anomaly_records`,
       method: 'POST',
       body,
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 c24ae573a95145..08f82be101dcfe 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
@@ -8,7 +8,7 @@
 // Queries Elasticsearch to obtain metric aggregation results.
 // index can be a String, or String[], of index names to search.
 // entityFields parameter must be an array, with each object in the array having 'fieldName'
-//  and 'fieldValue' properties.
+// and 'fieldValue' properties.
 // Extra query object can be supplied, or pass null if no additional query
 // to that built from the supplied entity fields.
 // Returned response contains a results property containing the requested aggregation.
@@ -17,18 +17,21 @@ import { map } from 'rxjs/operators';
 import { each, get } from 'lodash';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
 import type { ErrorType } from '@kbn/ml-error-utils';
+import {
+  aggregationTypeTransform,
+  type MlEntityField,
+  type MlRecordForInfluencer,
+} from '@kbn/ml-anomaly-utils';
 import { Dictionary } from '../../../../common/types/common';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
 import { Datafeed, JobId } from '../../../../common/types/anomaly_detection_jobs';
-import { MlApiServices } from '../ml_api_service';
-import { CriteriaField } from '.';
 import { findAggField } from '../../../../common/util/validation_utils';
 import { getDatafeedAggregations } from '../../../../common/util/datafeed_utils';
-import { aggregationTypeTransform, EntityField } from '../../../../common/util/anomaly_utils';
 import { ES_AGGREGATION } from '../../../../common/constants/aggregation_types';
 import { InfluencersFilterQuery } from '../../../../common/types/es_client';
-import { RecordForInfluencer } from './results_service';
 import { isRuntimeMappings } from '../../../../common';
+import { MlApiServices } from '../ml_api_service';
+import { CriteriaField } from '.';
 
 export interface ResultResponse {
   success: boolean;
@@ -648,14 +651,14 @@ export function resultsServiceRxProvider(mlApiServices: MlApiServices) {
     // Pass an empty array or ['*'] to search over all job IDs.
     getRecordsForInfluencer$(
       jobIds: string[],
-      influencers: EntityField[],
+      influencers: MlEntityField[],
       threshold: number,
       earliestMs: number,
       latestMs: number,
       maxResults: number,
       influencersFilterQuery: InfluencersFilterQuery
-    ): Observable<{ records: RecordForInfluencer[]; success: boolean }> {
-      const obj = { success: true, records: [] as RecordForInfluencer[] };
+    ): Observable<{ records: MlRecordForInfluencer[]; success: boolean }> {
+      const obj = { success: true, records: [] as MlRecordForInfluencer[] };
 
       // Build the criteria to use in the bool filter part of the request.
       // Add criteria for the time range, record score, plus any specified job IDs.
diff --git a/x-pack/plugins/ml/public/application/services/results_service/results_service.d.ts b/x-pack/plugins/ml/public/application/services/results_service/results_service.d.ts
index e18eb309a1987a..97e9e9202d3ddc 100644
--- a/x-pack/plugins/ml/public/application/services/results_service/results_service.d.ts
+++ b/x-pack/plugins/ml/public/application/services/results_service/results_service.d.ts
@@ -5,14 +5,12 @@
  * 2.0.
  */
 
+import type { EntityField } from '@kbn/ml-anomaly-utils';
 import { IndicesOptions } from '../../../../common/types/anomaly_detection_jobs';
-import { MlApiServices } from '../ml_api_service';
-import type { AnomalyRecordDoc } from '../../../../common/types/anomalies';
 import { InfluencersFilterQuery } from '../../../../common/types/es_client';
-import { EntityField } from '../../../../common/util/anomaly_utils';
 import { RuntimeMappings } from '../../../../common/types/fields';
+import { MlApiServices } from '../ml_api_service';
 
-export type RecordForInfluencer = AnomalyRecordDoc;
 export function resultsServiceProvider(mlApiServices: MlApiServices): {
   getScoresByBucket(
     jobIds: string[],
diff --git a/x-pack/plugins/ml/public/application/services/results_service/results_service.js b/x-pack/plugins/ml/public/application/services/results_service/results_service.js
index 11ec3b821c9f46..f7074a3498b75f 100644
--- a/x-pack/plugins/ml/public/application/services/results_service/results_service.js
+++ b/x-pack/plugins/ml/public/application/services/results_service/results_service.js
@@ -15,7 +15,7 @@ import {
   ANOMALY_SWIM_LANE_HARD_LIMIT,
   SWIM_LANE_DEFAULT_PAGE_SIZE,
 } from '../../explorer/explorer_constants';
-import { aggregationTypeTransform } from '../../../../common/util/anomaly_utils';
+import { aggregationTypeTransform } from '@kbn/ml-anomaly-utils';
 
 /**
  * Service for carrying out Elasticsearch queries to obtain data for the Ml Results dashboards.
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_config.tsx b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_config.tsx
index b7892f4797d480..3133a690d34e73 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_config.tsx
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_config.tsx
@@ -21,15 +21,15 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
+import type { MlEntityFieldType } from '@kbn/ml-anomaly-utils';
 import { Entity } from './entity_control';
 import { UiPartitionFieldConfig } from '../series_controls/series_controls';
-import { EntityFieldType } from '../../../../../common/types/anomalies';
 
 interface EntityConfigProps {
   entity: Entity;
   isModelPlotEnabled: boolean;
   config: UiPartitionFieldConfig;
-  onConfigChange: (fieldType: EntityFieldType, config: Partial<UiPartitionFieldConfig>) => void;
+  onConfigChange: (fieldType: MlEntityFieldType, config: Partial<UiPartitionFieldConfig>) => void;
 }
 
 export const EntityConfig: FC<EntityConfigProps> = ({
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx
index e688a8a27de668..c23edfb3941943 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/entity_control/entity_control.tsx
@@ -18,14 +18,13 @@ import {
   EuiHealth,
   EuiHighlight,
 } from '@elastic/eui';
-import { EntityFieldType } from '../../../../../common/types/anomalies';
+import { getSeverityColor, type MlEntityFieldType } from '@kbn/ml-anomaly-utils';
 import { UiPartitionFieldConfig } from '../series_controls/series_controls';
-import { getSeverityColor } from '../../../../../common';
 import { EntityConfig } from './entity_config';
 
 export interface Entity {
   fieldName: string;
-  fieldType: EntityFieldType;
+  fieldType: MlEntityFieldType;
   fieldValue: any;
   fieldValues?: any;
 }
@@ -48,7 +47,7 @@ export interface EntityControlProps {
   isLoading: boolean;
   onSearchChange: (entity: Entity, queryTerm: string) => void;
   config: UiPartitionFieldConfig;
-  onConfigChange: (fieldType: EntityFieldType, config: Partial<UiPartitionFieldConfig>) => void;
+  onConfigChange: (fieldType: MlEntityFieldType, config: Partial<UiPartitionFieldConfig>) => void;
   forceSelection: boolean;
   options: ComboBoxOption[];
   isModelPlotEnabled: boolean;
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx
index 8d79a41b0ab366..23bc2f80eb1a83 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/series_controls/series_controls.tsx
@@ -11,6 +11,7 @@ import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect, EuiSelectProps } from
 import { debounce } from 'lodash';
 import { lastValueFrom } from 'rxjs';
 import { useStorage } from '@kbn/ml-local-storage';
+import type { MlEntityFieldType } from '@kbn/ml-anomaly-utils';
 import { EntityControl } from '../entity_control';
 import { mlJobService } from '../../../services/job_service';
 import { Detector, JobId } from '../../../../../common/types/anomaly_detection_jobs';
@@ -29,7 +30,6 @@ import {
   type MlStorageKey,
   type TMlStorageMapped,
 } from '../../../../../common/types/storage';
-import { EntityFieldType } from '../../../../../common/types/anomalies';
 import { FieldDefinition } from '../../../services/results_service/result_service_rx';
 import { getViewableDetectors } from '../../timeseriesexplorer_utils/get_viewable_detectors';
 import { PlotByFunctionControls } from '../plot_function_controls';
@@ -52,7 +52,7 @@ export type UiPartitionFieldConfig = Exclude<PartitionFieldConfig, undefined>;
  * Provides default fields configuration.
  */
 const getDefaultFieldConfig = (
-  fieldTypes: EntityFieldType[],
+  fieldTypes: MlEntityFieldType[],
   isAnomalousOnly: boolean,
   applyTimeRange: boolean
 ): UiPartitionFieldsConfig => {
@@ -250,7 +250,7 @@ export const SeriesControls: FC<SeriesControlsProps> = ({
         // we need to change it for all the other fields
         for (const c in updatedResultConfig) {
           if (updatedResultConfig.hasOwnProperty(c)) {
-            updatedResultConfig[c as EntityFieldType]!.anomalousOnly =
+            updatedResultConfig[c as MlEntityFieldType]!.anomalousOnly =
               updatedFieldConfig.anomalousOnly;
           }
         }
@@ -261,7 +261,7 @@ export const SeriesControls: FC<SeriesControlsProps> = ({
         // we need to change it for all the other fields
         for (const c in updatedResultConfig) {
           if (updatedResultConfig.hasOwnProperty(c)) {
-            updatedResultConfig[c as EntityFieldType]!.applyTimeRange =
+            updatedResultConfig[c as MlEntityFieldType]!.applyTimeRange =
               updatedFieldConfig.applyTimeRange;
           }
         }
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
index 707511c1f22d4a..4c7af8120a4822 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/components/timeseries_chart/timeseries_chart.js
@@ -18,10 +18,7 @@ import d3 from 'd3';
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 
-import {
-  getFormattedSeverityScore,
-  getSeverityWithLow,
-} from '../../../../../common/util/anomaly_utils';
+import { getFormattedSeverityScore, getSeverityWithLow } from '@kbn/ml-anomaly-utils';
 import { formatValue } from '../../../formatters/format_value';
 import {
   LINE_CHART_ANOMALY_RADIUS,
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseries_search_service.ts b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseries_search_service.ts
index 2f879ded72e029..044d166ca5efa1 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseries_search_service.ts
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseries_search_service.ts
@@ -9,6 +9,7 @@ import { each, find, get, filter } from 'lodash';
 
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import type { MlEntityField } from '@kbn/ml-anomaly-utils';
 import { ml } from '../services/ml_api_service';
 import {
   isModelPlotChartableForDetector,
@@ -19,12 +20,11 @@ import { buildConfigFromDetector } from '../util/chart_config_builder';
 import { mlResultsService } from '../services/results_service';
 import { ModelPlotOutput } from '../services/results_service/result_service_rx';
 import { Job } from '../../../common/types/anomaly_detection_jobs';
-import { EntityField } from '../../../common/util/anomaly_utils';
 
 function getMetricData(
   job: Job,
   detectorIndex: number,
-  entityFields: EntityField[],
+  entityFields: MlEntityField[],
   earliestMs: number,
   latestMs: number,
   intervalMs: number,
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index 0725ce13d4b12f..a73926921fd278 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -82,7 +82,7 @@ import { ANOMALY_DETECTION_DEFAULT_TIME_RANGE } from '../../../common/constants/
 import { getControlsForDetector } from './get_controls_for_detector';
 import { SeriesControls } from './components/series_controls';
 import { TimeSeriesChartWithTooltips } from './components/timeseries_chart/timeseries_chart_with_tooltip';
-import { aggregationTypeTransform } from '../../../common/util/anomaly_utils';
+import { aggregationTypeTransform } from '@kbn/ml-anomaly-utils';
 import { isMetricDetector } from './get_function_description';
 import { getViewableDetectors } from './timeseriesexplorer_utils/get_viewable_detectors';
 import { TimeseriesexplorerChartDataError } from './components/timeseriesexplorer_chart_data_error';
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/get_focus_data.ts b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/get_focus_data.ts
index 7a7837ba714353..a70530f476ba07 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/get_focus_data.ts
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/get_focus_data.ts
@@ -8,6 +8,7 @@
 import { forkJoin, Observable, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { extractErrorMessage } from '@kbn/ml-error-utils';
+import { aggregationTypeTransform } from '@kbn/ml-anomaly-utils';
 import { ml } from '../../services/ml_api_service';
 import { ANNOTATIONS_TABLE_DEFAULT_QUERY_SIZE } from '../../../../common/constants/search';
 import { mlTimeSeriesSearchService } from '../timeseries_search_service';
@@ -23,7 +24,6 @@ import {
 import { mlForecastService } from '../../services/forecast_service';
 import { mlFunctionToESAggregation } from '../../../../common/util/job_utils';
 import { GetAnnotationsResponse } from '../../../../common/types/annotations';
-import { aggregationTypeTransform } from '../../../../common/util/anomaly_utils';
 
 export interface Interval {
   asMilliseconds: () => number;
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.js
index e18ee2fa98b75a..a0b20888939aa5 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_utils/timeseriesexplorer_utils.js
@@ -14,14 +14,14 @@
 import { each, get, find } from 'lodash';
 import moment from 'moment-timezone';
 
-import { isMultiBucketAnomaly } from '../../../../common/util/anomaly_utils';
+import { isMultiBucketAnomaly } from '@kbn/ml-anomaly-utils';
+
 import { isTimeSeriesViewJob } from '../../../../common/util/job_utils';
 import { parseInterval } from '../../../../common/util/parse_interval';
+import { ML_JOB_AGGREGATION } from '../../../../common/constants/aggregation_types';
 
 import { getBoundsRoundedToInterval, getTimeBucketsFromCache } from '../../util/time_buckets';
-
 import { CHARTS_POINT_TARGET, TIME_FIELD_NAME } from '../timeseriesexplorer_constants';
-import { ML_JOB_AGGREGATION } from '../../../../common/constants/aggregation_types';
 
 // create new job objects based on standard job config objects
 // new job objects just contain job id, bucket span in seconds and a selected flag.
diff --git a/x-pack/plugins/ml/public/application/util/chart_utils.js b/x-pack/plugins/ml/public/application/util/chart_utils.js
index ab842fe6f688d8..19b53177d68680 100644
--- a/x-pack/plugins/ml/public/application/util/chart_utils.js
+++ b/x-pack/plugins/ml/public/application/util/chart_utils.js
@@ -6,8 +6,8 @@
  */
 
 import d3 from 'd3';
+import { getAnomalyScoreExplanationImpactValue } from '@kbn/ml-anomaly-utils';
 import { calculateTextWidth } from './string_utils';
-import { getAnomalyScoreExplanationImpactValue } from '../../../common/util/anomaly_utils';
 import moment from 'moment';
 import { CHART_TYPE } from '../explorer/explorer_constants';
 import { ML_PAGES } from '../../../common/constants/locator';
diff --git a/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts b/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts
index 03524f5be3063b..359aaf1ce60743 100644
--- a/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/util/custom_url_utils.test.ts
@@ -5,6 +5,13 @@
  * 2.0.
  */
 
+import type {
+  MlAnomalyRecordDoc,
+  MlCustomUrlAnomalyRecordDoc,
+  MlKibanaUrlConfig,
+  MlUrlConfig,
+} from '@kbn/ml-anomaly-utils';
+
 import {
   replaceTokensInUrlValue,
   getUrlForRecord,
@@ -13,15 +20,9 @@ import {
   openCustomUrlWindow,
   getQueryField,
 } from './custom_url_utils';
-import { AnomalyRecordDoc } from '../../../common/types/anomalies';
-import {
-  CustomUrlAnomalyRecordDoc,
-  KibanaUrlConfig,
-  UrlConfig,
-} from '../../../common/types/custom_urls';
 
 describe('ML - custom URL utils', () => {
-  const TEST_DOC: AnomalyRecordDoc = {
+  const TEST_DOC: MlAnomalyRecordDoc = {
     job_id: 'farequote',
     result_type: 'record',
     probability: 6.533287347648861e-45,
@@ -47,7 +48,7 @@ describe('ML - custom URL utils', () => {
     airline: ['AAL'],
   };
 
-  const TEST_RECORD: CustomUrlAnomalyRecordDoc = {
+  const TEST_RECORD: MlCustomUrlAnomalyRecordDoc = {
     ...TEST_DOC,
     earliest: '2017-02-09T15:10:00.000Z',
     latest: '2017-02-09T17:15:00.000Z',
@@ -72,7 +73,7 @@ describe('ML - custom URL utils', () => {
     'odd:field,name': [">:&12<'"],
   };
 
-  const TEST_RECORD_MULTIPLE_INFLUENCER_VALUES: CustomUrlAnomalyRecordDoc = {
+  const TEST_RECORD_MULTIPLE_INFLUENCER_VALUES: MlCustomUrlAnomalyRecordDoc = {
     ...TEST_RECORD,
     influencers: [
       {
@@ -83,7 +84,7 @@ describe('ML - custom URL utils', () => {
     airline: ['AAL', 'AWE'],
   };
 
-  const TEST_RECORD_NO_INFLUENCER_VALUES: CustomUrlAnomalyRecordDoc = {
+  const TEST_RECORD_NO_INFLUENCER_VALUES: MlCustomUrlAnomalyRecordDoc = {
     ...TEST_RECORD,
     influencers: [
       {
@@ -94,33 +95,33 @@ describe('ML - custom URL utils', () => {
     airline: null,
   };
 
-  const TEST_DASHBOARD_URL: KibanaUrlConfig = {
+  const TEST_DASHBOARD_URL: MlKibanaUrlConfig = {
     url_name: 'Show dashboard',
     time_range: '1h',
     url_value:
       "dashboards#/view/5f112420-9fc6-11e8-9130-150552a4bef3?_g=(time:(from:'$earliest$',mode:absolute,to:'$latest$'))&_a=(filters:!(),query:(language:kuery,query:'airline:\"$airline$\"'))",
   };
 
-  const TEST_DISCOVER_URL: KibanaUrlConfig = {
+  const TEST_DISCOVER_URL: MlKibanaUrlConfig = {
     url_name: 'Raw data',
     time_range: 'auto',
     url_value:
       "discover#/?_g=(time:(from:'$earliest$',mode:absolute,to:'$latest$'))&_a=(index:bf6e5860-9404-11e8-8d4c-593f69c47267,query:(language:kuery,query:'airline:\"$airline$\" and odd:field,name : $odd:field,name$'))",
   };
 
-  const TEST_DASHBOARD_LUCENE_URL: KibanaUrlConfig = {
+  const TEST_DASHBOARD_LUCENE_URL: MlKibanaUrlConfig = {
     url_name: 'Show dashboard',
     time_range: '1h',
     url_value:
       "dashboards#/view/5f112420-9fc6-11e8-9130-150552a4bef3?_g=(time:(from:'$earliest$',mode:absolute,to:'$latest$'))&_a=(filters:!(),query:(language:lucene,query:'airline:\"$airline$\"'))",
   };
 
-  const TEST_OTHER_URL: UrlConfig = {
+  const TEST_OTHER_URL: MlUrlConfig = {
     url_name: 'Show airline',
     url_value: 'http://airlinecodes.info/airline-code-$airline$',
   };
 
-  const TEST_OTHER_URL_NO_TOKENS: UrlConfig = {
+  const TEST_OTHER_URL_NO_TOKENS: MlUrlConfig = {
     url_name: 'Show docs',
     url_value: 'https://www.elastic.co/guide/index.html',
   };
@@ -198,11 +199,11 @@ describe('ML - custom URL utils', () => {
     });
 
     test('replaces tokens outside of a query', () => {
-      const TEST_DOC_WITH_METHOD: AnomalyRecordDoc = {
+      const TEST_DOC_WITH_METHOD: MlAnomalyRecordDoc = {
         ...TEST_DOC,
         method: ['POST'],
       };
-      const TEST_MULTIPLE_NON_QUERY_TOKENS: UrlConfig = {
+      const TEST_MULTIPLE_NON_QUERY_TOKENS: MlUrlConfig = {
         url_name: 'no_query',
         url_value: `dashboards#/view/b3ad9930-db86-11e9-b5d5-e3a9ca224c61?_g=(filters:!(),time:(from:'2018-12-17T00:00:00.000Z',mode:absolute,to:'2018-12-17T09:00:00.000Z'))&_a=(description:'',filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'7e06e310-dae4-11e9-8260-995f99197467',key:method,negate:!f,params:(query:$method$),type:phrase,value:$method$),query:(match:(method:(query:$method$,type:phrase))))))`,
       };
@@ -219,7 +220,7 @@ describe('ML - custom URL utils', () => {
     });
 
     test('truncates long queries', () => {
-      const TEST_DOC_WITH_METHOD: AnomalyRecordDoc = {
+      const TEST_DOC_WITH_METHOD: MlAnomalyRecordDoc = {
         ...TEST_DOC,
         influencers: [
           {
@@ -240,7 +241,7 @@ describe('ML - custom URL utils', () => {
         referer: ['http://www.example.com/wp-admin/post.php?post=51&action=edit'],
         method: 'POST',
       };
-      const TEST_MULTIPLE_NON_QUERY_TOKENS: UrlConfig = {
+      const TEST_MULTIPLE_NON_QUERY_TOKENS: MlUrlConfig = {
         url_name: 'massive_url',
         url_value: `discover#/11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61-b3ad9930-db86-11e9-b5d5-e3a9ca224c61?_g=(filters:!(),time:(from:'$earliest$',mode:absolute,to:'$latest$'))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'7e06e310-dae4-11e9-8260-995f99197467',key:method,negate:!f,params:(query:$method$),type:phrase,value:$method$),query:(match:(method:(query:$method$,type:phrase))))),index:'7e06e310-dae4-11e9-8260-995f99197467',interval:auto,query:(language:kuery,query:'clientip:$clientip$ and action:$action$ and referer:$referer$'),sort:!(!('@timestamp',desc)))`,
       };
@@ -323,7 +324,7 @@ describe('ML - custom URL utils', () => {
     });
 
     test('replaces tokens with nesting', () => {
-      const testUrlApache: KibanaUrlConfig = {
+      const testUrlApache: MlKibanaUrlConfig = {
         url_name: 'Raw data',
         time_range: 'auto',
         url_value:
@@ -360,7 +361,7 @@ describe('ML - custom URL utils', () => {
     });
 
     test('does not escape special characters for Lucene query language inside of the filter', () => {
-      const testUrlLuceneFilters: KibanaUrlConfig = {
+      const testUrlLuceneFilters: MlKibanaUrlConfig = {
         url_name: 'Lucene query with filters',
         time_range: 'auto',
         url_value:
@@ -588,7 +589,7 @@ describe('ML - custom URL utils', () => {
     });
 
     test('returns expected URL with preserving custom filter', () => {
-      const urlWithCustomFilter: UrlConfig = {
+      const urlWithCustomFilter: MlUrlConfig = {
         url_name: 'URL with a custom filter',
         url_value: `discover#/?_g=(time:(from:'$earliest$',mode:absolute,to:'$latest$'))&_a=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,key:subSystem.keyword,negate:!f,params:(query:JDBC),type:phrase),query:(match_phrase:(subSystem.keyword:JDBC)))),index:'eap_wls_server_12c*,*:eap_wls_server_12c*',query:(language:kuery,query:'wlscluster.keyword:"$wlscluster.keyword$"'))`,
       };
diff --git a/x-pack/plugins/ml/public/application/util/custom_url_utils.ts b/x-pack/plugins/ml/public/application/util/custom_url_utils.ts
index 11c5ee32b499ca..c754472fd33e10 100644
--- a/x-pack/plugins/ml/public/application/util/custom_url_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/custom_url_utils.ts
@@ -11,14 +11,14 @@ import { get, flow } from 'lodash';
 import moment from 'moment';
 import rison, { type RisonValue } from '@kbn/rison';
 import { TimeRange } from '@kbn/es-query';
+import type {
+  MlAnomalyRecordDoc,
+  MlUrlConfig,
+  MlKibanaUrlConfig,
+  MlCustomUrlAnomalyRecordDoc,
+} from '@kbn/ml-anomaly-utils';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { escapeForElasticsearchQuery, replaceStringTokens } from './string_utils';
-import {
-  UrlConfig,
-  KibanaUrlConfig,
-  CustomUrlAnomalyRecordDoc,
-} from '../../../common/types/custom_urls';
-import { AnomalyRecordDoc } from '../../../common/types/anomalies';
 import type { DataGridItem } from '../components/data_grid';
 
 // Value of custom_url time_range property indicating drilldown time range is calculated automatically
@@ -28,7 +28,7 @@ const TIME_RANGE_AUTO = 'auto';
 // Replaces the $ delimited tokens in the url_value of the custom URL configuration
 // with values from the supplied document.
 export function replaceTokensInDFAUrlValue(
-  customUrlConfig: UrlConfig | KibanaUrlConfig,
+  customUrlConfig: MlUrlConfig | MlKibanaUrlConfig,
   doc: DataGridItem,
   timeRange?: TimeRange
 ) {
@@ -49,9 +49,9 @@ export function replaceTokensInDFAUrlValue(
 // Replaces the $ delimited tokens in the url_value of the custom URL configuration
 // with values from the supplied document.
 export function replaceTokensInUrlValue(
-  customUrlConfig: UrlConfig | KibanaUrlConfig,
+  customUrlConfig: MlUrlConfig | MlKibanaUrlConfig,
   jobBucketSpanSecs: number,
-  doc: AnomalyRecordDoc | Record<string, unknown>,
+  doc: MlAnomalyRecordDoc | Record<string, unknown>,
   timeFieldName: 'timestamp' | string
 ) {
   // If urlValue contains $earliest$ and $latest$ tokens, add in times to the test doc.
@@ -61,7 +61,7 @@ export function replaceTokensInUrlValue(
     'time_range' in customUrlConfig && customUrlConfig.time_range
       ? parseInterval(customUrlConfig.time_range)
       : null;
-  const record = { ...doc } as CustomUrlAnomalyRecordDoc;
+  const record = { ...doc } as MlCustomUrlAnomalyRecordDoc;
   if (urlValue.includes('$earliest$')) {
     const earliestMoment = moment(timestamp);
     if (timeRangeInterval !== null) {
@@ -88,8 +88,8 @@ export function replaceTokensInUrlValue(
 // Returns the URL to open from the supplied config, with any dollar delimited tokens
 // substituted from the supplied anomaly record.
 export function getUrlForRecord(
-  urlConfig: UrlConfig | KibanaUrlConfig,
-  record: CustomUrlAnomalyRecordDoc | DataGridItem
+  urlConfig: MlUrlConfig | MlKibanaUrlConfig,
+  record: MlCustomUrlAnomalyRecordDoc | DataGridItem
 ) {
   if (isKibanaUrl(urlConfig) === true) {
     return buildKibanaUrl(urlConfig, record);
@@ -104,7 +104,7 @@ export function getUrlForRecord(
 // object which indicates whether it is opening a Kibana page running on the same server.
 // `url` is the URL with any dollar delimited tokens from the urlConfig
 // having been substituted with values from an anomaly record.
-export function openCustomUrlWindow(url: string, urlConfig: UrlConfig, basePath: string) {
+export function openCustomUrlWindow(url: string, urlConfig: MlUrlConfig, basePath: string) {
   // Run through a regex to test whether the url_value starts with a protocol scheme.
   if (/^(?:[a-z]+:)?\/\//i.test(urlConfig.url_value) === false) {
     // If `url` is a relative path, we need to prefix the base path.
@@ -132,7 +132,7 @@ export function openCustomUrlWindow(url: string, urlConfig: UrlConfig, basePath:
 // recognize modules or with custom UI in the custom URL builder we'd
 // need to add the solution here. Manually created custom URLs for other
 // solution pages need to be prefixed with `app/` in the custom URL builder.
-function isKibanaUrl(urlConfig: UrlConfig) {
+function isKibanaUrl(urlConfig: MlUrlConfig) {
   const urlValue = urlConfig.url_value;
   return (
     // HashRouter based plugins
@@ -196,7 +196,7 @@ export const getQueryField = (str: string): string => {
   return fieldName;
 };
 const getQueryStringResultProvider =
-  (record: CustomUrlAnomalyRecordDoc | DataGridItem, getResultTokenValue: GetResultTokenValue) =>
+  (record: MlCustomUrlAnomalyRecordDoc | DataGridItem, getResultTokenValue: GetResultTokenValue) =>
   (resultPrefix: string, queryString: string, resultPostfix: string, isKuery: boolean): string => {
     const URL_LENGTH_LIMIT = 2000;
 
@@ -255,7 +255,10 @@ const getQueryStringResultProvider =
  * Builds a Kibana dashboard or Discover URL from the supplied config, with any
  * dollar delimited tokens substituted from the supplied anomaly record.
  */
-function buildKibanaUrl(urlConfig: UrlConfig, record: CustomUrlAnomalyRecordDoc | DataGridItem) {
+function buildKibanaUrl(
+  urlConfig: MlUrlConfig,
+  record: MlCustomUrlAnomalyRecordDoc | DataGridItem
+) {
   const urlValue = urlConfig.url_value;
 
   const isLuceneQueryLanguage = urlValue.includes('language:lucene');
diff --git a/x-pack/plugins/ml/public/application/util/string_utils.test.ts b/x-pack/plugins/ml/public/application/util/string_utils.test.ts
index 6547466231b300..94463e38f9611a 100644
--- a/x-pack/plugins/ml/public/application/util/string_utils.test.ts
+++ b/x-pack/plugins/ml/public/application/util/string_utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CustomUrlAnomalyRecordDoc } from '../../../common/types/custom_urls';
+import type { MlCustomUrlAnomalyRecordDoc } from '@kbn/ml-anomaly-utils';
 import { Detector } from '../../../common/types/anomaly_detection_jobs';
 
 import {
@@ -18,7 +18,7 @@ import {
 
 describe('ML - string utils', () => {
   describe('replaceStringTokens', () => {
-    const testRecord: CustomUrlAnomalyRecordDoc = {
+    const testRecord: MlCustomUrlAnomalyRecordDoc = {
       job_id: 'test_job',
       result_type: 'record',
       probability: 0.0191711,
diff --git a/x-pack/plugins/ml/public/application/util/string_utils.ts b/x-pack/plugins/ml/public/application/util/string_utils.ts
index a44aac08f81d18..f4a73ee200e7c1 100644
--- a/x-pack/plugins/ml/public/application/util/string_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/string_utils.ts
@@ -13,7 +13,7 @@ import he from 'he';
 
 import { escapeKuery } from '@kbn/es-query';
 import { isDefined } from '@kbn/ml-is-defined';
-import { CustomUrlAnomalyRecordDoc } from '../../../common/types/custom_urls';
+import type { MlCustomUrlAnomalyRecordDoc } from '@kbn/ml-anomaly-utils';
 import type { DataGridItem } from '../components/data_grid';
 import { Detector } from '../../../common/types/anomaly_detection_jobs';
 
@@ -26,7 +26,7 @@ import { Detector } from '../../../common/types/anomaly_detection_jobs';
 // If a corresponding key is not found in valuesByTokenName, then the String is not replaced.
 export function replaceStringTokens(
   str: string,
-  valuesByTokenName: CustomUrlAnomalyRecordDoc | DataGridItem,
+  valuesByTokenName: MlCustomUrlAnomalyRecordDoc | DataGridItem,
   encodeForURI: boolean
 ) {
   return String(str).replace(/\$([^?&$\'"]+)\$/g, (match, name) => {
diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
index 98f211e3fc8df9..dd83c4fbbf3391 100644
--- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
+++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/embeddable_anomaly_charts_container.tsx
@@ -12,6 +12,11 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import { throttle } from 'lodash';
 import { UI_SETTINGS } from '@kbn/data-plugin/common';
 import useObservable from 'react-use/lib/useObservable';
+import {
+  type MlEntityField,
+  type MlEntityFieldOperation,
+  ML_ANOMALY_THRESHOLD,
+} from '@kbn/ml-anomaly-utils';
 import { useEmbeddableExecutionContext } from '../common/use_embeddable_execution_context';
 import { useAnomalyChartsInputResolver } from './use_anomaly_charts_input_resolver';
 import type { IAnomalyChartsEmbeddable } from './anomaly_charts_embeddable';
@@ -20,12 +25,10 @@ import type {
   AnomalyChartsEmbeddableOutput,
   AnomalyChartsEmbeddableServices,
 } from '..';
-import type { EntityField, EntityFieldOperation } from '../../../common/util/anomaly_utils';
 
 import { ExplorerAnomaliesContainer } from '../../application/explorer/explorer_charts/explorer_anomalies_container';
 import { ML_APP_LOCATOR } from '../../../common/constants/locator';
 import { optionValueToThreshold } from '../../application/components/controls/select_severity/select_severity';
-import { ANOMALY_THRESHOLD } from '../../../common';
 import { TimeBuckets } from '../../application/util/time_buckets';
 import { EXPLORER_ENTITY_FIELD_SELECTION_TRIGGER } from '../../ui_actions/triggers';
 import { MlLocatorParams } from '../../../common/types/locator';
@@ -68,10 +71,10 @@ export const EmbeddableAnomalyChartsContainer: FC<EmbeddableAnomalyChartsContain
   const [chartWidth, setChartWidth] = useState<number>(0);
   const [severity, setSeverity] = useState(
     optionValueToThreshold(
-      embeddableContext.getInput().severityThreshold ?? ANOMALY_THRESHOLD.WARNING
+      embeddableContext.getInput().severityThreshold ?? ML_ANOMALY_THRESHOLD.WARNING
     )
   );
-  const [selectedEntities, setSelectedEntities] = useState<EntityField[] | undefined>();
+  const [selectedEntities, setSelectedEntities] = useState<MlEntityField[] | undefined>();
   const [{ uiSettings }, { data: dataServices, share, uiActions, charts: chartsService }] =
     services;
   const { timefilter } = dataServices.query.timefilter;
@@ -162,9 +165,9 @@ export const EmbeddableAnomalyChartsContainer: FC<EmbeddableAnomalyChartsContain
   const addEntityFieldFilter = (
     fieldName: string,
     fieldValue: string,
-    operation: EntityFieldOperation
+    operation: MlEntityFieldOperation
   ) => {
-    const entity: EntityField = {
+    const entity: MlEntityField = {
       fieldName,
       fieldValue,
       operation,
diff --git a/x-pack/plugins/ml/public/embeddables/types.ts b/x-pack/plugins/ml/public/embeddables/types.ts
index 69a90ac5ef1383..74a2e042a9898e 100644
--- a/x-pack/plugins/ml/public/embeddables/types.ts
+++ b/x-pack/plugins/ml/public/embeddables/types.ts
@@ -11,6 +11,7 @@ import type { RefreshInterval } from '@kbn/data-plugin/common';
 import type { EmbeddableInput, EmbeddableOutput, IEmbeddable } from '@kbn/embeddable-plugin/public';
 import type { DataView } from '@kbn/data-views-plugin/common';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
+import type { MlEntityField } from '@kbn/ml-anomaly-utils';
 import type { JobId } from '../../common/types/anomaly_detection_jobs';
 import type { SwimlaneType } from '../application/explorer/explorer_constants';
 import type { AnomalyDetectorService } from '../application/services/anomaly_detector_service';
@@ -18,7 +19,6 @@ import type { AnomalyTimelineService } from '../application/services/anomaly_tim
 import type { MlDependencies } from '../application/app';
 import type { AppStateSelectedCells } from '../application/explorer/explorer_utils';
 import { AnomalyExplorerChartsService } from '../application/services/anomaly_explorer_charts_service';
-import { EntityField } from '../../common/util/anomaly_utils';
 import {
   ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE,
   ANOMALY_SWIMLANE_EMBEDDABLE_TYPE,
@@ -107,7 +107,7 @@ export interface AnomalyChartsServices {
 
 export type AnomalyChartsEmbeddableServices = [CoreStart, MlDependencies, AnomalyChartsServices];
 export interface AnomalyChartsCustomOutput {
-  entityFields?: EntityField[];
+  entityFields?: MlEntityField[];
   severity?: number;
   indexPatterns?: DataView[];
 }
@@ -119,7 +119,7 @@ export interface AnomalyChartsFieldSelectionContext extends EditAnomalyChartsPan
   /**
    * Optional fields selected using anomaly charts
    */
-  data?: EntityField[];
+  data?: MlEntityField[];
 }
 export function isAnomalyExplorerEmbeddable(
   arg: unknown
diff --git a/x-pack/plugins/ml/public/index.ts b/x-pack/plugins/ml/public/index.ts
index ed99376a51c915..770a268442ba07 100755
--- a/x-pack/plugins/ml/public/index.ts
+++ b/x-pack/plugins/ml/public/index.ts
@@ -27,9 +27,7 @@ export const plugin: PluginInitializer<
 
 export type { MlPluginSetup, MlPluginStart };
 export type {
-  AnomaliesTableRecord,
   DataRecognizerConfigResponse,
-  Influencer,
   JobExistResult,
   JobStat,
   MlCapabilitiesResponse,
@@ -44,16 +42,8 @@ export type { AnomalySwimlaneEmbeddableInput } from './embeddables';
 export { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE } from './embeddables/constants';
 export { CONTROLLED_BY_SWIM_LANE_FILTER } from './ui_actions/constants';
 
-// Static exports
-export {
-  getSeverityColor,
-  getSeverityType,
-  getFormattedSeverityScore,
-  getSeverity,
-} from '../common/util/anomaly_utils';
 export { ES_CLIENT_TOTAL_HITS_RELATION } from '../common/types/es_client';
 
-export { ANOMALY_SEVERITY } from '../common';
 export type { MlLocator } from './locator';
 export { useMlHref, ML_PAGES, MlLocatorDefinition } from './locator';
 
diff --git a/x-pack/plugins/ml/public/maps/util.ts b/x-pack/plugins/ml/public/maps/util.ts
index 00a1d75295409f..c070d352ab99e9 100644
--- a/x-pack/plugins/ml/public/maps/util.ts
+++ b/x-pack/plugins/ml/public/maps/util.ts
@@ -18,10 +18,9 @@ import { fromKueryExpression, luceneStringToDsl, toElasticsearchQuery } from '@k
 import type { ESSearchResponse } from '@kbn/es-types';
 import { VectorSourceRequestMeta } from '@kbn/maps-plugin/common';
 import { LAYER_TYPE, SOURCE_TYPES, SCALING_TYPES } from '@kbn/maps-plugin/common';
-import { SEVERITY_COLOR_RAMP } from '../../common';
+import { type MLAnomalyDoc, ML_SEVERITY_COLOR_RAMP } from '@kbn/ml-anomaly-utils';
 import { formatHumanReadableDateTimeSeconds } from '../../common/util/date_utils';
 import type { MlApiServices } from '../application/services/ml_api_service';
-import { MLAnomalyDoc } from '../../common/types/anomalies';
 import { SEARCH_QUERY_LANGUAGE } from '../../common/constants/search';
 import { tabColor } from '../../common/util/group_color_utils';
 import { getIndexPattern } from '../application/explorer/reducers/explorer_reducer/get_index_pattern';
@@ -37,7 +36,7 @@ export const ML_ANOMALY_LAYERS = {
 export const CUSTOM_COLOR_RAMP = {
   type: STYLE_TYPE.DYNAMIC,
   options: {
-    customColorRamp: SEVERITY_COLOR_RAMP,
+    customColorRamp: ML_SEVERITY_COLOR_RAMP,
     field: {
       name: 'record_score',
       origin: FIELD_ORIGIN.SOURCE,
diff --git a/x-pack/plugins/ml/public/shared.ts b/x-pack/plugins/ml/public/shared.ts
index 1d19fee5c8392c..0a1db5660237a3 100644
--- a/x-pack/plugins/ml/public/shared.ts
+++ b/x-pack/plugins/ml/public/shared.ts
@@ -5,16 +5,12 @@
  * 2.0.
  */
 
-export * from '../common/constants/anomalies';
-
 export * from '../common/types/data_recognizer';
 export * from '../common/types/capabilities';
-export * from '../common/types/anomalies';
 export * from '../common/types/anomaly_detection_jobs';
 export * from '../common/types/modules';
 export * from '../common/types/audit_message';
 
-export * from '../common/util/anomaly_utils';
 export * from '../common/util/validators';
 export * from '../common/util/date_utils';
 
diff --git a/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx b/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
index ec823fd13ea468..6ee0ad3fbdb70e 100644
--- a/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/apply_entity_filters_action.tsx
@@ -8,13 +8,13 @@
 import { Filter, FilterStateStore } from '@kbn/es-query';
 import { i18n } from '@kbn/i18n';
 import type { UiActionsActionDefinition } from '@kbn/ui-actions-plugin/public';
+import { ML_ENTITY_FIELD_OPERATIONS } from '@kbn/ml-anomaly-utils';
 import { MlCoreSetup } from '../plugin';
 import {
   ANOMALY_EXPLORER_CHARTS_EMBEDDABLE_TYPE,
   AnomalyChartsFieldSelectionContext,
 } from '../embeddables';
 import { CONTROLLED_BY_ANOMALY_CHARTS_FILTER } from './constants';
-import { ENTITY_FIELD_OPERATIONS } from '../../common/util/anomaly_utils';
 
 export const APPLY_ENTITY_FIELD_FILTERS_ACTION = 'applyEntityFieldFiltersAction';
 
@@ -41,7 +41,7 @@ export function createApplyEntityFieldFiltersAction(
 
       filterManager.addFilters(
         data
-          .filter((d) => d.operation === ENTITY_FIELD_OPERATIONS.ADD)
+          .filter((d) => d.operation === ML_ENTITY_FIELD_OPERATIONS.ADD)
           .map<Filter>(({ fieldName, fieldValue }) => {
             return {
               $state: {
@@ -73,7 +73,7 @@ export function createApplyEntityFieldFiltersAction(
       );
 
       data
-        .filter((field) => field.operation === ENTITY_FIELD_OPERATIONS.REMOVE)
+        .filter((field) => field.operation === ML_ENTITY_FIELD_OPERATIONS.REMOVE)
         .forEach((field) => {
           const filter = filterManager
             .getFilters()
diff --git a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
index b4a21ad621b4b2..ad7af5f05a75a3 100644
--- a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
@@ -8,6 +8,7 @@
 import { i18n } from '@kbn/i18n';
 import { SerializableRecord } from '@kbn/utility-types';
 import type { UiActionsActionDefinition } from '@kbn/ui-actions-plugin/public';
+import { ML_ENTITY_FIELD_OPERATIONS } from '@kbn/ml-anomaly-utils';
 import { MlCoreSetup } from '../plugin';
 import { ML_APP_LOCATOR } from '../../common/constants/locator';
 import {
@@ -18,7 +19,6 @@ import {
   isSwimLaneEmbeddable,
   SwimLaneDrilldownContext,
 } from '../embeddables';
-import { ENTITY_FIELD_OPERATIONS } from '../../common/util/anomaly_utils';
 import { ExplorerAppState } from '../../common/types/locator';
 
 export const OPEN_IN_ANOMALY_EXPLORER_ACTION = 'openInAnomalyExplorerAction';
@@ -76,7 +76,7 @@ export function createOpenInExplorerAction(
         if (
           Array.isArray(entityFields) &&
           entityFields.length === 1 &&
-          entityFields[0].operation === ENTITY_FIELD_OPERATIONS.ADD
+          entityFields[0].operation === ML_ENTITY_FIELD_OPERATIONS.ADD
         ) {
           const { fieldName, fieldValue } = entityFields[0];
           if (fieldName !== undefined && fieldValue !== undefined) {
diff --git a/x-pack/plugins/ml/readme.md b/x-pack/plugins/ml/readme.md
index c4b88780f6659f..72739cc79fffec 100644
--- a/x-pack/plugins/ml/readme.md
+++ b/x-pack/plugins/ml/readme.md
@@ -129,7 +129,7 @@ With PATH_TO_CONFIG and other options as follows.
     The `short tests` group contains tests for page navigation, model management,
     feature controls, settings and notifications. Test files for each group are located
     in the directory of their configuration file.
-  
+
 1.  Functional UI tests with `Basic` license:
 
     Group | PATH_TO_CONFIG
@@ -165,8 +165,11 @@ and Kibana instance that the tests will be run against.
 
 The generated screenshots are stored in `x-pack/test/functional/screenshots/session/ml_docs`.
 ML screenshot generation tests are located in `x-pack/test/screenshot_creation/apps/ml_docs`.
+
 ## Shared functions
 
+Note: We are in the process of moving shared code to packages, for example `@kbn/ml-anomaly-utils`. We'll update the docs accordingly once this work is done.
+
 You can find the ML shared functions in the following files in GitHub:
 
 ```
@@ -186,7 +189,7 @@ import { MlPluginSetup } from '../../../../ml/server';
 or
 
 ```
-import { ANOMALY_SEVERITY } from '../../ml/common';
+import { ML_ANOMALY_SEVERITY } from '../../ml/common';
 ```
 
 Functions are shared from the following directories:
diff --git a/x-pack/plugins/ml/server/index.ts b/x-pack/plugins/ml/server/index.ts
index 571612f1a4af9c..9f46005dd5068d 100644
--- a/x-pack/plugins/ml/server/index.ts
+++ b/x-pack/plugins/ml/server/index.ts
@@ -9,9 +9,6 @@ import { PluginInitializerContext } from '@kbn/core/server';
 import { MlServerPlugin } from './plugin';
 export type { MlPluginSetup, MlPluginStart } from './plugin';
 export type {
-  AnomalyRecordDoc as MlAnomalyRecordDoc,
-  AnomaliesTableRecord as MlAnomaliesTableRecord,
-  AnomalyResultType as MlAnomalyResultType,
   DatafeedStats as MlDatafeedStats,
   Job as MlJob,
   MlSummaryJob,
diff --git a/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts b/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
index 36182956b73883..84241f58d04dca 100644
--- a/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
@@ -16,13 +16,18 @@ import {
   SerializedFieldFormat,
 } from '@kbn/field-formats-plugin/common';
 import { isDefined } from '@kbn/ml-is-defined';
+import {
+  getEntityFieldName,
+  getEntityFieldValue,
+  type MlAnomalyRecordDoc,
+  type MlAnomalyResultType,
+  ML_ANOMALY_RESULT_TYPE,
+} from '@kbn/ml-anomaly-utils';
 import { MlClient } from '../ml_client';
 import {
   MlAnomalyDetectionAlertParams,
   MlAnomalyDetectionAlertPreviewRequest,
 } from '../../routes/schemas/alerting_schema';
-import { ANOMALY_RESULT_TYPE } from '../../../common/constants/anomalies';
-import { AnomalyRecordDoc, AnomalyResultType } from '../../../common/types/anomalies';
 import {
   AlertExecutionResult,
   InfluencerAnomalyAlertDoc,
@@ -35,7 +40,6 @@ import { AnomalyDetectionAlertContext } from './register_anomaly_detection_alert
 import { resolveMaxTimeInterval } from '../../../common/util/job_utils';
 import { getTopNBuckets, resolveLookbackInterval } from '../../../common/util/alerts';
 import type { DatafeedsService } from '../../models/job_service/datafeeds';
-import { getEntityFieldName, getEntityFieldValue } from '../../../common/util/anomaly_utils';
 import { FieldFormatsRegistryProvider } from '../../../common/types/kibana';
 import type { AwaitReturnType } from '../../../common/types/common';
 import { getTypicalAndActualValues } from '../../models/results_service/results_service';
@@ -52,7 +56,7 @@ type AggResultsResponse = { key?: number } & {
 };
 
 interface AnomalyESQueryParams {
-  resultType: AnomalyResultType;
+  resultType: MlAnomalyResultType;
   /** Appropriate score field for requested result type. */
   anomalyScoreField: string;
   anomalyScoreThreshold: number;
@@ -73,10 +77,10 @@ const TIME_RANGE_PADDING = 10;
 export function buildExplorerUrl(
   jobIds: string[],
   timeRange: { from: string; to: string; mode?: string },
-  type: AnomalyResultType,
+  type: MlAnomalyResultType,
   r?: AlertExecutionResult
 ): string {
-  const isInfluencerResult = type === ANOMALY_RESULT_TYPE.INFLUENCER;
+  const isInfluencerResult = type === ML_ANOMALY_RESULT_TYPE.INFLUENCER;
 
   /**
    * Disabled until Anomaly Explorer page is fixed and properly
@@ -150,9 +154,9 @@ export function buildExplorerUrl(
  * Mapping for result types and corresponding score fields.
  */
 const resultTypeScoreMapping = {
-  [ANOMALY_RESULT_TYPE.BUCKET]: 'anomaly_score',
-  [ANOMALY_RESULT_TYPE.RECORD]: 'record_score',
-  [ANOMALY_RESULT_TYPE.INFLUENCER]: 'influencer_score',
+  [ML_ANOMALY_RESULT_TYPE.BUCKET]: 'anomaly_score',
+  [ML_ANOMALY_RESULT_TYPE.RECORD]: 'record_score',
+  [ML_ANOMALY_RESULT_TYPE.INFLUENCER]: 'influencer_score',
 };
 
 /**
@@ -212,7 +216,7 @@ export function alertingServiceProvider(
     }
   );
 
-  const getAggResultsLabel = (resultType: AnomalyResultType) => {
+  const getAggResultsLabel = (resultType: MlAnomalyResultType) => {
     return {
       aggGroupLabel: `${resultType}_results` as PreviewResultsKeys,
       topHitsLabel: `top_${resultType}_hits` as TopHitsResultsKeys,
@@ -225,20 +229,20 @@ export function alertingServiceProvider(
    * @param severity
    */
   const getResultTypeAggRequest = (
-    resultType: AnomalyResultType,
+    resultType: MlAnomalyResultType,
     severity: number,
     useInitialScore?: boolean
   ) => {
-    const influencerScoreField = getScoreFields(ANOMALY_RESULT_TYPE.INFLUENCER, useInitialScore);
-    const recordScoreField = getScoreFields(ANOMALY_RESULT_TYPE.RECORD, useInitialScore);
-    const bucketScoreField = getScoreFields(ANOMALY_RESULT_TYPE.BUCKET, useInitialScore);
+    const influencerScoreField = getScoreFields(ML_ANOMALY_RESULT_TYPE.INFLUENCER, useInitialScore);
+    const recordScoreField = getScoreFields(ML_ANOMALY_RESULT_TYPE.RECORD, useInitialScore);
+    const bucketScoreField = getScoreFields(ML_ANOMALY_RESULT_TYPE.BUCKET, useInitialScore);
 
     return {
       influencer_results: {
         filter: {
           range: {
             [influencerScoreField]: {
-              gte: resultType === ANOMALY_RESULT_TYPE.INFLUENCER ? severity : 0,
+              gte: resultType === ML_ANOMALY_RESULT_TYPE.INFLUENCER ? severity : 0,
             },
           },
         },
@@ -274,7 +278,7 @@ export function alertingServiceProvider(
         filter: {
           range: {
             [recordScoreField]: {
-              gte: resultType === ANOMALY_RESULT_TYPE.RECORD ? severity : 0,
+              gte: resultType === ML_ANOMALY_RESULT_TYPE.RECORD ? severity : 0,
             },
           },
         },
@@ -317,7 +321,7 @@ export function alertingServiceProvider(
           },
         },
       },
-      ...(resultType === ANOMALY_RESULT_TYPE.BUCKET
+      ...(resultType === ML_ANOMALY_RESULT_TYPE.BUCKET
         ? {
             bucket_results: {
               filter: {
@@ -361,15 +365,15 @@ export function alertingServiceProvider(
   /**
    * Provides a key for alert instance.
    */
-  const getAlertInstanceKey = (source: AnomalyRecordDoc): string => {
+  const getAlertInstanceKey = (source: MlAnomalyRecordDoc): string => {
     return source.job_id;
   };
 
-  const getScoreFields = (resultType: AnomalyResultType, useInitialScore?: boolean) => {
+  const getScoreFields = (resultType: MlAnomalyResultType, useInitialScore?: boolean) => {
     return `${useInitialScore ? 'initial_' : ''}${resultTypeScoreMapping[resultType]}`;
   };
 
-  const getRecordKey = (source: AnomalyRecordDoc): string => {
+  const getRecordKey = (source: MlAnomalyRecordDoc): string => {
     let alertInstanceKey = `${source.job_id}_${source.timestamp}`;
 
     const fieldName = getEntityFieldName(source);
@@ -387,7 +391,7 @@ export function alertingServiceProvider(
    * @param resultType
    */
   const getResultsFormatter = (
-    resultType: AnomalyResultType,
+    resultType: MlAnomalyResultType,
     useInitialScore: boolean = false,
     formatters: FieldFormatters
   ) => {
@@ -434,7 +438,7 @@ export function alertingServiceProvider(
             typical: typical?.map((t) => formatter(t)),
             actual: actual?.map((a) => formatter(a)),
             score: Math.floor(
-              h._source[getScoreFields(ANOMALY_RESULT_TYPE.RECORD, useInitialScore)]
+              h._source[getScoreFields(ML_ANOMALY_RESULT_TYPE.RECORD, useInitialScore)]
             ),
             unique_key: getRecordKey(h._source),
           };
@@ -443,7 +447,7 @@ export function alertingServiceProvider(
           return {
             ...h._source,
             score: Math.floor(
-              h._source[getScoreFields(ANOMALY_RESULT_TYPE.INFLUENCER, useInitialScore)]
+              h._source[getScoreFields(ML_ANOMALY_RESULT_TYPE.INFLUENCER, useInitialScore)]
             ),
             unique_key: `${h._source.timestamp}_${h._source.influencer_field_name}_${h._source.influencer_field_value}`,
           };
@@ -518,7 +522,7 @@ export function alertingServiceProvider(
             },
             {
               terms: {
-                result_type: Object.values(ANOMALY_RESULT_TYPE) as string[],
+                result_type: Object.values(ML_ANOMALY_RESULT_TYPE) as string[],
               },
             },
             ...(params.includeInterim
@@ -673,7 +677,7 @@ export function alertingServiceProvider(
             },
             {
               terms: {
-                result_type: Object.values(ANOMALY_RESULT_TYPE) as string[],
+                result_type: Object.values(ML_ANOMALY_RESULT_TYPE) as string[],
               },
             },
             {
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
index 2501fa93ac258c..91bfd177feb218 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
@@ -10,8 +10,8 @@ import { each, get } from 'lodash';
 import { IScopedClusterClient } from '@kbn/core/server';
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { ML_PARTITION_FIELDS } from '@kbn/ml-anomaly-utils';
 import { ANNOTATION_EVENT_USER, ANNOTATION_TYPE } from '../../../common/constants/annotations';
-import { PARTITION_FIELDS } from '../../../common/constants/anomalies';
 import {
   ML_ANNOTATIONS_INDEX_ALIAS_READ,
   ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
@@ -264,7 +264,7 @@ export function annotationProvider({ asInternalUser }: IScopedClusterClient) {
 
       // clause to get annotations that have no partition fields
       const haveAnyPartitionFields: object[] = [];
-      PARTITION_FIELDS.forEach((field) => {
+      ML_PARTITION_FIELDS.forEach((field) => {
         haveAnyPartitionFields.push({
           exists: {
             field: getAnnotationFieldName(field),
diff --git a/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts b/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
index bcce2455539f7d..ea282d78ada60c 100644
--- a/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
+++ b/x-pack/plugins/ml/server/models/results_service/anomaly_charts.ts
@@ -12,6 +12,13 @@ import type * as estypes from '@elastic/elasticsearch/lib/api/types';
 import { extent, max, min } from 'd3';
 import { isPopulatedObject } from '@kbn/ml-is-populated-object';
 import { isDefined } from '@kbn/ml-is-defined';
+import {
+  aggregationTypeTransform,
+  getEntityFieldList,
+  isMultiBucketAnomaly,
+  type MlEntityField,
+} from '@kbn/ml-anomaly-utils';
+import type { MlAnomalyRecordDoc, MlRecordForInfluencer } from '@kbn/ml-anomaly-utils';
 import type { MlClient } from '../../lib/ml_client';
 import { isRuntimeMappings } from '../../../common';
 import type {
@@ -34,14 +41,8 @@ import {
   mlFunctionToESAggregation,
 } from '../../../common/util/job_utils';
 import { CriteriaField } from './results_service';
-import {
-  aggregationTypeTransform,
-  EntityField,
-  getEntityFieldList,
-  isMultiBucketAnomaly,
-} from '../../../common/util/anomaly_utils';
 import { InfluencersFilterQuery } from '../../../common/types/es_client';
-import { AnomalyRecordDoc, CombinedJob, Datafeed, RecordForInfluencer } from '../../shared';
+import type { CombinedJob, Datafeed } from '../../shared';
 import { ES_AGGREGATION, ML_JOB_AGGREGATION } from '../../../common/constants/aggregation_types';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { _DOC_COUNT, DOC_COUNT } from '../../../common/constants/field_types';
@@ -129,7 +130,7 @@ export function anomalyChartsDataProvider(mlClient: MlClient, client: IScopedClu
 
   async function fetchMetricData(
     index: string,
-    entityFields: EntityField[],
+    entityFields: MlEntityField[],
     query: object | undefined,
     metricFunction: string | null, // ES aggregation name
     metricFieldName: string | undefined,
@@ -453,7 +454,7 @@ export function anomalyChartsDataProvider(mlClient: MlClient, client: IScopedClu
 
   function processRecordsForDisplay(
     combinedJobRecords: Record<string, MlJob>,
-    anomalyRecords: RecordForInfluencer[]
+    anomalyRecords: MlRecordForInfluencer[]
   ): { records: ChartRecord[]; errors: Record<string, Set<string>> | undefined } {
     // Aggregate the anomaly data by detector, and entity (by/over/partition).
     if (anomalyRecords.length === 0) {
@@ -1131,7 +1132,7 @@ export function anomalyChartsDataProvider(mlClient: MlClient, client: IScopedClu
 
     function getChartDataForPointSearch(
       chartData: ChartPoint[],
-      record: AnomalyRecordDoc,
+      record: MlAnomalyRecordDoc,
       chartType: ChartType
     ) {
       if (
@@ -1439,8 +1440,8 @@ export function anomalyChartsDataProvider(mlClient: MlClient, client: IScopedClu
 
   async function getEventDistributionData(
     index: string,
-    splitField: EntityField | undefined | null,
-    filterField: EntityField | undefined | null,
+    splitField: MlEntityField | undefined | null,
+    filterField: MlEntityField | undefined | null,
     query: any,
     metricFunction: string | undefined | null, // ES aggregation name
     metricFieldName: string | undefined,
@@ -1645,7 +1646,7 @@ export function anomalyChartsDataProvider(mlClient: MlClient, client: IScopedClu
   }
 
   async function getRecordsForCriteriaChart(config: SeriesConfigWithMetadata, range: ChartRange) {
-    let criteria: EntityField[] = [];
+    let criteria: MlEntityField[] = [];
     criteria.push({ fieldName: 'detector_index', fieldValue: config.detectorIndex });
     criteria = criteria.concat(config.entityFields);
 
@@ -1812,13 +1813,13 @@ export function anomalyChartsDataProvider(mlClient: MlClient, client: IScopedClu
 
   async function getRecordsForInfluencer(
     jobIds: string[],
-    influencers: EntityField[],
+    influencers: MlEntityField[],
     threshold: number,
     earliestMs: number,
     latestMs: number,
     maxResults: number,
     influencersFilterQuery?: InfluencersFilterQuery
-  ): Promise<RecordForInfluencer[]> {
+  ): Promise<MlRecordForInfluencer[]> {
     // Build the criteria to use in the bool filter part of the request.
     // Add criteria for the time range, record score, plus any specified job IDs.
     const boolCriteria: estypes.QueryDslBoolQuery['must'] = [
@@ -1894,7 +1895,7 @@ export function anomalyChartsDataProvider(mlClient: MlClient, client: IScopedClu
       });
     }
 
-    const response = await mlClient.anomalySearch<estypes.SearchResponse<RecordForInfluencer>>(
+    const response = await mlClient.anomalySearch<estypes.SearchResponse<MlRecordForInfluencer>>(
       {
         body: {
           size: maxResults !== undefined ? maxResults : 100,
@@ -1933,7 +1934,7 @@ export function anomalyChartsDataProvider(mlClient: MlClient, client: IScopedClu
    */
   async function getAnomalyChartsData(options: {
     jobIds: string[];
-    influencers: EntityField[];
+    influencers: MlEntityField[];
     threshold: number;
     earliestMs: number;
     latestMs: number;
diff --git a/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.d.ts b/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.d.ts
index 00f6814fc23f21..d9ff1fc9592515 100644
--- a/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.d.ts
+++ b/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.d.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { AnomaliesTableRecord } from '../../../common/types/anomalies';
+import type { MlAnomaliesTableRecord } from '@kbn/ml-anomaly-utils';
 
 export function buildAnomalyTableItems(
   anomalyRecords: any,
   aggregationInterval: any,
   dateFormatTz: string
-): AnomaliesTableRecord[];
+): MlAnomaliesTableRecord[];
diff --git a/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.js b/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.js
index 380d5e4a881aa5..306f04c7ca95cc 100644
--- a/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.js
+++ b/x-pack/plugins/ml/server/models/results_service/build_anomaly_table_items.js
@@ -13,7 +13,7 @@ import {
   getEntityFieldValue,
   showActualForFunction,
   showTypicalForFunction,
-} from '../../../common/util/anomaly_utils';
+} from '@kbn/ml-anomaly-utils';
 
 // Builds the items for display in the anomalies table from the supplied list of anomaly records.
 // Provide the timezone to use for aggregating anomalies (by day or hour) as set in the
diff --git a/x-pack/plugins/ml/server/models/results_service/get_partition_fields_values.ts b/x-pack/plugins/ml/server/models/results_service/get_partition_fields_values.ts
index 8b6c3c4db603ae..40479ce3c618ce 100644
--- a/x-pack/plugins/ml/server/models/results_service/get_partition_fields_values.ts
+++ b/x-pack/plugins/ml/server/models/results_service/get_partition_fields_values.ts
@@ -7,15 +7,14 @@
 
 import Boom from '@hapi/boom';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { PARTITION_FIELDS } from '../../../common/constants/anomalies';
-import { PartitionFieldsType } from '../../../common/types/anomalies';
+import { type MlPartitionFieldsType, ML_PARTITION_FIELDS } from '@kbn/ml-anomaly-utils';
 import { CriteriaField } from './results_service';
 import { FieldConfig, FieldsConfig } from '../../routes/schemas/results_service_schema';
 import type { MlClient } from '../../lib/ml_client';
 
 type SearchTerm =
   | {
-      [key in PartitionFieldsType]?: string;
+      [key in MlPartitionFieldsType]?: string;
     }
   | undefined;
 
@@ -33,7 +32,7 @@ export interface PartitionFieldData {
  * @returns {Object}
  */
 function getFieldAgg(
-  fieldType: PartitionFieldsType,
+  fieldType: MlPartitionFieldsType,
   isModelPlotSearch: boolean,
   query?: string,
   fieldConfig?: FieldConfig
@@ -117,9 +116,9 @@ function getFieldAgg(
  * @param aggs - Aggregation response
  */
 function getFieldObject(
-  fieldType: PartitionFieldsType,
+  fieldType: MlPartitionFieldsType,
   aggs: Record<estypes.AggregateName, estypes.AggregationsAggregate>
-): Record<PartitionFieldsType, PartitionFieldData> | {} {
+): Record<MlPartitionFieldsType, PartitionFieldData> | {} {
   const fieldNameKey = `${fieldType}_name` as const;
   const fieldValueKey = `${fieldType}_value` as const;
 
@@ -146,7 +145,7 @@ function getFieldObject(
     : {};
 }
 
-export type PartitionFieldValueResponse = Record<PartitionFieldsType, PartitionFieldData>;
+export type PartitionFieldValueResponse = Record<MlPartitionFieldsType, PartitionFieldData>;
 
 export const getPartitionFieldsValuesFactory = (mlClient: MlClient) =>
   /**
@@ -231,7 +230,7 @@ export const getPartitionFieldsValuesFactory = (mlClient: MlClient) =>
         },
       },
       aggs: {
-        ...PARTITION_FIELDS.reduce((acc, key) => {
+        ...ML_PARTITION_FIELDS.reduce((acc, key) => {
           return {
             ...acc,
             ...getFieldAgg(key, isModelPlotSearch, searchTerm[key], fieldsConfig[key]),
@@ -250,7 +249,7 @@ export const getPartitionFieldsValuesFactory = (mlClient: MlClient) =>
       [jobId]
     );
 
-    return PARTITION_FIELDS.reduce((acc, key) => {
+    return ML_PARTITION_FIELDS.reduce((acc, key) => {
       return {
         ...acc,
         ...getFieldObject(key, body.aggregations!),
diff --git a/x-pack/plugins/ml/server/models/results_service/results_service.ts b/x-pack/plugins/ml/server/models/results_service/results_service.ts
index deb222ef6b3bd4..30ce44adca152e 100644
--- a/x-pack/plugins/ml/server/models/results_service/results_service.ts
+++ b/x-pack/plugins/ml/server/models/results_service/results_service.ts
@@ -10,15 +10,18 @@ import { sortBy, slice, get, cloneDeep } from 'lodash';
 import moment from 'moment';
 import Boom from '@hapi/boom';
 import { IScopedClusterClient } from '@kbn/core/server';
+import {
+  showActualForFunction,
+  showTypicalForFunction,
+  type MlAnomaliesTableRecord,
+  type MlAnomalyCategorizerStatsDoc,
+  type MlAnomalyRecordDoc,
+  ML_JOB_ID,
+  ML_PARTITION_FIELD_VALUE,
+} from '@kbn/ml-anomaly-utils';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
 import { getPartitionFieldsValuesFactory } from './get_partition_fields_values';
-import {
-  AnomaliesTableRecord,
-  AnomalyCategorizerStatsDoc,
-  AnomalyRecordDoc,
-} from '../../../common/types/anomalies';
-import { JOB_ID, PARTITION_FIELD_VALUE } from '../../../common/constants/anomalies';
 import {
   GetStoppedPartitionResult,
   GetDatafeedResultsChartDataResult,
@@ -28,7 +31,6 @@ import {
 import type { MlClient } from '../../lib/ml_client';
 import { datafeedsProvider } from '../job_service/datafeeds';
 import { annotationServiceProvider } from '../annotation_service';
-import { showActualForFunction, showTypicalForFunction } from '../../../common/util/anomaly_utils';
 import { anomalyChartsDataProvider } from './anomaly_charts';
 
 // Service for carrying out Elasticsearch queries to obtain data for the
@@ -51,7 +53,7 @@ interface Influencer {
  * Extracts typical and actual values from the anomaly record.
  * @param source
  */
-export function getTypicalAndActualValues(source: AnomalyRecordDoc) {
+export function getTypicalAndActualValues(source: MlAnomalyRecordDoc) {
   const result: { actual?: number[]; typical?: number[] } = {};
 
   const functionDescription = source.function_description || '';
@@ -219,7 +221,7 @@ export function resultsServiceProvider(mlClient: MlClient, client?: IScopedClust
     );
 
     const tableData: {
-      anomalies: AnomaliesTableRecord[];
+      anomalies: MlAnomaliesTableRecord[];
       interval: string;
       examplesByJobId?: { [key: string]: any };
     } = {
@@ -228,7 +230,7 @@ export function resultsServiceProvider(mlClient: MlClient, client?: IScopedClust
     };
 
     if ((body.hits.total as estypes.SearchTotalHits).value > 0) {
-      let records: AnomalyRecordDoc[] = [];
+      let records: MlAnomalyRecordDoc[] = [];
       body.hits.hits.forEach((hit: any) => {
         records.push(hit._source);
       });
@@ -510,7 +512,7 @@ export function resultsServiceProvider(mlClient: MlClient, client?: IScopedClust
         },
       });
     }
-    const body = await mlClient.anomalySearch<AnomalyCategorizerStatsDoc>(
+    const body = await mlClient.anomalySearch<MlAnomalyCategorizerStatsDoc>(
       {
         body: {
           query: {
@@ -534,7 +536,7 @@ export function resultsServiceProvider(mlClient: MlClient, client?: IScopedClust
 
   async function getCategoryStoppedPartitions(
     jobIds: string[],
-    fieldToBucket: typeof JOB_ID | typeof PARTITION_FIELD_VALUE = PARTITION_FIELD_VALUE
+    fieldToBucket: typeof ML_JOB_ID | typeof ML_PARTITION_FIELD_VALUE = ML_PARTITION_FIELD_VALUE
   ): Promise<GetStoppedPartitionResult> {
     let finalResults: GetStoppedPartitionResult = {
       jobs: {},
@@ -557,12 +559,12 @@ export function resultsServiceProvider(mlClient: MlClient, client?: IScopedClust
       .map((j) => j.job_id);
 
     let aggs: any;
-    if (fieldToBucket === JOB_ID) {
+    if (fieldToBucket === ML_JOB_ID) {
       // if bucketing by job_id, then return list of job_ids with at least one stopped_partitions
       aggs = {
         unique_terms: {
           terms: {
-            field: JOB_ID,
+            field: ML_JOB_ID,
           },
         },
       };
@@ -571,12 +573,12 @@ export function resultsServiceProvider(mlClient: MlClient, client?: IScopedClust
       aggs = {
         jobs: {
           terms: {
-            field: JOB_ID,
+            field: ML_JOB_ID,
           },
           aggs: {
             unique_stopped_partitions: {
               terms: {
-                field: PARTITION_FIELD_VALUE,
+                field: ML_PARTITION_FIELD_VALUE,
               },
             },
           },
@@ -620,14 +622,14 @@ export function resultsServiceProvider(mlClient: MlClient, client?: IScopedClust
         },
         jobIds
       );
-      if (fieldToBucket === JOB_ID) {
+      if (fieldToBucket === ML_JOB_ID) {
         finalResults = {
           // @ts-expect-error incorrect search response type
           jobs: results.aggregations?.unique_terms?.buckets.map(
             (b: { key: string; doc_count: number }) => b.key
           ),
         };
-      } else if (fieldToBucket === PARTITION_FIELD_VALUE) {
+      } else if (fieldToBucket === ML_PARTITION_FIELD_VALUE) {
         const jobs: Record<string, string[]> = jobIdsWithStopOnWarnSet.reduce(
           (obj: Record<string, string[]>, jobId: string) => {
             obj[jobId] = [];
diff --git a/x-pack/plugins/ml/server/routes/schemas/alerting_schema.ts b/x-pack/plugins/ml/server/routes/schemas/alerting_schema.ts
index ed58d8d5c9313e..1ca1db8811a3ae 100644
--- a/x-pack/plugins/ml/server/routes/schemas/alerting_schema.ts
+++ b/x-pack/plugins/ml/server/routes/schemas/alerting_schema.ts
@@ -7,8 +7,8 @@
 
 import { schema, TypeOf } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
+import { ML_ANOMALY_RESULT_TYPE } from '@kbn/ml-anomaly-utils';
 import { ALERT_PREVIEW_SAMPLE_SIZE } from '../../../common/constants/alerts';
-import { ANOMALY_RESULT_TYPE } from '../../../common/constants/anomalies';
 
 const jobsSelectionSchema = schema.object(
   {
@@ -32,9 +32,9 @@ export const mlAnomalyDetectionAlertParams = schema.object({
   severity: schema.number({ min: 0, max: 100 }),
   /** Result type to alert upon  */
   resultType: schema.oneOf([
-    schema.literal(ANOMALY_RESULT_TYPE.RECORD),
-    schema.literal(ANOMALY_RESULT_TYPE.BUCKET),
-    schema.literal(ANOMALY_RESULT_TYPE.INFLUENCER),
+    schema.literal(ML_ANOMALY_RESULT_TYPE.RECORD),
+    schema.literal(ML_ANOMALY_RESULT_TYPE.BUCKET),
+    schema.literal(ML_ANOMALY_RESULT_TYPE.INFLUENCER),
   ]),
   includeInterim: schema.boolean({ defaultValue: true }),
   /** User's override for the lookback interval */
diff --git a/x-pack/plugins/ml/server/shared.ts b/x-pack/plugins/ml/server/shared.ts
index bd0807a1e30d84..3a916f613ad322 100644
--- a/x-pack/plugins/ml/server/shared.ts
+++ b/x-pack/plugins/ml/server/shared.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-export * from '../common/types/anomalies';
 export * from '../common/types/anomaly_detection_jobs';
 export * from './lib/capabilities/errors';
 export type { ModuleSetupPayload } from './shared_services/providers/modules';
diff --git a/x-pack/plugins/ml/server/usage/collector.ts b/x-pack/plugins/ml/server/usage/collector.ts
index 876e604fcf6f27..455675c46ba3f7 100644
--- a/x-pack/plugins/ml/server/usage/collector.ts
+++ b/x-pack/plugins/ml/server/usage/collector.ts
@@ -6,8 +6,8 @@
  */
 
 import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
+import { MlAnomalyResultType } from '@kbn/ml-anomaly-utils';
 import { ML_ALERT_TYPES } from '../../common/constants/alerts';
-import { AnomalyResultType } from '../../common/types/anomalies';
 import { MlAnomalyDetectionJobsHealthRuleParams } from '../../common/types/alerts';
 import { getResultJobsHealthRuleConfig } from '../../common/util/alerts';
 
@@ -125,7 +125,7 @@ export function registerCollector(
       const aggResponse = result.aggregations as {
         count_by_result_type: {
           buckets: Array<{
-            key: AnomalyResultType;
+            key: MlAnomalyResultType;
             doc_count: number;
           }>;
         };
diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json
index 8288c9998fc7db..3f5d9a81110237 100644
--- a/x-pack/plugins/ml/tsconfig.json
+++ b/x-pack/plugins/ml/tsconfig.json
@@ -90,5 +90,6 @@
     "@kbn/usage-collection-plugin",
     "@kbn/utility-types",
     "@kbn/ml-error-utils",
+    "@kbn/ml-anomaly-utils",
   ],
 }
diff --git a/x-pack/plugins/observability/public/components/alerts_flyout_body.tsx b/x-pack/plugins/observability/public/components/alerts_flyout_body.tsx
index 8f1b290b439d2e..7686144affbb85 100644
--- a/x-pack/plugins/observability/public/components/alerts_flyout_body.tsx
+++ b/x-pack/plugins/observability/public/components/alerts_flyout_body.tsx
@@ -30,7 +30,7 @@ import { AlertLifecycleStatusBadge } from '@kbn/alerts-ui-shared';
 import moment from 'moment-timezone';
 import { useUiSetting } from '@kbn/kibana-react-plugin/public';
 import { useKibana } from '../utils/kibana_react';
-import { asDuration } from '../../common/utils/formatters';
+import { asDuration, toMicroseconds } from '../../common/utils/formatters';
 import { paths } from '../config/paths';
 import { translations } from '../config/translations';
 import { formatAlertEvaluationValue } from '../utils/format_alert_evaluation_value';
@@ -42,6 +42,14 @@ interface FlyoutProps {
   id?: string;
 }
 
+// For APM Latency threshold rule, threshold is in ms but the duration formatter works with microseconds
+const normalizeUnit = (ruleTypeId: string, value?: number) => {
+  if (ruleTypeId === 'apm.transaction_duration' && value) {
+    return toMicroseconds(value, 'milliseconds');
+  }
+  return value;
+};
+
 export function AlertsFlyoutBody({ alert, id: pageId }: FlyoutProps) {
   const {
     http: {
@@ -89,7 +97,7 @@ export function AlertsFlyoutBody({ alert, id: pageId }: FlyoutProps) {
       title: translations.alertsFlyout.expectedValueLabel,
       description: formatAlertEvaluationValue(
         alert.fields[ALERT_RULE_TYPE_ID],
-        alert.fields[ALERT_EVALUATION_THRESHOLD]
+        normalizeUnit(alert.fields[ALERT_RULE_TYPE_ID], alert.fields[ALERT_EVALUATION_THRESHOLD])
       ),
     },
     {
diff --git a/x-pack/plugins/observability/public/components/shared/alert_search_bar/alert_search_bar.tsx b/x-pack/plugins/observability/public/components/shared/alert_search_bar/alert_search_bar.tsx
index 6abf6017cc0c24..1442dbb9dbf918 100644
--- a/x-pack/plugins/observability/public/components/shared/alert_search_bar/alert_search_bar.tsx
+++ b/x-pack/plugins/observability/public/components/shared/alert_search_bar/alert_search_bar.tsx
@@ -111,7 +111,7 @@ export function ObservabilityAlertSearchBar({
           rangeFrom={rangeFrom}
           rangeTo={rangeTo}
           query={kuery}
-          onQueryChange={onSearchBarParamsChange}
+          onQuerySubmit={onSearchBarParamsChange}
         />
       </EuiFlexItem>
 
diff --git a/x-pack/plugins/observability/public/config/paths.ts b/x-pack/plugins/observability/public/config/paths.ts
index 73430af2edbcf3..8d20c226376980 100644
--- a/x-pack/plugins/observability/public/config/paths.ts
+++ b/x-pack/plugins/observability/public/config/paths.ts
@@ -18,6 +18,7 @@ export const paths = {
     ruleDetails: (ruleId?: string | null) =>
       ruleId ? `${RULES_PAGE_LINK}/${encodeURI(ruleId)}` : RULES_PAGE_LINK,
     slos: SLOS_PAGE_LINK,
+    slosWelcome: `${SLOS_PAGE_LINK}/welcome`,
     sloCreate: `${SLOS_PAGE_LINK}/create`,
     sloEdit: (sloId: string) => `${SLOS_PAGE_LINK}/edit/${encodeURI(sloId)}`,
     sloDetails: (sloId: string) => `${SLOS_PAGE_LINK}/${encodeURI(sloId)}`,
diff --git a/x-pack/plugins/observability/public/hooks/slo/__storybook_mocks__/use_fetch_slo_list.ts b/x-pack/plugins/observability/public/hooks/slo/__storybook_mocks__/use_fetch_slo_list.ts
index 3c573cb6754d58..2faa0887b82ea6 100644
--- a/x-pack/plugins/observability/public/hooks/slo/__storybook_mocks__/use_fetch_slo_list.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/__storybook_mocks__/use_fetch_slo_list.ts
@@ -12,6 +12,7 @@ export const useFetchSloList = (): UseFetchSloListResponse => {
   return {
     isInitialLoading: false,
     isLoading: false,
+    isRefetching: false,
     isError: false,
     isSuccess: true,
     sloList,
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_clone_slo.ts b/x-pack/plugins/observability/public/hooks/slo/use_clone_slo.ts
index d2fcc25eb2c349..3c32ecb227a359 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_clone_slo.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_clone_slo.ts
@@ -7,15 +7,19 @@
 
 import { v1 as uuidv1 } from 'uuid';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { i18n } from '@kbn/i18n';
 import type { CreateSLOInput, CreateSLOResponse, FindSLOResponse } from '@kbn/slo-schema';
 
 import { useKibana } from '../../utils/kibana_react';
 
 export function useCloneSlo() {
-  const { http } = useKibana().services;
+  const {
+    http,
+    notifications: { toasts },
+  } = useKibana().services;
   const queryClient = useQueryClient();
 
-  const cloneSlo = useMutation<
+  return useMutation<
     CreateSLOResponse,
     string,
     { slo: CreateSLOInput; idToCopyFrom?: string },
@@ -29,7 +33,7 @@ export function useCloneSlo() {
     {
       onMutate: async ({ slo, idToCopyFrom }) => {
         // Cancel any outgoing refetches (so they don't overwrite our optimistic update)
-        await queryClient.cancelQueries(['fetchSloList']);
+        await queryClient.cancelQueries(['fetchSloList'], { exact: false });
 
         const latestFetchSloListRequest = (
           queryClient.getQueriesData<FindSLOResponse>(['fetchSloList']) || []
@@ -41,7 +45,10 @@ export function useCloneSlo() {
 
         const optimisticUpdate = {
           ...data,
-          results: [...(data?.results || []), { ...sloUsedToClone, name: slo.name, id: uuidv1() }],
+          results: [
+            ...(data?.results || []),
+            { ...sloUsedToClone, name: slo.name, id: uuidv1(), summary: undefined },
+          ],
           total: data?.total && data.total + 1,
         };
 
@@ -50,20 +57,31 @@ export function useCloneSlo() {
           queryClient.setQueryData(queryKey, optimisticUpdate);
         }
 
+        toasts.addSuccess(
+          i18n.translate('xpack.observability.slo.clone.successNotification', {
+            defaultMessage: 'Successfully created {name}',
+            values: { name: slo.name },
+          })
+        );
+
         // Return a context object with the snapshotted value
         return { previousSloList: data };
       },
       // If the mutation fails, use the context returned from onMutate to roll back
-      onError: (_err, _slo, context) => {
+      onError: (_err, { slo }, context) => {
         if (context?.previousSloList) {
           queryClient.setQueryData(['fetchSloList'], context.previousSloList);
         }
+        toasts.addDanger(
+          i18n.translate('xpack.observability.slo.clone.errorNotification', {
+            defaultMessage: 'Failed to clone {name}',
+            values: { name: slo.name },
+          })
+        );
       },
       onSuccess: () => {
-        queryClient.invalidateQueries(['fetchSloList']);
+        queryClient.invalidateQueries(['fetchSloList'], { exact: false });
       },
     }
   );
-
-  return cloneSlo;
 }
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_create_slo.ts b/x-pack/plugins/observability/public/hooks/slo/use_create_slo.ts
index d9b000fee0cd29..3b4bdf4ce61bd9 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_create_slo.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_create_slo.ts
@@ -5,27 +5,70 @@
  * 2.0.
  */
 
+import { v1 as uuidv1 } from 'uuid';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import type { CreateSLOInput, CreateSLOResponse } from '@kbn/slo-schema';
+import { i18n } from '@kbn/i18n';
+import type { CreateSLOInput, CreateSLOResponse, FindSLOResponse } from '@kbn/slo-schema';
 
 import { useKibana } from '../../utils/kibana_react';
 
 export function useCreateSlo() {
-  const { http } = useKibana().services;
+  const {
+    http,
+    notifications: { toasts },
+  } = useKibana().services;
   const queryClient = useQueryClient();
 
-  const createSlo = useMutation(
+  return useMutation(
     ({ slo }: { slo: CreateSLOInput }) => {
       const body = JSON.stringify(slo);
       return http.post<CreateSLOResponse>(`/api/observability/slos`, { body });
     },
     {
       mutationKey: ['createSlo'],
-      onSuccess: () => {
+      onSuccess: (_data, { slo: { name } }) => {
+        toasts.addSuccess(
+          i18n.translate('xpack.observability.slo.create.successNotification', {
+            defaultMessage: 'Successfully created {name}',
+            values: { name },
+          })
+        );
         queryClient.invalidateQueries(['fetchSloList']);
       },
+      onError: (error, { slo: { name } }) => {
+        toasts.addError(new Error(String(error)), {
+          title: i18n.translate('xpack.observability.slo.create.errorNotification', {
+            defaultMessage: 'Something went wrong while creating {name}',
+            values: { name },
+          }),
+        });
+      },
+      onMutate: async ({ slo }) => {
+        // Cancel any outgoing refetches (so they don't overwrite our optimistic update)
+        await queryClient.cancelQueries(['fetchSloList']);
+
+        const latestFetchSloListRequest = (
+          queryClient.getQueriesData<FindSLOResponse>(['fetchSloList']) || []
+        ).at(0);
+
+        const [queryKey, data] = latestFetchSloListRequest || [];
+
+        const newItem = { ...slo, id: uuidv1() };
+
+        const optimisticUpdate = {
+          ...data,
+          results: [...(data?.results || []), { ...newItem }],
+          total: data?.total ? data.total + 1 : 1,
+        };
+
+        // Optimistically update to the new value
+        if (queryKey) {
+          queryClient.setQueryData(queryKey, optimisticUpdate);
+        }
+
+        // Return a context object with the snapshotted value
+        return { previousSloList: data };
+      },
     }
   );
-
-  return createSlo;
 }
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_delete_slo.ts b/x-pack/plugins/observability/public/hooks/slo/use_delete_slo.ts
index f0af48585a26ad..a3829cbebf2dce 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_delete_slo.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_delete_slo.ts
@@ -6,21 +6,24 @@
  */
 
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { i18n } from '@kbn/i18n';
 import { FindSLOResponse } from '@kbn/slo-schema';
-
 import { useKibana } from '../../utils/kibana_react';
 
-export function useDeleteSlo(sloId: string) {
-  const { http } = useKibana().services;
+export function useDeleteSlo() {
+  const {
+    http,
+    notifications: { toasts },
+  } = useKibana().services;
   const queryClient = useQueryClient();
 
   const deleteSlo = useMutation<
     string,
     string,
-    { id: string },
+    { id: string; name: string },
     { previousSloList: FindSLOResponse | undefined }
   >(
-    ['deleteSlo', sloId],
+    ['deleteSlo'],
     ({ id }) => {
       try {
         return http.delete<string>(`/api/observability/slos/${id}`);
@@ -31,7 +34,7 @@ export function useDeleteSlo(sloId: string) {
     {
       onMutate: async (slo) => {
         // Cancel any outgoing refetches (so they don't overwrite our optimistic update)
-        await queryClient.cancelQueries(['fetchSloList']);
+        await queryClient.cancelQueries(['fetchSloList'], { exact: false });
 
         const latestFetchSloListRequest = (
           queryClient.getQueriesData<FindSLOResponse>(['fetchSloList']) || []
@@ -50,17 +53,36 @@ export function useDeleteSlo(sloId: string) {
           queryClient.setQueryData(queryKey, optimisticUpdate);
         }
 
+        toasts.addSuccess(
+          i18n.translate('xpack.observability.slo.slo.delete.successNotification', {
+            defaultMessage: 'Deleted {name}',
+            values: { name: slo.name },
+          })
+        );
+
         // Return a context object with the snapshotted value
         return { previousSloList: data };
       },
       // If the mutation fails, use the context returned from onMutate to roll back
-      onError: (_err, _slo, context) => {
+      onError: (_err, slo, context) => {
         if (context?.previousSloList) {
           queryClient.setQueryData(['fetchSloList'], context.previousSloList);
         }
+
+        toasts.addDanger(
+          i18n.translate('xpack.observability.slo.slo.delete.errorNotification', {
+            defaultMessage: 'Failed to delete {name}',
+            values: { name: slo.name },
+          })
+        );
       },
       onSuccess: () => {
-        queryClient.invalidateQueries(['fetchSloList']);
+        if (
+          queryClient.getQueryCache().find(['fetchSloList'], { exact: false })?.options // @ts-ignore
+            .refetchInterval === undefined
+        ) {
+          queryClient.invalidateQueries(['fetchSloList'], { exact: false });
+        }
       },
     }
   );
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_fetch_historical_summary.ts b/x-pack/plugins/observability/public/hooks/slo/use_fetch_historical_summary.ts
index fe9ffd92f579dd..0eb59aa85bc833 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_fetch_historical_summary.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_fetch_historical_summary.ts
@@ -50,6 +50,7 @@ export function useFetchHistoricalSummary({
     },
     refetchInterval: shouldRefetch ? LONG_REFETCH_INTERVAL : undefined,
     refetchOnWindowFocus: false,
+    keepPreviousData: true,
   });
 
   return {
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_fetch_rules_for_slo.ts b/x-pack/plugins/observability/public/hooks/slo/use_fetch_rules_for_slo.ts
index 153e2fb95c9661..39ea6fdf994e96 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_fetch_rules_for_slo.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_fetch_rules_for_slo.ts
@@ -77,8 +77,9 @@ export function useFetchRulesForSlo({ sloIds }: Params): UseFetchRulesForSloResp
           // ignore error for retrieving slos
         }
       },
-      enabled: Boolean(sloIds),
+      enabled: Boolean(sloIds?.length),
       refetchOnWindowFocus: false,
+      keepPreviousData: true,
     }
   );
 
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts b/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts
index fa9c2761e94d86..990b303ea03423 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_fetch_slo_list.ts
@@ -28,6 +28,7 @@ interface SLOListParams {
 export interface UseFetchSloListResponse {
   isInitialLoading: boolean;
   isLoading: boolean;
+  isRefetching: boolean;
   isSuccess: boolean;
   isError: boolean;
   sloList: FindSLOResponse | undefined;
@@ -83,7 +84,7 @@ export function useFetchSloList({
           return;
         }
 
-        if (results.find((slo) => slo.summary.status === 'NO_DATA')) {
+        if (results.find((slo) => slo.summary.status === 'NO_DATA' || !slo.summary)) {
           setStateRefetchInterval(SHORT_REFETCH_INTERVAL);
         } else {
           setStateRefetchInterval(LONG_REFETCH_INTERVAL);
@@ -96,14 +97,19 @@ export function useFetchSloList({
         queryClient.invalidateQueries(['fetchActiveAlerts'], {
           exact: false,
         });
+
+        queryClient.invalidateQueries(['fetchRulesForSlo'], {
+          exact: false,
+        });
       },
     }
   );
 
   return {
     sloList: data,
-    isLoading: isLoading || isRefetching,
     isInitialLoading,
+    isLoading,
+    isRefetching,
     isSuccess,
     isError,
     refetch,
diff --git a/x-pack/plugins/observability/public/hooks/slo/use_update_slo.ts b/x-pack/plugins/observability/public/hooks/slo/use_update_slo.ts
index 46d3d2eddea76d..5fc25f41927567 100644
--- a/x-pack/plugins/observability/public/hooks/slo/use_update_slo.ts
+++ b/x-pack/plugins/observability/public/hooks/slo/use_update_slo.ts
@@ -6,27 +6,43 @@
  */
 
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { i18n } from '@kbn/i18n';
 import type { UpdateSLOInput, UpdateSLOResponse } from '@kbn/slo-schema';
 
 import { useKibana } from '../../utils/kibana_react';
 
 export function useUpdateSlo() {
-  const { http } = useKibana().services;
+  const {
+    http,
+    notifications: { toasts },
+  } = useKibana().services;
   const queryClient = useQueryClient();
 
-  const updateSlo = useMutation(
+  return useMutation(
     ({ sloId, slo }: { sloId: string; slo: UpdateSLOInput }) => {
       const body = JSON.stringify(slo);
       return http.put<UpdateSLOResponse>(`/api/observability/slos/${sloId}`, { body });
     },
     {
       mutationKey: ['updateSlo'],
-      onSuccess: () => {
+      onSuccess: (_data, { slo: { name } }) => {
+        toasts.addSuccess(
+          i18n.translate('xpack.observability.slo.update.successNotification', {
+            defaultMessage: 'Successfully updated {name}',
+            values: { name },
+          })
+        );
         queryClient.invalidateQueries(['fetchSloList']);
         queryClient.invalidateQueries(['fetchHistoricalSummary']);
       },
+      onError: (error, { slo: { name } }) => {
+        toasts.addError(new Error(String(error)), {
+          title: i18n.translate('xpack.observability.slo.update.errorNotification', {
+            defaultMessage: 'Something went wrong when updating {name}',
+            values: { name },
+          }),
+        });
+      },
     }
   );
-
-  return updateSlo;
 }
diff --git a/x-pack/plugins/observability/public/pages/alert_details/components/page_title.test.tsx b/x-pack/plugins/observability/public/pages/alert_details/components/page_title.test.tsx
index d988be160c48ae..125ea4885a5646 100644
--- a/x-pack/plugins/observability/public/pages/alert_details/components/page_title.test.tsx
+++ b/x-pack/plugins/observability/public/pages/alert_details/components/page_title.test.tsx
@@ -28,9 +28,7 @@ describe('Page Title', () => {
   it('should display Log threshold title', () => {
     const { getByTestId } = renderComp(defaultProps);
 
-    expect(getByTestId('page-title-container').children.item(0)?.textContent).toEqual(
-      'Log threshold breached'
-    );
+    expect(getByTestId('page-title-container').textContent).toContain('Log threshold breached');
   });
 
   it('should display Anomaly title', () => {
@@ -46,9 +44,7 @@ describe('Page Title', () => {
 
     const { getByTestId } = renderComp(props);
 
-    expect(getByTestId('page-title-container').children.item(0)?.textContent).toEqual(
-      'Anomaly detected'
-    );
+    expect(getByTestId('page-title-container').textContent).toContain('Anomaly detected');
   });
 
   it('should display Inventory title', () => {
@@ -64,7 +60,7 @@ describe('Page Title', () => {
 
     const { getByTestId } = renderComp(props);
 
-    expect(getByTestId('page-title-container').children.item(0)?.textContent).toEqual(
+    expect(getByTestId('page-title-container').textContent).toContain(
       'Inventory threshold breached'
     );
   });
diff --git a/x-pack/plugins/observability/public/pages/alert_details/components/page_title.tsx b/x-pack/plugins/observability/public/pages/alert_details/components/page_title.tsx
index 201e19a5c94a65..a2e47ac4ccf16c 100644
--- a/x-pack/plugins/observability/public/pages/alert_details/components/page_title.tsx
+++ b/x-pack/plugins/observability/public/pages/alert_details/components/page_title.tsx
@@ -35,15 +35,13 @@ export interface PageTitleProps {
 }
 
 export function pageTitleContent(ruleCategory: string) {
-  return (
-    <FormattedMessage
-      id="xpack.observability.pages.alertDetails.pageTitle.title"
-      values={{
-        ruleCategory,
-      }}
-      defaultMessage="{ruleCategory} {ruleCategory, select, Anomaly {detected} Inventory {threshold breached} other {breached}}"
-    />
-  );
+  return i18n.translate('xpack.observability.pages.alertDetails.pageTitle.title', {
+    defaultMessage:
+      '{ruleCategory} {ruleCategory, select, Anomaly {detected} Inventory {threshold breached} other {breached}}',
+    values: {
+      ruleCategory,
+    },
+  });
 }
 
 export function PageTitle({ alert }: PageTitleProps) {
diff --git a/x-pack/plugins/observability/public/pages/slo_details/components/header_control.tsx b/x-pack/plugins/observability/public/pages/slo_details/components/header_control.tsx
index 848b35b8bb2930..ace0f1a6e5167d 100644
--- a/x-pack/plugins/observability/public/pages/slo_details/components/header_control.tsx
+++ b/x-pack/plugins/observability/public/pages/slo_details/components/header_control.tsx
@@ -5,20 +5,20 @@
  * 2.0.
  */
 
-import React, { useState } from 'react';
-import { useIsMutating } from '@tanstack/react-query';
+import React, { useCallback, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiButton, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
 import { SLOWithSummaryResponse } from '@kbn/slo-schema';
 
 import { useCapabilities } from '../../../hooks/slo/use_capabilities';
 import { useKibana } from '../../../utils/kibana_react';
+import { useCloneSlo } from '../../../hooks/slo/use_clone_slo';
+import { useDeleteSlo } from '../../../hooks/slo/use_delete_slo';
 import { isApmIndicatorType } from '../../../utils/slo/indicator';
 import { convertSliApmParamsToApmAppDeeplinkUrl } from '../../../utils/slo/convert_sli_apm_params_to_apm_app_deeplink_url';
 import { SLO_BURN_RATE_RULE_ID } from '../../../../common/constants';
 import { rulesLocatorID, sloFeatureId } from '../../../../common';
 import { paths } from '../../../config/paths';
-import { useCloneSlo } from '../../../hooks/slo/use_clone_slo';
 import {
   transformSloResponseToCreateSloInput,
   transformValuesToCreateSLOInput,
@@ -35,7 +35,6 @@ export function HeaderControl({ isLoading, slo }: Props) {
   const {
     application: { navigateToUrl },
     http: { basePath },
-    notifications: { toasts },
     share: {
       url: { locators },
     },
@@ -47,15 +46,15 @@ export function HeaderControl({ isLoading, slo }: Props) {
   const [isRuleFlyoutVisible, setRuleFlyoutVisibility] = useState<boolean>(false);
   const [isDeleteConfirmationModalOpen, setDeleteConfirmationModalOpen] = useState(false);
 
-  const { mutateAsync: cloneSlo } = useCloneSlo();
-  const isDeleting = Boolean(useIsMutating(['deleteSlo', slo?.id]));
+  const { mutate: cloneSlo } = useCloneSlo();
+  const { mutate: deleteSlo } = useDeleteSlo();
 
   const handleActionsClick = () => setIsPopoverOpen((value) => !value);
   const closePopover = () => setIsPopoverOpen(false);
 
   const handleEdit = () => {
     if (slo) {
-      navigateToUrl(basePath.prepend(paths.observability.sloEdit(slo.id)));
+      navigate(basePath.prepend(paths.observability.sloEdit(slo.id)));
     }
   };
 
@@ -104,7 +103,7 @@ export function HeaderControl({ isLoading, slo }: Props) {
         transactionType,
       });
 
-      navigateToUrl(basePath.prepend(url));
+      navigate(basePath.prepend(url));
     }
   };
 
@@ -116,16 +115,9 @@ export function HeaderControl({ isLoading, slo }: Props) {
         transformSloResponseToCreateSloInput({ ...slo, name: `[Copy] ${slo.name}` })!
       );
 
-      await cloneSlo({ slo: newSlo, idToCopyFrom: slo.id });
-
-      toasts.addSuccess(
-        i18n.translate('xpack.observability.slo.sloDetails.headerControl.cloneSuccess', {
-          defaultMessage: 'Successfully created {name}',
-          values: { name: newSlo.name },
-        })
-      );
+      cloneSlo({ slo: newSlo, idToCopyFrom: slo.id });
 
-      navigateToUrl(basePath.prepend(paths.observability.slos));
+      navigate(basePath.prepend(paths.observability.slos));
     }
   };
 
@@ -138,10 +130,18 @@ export function HeaderControl({ isLoading, slo }: Props) {
     setDeleteConfirmationModalOpen(false);
   };
 
-  const handleDeleteSuccess = () => {
-    navigateToUrl(basePath.prepend(paths.observability.slos));
+  const handleDeleteConfirm = async () => {
+    if (slo) {
+      deleteSlo({ id: slo.id, name: slo.name });
+      navigate(basePath.prepend(paths.observability.slos));
+    }
   };
 
+  const navigate = useCallback(
+    (url: string) => setTimeout(() => navigateToUrl(url)),
+    [navigateToUrl]
+  );
+
   return (
     <>
       <EuiPopover
@@ -154,7 +154,7 @@ export function HeaderControl({ isLoading, slo }: Props) {
             iconType="arrowDown"
             iconSize="s"
             onClick={handleActionsClick}
-            disabled={isLoading || isDeleting || !slo}
+            disabled={isLoading || !slo}
           >
             {i18n.translate('xpack.observability.slo.sloDetails.headerControl.actions', {
               defaultMessage: 'Actions',
@@ -264,7 +264,7 @@ export function HeaderControl({ isLoading, slo }: Props) {
         <SloDeleteConfirmationModal
           slo={slo}
           onCancel={handleDeleteCancel}
-          onSuccess={handleDeleteSuccess}
+          onConfirm={handleDeleteConfirm}
         />
       ) : null}
     </>
diff --git a/x-pack/plugins/observability/public/pages/slo_details/slo_details.test.tsx b/x-pack/plugins/observability/public/pages/slo_details/slo_details.test.tsx
index 1dc86a2901a442..6268f3682fa55e 100644
--- a/x-pack/plugins/observability/public/pages/slo_details/slo_details.test.tsx
+++ b/x-pack/plugins/observability/public/pages/slo_details/slo_details.test.tsx
@@ -6,19 +6,21 @@
  */
 
 import React from 'react';
-import { fireEvent, screen } from '@testing-library/react';
+import { fireEvent, screen, waitFor } from '@testing-library/react';
 
 import { useKibana } from '../../utils/kibana_react';
 import { useParams } from 'react-router-dom';
 import { useLicense } from '../../hooks/use_license';
+import { useCapabilities } from '../../hooks/slo/use_capabilities';
 import { useFetchSloDetails } from '../../hooks/slo/use_fetch_slo_details';
+import { useFetchHistoricalSummary } from '../../hooks/slo/use_fetch_historical_summary';
+import { useFetchActiveAlerts } from '../../hooks/slo/use_fetch_active_alerts';
+import { useCloneSlo } from '../../hooks/slo/use_clone_slo';
+import { useDeleteSlo } from '../../hooks/slo/use_delete_slo';
 import { render } from '../../utils/test_helper';
 import { SloDetailsPage } from './slo_details';
 import { buildSlo } from '../../data/slo/slo';
 import { paths } from '../../config/paths';
-import { useFetchHistoricalSummary } from '../../hooks/slo/use_fetch_historical_summary';
-import { useCapabilities } from '../../hooks/slo/use_capabilities';
-import { useFetchActiveAlerts } from '../../hooks/slo/use_fetch_active_alerts';
 import {
   HEALTHY_STEP_DOWN_ROLLING_SLO,
   historicalSummaryData,
@@ -34,22 +36,27 @@ jest.mock('react-router-dom', () => ({
 jest.mock('../../utils/kibana_react');
 jest.mock('../../hooks/use_breadcrumbs');
 jest.mock('../../hooks/use_license');
+jest.mock('../../hooks/slo/use_capabilities');
 jest.mock('../../hooks/slo/use_fetch_active_alerts');
 jest.mock('../../hooks/slo/use_fetch_slo_details');
 jest.mock('../../hooks/slo/use_fetch_historical_summary');
-jest.mock('../../hooks/slo/use_capabilities');
+jest.mock('../../hooks/slo/use_clone_slo');
+jest.mock('../../hooks/slo/use_delete_slo');
 
 const useKibanaMock = useKibana as jest.Mock;
 const useParamsMock = useParams as jest.Mock;
 const useLicenseMock = useLicense as jest.Mock;
+const useCapabilitiesMock = useCapabilities as jest.Mock;
 const useFetchActiveAlertsMock = useFetchActiveAlerts as jest.Mock;
 const useFetchSloDetailsMock = useFetchSloDetails as jest.Mock;
 const useFetchHistoricalSummaryMock = useFetchHistoricalSummary as jest.Mock;
-const useCapabilitiesMock = useCapabilities as jest.Mock;
+const useCloneSloMock = useCloneSlo as jest.Mock;
+const useDeleteSloMock = useDeleteSlo as jest.Mock;
 
 const mockNavigate = jest.fn();
-const mockBasePathPrepend = jest.fn();
 const mockLocator = jest.fn();
+const mockClone = jest.fn();
+const mockDelete = jest.fn();
 
 const mockKibana = () => {
   useKibanaMock.mockReturnValue({
@@ -58,12 +65,13 @@ const mockKibana = () => {
       charts: chartPluginMock.createStartContract(),
       http: {
         basePath: {
-          prepend: mockBasePathPrepend,
+          prepend: (url: string) => url,
         },
       },
       notifications: {
         toasts: {
           addSuccess: jest.fn(),
+          addDanger: jest.fn(),
           addError: jest.fn(),
         },
       },
@@ -100,6 +108,8 @@ describe('SLO Details Page', () => {
       sloHistoricalSummaryResponse: historicalSummaryData,
     });
     useFetchActiveAlertsMock.mockReturnValue({ isLoading: false, data: {} });
+    useCloneSloMock.mockReturnValue({ mutate: mockClone });
+    useDeleteSloMock.mockReturnValue({ mutate: mockDelete });
   });
 
   describe('when the incorrect license is found', () => {
@@ -111,7 +121,7 @@ describe('SLO Details Page', () => {
 
       render(<SloDetailsPage />);
 
-      expect(mockNavigate).toBeCalledWith(mockBasePathPrepend(paths.observability.slos));
+      expect(mockNavigate).toBeCalledWith(paths.observability.slos);
     });
   });
 
@@ -217,7 +227,26 @@ describe('SLO Details Page', () => {
     render(<SloDetailsPage />);
 
     fireEvent.click(screen.getByTestId('o11yHeaderControlActionsButton'));
-    expect(screen.queryByTestId('sloDetailsHeaderControlPopoverClone')).toBeTruthy();
+
+    const button = screen.queryByTestId('sloDetailsHeaderControlPopoverClone');
+
+    expect(button).toBeTruthy();
+
+    fireEvent.click(button!);
+
+    const { id, createdAt, enabled, revision, summary, updatedAt, ...newSlo } = slo;
+
+    expect(mockClone).toBeCalledWith({
+      idToCopyFrom: slo.id,
+      slo: {
+        ...newSlo,
+        name: `[Copy] ${newSlo.name}`,
+      },
+    });
+
+    await waitFor(() => {
+      expect(mockNavigate).toBeCalledWith(paths.observability.slos);
+    });
   });
 
   it("renders a 'Delete' button under actions menu", async () => {
@@ -229,14 +258,25 @@ describe('SLO Details Page', () => {
     render(<SloDetailsPage />);
 
     fireEvent.click(screen.getByTestId('o11yHeaderControlActionsButton'));
-    expect(screen.queryByTestId('sloDetailsHeaderControlPopoverDelete')).toBeTruthy();
 
-    const manageRulesButton = screen.queryByTestId('sloDetailsHeaderControlPopoverManageRules');
-    expect(manageRulesButton).toBeTruthy();
+    const button = screen.queryByTestId('sloDetailsHeaderControlPopoverDelete');
 
-    fireEvent.click(manageRulesButton!);
+    expect(button).toBeTruthy();
 
-    expect(mockLocator).toBeCalled();
+    fireEvent.click(button!);
+
+    const deleteModalConfirmButton = screen.queryByTestId('confirmModalConfirmButton');
+
+    fireEvent.click(deleteModalConfirmButton!);
+
+    expect(mockDelete).toBeCalledWith({
+      id: slo.id,
+      name: slo.name,
+    });
+
+    await waitFor(() => {
+      expect(mockNavigate).toBeCalledWith(paths.observability.slos);
+    });
   });
 
   it('renders the Overview tab by default', async () => {
diff --git a/x-pack/plugins/observability/public/pages/slo_edit/components/slo_edit_form.tsx b/x-pack/plugins/observability/public/pages/slo_edit/components/slo_edit_form.tsx
index 195bc7933a74d1..9331c648bbd8c8 100644
--- a/x-pack/plugins/observability/public/pages/slo_edit/components/slo_edit_form.tsx
+++ b/x-pack/plugins/observability/public/pages/slo_edit/components/slo_edit_form.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useLocation, useHistory } from 'react-router-dom';
 import {
@@ -51,7 +51,6 @@ export function SloEditForm({ slo }: Props) {
   const {
     application: { navigateToUrl },
     http: { basePath },
-    notifications: { toasts },
     triggersActionsUi: { getAddRuleFlyout: AddRuleFlyout },
   } = useKibana().services;
 
@@ -121,64 +120,39 @@ export function SloEditForm({ slo }: Props) {
     const values = getValues();
 
     if (isEditMode) {
-      try {
-        const processedValues = transformValuesToUpdateSLOInput(values);
+      const processedValues = transformValuesToUpdateSLOInput(values);
 
+      if (isCreateRuleCheckboxChecked) {
         await updateSlo({ sloId: slo.id, slo: processedValues });
-
-        toasts.addSuccess(
-          i18n.translate('xpack.observability.slo.sloEdit.update.success', {
-            defaultMessage: 'Successfully updated {name}',
-            values: { name: getValues().name },
-          })
+        navigate(
+          basePath.prepend(
+            `${paths.observability.sloEdit(slo.id)}?${CREATE_RULE_SEARCH_PARAM}=true`
+          )
         );
-
-        if (isCreateRuleCheckboxChecked) {
-          navigateToUrl(
-            basePath.prepend(
-              `${paths.observability.sloEdit(slo.id)}?${CREATE_RULE_SEARCH_PARAM}=true`
-            )
-          );
-        } else {
-          navigateToUrl(basePath.prepend(paths.observability.slos));
-        }
-      } catch (error) {
-        toasts.addError(new Error(error), {
-          title: i18n.translate('xpack.observability.slo.sloEdit.creation.error', {
-            defaultMessage: 'Something went wrong',
-          }),
-        });
+      } else {
+        updateSlo({ sloId: slo.id, slo: processedValues });
+        navigate(basePath.prepend(paths.observability.slos));
       }
     } else {
-      try {
-        const processedValues = transformValuesToCreateSLOInput(values);
+      const processedValues = transformValuesToCreateSLOInput(values);
 
+      if (isCreateRuleCheckboxChecked) {
         const { id } = await createSlo({ slo: processedValues });
-
-        toasts.addSuccess(
-          i18n.translate('xpack.observability.slo.sloEdit.creation.success', {
-            defaultMessage: 'Successfully created {name}',
-            values: { name: getValues().name },
-          })
+        navigate(
+          basePath.prepend(`${paths.observability.sloEdit(id)}?${CREATE_RULE_SEARCH_PARAM}=true`)
         );
-
-        if (isCreateRuleCheckboxChecked) {
-          navigateToUrl(
-            basePath.prepend(`${paths.observability.sloEdit(id)}?${CREATE_RULE_SEARCH_PARAM}=true`)
-          );
-        } else {
-          navigateToUrl(basePath.prepend(paths.observability.slos));
-        }
-      } catch (error) {
-        toasts.addError(new Error(error), {
-          title: i18n.translate('xpack.observability.slo.sloEdit.creation.error', {
-            defaultMessage: 'Something went wrong',
-          }),
-        });
+      } else {
+        createSlo({ slo: processedValues });
+        navigate(basePath.prepend(paths.observability.slos));
       }
     }
   };
 
+  const navigate = useCallback(
+    (url: string) => setTimeout(() => navigateToUrl(url)),
+    [navigateToUrl]
+  );
+
   const handleChangeCheckbox = () => {
     setIsCreateRuleCheckboxChecked(!isCreateRuleCheckboxChecked);
   };
diff --git a/x-pack/plugins/observability/public/pages/slo_edit/slo_edit.test.tsx b/x-pack/plugins/observability/public/pages/slo_edit/slo_edit.test.tsx
index 73b386e54ca16c..da327bc22b492b 100644
--- a/x-pack/plugins/observability/public/pages/slo_edit/slo_edit.test.tsx
+++ b/x-pack/plugins/observability/public/pages/slo_edit/slo_edit.test.tsx
@@ -539,46 +539,6 @@ describe('SLO Edit Page', () => {
     });
 
     describe('when submitting has completed successfully', () => {
-      it('renders a success toast', async () => {
-        const slo = buildSlo();
-
-        jest.spyOn(Router, 'useParams').mockReturnValue({ sloId: '123' });
-        jest
-          .spyOn(Router, 'useLocation')
-          .mockReturnValue({ pathname: 'foo', search: '', state: '', hash: '' });
-
-        useFetchSloMock.mockReturnValue({ isLoading: false, slo });
-
-        useFetchIndicesMock.mockReturnValue({
-          isLoading: false,
-          indices: [{ name: 'some-index' }],
-        });
-
-        useCreateSloMock.mockReturnValue({
-          mutateAsync: jest.fn().mockResolvedValue('success'),
-          isLoading: false,
-          isSuccess: false,
-          isError: false,
-        });
-
-        useUpdateSloMock.mockReturnValue({
-          mutateAsync: jest.fn().mockResolvedValue('success'),
-          isLoading: false,
-          isSuccess: false,
-          isError: false,
-        });
-
-        render(<SloEditPage />);
-
-        expect(screen.queryByTestId('sloFormSubmitButton')).toBeEnabled();
-
-        await waitFor(() => {
-          fireEvent.click(screen.getByTestId('sloFormSubmitButton'));
-        });
-
-        expect(mockAddSuccess).toBeCalled();
-      });
-
       it('navigates to the SLO List page when checkbox to create new rule is not checked', async () => {
         const slo = buildSlo();
 
@@ -615,8 +575,9 @@ describe('SLO Edit Page', () => {
         await waitFor(() => {
           fireEvent.click(screen.getByTestId('sloFormSubmitButton'));
         });
-
-        expect(mockNavigate).toBeCalledWith(mockBasePathPrepend(paths.observability.slos));
+        await waitFor(() => {
+          expect(mockNavigate).toBeCalledWith(mockBasePathPrepend(paths.observability.slos));
+        });
       });
 
       it('navigates to the SLO Edit page when checkbox to create new rule is checked', async () => {
@@ -657,9 +618,11 @@ describe('SLO Edit Page', () => {
           fireEvent.click(screen.getByTestId('sloFormSubmitButton'));
         });
 
-        expect(mockNavigate).toBeCalledWith(
-          mockBasePathPrepend(`${paths.observability.sloEdit(slo.id)}?create-rule=true`)
-        );
+        await waitFor(() => {
+          expect(mockNavigate).toBeCalledWith(
+            mockBasePathPrepend(`${paths.observability.sloEdit(slo.id)}?create-rule=true`)
+          );
+        });
       });
 
       it('opens the Add Rule Flyout when visiting an existing SLO with search params set', async () => {
@@ -698,47 +661,5 @@ describe('SLO Edit Page', () => {
         });
       });
     });
-
-    describe('when submitting has not completed successfully', () => {
-      it('renders an error toast', async () => {
-        const slo = buildSlo();
-
-        jest.spyOn(Router, 'useParams').mockReturnValue({ sloId: '123' });
-        jest
-          .spyOn(Router, 'useLocation')
-          .mockReturnValue({ pathname: 'foo', search: '', state: '', hash: '' });
-
-        useFetchSloMock.mockReturnValue({ isLoading: false, slo });
-
-        useFetchIndicesMock.mockReturnValue({
-          isLoading: false,
-          indices: [{ name: 'some-index' }],
-        });
-
-        useCreateSloMock.mockReturnValue({
-          mutateAsync: jest.fn().mockRejectedValue('argh, I died'),
-          isLoading: false,
-          isSuccess: false,
-          isError: false,
-        });
-
-        useUpdateSloMock.mockReturnValue({
-          mutateAsync: jest.fn().mockRejectedValue('argh, I died'),
-          isLoading: false,
-          isSuccess: false,
-          isError: false,
-        });
-
-        render(<SloEditPage />);
-
-        expect(screen.queryByTestId('sloFormSubmitButton')).toBeEnabled();
-
-        await waitFor(() => {
-          fireEvent.click(screen.getByTestId('sloFormSubmitButton'));
-        });
-
-        expect(mockAddError).toBeCalled();
-      });
-    });
   });
 });
diff --git a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
index 89d5eadf4d9ad0..380d1a898bf0c4 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/badges/slo_badges.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { EuiFlexGroup } from '@elastic/eui';
+import { EuiFlexGroup, EuiSkeletonRectangle } from '@elastic/eui';
 import { SLOWithSummaryResponse } from '@kbn/slo-schema';
 import { Rule } from '@kbn/triggers-actions-ui-plugin/public';
 
@@ -14,25 +14,54 @@ import { SloIndicatorTypeBadge } from './slo_indicator_type_badge';
 import { SloStatusBadge } from '../../../../components/slo/slo_status_badge';
 import { SloActiveAlertsBadge } from '../../../../components/slo/slo_status_badge/slo_active_alerts_badge';
 import { SloTimeWindowBadge } from './slo_time_window_badge';
+import { SloRulesBadge } from './slo_rules_badge';
 import type { ActiveAlerts } from '../../../../hooks/slo/use_fetch_active_alerts';
 import type { SloRule } from '../../../../hooks/slo/use_fetch_rules_for_slo';
-import { SloRulesBadge } from './slo_rules_badge';
 
 export interface Props {
   activeAlerts?: ActiveAlerts;
+  isLoading: boolean;
   rules: Array<Rule<SloRule>> | undefined;
   slo: SLOWithSummaryResponse;
   onClickRuleBadge: () => void;
 }
 
-export function SloBadges({ activeAlerts, rules, slo, onClickRuleBadge }: Props) {
+export function SloBadges({ activeAlerts, isLoading, rules, slo, onClickRuleBadge }: Props) {
   return (
     <EuiFlexGroup direction="row" responsive={false} gutterSize="s" alignItems="center">
-      <SloStatusBadge slo={slo} />
-      <SloIndicatorTypeBadge slo={slo} />
-      <SloTimeWindowBadge slo={slo} />
-      <SloActiveAlertsBadge slo={slo} activeAlerts={activeAlerts} />
-      <SloRulesBadge rules={rules} onClick={onClickRuleBadge} />
+      {isLoading ? (
+        <>
+          <EuiSkeletonRectangle
+            isLoading
+            contentAriaLabel="Loading"
+            width="54.16px"
+            height="20px"
+            borderRadius="s"
+          />
+          <EuiSkeletonRectangle
+            isLoading
+            contentAriaLabel="Loading"
+            width="54.16px"
+            height="20px"
+            borderRadius="s"
+          />
+          <EuiSkeletonRectangle
+            isLoading
+            contentAriaLabel="Loading"
+            width="54.16px"
+            height="20px"
+            borderRadius="s"
+          />
+        </>
+      ) : (
+        <>
+          <SloStatusBadge slo={slo} />
+          <SloIndicatorTypeBadge slo={slo} />
+          <SloTimeWindowBadge slo={slo} />
+          <SloActiveAlertsBadge slo={slo} activeAlerts={activeAlerts} />
+          <SloRulesBadge rules={rules} onClick={onClickRuleBadge} />
+        </>
+      )}
     </EuiFlexGroup>
   );
 }
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_delete_confirmation_modal.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_delete_confirmation_modal.tsx
index b1b2d341a9bd83..e132661aa16adf 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_delete_confirmation_modal.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_delete_confirmation_modal.tsx
@@ -5,94 +5,49 @@
  * 2.0.
  */
 
+import React from 'react';
 import { EuiConfirmModal } from '@elastic/eui';
-import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import type { SLOWithSummaryResponse } from '@kbn/slo-schema';
-import { useKibana } from '../../../utils/kibana_react';
-import { useDeleteSlo } from '../../../hooks/slo/use_delete_slo';
 
 export interface SloDeleteConfirmationModalProps {
   slo: SLOWithSummaryResponse;
   onCancel: () => void;
-  onSuccess?: () => void;
+  onConfirm: () => void;
 }
 
 export function SloDeleteConfirmationModal({
-  slo: { id, name },
+  slo: { name },
   onCancel,
-  onSuccess,
+  onConfirm,
 }: SloDeleteConfirmationModalProps) {
-  const {
-    notifications: { toasts },
-  } = useKibana().services;
-
-  const [isVisible, setIsVisible] = useState(true);
-
-  const { mutate: deleteSlo, isSuccess, isError } = useDeleteSlo(id);
-
-  if (isSuccess) {
-    toasts.addSuccess(getDeleteSuccesfulMessage(name));
-    onSuccess?.();
-  }
-
-  if (isError) {
-    toasts.addDanger(getDeleteFailMessage(name));
-  }
-
-  const handleConfirm = () => {
-    setIsVisible(false);
-    deleteSlo({ id });
-  };
-
-  return isVisible ? (
+  return (
     <EuiConfirmModal
       buttonColor="danger"
       data-test-subj="sloDeleteConfirmationModal"
-      title={getTitle()}
-      cancelButtonText={getCancelButtonText()}
-      confirmButtonText={getConfirmButtonText(name)}
+      title={i18n.translate('xpack.observability.slo.slo.deleteConfirmationModal.title', {
+        defaultMessage: 'Are you sure?',
+      })}
+      cancelButtonText={i18n.translate(
+        'xpack.observability.slo.slo.deleteConfirmationModal.cancelButtonLabel',
+        {
+          defaultMessage: 'Cancel',
+        }
+      )}
+      confirmButtonText={i18n.translate(
+        'xpack.observability.slo.slo.deleteConfirmationModal.deleteButtonLabel',
+        {
+          defaultMessage: 'Delete {name}',
+          values: { name },
+        }
+      )}
       onCancel={onCancel}
-      onConfirm={handleConfirm}
+      onConfirm={onConfirm}
     >
       {i18n.translate('xpack.observability.slo.slo.deleteConfirmationModal.descriptionText', {
         defaultMessage: "You can't recover {name} after deleting.",
         values: { name },
       })}
     </EuiConfirmModal>
-  ) : null;
-}
-
-const getTitle = () =>
-  i18n.translate('xpack.observability.slo.slo.deleteConfirmationModal.title', {
-    defaultMessage: 'Are you sure?',
-  });
-
-const getCancelButtonText = () =>
-  i18n.translate('xpack.observability.slo.slo.deleteConfirmationModal.cancelButtonLabel', {
-    defaultMessage: 'Cancel',
-  });
-
-const getConfirmButtonText = (name: string) =>
-  i18n.translate('xpack.observability.slo.slo.deleteConfirmationModal.deleteButtonLabel', {
-    defaultMessage: 'Delete {name}',
-    values: { name },
-  });
-
-const getDeleteSuccesfulMessage = (name: string) =>
-  i18n.translate(
-    'xpack.observability.slo.slo.deleteConfirmationModal.successNotification.descriptionText',
-    {
-      defaultMessage: 'Deleted {name}',
-      values: { name },
-    }
-  );
-
-const getDeleteFailMessage = (name: string) =>
-  i18n.translate(
-    'xpack.observability.slo.slo.deleteConfirmationModal.errorNotification.descriptionText',
-    {
-      defaultMessage: 'Failed to delete {name}',
-      values: { name },
-    }
   );
+}
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_list.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_list.tsx
index e71a2cd98a0e64..0efab27b0ebdf7 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_list.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_list.tsx
@@ -29,7 +29,7 @@ export function SloList({ autoRefresh }: Props) {
   const [sort, setSort] = useState<SortType>('creationTime');
   const [indicatorTypeFilter, setIndicatorTypeFilter] = useState<FilterType[]>([]);
 
-  const { isLoading, isError, sloList, refetch } = useFetchSloList({
+  const { isInitialLoading, isLoading, isRefetching, isError, sloList, refetch } = useFetchSloList({
     page: activePage + 1,
     name: query,
     sortBy: sort,
@@ -69,7 +69,15 @@ export function SloList({ autoRefresh }: Props) {
     <EuiFlexGroup direction="column" gutterSize="m" data-test-subj="sloList">
       <EuiFlexItem grow>
         <SloListSearchFilterSortBar
-          loading={isLoading || isCreatingSlo || isCloningSlo || isUpdatingSlo || isDeletingSlo}
+          loading={
+            isInitialLoading ||
+            isLoading ||
+            isRefetching ||
+            isCreatingSlo ||
+            isCloningSlo ||
+            isUpdatingSlo ||
+            isDeletingSlo
+          }
           onChangeQuery={handleChangeQuery}
           onChangeSort={handleChangeSort}
           onChangeIndicatorTypeFilter={handleChangeIndicatorTypeFilter}
@@ -77,7 +85,7 @@ export function SloList({ autoRefresh }: Props) {
       </EuiFlexItem>
 
       <EuiFlexItem>
-        <SloListItems sloList={results} loading={isLoading} error={isError} />
+        <SloListItems sloList={results} loading={isLoading || isRefetching} error={isError} />
       </EuiFlexItem>
 
       {results.length ? (
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_list_item.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_list_item.tsx
index 3fe0f5d31f5431..4502e7a2d9d200 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_list_item.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_list_item.tsx
@@ -6,7 +6,7 @@
  */
 
 import React, { useState } from 'react';
-import { useIsMutating, useQueryClient } from '@tanstack/react-query';
+import { useQueryClient } from '@tanstack/react-query';
 import {
   EuiButtonIcon,
   EuiContextMenuItem,
@@ -46,6 +46,7 @@ export interface SloListItemProps {
   historicalSummary?: HistoricalSummaryResponse[];
   historicalSummaryLoading: boolean;
   activeAlerts?: ActiveAlerts;
+  onConfirmDelete: (slo: SLOWithSummaryResponse) => void;
 }
 
 export function SloListItem({
@@ -54,6 +55,7 @@ export function SloListItem({
   historicalSummary = [],
   historicalSummaryLoading,
   activeAlerts,
+  onConfirmDelete,
 }: SloListItemProps) {
   const {
     application: { navigateToUrl },
@@ -69,7 +71,6 @@ export function SloListItem({
   const filteredRuleTypes = useGetFilteredRuleTypes();
 
   const { mutate: cloneSlo } = useCloneSlo();
-  const isDeletingSlo = Boolean(useIsMutating(['deleteSlo', slo.id]));
 
   const [isActionsPopoverOpen, setIsActionsPopoverOpen] = useState(false);
   const [isAddRuleFlyoutOpen, setIsAddRuleFlyoutOpen] = useState(false);
@@ -123,21 +124,17 @@ export function SloListItem({
     setIsActionsPopoverOpen(false);
   };
 
+  const handleDeleteConfirm = () => {
+    setDeleteConfirmationModalOpen(false);
+    onConfirmDelete(slo);
+  };
+
   const handleDeleteCancel = () => {
     setDeleteConfirmationModalOpen(false);
   };
 
   return (
-    <EuiPanel
-      data-test-subj="sloItem"
-      color={isDeletingSlo ? 'subdued' : undefined}
-      hasBorder
-      hasShadow={false}
-      style={{
-        opacity: isDeletingSlo ? 0.3 : 1,
-        transition: 'opacity 0.1s ease-in',
-      }}
-    >
+    <EuiPanel data-test-subj="sloItem" hasBorder hasShadow={false}>
       <EuiFlexGroup responsive={false} alignItems="center">
         {/* CONTENT */}
         <EuiFlexItem grow>
@@ -146,13 +143,18 @@ export function SloListItem({
               <EuiFlexGroup direction="column" gutterSize="m">
                 <EuiFlexItem>
                   <EuiText size="s">
-                    <EuiLink data-test-subj="o11ySloListItemLink" onClick={handleViewDetails}>
-                      {slo.name}
-                    </EuiLink>
+                    {slo.summary ? (
+                      <EuiLink data-test-subj="o11ySloListItemLink" onClick={handleViewDetails}>
+                        {slo.name}
+                      </EuiLink>
+                    ) : (
+                      <span>{slo.name}</span>
+                    )}
                   </EuiText>
                 </EuiFlexItem>
                 <SloBadges
                   activeAlerts={activeAlerts}
+                  isLoading={!slo.summary}
                   rules={rules}
                   slo={slo}
                   onClickRuleBadge={handleCreateRule}
@@ -161,11 +163,13 @@ export function SloListItem({
             </EuiFlexItem>
 
             <EuiFlexItem grow={false}>
-              <SloSummary
-                slo={slo}
-                historicalSummary={historicalSummary}
-                historicalSummaryLoading={historicalSummaryLoading}
-              />
+              {slo.summary ? (
+                <SloSummary
+                  slo={slo}
+                  historicalSummary={historicalSummary}
+                  historicalSummaryLoading={historicalSummaryLoading}
+                />
+              ) : null}
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlexItem>
@@ -177,8 +181,9 @@ export function SloListItem({
             button={
               <EuiButtonIcon
                 aria-label="Actions"
-                display="empty"
                 color="text"
+                disabled={!slo.summary}
+                display="empty"
                 iconType="boxesVertical"
                 size="s"
                 onClick={handleClickActions}
@@ -276,7 +281,11 @@ export function SloListItem({
       ) : null}
 
       {isDeleteConfirmationModalOpen ? (
-        <SloDeleteConfirmationModal slo={slo} onCancel={handleDeleteCancel} />
+        <SloDeleteConfirmationModal
+          slo={slo}
+          onCancel={handleDeleteCancel}
+          onConfirm={handleDeleteConfirm}
+        />
       ) : null}
     </EuiPanel>
   );
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_list_items.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_list_items.tsx
index 2f6f71612788e8..e70f8139fe9f59 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_list_items.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_list_items.tsx
@@ -11,6 +11,7 @@ import type { SLOWithSummaryResponse } from '@kbn/slo-schema';
 import { useFetchActiveAlerts } from '../../../hooks/slo/use_fetch_active_alerts';
 import { useFetchRulesForSlo } from '../../../hooks/slo/use_fetch_rules_for_slo';
 import { useFetchHistoricalSummary } from '../../../hooks/slo/use_fetch_historical_summary';
+import { useDeleteSlo } from '../../../hooks/slo/use_delete_slo';
 import { SloListItem } from './slo_list_item';
 import { SloListEmpty } from './slo_list_empty';
 import { SloListError } from './slo_list_error';
@@ -29,6 +30,8 @@ export function SloListItems({ sloList, loading, error }: Props) {
   const { isLoading: historicalSummaryLoading, sloHistoricalSummaryResponse } =
     useFetchHistoricalSummary({ sloIds });
 
+  const { mutate: deleteSlo } = useDeleteSlo();
+
   if (!loading && !error && sloList.length === 0) {
     return <SloListEmpty />;
   }
@@ -36,6 +39,10 @@ export function SloListItems({ sloList, loading, error }: Props) {
     return <SloListError />;
   }
 
+  const handleDelete = (slo: SLOWithSummaryResponse) => {
+    deleteSlo({ id: slo.id, name: slo.name });
+  };
+
   return (
     <EuiFlexGroup direction="column" gutterSize="s">
       {sloList.map((slo) => (
@@ -46,6 +53,7 @@ export function SloListItems({ sloList, loading, error }: Props) {
             historicalSummary={sloHistoricalSummaryResponse?.[slo.id]}
             historicalSummaryLoading={historicalSummaryLoading}
             slo={slo}
+            onConfirmDelete={handleDelete}
           />
         </EuiFlexItem>
       ))}
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_sparkline.tsx b/x-pack/plugins/observability/public/pages/slos/components/slo_sparkline.tsx
index 8b3586554abf88..c546d8306bb38c 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_sparkline.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/components/slo_sparkline.tsx
@@ -50,7 +50,7 @@ export function SloSparkline({ chart, data, id, isLoading, state }: Props) {
     ) : null;
 
   if (isLoading) {
-    return <EuiLoadingChart size="m" mono />;
+    return <EuiLoadingChart style={{ minWidth: 60, justifyContent: 'center' }} size="m" mono />;
   }
 
   return (
diff --git a/x-pack/plugins/observability/public/pages/slos/slos.test.tsx b/x-pack/plugins/observability/public/pages/slos/slos.test.tsx
index 12a6f2762de58d..f017f8690305f8 100644
--- a/x-pack/plugins/observability/public/pages/slos/slos.test.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/slos.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { screen, act } from '@testing-library/react';
+import { screen, act, waitFor } from '@testing-library/react';
 
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { waitForEuiPopoverOpen } from '@elastic/eui/lib/test/rtl';
@@ -23,6 +23,7 @@ import { SlosPage } from './slos';
 import { emptySloList, sloList } from '../../data/slo/slo';
 import { historicalSummaryData } from '../../data/slo/historical_summary_data';
 import { useCapabilities } from '../../hooks/slo/use_capabilities';
+import { paths } from '../../config/paths';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -70,7 +71,7 @@ const mockKibana = () => {
       charts: chartPluginMock.createSetupContract(),
       http: {
         basePath: {
-          prepend: jest.fn(),
+          prepend: (url: string) => url,
         },
       },
       notifications: {
@@ -106,17 +107,22 @@ describe('SLOs Page', () => {
   });
 
   describe('when the incorrect license is found', () => {
-    it('renders the welcome prompt with subscription buttons', async () => {
+    beforeEach(() => {
       useFetchSloListMock.mockReturnValue({ isLoading: false, sloList: emptySloList });
       useLicenseMock.mockReturnValue({ hasAtLeast: () => false });
-
+      useFetchHistoricalSummaryMock.mockReturnValue({
+        isLoading: false,
+        sloHistoricalSummaryResponse: {},
+      });
+    });
+    it('navigates to the SLOs Welcome Page', async () => {
       await act(async () => {
         render(<SlosPage />);
       });
 
-      expect(screen.queryByTestId('slosPageWelcomePrompt')).toBeTruthy();
-      expect(screen.queryByTestId('slosPageWelcomePromptSignupForCloudButton')).toBeTruthy();
-      expect(screen.queryByTestId('slosPageWelcomePromptSignupForLicenseButton')).toBeTruthy();
+      await waitFor(() => {
+        expect(mockNavigate).toBeCalledWith(paths.observability.slosWelcome);
+      });
     });
   });
 
@@ -125,14 +131,20 @@ describe('SLOs Page', () => {
       useLicenseMock.mockReturnValue({ hasAtLeast: () => true });
     });
 
-    it('renders the SLOs Welcome Prompt when the API has finished loading and there are no results', async () => {
+    it('navigates to the SLOs Welcome Page when the API has finished loading and there are no results', async () => {
       useFetchSloListMock.mockReturnValue({ isLoading: false, sloList: emptySloList });
+      useFetchHistoricalSummaryMock.mockReturnValue({
+        isLoading: false,
+        sloHistoricalSummaryResponse: {},
+      });
 
       await act(async () => {
         render(<SlosPage />);
       });
 
-      expect(screen.queryByTestId('slosPageWelcomePrompt')).toBeTruthy();
+      await waitFor(() => {
+        expect(mockNavigate).toBeCalledWith(paths.observability.slosWelcome);
+      });
     });
 
     it('should have a create new SLO button', async () => {
@@ -206,7 +218,9 @@ describe('SLOs Page', () => {
 
         button.click();
 
-        expect(mockNavigate).toBeCalled();
+        expect(mockNavigate).toBeCalledWith(
+          `${paths.observability.sloEdit(sloList.results.at(0)?.id || '')}`
+        );
       });
 
       it('allows creating a new rule for an SLO', async () => {
@@ -283,7 +297,10 @@ describe('SLOs Page', () => {
 
         screen.getByTestId('confirmModalConfirmButton').click();
 
-        expect(mockDeleteSlo).toBeCalledWith({ id: sloList.results.at(0)?.id });
+        expect(mockDeleteSlo).toBeCalledWith({
+          id: sloList.results.at(0)?.id,
+          name: sloList.results.at(0)?.name,
+        });
       });
 
       it('allows cloning an SLO', async () => {
diff --git a/x-pack/plugins/observability/public/pages/slos/slos.tsx b/x-pack/plugins/observability/public/pages/slos/slos.tsx
index f9cf30cb7b3441..9b7df97e1e13c4 100644
--- a/x-pack/plugins/observability/public/pages/slos/slos.tsx
+++ b/x-pack/plugins/observability/public/pages/slos/slos.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { EuiButton } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
@@ -16,7 +16,6 @@ import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
 import { useCapabilities } from '../../hooks/slo/use_capabilities';
 import { useFetchSloList } from '../../hooks/slo/use_fetch_slo_list';
 import { SloList } from './components/slo_list';
-import { SloListWelcomePrompt } from './components/slo_list_welcome_prompt';
 import { AutoRefreshButton } from './components/auto_refresh_button';
 import { HeaderTitle } from './components/header_title';
 import { FeedbackButton } from '../../components/slo/feedback_button/feedback_button';
@@ -55,14 +54,16 @@ export function SlosPage() {
     setIsAutoRefreshing(!isAutoRefreshing);
   };
 
+  useEffect(() => {
+    if ((!isLoading && total === 0) || hasAtLeast('platinum') === false) {
+      navigateToUrl(basePath.prepend(paths.observability.slosWelcome));
+    }
+  }, [basePath, hasAtLeast, isLoading, navigateToUrl, total]);
+
   if (isInitialLoading) {
     return null;
   }
 
-  if ((!isLoading && total === 0) || !hasAtLeast('platinum')) {
-    return <SloListWelcomePrompt />;
-  }
-
   return (
     <ObservabilityPageTemplate
       pageHeader={{
diff --git a/x-pack/plugins/observability/public/pages/slos/components/assets/illustration.svg b/x-pack/plugins/observability/public/pages/slos_welcome/assets/illustration.svg
similarity index 100%
rename from x-pack/plugins/observability/public/pages/slos/components/assets/illustration.svg
rename to x-pack/plugins/observability/public/pages/slos_welcome/assets/illustration.svg
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_list_welcome_prompt.stories.tsx b/x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.stories.tsx
similarity index 71%
rename from x-pack/plugins/observability/public/pages/slos/components/slo_list_welcome_prompt.stories.tsx
rename to x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.stories.tsx
index 89ee6435543c68..cb3cb1710bf0e5 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_list_welcome_prompt.stories.tsx
+++ b/x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.stories.tsx
@@ -8,12 +8,12 @@
 import React from 'react';
 import { ComponentStory } from '@storybook/react';
 
-import { KibanaReactStorybookDecorator } from '../../../utils/kibana_react.storybook_decorator';
-import { SloListWelcomePrompt as Component } from './slo_list_welcome_prompt';
+import { KibanaReactStorybookDecorator } from '../../utils/kibana_react.storybook_decorator';
+import { SlosWelcomePage as Component } from './slos_welcome';
 
 export default {
   component: Component,
-  title: 'app/SLO/ListPage/SloListWelcomePrompt',
+  title: 'app/SLO/SlosWelcomePage',
   decorators: [KibanaReactStorybookDecorator],
 };
 
diff --git a/x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.test.tsx b/x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.test.tsx
new file mode 100644
index 00000000000000..8369ff79afcf18
--- /dev/null
+++ b/x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.test.tsx
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { screen, waitFor } from '@testing-library/react';
+
+import { render } from '../../utils/test_helper';
+import { useKibana } from '../../utils/kibana_react';
+import { useFetchSloList } from '../../hooks/slo/use_fetch_slo_list';
+import { useLicense } from '../../hooks/use_license';
+import { SlosWelcomePage } from './slos_welcome';
+import { emptySloList, sloList } from '../../data/slo/slo';
+import { useCapabilities } from '../../hooks/slo/use_capabilities';
+import { paths } from '../../config/paths';
+
+jest.mock('../../utils/kibana_react');
+jest.mock('../../hooks/use_breadcrumbs');
+jest.mock('../../hooks/use_license');
+jest.mock('../../hooks/slo/use_fetch_slo_list');
+jest.mock('../../hooks/slo/use_capabilities');
+
+const useKibanaMock = useKibana as jest.Mock;
+const useLicenseMock = useLicense as jest.Mock;
+const useFetchSloListMock = useFetchSloList as jest.Mock;
+const useCapabilitiesMock = useCapabilities as jest.Mock;
+
+const mockNavigate = jest.fn();
+
+const mockKibana = () => {
+  useKibanaMock.mockReturnValue({
+    services: {
+      application: { navigateToUrl: mockNavigate },
+      http: {
+        basePath: {
+          prepend: (url: string) => url,
+        },
+      },
+    },
+  });
+};
+
+describe('SLOs Welcome Page', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockKibana();
+    useCapabilitiesMock.mockReturnValue({ hasWriteCapabilities: true, hasReadCapabilities: true });
+  });
+
+  describe('when the incorrect license is found', () => {
+    it('renders the welcome message with subscription buttons', async () => {
+      useFetchSloListMock.mockReturnValue({ isLoading: false, sloList: emptySloList });
+      useLicenseMock.mockReturnValue({ hasAtLeast: () => false });
+
+      render(<SlosWelcomePage />);
+
+      expect(screen.queryByTestId('slosPageWelcomePrompt')).toBeTruthy();
+      expect(screen.queryByTestId('slosPageWelcomePromptSignupForCloudButton')).toBeTruthy();
+      expect(screen.queryByTestId('slosPageWelcomePromptSignupForLicenseButton')).toBeTruthy();
+    });
+  });
+
+  describe('when the correct license is found', () => {
+    beforeEach(() => {
+      useLicenseMock.mockReturnValue({ hasAtLeast: () => true });
+    });
+
+    describe('when loading is done and no results are found', () => {
+      beforeEach(() => {
+        useFetchSloListMock.mockReturnValue({ isLoading: false, emptySloList });
+      });
+
+      it('should display the welcome message with a Create new SLO button which should navigate to the SLO Creation page', async () => {
+        render(<SlosWelcomePage />);
+        expect(screen.queryByTestId('slosPageWelcomePrompt')).toBeTruthy();
+
+        const createNewSloButton = screen.queryByTestId('o11ySloListWelcomePromptCreateSloButton');
+        expect(createNewSloButton).toBeTruthy();
+        createNewSloButton?.click();
+
+        await waitFor(() => {
+          expect(mockNavigate).toBeCalledWith(paths.observability.sloCreate);
+        });
+      });
+    });
+
+    describe('when loading is done and results are found', () => {
+      beforeEach(() => {
+        useFetchSloListMock.mockReturnValue({ isLoading: false, sloList });
+      });
+
+      it('should navigate to the SLO List page', async () => {
+        render(<SlosWelcomePage />);
+        await waitFor(() => {
+          expect(mockNavigate).toBeCalledWith(paths.observability.slos);
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/observability/public/pages/slos/components/slo_list_welcome_prompt.tsx b/x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.tsx
similarity index 87%
rename from x-pack/plugins/observability/public/pages/slos/components/slo_list_welcome_prompt.tsx
rename to x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.tsx
index 478c0d85cc613a..50a062413951b7 100644
--- a/x-pack/plugins/observability/public/pages/slos/components/slo_list_welcome_prompt.tsx
+++ b/x-pack/plugins/observability/public/pages/slos_welcome/slos_welcome.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useEffect } from 'react';
 import {
   EuiPageTemplate,
   EuiButton,
@@ -18,13 +18,14 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { useKibana } from '../../../utils/kibana_react';
-import { useLicense } from '../../../hooks/use_license';
-import { usePluginContext } from '../../../hooks/use_plugin_context';
-import { paths } from '../../../config/paths';
+import { useKibana } from '../../utils/kibana_react';
+import { useLicense } from '../../hooks/use_license';
+import { usePluginContext } from '../../hooks/use_plugin_context';
+import { useFetchSloList } from '../../hooks/slo/use_fetch_slo_list';
+import { paths } from '../../config/paths';
 import illustration from './assets/illustration.svg';
 
-export function SloListWelcomePrompt() {
+export function SlosWelcomePage() {
   const {
     application: { navigateToUrl },
     http: { basePath },
@@ -32,14 +33,24 @@ export function SloListWelcomePrompt() {
   const { ObservabilityPageTemplate } = usePluginContext();
 
   const { hasAtLeast } = useLicense();
-
   const hasRightLicense = hasAtLeast('platinum');
 
+  const { isLoading, sloList } = useFetchSloList();
+  const { total } = sloList || { total: 0 };
+
   const handleClickCreateSlo = () => {
     navigateToUrl(basePath.prepend(paths.observability.sloCreate));
   };
 
-  return (
+  const hasSlosAndHasPermissions = total > 0 && hasAtLeast('platinum') === true;
+
+  useEffect(() => {
+    if (hasSlosAndHasPermissions) {
+      navigateToUrl(basePath.prepend(paths.observability.slos));
+    }
+  }, [basePath, hasSlosAndHasPermissions, navigateToUrl]);
+
+  return hasSlosAndHasPermissions || isLoading ? null : (
     <ObservabilityPageTemplate data-test-subj="slosPageWelcomePrompt">
       <EuiPageTemplate.EmptyPrompt
         title={
@@ -171,7 +182,7 @@ export function SloListWelcomePrompt() {
             &nbsp;
             <EuiLink
               data-test-subj="o11ySloListWelcomePromptReadTheDocsLink"
-              href="#"
+              href="https://www.elastic.co/guide/en/observability/current/slo.html"
               target="_blank"
             >
               {i18n.translate('xpack.observability.slo.sloList.welcomePrompt.learnMoreLink', {
diff --git a/x-pack/plugins/observability/public/routes/index.tsx b/x-pack/plugins/observability/public/routes/index.tsx
index f6fe3071953098..165a7e6767569f 100644
--- a/x-pack/plugins/observability/public/routes/index.tsx
+++ b/x-pack/plugins/observability/public/routes/index.tsx
@@ -17,6 +17,7 @@ import { OverviewPage } from '../pages/overview/overview';
 import { RulesPage } from '../pages/rules/rules';
 import { RuleDetailsPage } from '../pages/rule_details';
 import { SlosPage } from '../pages/slos/slos';
+import { SlosWelcomePage } from '../pages/slos_welcome/slos_welcome';
 import { SloDetailsPage } from '../pages/slo_details/slo_details';
 import { SloEditPage } from '../pages/slo_edit/slo_edit';
 import { casesPath } from '../../common';
@@ -135,6 +136,13 @@ export const routes = {
     params: {},
     exact: true,
   },
+  '/slos/welcome': {
+    handler: () => {
+      return <SlosWelcomePage />;
+    },
+    params: {},
+    exact: true,
+  },
   '/slos/edit/:sloId': {
     handler: () => {
       return <SloEditPage />;
diff --git a/x-pack/plugins/observability/public/rules/register_observability_rule_types.ts b/x-pack/plugins/observability/public/rules/register_observability_rule_types.ts
index f2a22b77d0a61c..89557987190954 100644
--- a/x-pack/plugins/observability/public/rules/register_observability_rule_types.ts
+++ b/x-pack/plugins/observability/public/rules/register_observability_rule_types.ts
@@ -31,7 +31,7 @@ export const registerObservabilityRuleTypes = (
     },
     iconClass: 'bell',
     documentationUrl(docLinks) {
-      return '/unknown/docs';
+      return 'https://www.elastic.co/guide/en/observability/current/slo-burn-rate-alert.html';
     },
     ruleParamsExpression: lazy(() => import('../components/app/burn_rate_rule_editor')),
     validate: validateBurnRateRule,
diff --git a/x-pack/plugins/observability/public/utils/kibana_react.storybook_decorator.tsx b/x-pack/plugins/observability/public/utils/kibana_react.storybook_decorator.tsx
index a0e5a1f0e037b8..c79428b508ef04 100644
--- a/x-pack/plugins/observability/public/utils/kibana_react.storybook_decorator.tsx
+++ b/x-pack/plugins/observability/public/utils/kibana_react.storybook_decorator.tsx
@@ -11,6 +11,7 @@ import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { AppMountParameters } from '@kbn/core-application-browser';
 import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
 import { CoreTheme } from '@kbn/core-theme-browser';
+import { MemoryRouter } from 'react-router-dom';
 import { casesFeatureId, sloFeatureId } from '../../common';
 import { PluginContext } from '../context/plugin_context';
 import { createObservabilityRuleTypeRegistryMock } from '../rules/observability_rule_type_registry_mock';
@@ -19,7 +20,9 @@ import { ConfigSchema } from '../plugin';
 export function KibanaReactStorybookDecorator(Story: ComponentType) {
   const queryClient = new QueryClient();
 
-  const appMountParameters = { setHeaderActionMenu: () => {} } as unknown as AppMountParameters;
+  const appMountParameters = {
+    setHeaderActionMenu: () => {},
+  } as unknown as AppMountParameters;
   const observabilityRuleTypeRegistry = createObservabilityRuleTypeRegistryMock();
 
   const config: ConfigSchema = {
@@ -31,7 +34,6 @@ export function KibanaReactStorybookDecorator(Story: ComponentType) {
       },
     },
   };
-
   const mockTheme: CoreTheme = {
     darkMode: false,
   };
@@ -86,6 +88,9 @@ export function KibanaReactStorybookDecorator(Story: ComponentType) {
             addDanger: () => {},
           },
         },
+        share: {
+          url: { locators: { get: () => {} } },
+        },
         storage: {
           get: () => {},
         },
@@ -114,9 +119,11 @@ export function KibanaReactStorybookDecorator(Story: ComponentType) {
           ObservabilityPageTemplate: KibanaPageTemplate,
         }}
       >
-        <QueryClientProvider client={queryClient}>
-          <Story />
-        </QueryClientProvider>
+        <MemoryRouter>
+          <QueryClientProvider client={queryClient}>
+            <Story />
+          </QueryClientProvider>
+        </MemoryRouter>
       </PluginContext.Provider>
     </KibanaContextProvider>
   );
diff --git a/x-pack/plugins/observability/server/plugin.ts b/x-pack/plugins/observability/server/plugin.ts
index 9fdf113cc64af3..4e44593dc77677 100644
--- a/x-pack/plugins/observability/server/plugin.ts
+++ b/x-pack/plugins/observability/server/plugin.ts
@@ -14,7 +14,7 @@ import {
   Logger,
 } from '@kbn/core/server';
 import { hiddenTypes as filesSavedObjectTypes } from '@kbn/files-plugin/server/saved_objects';
-import { PluginSetupContract } from '@kbn/alerting-plugin/server';
+import { PluginSetupContract, PluginStartContract } from '@kbn/alerting-plugin/server';
 import { Dataset, RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
 import { PluginSetupContract as FeaturesSetup } from '@kbn/features-plugin/server';
 import { legacyExperimentalFieldMap } from '@kbn/alerts-as-data-utils';
@@ -59,6 +59,10 @@ interface PluginSetup {
   usageCollection?: UsageCollectionSetup;
 }
 
+interface PluginStart {
+  alerting: PluginStartContract;
+}
+
 export class ObservabilityPlugin implements Plugin<ObservabilityPluginSetup> {
   private logger: Logger;
 
@@ -67,7 +71,7 @@ export class ObservabilityPlugin implements Plugin<ObservabilityPluginSetup> {
     this.logger = initContext.logger.get();
   }
 
-  public setup(core: CoreSetup, plugins: PluginSetup) {
+  public setup(core: CoreSetup<PluginStart>, plugins: PluginSetup) {
     const casesCapabilities = createCasesUICapabilities();
     const casesApiTags = getCasesApiTags(observabilityFeatureId);
 
@@ -237,13 +241,16 @@ export class ObservabilityPlugin implements Plugin<ObservabilityPluginSetup> {
     registerRuleTypes(plugins.alerting, this.logger, ruleDataClient, core.http.basePath);
     registerSloUsageCollector(plugins.usageCollection);
 
-    registerRoutes({
-      core,
-      dependencies: {
-        ruleDataService,
-      },
-      logger: this.logger,
-      repository: getObservabilityServerRouteRepository(),
+    core.getStartServices().then(([coreStart, pluginStart]) => {
+      registerRoutes({
+        core,
+        dependencies: {
+          ruleDataService,
+          getRulesClientWithRequest: pluginStart.alerting.getRulesClientWithRequest,
+        },
+        logger: this.logger,
+        repository: getObservabilityServerRouteRepository(),
+      });
     });
 
     /**
diff --git a/x-pack/plugins/observability/server/routes/register_routes.ts b/x-pack/plugins/observability/server/routes/register_routes.ts
index de46f624addb7e..f79027bd4d6bba 100644
--- a/x-pack/plugins/observability/server/routes/register_routes.ts
+++ b/x-pack/plugins/observability/server/routes/register_routes.ts
@@ -10,10 +10,11 @@ import {
   parseEndpoint,
   routeValidationObject,
 } from '@kbn/server-route-repository';
-import { CoreSetup, Logger, RouteRegistrar } from '@kbn/core/server';
+import { CoreSetup, KibanaRequest, Logger, RouteRegistrar } from '@kbn/core/server';
 import Boom from '@hapi/boom';
 import { errors } from '@elastic/elasticsearch';
 import { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
+import { RulesClientApi } from '@kbn/alerting-plugin/server/types';
 
 import { ObservabilityRequestHandlerContext } from '../types';
 import { AbstractObservabilityServerRouteRepository } from './types';
@@ -28,6 +29,7 @@ interface RegisterRoutes {
 
 export interface RegisterRoutesDependencies {
   ruleDataService: RuleDataPluginService;
+  getRulesClientWithRequest: (request: KibanaRequest) => RulesClientApi;
 }
 
 export function registerRoutes({ repository, core, logger, dependencies }: RegisterRoutes) {
diff --git a/x-pack/plugins/observability/server/routes/slo/route.ts b/x-pack/plugins/observability/server/routes/slo/route.ts
index 1aec94e3dde1f0..0d0a9644087732 100644
--- a/x-pack/plugins/observability/server/routes/slo/route.ts
+++ b/x-pack/plugins/observability/server/routes/slo/route.ts
@@ -106,18 +106,25 @@ const deleteSLORoute = createObservabilityServerRoute({
     tags: ['access:slo_write'],
   },
   params: deleteSLOParamsSchema,
-  handler: async ({ context, params, logger }) => {
+  handler: async ({
+    request,
+    context,
+    params,
+    logger,
+    dependencies: { getRulesClientWithRequest },
+  }) => {
     if (!isLicenseAtLeastPlatinum(context)) {
       throw badRequest('Platinum license or higher is needed to make use of this feature.');
     }
 
     const esClient = (await context.core).elasticsearch.client.asCurrentUser;
     const soClient = (await context.core).savedObjects.client;
+    const rulesClient = getRulesClientWithRequest(request);
 
     const repository = new KibanaSavedObjectsSLORepository(soClient);
     const transformManager = new DefaultTransformManager(transformGenerators, esClient, logger);
 
-    const deleteSLO = new DeleteSLO(repository, transformManager, esClient);
+    const deleteSLO = new DeleteSLO(repository, transformManager, esClient, rulesClient);
 
     await deleteSLO.execute(params.path.id);
   },
diff --git a/x-pack/plugins/observability/server/services/slo/delete_slo.test.ts b/x-pack/plugins/observability/server/services/slo/delete_slo.test.ts
index a979265ce1ef9e..e1e76fa56400d3 100644
--- a/x-pack/plugins/observability/server/services/slo/delete_slo.test.ts
+++ b/x-pack/plugins/observability/server/services/slo/delete_slo.test.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { RulesClientApi } from '@kbn/alerting-plugin/server/types';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/rules_client.mock';
 import { ElasticsearchClient } from '@kbn/core/server';
 import { elasticsearchServiceMock } from '@kbn/core/server/mocks';
 import { getSLOTransformId, SLO_INDEX_TEMPLATE_NAME } from '../../assets/constants';
@@ -18,17 +20,19 @@ describe('DeleteSLO', () => {
   let mockRepository: jest.Mocked<SLORepository>;
   let mockTransformManager: jest.Mocked<TransformManager>;
   let mockEsClient: jest.Mocked<ElasticsearchClient>;
+  let mockRulesClient: jest.Mocked<RulesClientApi>;
   let deleteSLO: DeleteSLO;
 
   beforeEach(() => {
     mockRepository = createSLORepositoryMock();
     mockTransformManager = createTransformManagerMock();
     mockEsClient = elasticsearchServiceMock.createElasticsearchClient();
-    deleteSLO = new DeleteSLO(mockRepository, mockTransformManager, mockEsClient);
+    mockRulesClient = rulesClientMock.create();
+    deleteSLO = new DeleteSLO(mockRepository, mockTransformManager, mockEsClient, mockRulesClient);
   });
 
   describe('happy path', () => {
-    it('removes the transform, the roll up data and the SLO from the repository', async () => {
+    it('removes the transform, the roll up data, the associated rules and the SLO from the repository', async () => {
       const slo = createSLO({ indicator: createAPMTransactionErrorRateIndicator() });
       mockRepository.findById.mockResolvedValueOnce(slo);
 
@@ -51,6 +55,9 @@ describe('DeleteSLO', () => {
           },
         })
       );
+      expect(mockRulesClient.bulkDeleteRules).toHaveBeenCalledWith({
+        filter: `alert.attributes.params.sloId:${slo.id}`,
+      });
       expect(mockRepository.deleteById).toHaveBeenCalledWith(slo.id);
     });
   });
diff --git a/x-pack/plugins/observability/server/services/slo/delete_slo.ts b/x-pack/plugins/observability/server/services/slo/delete_slo.ts
index 8ec8d2060f7308..dc812b1bd4f31f 100644
--- a/x-pack/plugins/observability/server/services/slo/delete_slo.ts
+++ b/x-pack/plugins/observability/server/services/slo/delete_slo.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { RulesClientApi } from '@kbn/alerting-plugin/server/types';
 import { ElasticsearchClient } from '@kbn/core/server';
 import { getSLOTransformId, SLO_INDEX_TEMPLATE_NAME } from '../../assets/constants';
 
@@ -15,7 +16,8 @@ export class DeleteSLO {
   constructor(
     private repository: SLORepository,
     private transformManager: TransformManager,
-    private esClient: ElasticsearchClient
+    private esClient: ElasticsearchClient,
+    private rulesClient: RulesClientApi
   ) {}
 
   public async execute(sloId: string): Promise<void> {
@@ -26,6 +28,7 @@ export class DeleteSLO {
     await this.transformManager.uninstall(sloTransformId);
 
     await this.deleteRollupData(slo.id);
+    await this.deleteAssociatedRules(slo.id);
     await this.repository.deleteById(slo.id);
   }
 
@@ -40,4 +43,14 @@ export class DeleteSLO {
       },
     });
   }
+
+  private async deleteAssociatedRules(sloId: string): Promise<void> {
+    try {
+      await this.rulesClient.bulkDeleteRules({
+        filter: `alert.attributes.params.sloId:${sloId}`,
+      });
+    } catch (err) {
+      // no-op: bulkDeleteRules throws if no rules are found.
+    }
+  }
 }
diff --git a/x-pack/plugins/observability_onboarding/public/application/app.tsx b/x-pack/plugins/observability_onboarding/public/application/app.tsx
index 28d96eda8df267..13e45999336f8f 100644
--- a/x-pack/plugins/observability_onboarding/public/application/app.tsx
+++ b/x-pack/plugins/observability_onboarding/public/application/app.tsx
@@ -17,20 +17,23 @@ import {
   KibanaContextProvider,
   KibanaThemeProvider,
   RedirectAppLinks,
-  useKibana,
   useUiSetting$,
 } from '@kbn/kibana-react-plugin/public';
-import { useBreadcrumbs } from '@kbn/observability-plugin/public';
-import { RouterProvider, createRouter } from '@kbn/typed-react-router-config';
+import { Route } from '@kbn/shared-ux-router';
 import { euiDarkVars, euiLightVars } from '@kbn/ui-theme';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Redirect, RouteComponentProps, RouteProps } from 'react-router-dom';
-import { Home } from '../components/app/home';
+import {
+  Router,
+  Switch,
+  RouteComponentProps,
+  RouteProps,
+} from 'react-router-dom';
 import {
   ObservabilityOnboardingPluginSetupDeps,
   ObservabilityOnboardingPluginStartDeps,
 } from '../plugin';
+import { routes } from '../routes';
 
 export type BreadcrumbTitle<
   T extends { [K in keyof T]?: string | undefined } = {}
@@ -49,33 +52,33 @@ export const onBoardingTitle = i18n.translate(
   }
 );
 
-export const onboardingRoutes: RouteDefinition[] = [
-  {
-    exact: true,
-    path: '/',
-    render: () => <Redirect to="/observabilityOnboarding" />,
-    breadcrumb: onBoardingTitle,
-  },
-];
+export const breadcrumbsApp = {
+  id: 'observabilityOnboarding',
+  label: onBoardingTitle,
+};
+
+function App() {
+  return (
+    <>
+      <Switch>
+        {Object.keys(routes).map((key) => {
+          const path = key as keyof typeof routes;
+          const { handler, exact } = routes[path];
+          const Wrapper = () => {
+            return handler();
+          };
+          return (
+            <Route key={path} path={path} exact={exact} component={Wrapper} />
+          );
+        })}
+      </Switch>
+    </>
+  );
+}
 
 function ObservabilityOnboardingApp() {
   const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
 
-  const { http } = useKibana<ObservabilityOnboardingPluginStartDeps>().services;
-  const basePath = http.basePath.get();
-
-  useBreadcrumbs([
-    {
-      text: onBoardingTitle,
-      href: basePath + '/app/observabilityOnboarding',
-    },
-    {
-      text: i18n.translate('xpack.observability_onboarding.breadcrumbs.logs', {
-        defaultMessage: 'Logs',
-      }),
-    },
-  ]);
-
   return (
     <ThemeProvider
       theme={(outerTheme?: Theme) => ({
@@ -85,14 +88,12 @@ function ObservabilityOnboardingApp() {
       })}
     >
       <div className={APP_WRAPPER_CLASS} data-test-subj="csmMainContainer">
-        <Home />
+        <App />
       </div>
     </ThemeProvider>
   );
 }
 
-export const observabilityOnboardingRouter = createRouter({});
-
 export function ObservabilityOnboardingAppRoot({
   appMountParameters,
   core,
@@ -131,14 +132,11 @@ export function ObservabilityOnboardingAppRoot({
           }}
         >
           <i18nCore.Context>
-            <RouterProvider
-              history={history}
-              router={observabilityOnboardingRouter}
-            >
+            <Router history={history}>
               <EuiErrorBoundary>
                 <ObservabilityOnboardingApp />
               </EuiErrorBoundary>
-            </RouterProvider>
+            </Router>
           </i18nCore.Context>
         </KibanaThemeProvider>
       </KibanaContextProvider>
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/index.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/index.tsx
new file mode 100644
index 00000000000000..9cdffa9ea05d0e
--- /dev/null
+++ b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/index.tsx
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { useBreadcrumbs } from '@kbn/observability-plugin/public';
+import React, { ComponentType, useRef, useState } from 'react';
+import {
+  FilmstripFrame,
+  FilmstripTransition,
+  TransitionState,
+} from '../../shared/filmstrip_transition';
+import { Provider as WizardProvider, Step as WizardStep } from './wizard';
+import { HorizontalSteps } from './wizard/horizontal_steps';
+import { PageTitle } from './wizard/page_title';
+import { breadcrumbsApp } from '../../../application/app';
+
+export function CustomLogs() {
+  useBreadcrumbs(
+    [
+      {
+        text: i18n.translate(
+          'xpack.observability_onboarding.breadcrumbs.logs',
+          { defaultMessage: 'Logs' }
+        ),
+      },
+    ],
+    breadcrumbsApp
+  );
+  return <AnimatedTransitionsWizard />;
+}
+
+const TRANSITION_DURATION = 180;
+
+function AnimatedTransitionsWizard() {
+  const [transition, setTransition] = useState<TransitionState>('ready');
+  const TransitionComponent = useRef<ComponentType>(() => null);
+
+  function onChangeStep({
+    direction,
+    StepComponent,
+  }: {
+    direction: 'back' | 'next';
+    StepComponent: ComponentType;
+  }) {
+    setTransition(direction);
+    TransitionComponent.current = StepComponent;
+    setTimeout(() => {
+      setTransition('ready');
+    }, TRANSITION_DURATION + 10);
+  }
+
+  return (
+    <WizardProvider
+      transitionDuration={TRANSITION_DURATION}
+      onChangeStep={onChangeStep}
+    >
+      <EuiFlexGroup direction="column" alignItems="center">
+        <EuiFlexItem grow={false}>
+          <EuiSpacer size="l" />
+          <PageTitle />
+        </EuiFlexItem>
+        <EuiFlexItem grow={false} style={{ width: '50%' }}>
+          <HorizontalSteps />
+        </EuiFlexItem>
+        <EuiFlexItem grow={1} style={{ width: '50%' }}>
+          <FilmstripTransition
+            duration={TRANSITION_DURATION}
+            transition={transition}
+          >
+            <FilmstripFrame position="left">
+              {
+                // eslint-disable-next-line react/jsx-pascal-case
+                transition === 'back' ? <TransitionComponent.current /> : null
+              }
+            </FilmstripFrame>
+            <FilmstripFrame position="center">
+              <WizardStep />
+            </FilmstripFrame>
+            <FilmstripFrame position="right">
+              {
+                // eslint-disable-next-line react/jsx-pascal-case
+                transition === 'next' ? <TransitionComponent.current /> : null
+              }
+            </FilmstripFrame>
+          </FilmstripTransition>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </WizardProvider>
+  );
+}
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/configure_logs.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/configure_logs.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/configure_logs.tsx
rename to x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/configure_logs.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/horizontal_steps.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/horizontal_steps.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/horizontal_steps.tsx
rename to x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/horizontal_steps.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/import_data.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/import_data.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/import_data.tsx
rename to x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/import_data.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/index.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/index.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/index.tsx
rename to x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/index.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/inspect.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/inspect.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/inspect.tsx
rename to x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/inspect.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/install_elastic_agent.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/install_elastic_agent.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/install_elastic_agent.tsx
rename to x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/install_elastic_agent.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/name_logs.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/name_logs.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/name_logs.tsx
rename to x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/name_logs.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/page_title.tsx b/x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/page_title.tsx
similarity index 100%
rename from x-pack/plugins/observability_onboarding/public/components/app/home/logs_onboarding_wizard/page_title.tsx
rename to x-pack/plugins/observability_onboarding/public/components/app/custom_logs/wizard/page_title.tsx
diff --git a/x-pack/plugins/observability_onboarding/public/components/app/home/index.tsx b/x-pack/plugins/observability_onboarding/public/components/app/home/index.tsx
index 4b4b3dfdbf3afb..5620b7535ba632 100644
--- a/x-pack/plugins/observability_onboarding/public/components/app/home/index.tsx
+++ b/x-pack/plugins/observability_onboarding/public/components/app/home/index.tsx
@@ -5,95 +5,299 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import React, { ComponentType, useRef, useState } from 'react';
 import {
-  FilmstripFrame,
-  FilmstripTransition,
-  TransitionState,
-} from '../../shared/filmstrip_transition';
-import {
-  Provider as WizardProvider,
-  Step as WizardStep,
-} from './logs_onboarding_wizard';
-import { HorizontalSteps } from './logs_onboarding_wizard/horizontal_steps';
-import { PageTitle } from './logs_onboarding_wizard/page_title';
-
-export function Home({ animated = true }: { animated?: boolean }) {
-  if (animated) {
-    return <AnimatedTransitionsWizard />;
-  }
-  return <StillTransitionsWizard />;
-}
-
-function StillTransitionsWizard() {
-  return (
-    <WizardProvider>
-      <EuiFlexGroup alignItems="center" justifyContent="spaceAround">
-        <EuiFlexItem grow={false}>
-          <WizardStep />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </WizardProvider>
-  );
-}
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiTitle,
+  EuiText,
+  EuiCard,
+  EuiHorizontalRule,
+  EuiButtonEmpty,
+  EuiBadge,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { useBreadcrumbs } from '@kbn/observability-plugin/public';
+import React from 'react';
+import { useKibanaNavigation } from '../../../hooks/use_kibana_navigation';
+import { breadcrumbsApp } from '../../../application/app';
 
-const TRANSITION_DURATION = 180;
+export function Home() {
+  useBreadcrumbs([], breadcrumbsApp);
 
-function AnimatedTransitionsWizard() {
-  const [transition, setTransition] = useState<TransitionState>('ready');
-  const TransitionComponent = useRef<ComponentType>(() => null);
+  const navigateToKibanaUrl = useKibanaNavigation();
 
-  function onChangeStep({
-    direction,
-    StepComponent,
-  }: {
-    direction: 'back' | 'next';
-    StepComponent: ComponentType;
-  }) {
-    setTransition(direction);
-    TransitionComponent.current = StepComponent;
-    setTimeout(() => {
-      setTransition('ready');
-    }, TRANSITION_DURATION + 10);
-  }
+  const handleClickSystemLogs = () => {};
+  const handleClickCustomLogs = () => {
+    navigateToKibanaUrl('/app/observabilityOnboarding/customLogs');
+  };
+  const handleClickApmSetupGuide = () => {
+    navigateToKibanaUrl('/app/home#/tutorial/apm');
+  };
+  const handleClickKubernetesSetupGuide = () => {
+    navigateToKibanaUrl('/app/integrations/detail/kubernetes');
+  };
+  const handleClickIntegrations = () => {
+    navigateToKibanaUrl('/app/integrations');
+  };
+  const handleClickSampleData = () => {
+    navigateToKibanaUrl('/app/home#/tutorial_directory/sampleData');
+  };
+  const handleClickSkip = () => {
+    navigateToKibanaUrl('/app/observability/overview');
+  };
 
   return (
-    <WizardProvider
-      transitionDuration={TRANSITION_DURATION}
-      onChangeStep={onChangeStep}
+    <EuiFlexGroup
+      direction="column"
+      alignItems="center"
+      style={{ margin: 'auto', maxWidth: 800 }}
     >
-      <EuiFlexGroup direction="column" alignItems="center">
-        <EuiFlexItem grow={false}>
-          <EuiSpacer size="l" />
-          <PageTitle />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false} style={{ width: '50%' }}>
-          <HorizontalSteps />
-        </EuiFlexItem>
-        <EuiFlexItem grow={1} style={{ width: '50%' }}>
-          <FilmstripTransition
-            duration={TRANSITION_DURATION}
-            transition={transition}
-          >
-            <FilmstripFrame position="left">
-              {
-                // eslint-disable-next-line react/jsx-pascal-case
-                transition === 'back' ? <TransitionComponent.current /> : null
+      <EuiFlexItem grow={false}>
+        <EuiSpacer size="l" />
+        <EuiTitle size="l">
+          <h1>
+            {i18n.translate('xpack.observability_onboarding.home.title', {
+              defaultMessage: 'Get started with Observability',
+            })}
+          </h1>
+        </EuiTitle>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiText color="subdued" style={{ textAlign: 'center' }}>
+          <p>
+            {i18n.translate('xpack.observability_onboarding.home.description', {
+              defaultMessage:
+                'Monitor and gain insights across your cloud-native and distributed systems on a single platform.',
+            })}
+          </p>
+        </EuiText>
+        <EuiSpacer size="xl" />
+      </EuiFlexItem>
+      <EuiFlexItem grow={false} style={{ width: '100%' }}>
+        <EuiFlexGroup alignItems="stretch">
+          <EuiFlexItem>
+            <EuiCard
+              icon={
+                <EuiBadge color="hollow" iconType="bolt">
+                  {i18n.translate(
+                    'xpack.observability_onboarding.card.systemLogs.quickstartBadge',
+                    {
+                      defaultMessage: 'Quickstart',
+                    }
+                  )}
+                </EuiBadge>
               }
-            </FilmstripFrame>
-            <FilmstripFrame position="center">
-              <WizardStep />
-            </FilmstripFrame>
-            <FilmstripFrame position="right">
-              {
-                // eslint-disable-next-line react/jsx-pascal-case
-                transition === 'next' ? <TransitionComponent.current /> : null
+              title={i18n.translate(
+                'xpack.observability_onboarding.card.systemLogs.title',
+                { defaultMessage: 'Collect system logs' }
+              )}
+              selectable={{
+                onClick: handleClickSystemLogs,
+                color: 'primary',
+                fill: true,
+                fullWidth: false,
+                style: { margin: 'auto' },
+              }}
+              paddingSize="xl"
+            >
+              <EuiHorizontalRule
+                margin="m"
+                style={{
+                  marginLeft: 'auto',
+                  marginRight: 'auto',
+                  width: '80%',
+                }}
+              />
+              <EuiText color="subdued" size="s" textAlign="left">
+                <p>
+                  {i18n.translate(
+                    'xpack.observability_onboarding.card.systemLogs.description1',
+                    {
+                      defaultMessage:
+                        'The quickest path to onboard log data and start analysing it straight away.',
+                    }
+                  )}
+                </p>
+                <p>
+                  {i18n.translate(
+                    'xpack.observability_onboarding.card.systemLogs.description2',
+                    {
+                      defaultMessage:
+                        'Monitor servers, personal computers and more by collecting logs from your machine.',
+                    }
+                  )}
+                </p>
+              </EuiText>
+            </EuiCard>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiCard
+              icon={
+                <EuiBadge color="hollow" iconType="launch">
+                  {i18n.translate(
+                    'xpack.observability_onboarding.card.customLogs.fewMinutesBadge',
+                    { defaultMessage: 'In a few minutes' }
+                  )}
+                </EuiBadge>
               }
-            </FilmstripFrame>
-          </FilmstripTransition>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </WizardProvider>
+              title={i18n.translate(
+                'xpack.observability_onboarding.card.customLogs.title',
+                { defaultMessage: 'Collect custom logs' }
+              )}
+              selectable={{
+                onClick: handleClickCustomLogs,
+                color: 'primary',
+                fill: true,
+                fullWidth: false,
+                style: { margin: 'auto' },
+              }}
+              paddingSize="xl"
+            >
+              <EuiHorizontalRule
+                margin="m"
+                style={{
+                  marginLeft: 'auto',
+                  marginRight: 'auto',
+                  width: '80%',
+                }}
+              />
+              <EuiText color="subdued" size="s" textAlign="left">
+                <p>
+                  {i18n.translate(
+                    'xpack.observability_onboarding.card.customLogs.description.text',
+                    {
+                      defaultMessage:
+                        'Choose what logs to collect, configure an ingest pipeline, and explore your data.',
+                    }
+                  )}
+                </p>
+                <ul>
+                  <li>
+                    {i18n.translate(
+                      'xpack.observability_onboarding.card.customLogs.description.example.streamlogs',
+                      { defaultMessage: 'Stream custom logs' }
+                    )}
+                  </li>
+                  <li>
+                    {i18n.translate(
+                      'xpack.observability_onboarding.card.customLogs.description.example.networkStream',
+                      {
+                        defaultMessage: 'Collect network streaming logs',
+                      }
+                    )}
+                  </li>
+                  <li>
+                    {i18n.translate(
+                      'xpack.observability_onboarding.card.customLogs.description.example.uploadLogFile',
+                      { defaultMessage: 'Upload log files' }
+                    )}
+                  </li>
+                  <li>
+                    {i18n.translate(
+                      'xpack.observability_onboarding.card.customLogs.description.example.andMore',
+                      { defaultMessage: '... and more' }
+                    )}
+                  </li>
+                </ul>
+              </EuiText>
+            </EuiCard>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false} style={{ width: '100%' }}>
+        <EuiFlexGroup alignItems="stretch">
+          <EuiFlexItem>
+            <EuiCard
+              betaBadgeProps={{ label: setupGuideBadgeLabel }}
+              title={i18n.translate(
+                'xpack.observability_onboarding.card.apm.title',
+                {
+                  defaultMessage:
+                    'Monitor my application performance (APM / tracing)',
+                }
+              )}
+              titleSize="xs"
+              paddingSize="xl"
+              onClick={handleClickApmSetupGuide}
+            />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiCard
+              betaBadgeProps={{ label: setupGuideBadgeLabel }}
+              title={i18n.translate(
+                'xpack.observability_onboarding.card.k8s.title',
+                { defaultMessage: 'Monitor my kubernetes clusters' }
+              )}
+              titleSize="xs"
+              paddingSize="xl"
+              onClick={handleClickKubernetesSetupGuide}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false} style={{ width: '100%' }}>
+        <EuiHorizontalRule margin="l" />
+      </EuiFlexItem>
+      <EuiFlexItem grow={false} style={{ width: '100%' }}>
+        <EuiFlexGroup alignItems="stretch">
+          <EuiFlexItem>
+            <EuiCard
+              betaBadgeProps={{
+                label: i18n.translate(
+                  'xpack.observability_onboarding.card.integrations.badgeLabel',
+                  { defaultMessage: 'Integrations' }
+                ),
+              }}
+              title={i18n.translate(
+                'xpack.observability_onboarding.card.integrations.title',
+                {
+                  defaultMessage:
+                    'Explore 300+ ways of ingesting data with our Integrations',
+                }
+              )}
+              titleSize="xs"
+              paddingSize="xl"
+              onClick={handleClickIntegrations}
+            />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiCard
+              betaBadgeProps={{
+                label: i18n.translate(
+                  'xpack.observability_onboarding.card.sampleData.badgeLabel',
+                  { defaultMessage: 'Sample data' }
+                ),
+              }}
+              title={i18n.translate(
+                'xpack.observability_onboarding.card.sampleData.title',
+                {
+                  defaultMessage:
+                    'Explore data, visualizations, and dashboards samples',
+                }
+              )}
+              titleSize="xs"
+              paddingSize="xl"
+              onClick={handleClickSampleData}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false} style={{ width: '100%' }}>
+        <EuiHorizontalRule margin="l" />
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiButtonEmpty onClick={handleClickSkip}>
+          {i18n.translate('xpack.observability_onboarding.skipLinkLabel', {
+            defaultMessage: 'Skip for now',
+          })}
+        </EuiButtonEmpty>
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 }
+
+const setupGuideBadgeLabel = i18n.translate(
+  'xpack.observability_onboarding.card.setupGuide',
+  { defaultMessage: 'Setup guide' }
+);
diff --git a/x-pack/plugins/observability_onboarding/public/hooks/use_kibana_navigation.ts b/x-pack/plugins/observability_onboarding/public/hooks/use_kibana_navigation.ts
new file mode 100644
index 00000000000000..f9628e7e333ba3
--- /dev/null
+++ b/x-pack/plugins/observability_onboarding/public/hooks/use_kibana_navigation.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 { useKibana } from '@kbn/kibana-react-plugin/public';
+import type { ApplicationStart, HttpStart } from '@kbn/core/public';
+
+interface ObservabilityOnboardingAppServices {
+  application: ApplicationStart;
+  http: HttpStart;
+}
+
+export function useKibanaNavigation() {
+  const {
+    application: { navigateToUrl },
+    http: { basePath },
+  } = useKibana<ObservabilityOnboardingAppServices>().services;
+
+  const navigateToKibanaUrl = (kibanaPath: string) => {
+    navigateToUrl(basePath.prepend(kibanaPath));
+  };
+
+  return navigateToKibanaUrl;
+}
diff --git a/x-pack/plugins/observability_onboarding/public/routes/index.tsx b/x-pack/plugins/observability_onboarding/public/routes/index.tsx
new file mode 100644
index 00000000000000..d462844f91d515
--- /dev/null
+++ b/x-pack/plugins/observability_onboarding/public/routes/index.tsx
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import * as t from 'io-ts';
+import React from 'react';
+import { Redirect } from 'react-router-dom';
+import { Home } from '../components/app/home';
+import { CustomLogs } from '../components/app/custom_logs';
+
+export type RouteParams<T extends keyof typeof routes> = DecodeParams<
+  typeof routes[T]['params']
+>;
+
+type DecodeParams<TParams extends Params | undefined> = {
+  [key in keyof TParams]: TParams[key] extends t.Any
+    ? t.TypeOf<TParams[key]>
+    : never;
+};
+
+export interface Params {
+  query?: t.HasProps;
+  path?: t.HasProps;
+}
+
+export const routes = {
+  '/': {
+    handler: () => {
+      return <Home />;
+    },
+    params: {},
+    exact: true,
+  },
+  '/overview': {
+    handler: () => {
+      return <Redirect to="/" />;
+    },
+    params: {},
+    exact: true,
+  },
+  '/customLogs': {
+    handler: () => {
+      return <CustomLogs />;
+    },
+    params: {},
+    exact: true,
+  },
+};
diff --git a/x-pack/plugins/observability_onboarding/tsconfig.json b/x-pack/plugins/observability_onboarding/tsconfig.json
index 4534db3d6d37a5..e7c9d9d48d8a92 100644
--- a/x-pack/plugins/observability_onboarding/tsconfig.json
+++ b/x-pack/plugins/observability_onboarding/tsconfig.json
@@ -19,9 +19,9 @@
     "@kbn/i18n",
     "@kbn/core-http-browser",
     "@kbn/ui-theme",
-    "@kbn/typed-react-router-config",
     "@kbn/server-route-repository",
     "@kbn/config-schema",
+    "@kbn/shared-ux-router",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/observability_shared/public/components/page_template/lazy_page_template.tsx b/x-pack/plugins/observability_shared/public/components/page_template/lazy_page_template.tsx
index 7c61cae4f2c73c..e61254fa10ca66 100644
--- a/x-pack/plugins/observability_shared/public/components/page_template/lazy_page_template.tsx
+++ b/x-pack/plugins/observability_shared/public/components/page_template/lazy_page_template.tsx
@@ -6,6 +6,8 @@
  */
 
 import React from 'react';
+import useObservable from 'react-use/lib/useObservable';
+
 import type {
   ObservabilityPageTemplateDependencies,
   WrappedPageTemplateProps,
@@ -15,12 +17,19 @@ export const LazyObservabilityPageTemplate = React.lazy(() => import('./page_tem
 
 export type LazyObservabilityPageTemplateProps = WrappedPageTemplateProps;
 
-export function createLazyObservabilityPageTemplate(
-  injectedDeps: ObservabilityPageTemplateDependencies
-) {
-  return (pageTemplateProps: LazyObservabilityPageTemplateProps) => (
-    <React.Suspense fallback={null}>
-      <LazyObservabilityPageTemplate {...pageTemplateProps} {...injectedDeps} />
-    </React.Suspense>
-  );
+export function createLazyObservabilityPageTemplate({
+  isSidebarEnabled$,
+  ...injectedDeps
+}: ObservabilityPageTemplateDependencies) {
+  return (pageTemplateProps: LazyObservabilityPageTemplateProps) => {
+    const isSidebarEnabled = useObservable(isSidebarEnabled$);
+    const { showSolutionNav: showSolutionNavProp, ...props } = pageTemplateProps;
+    const showSolutionNav = !!showSolutionNavProp || isSidebarEnabled;
+
+    return (
+      <React.Suspense fallback={null}>
+        <LazyObservabilityPageTemplate {...{ ...props, showSolutionNav }} {...injectedDeps} />
+      </React.Suspense>
+    );
+  };
 }
diff --git a/x-pack/plugins/observability_shared/public/components/page_template/page_template.test.tsx b/x-pack/plugins/observability_shared/public/components/page_template/page_template.test.tsx
index b33925ed09e4b7..3ea28007c207d9 100644
--- a/x-pack/plugins/observability_shared/public/components/page_template/page_template.test.tsx
+++ b/x-pack/plugins/observability_shared/public/components/page_template/page_template.test.tsx
@@ -9,7 +9,7 @@ import { I18nProvider } from '@kbn/i18n-react';
 import { render } from '@testing-library/react';
 import { shallow } from 'enzyme';
 import React from 'react';
-import { of } from 'rxjs';
+import { BehaviorSubject, of } from 'rxjs';
 import { getKibanaPageTemplateKibanaDependenciesMock as getPageTemplateServices } from '@kbn/shared-ux-page-kibana-template-mocks';
 import { guidedOnboardingMock } from '@kbn/guided-onboarding-plugin/public/mocks';
 
@@ -56,6 +56,7 @@ describe('Page template', () => {
       navigationSections$: navigationRegistry.sections$,
       getPageTemplateServices,
       guidedOnboardingApi: guidedOnboardingMock.createStart().guidedOnboardingApi,
+      isSidebarEnabled$: new BehaviorSubject<boolean>(true),
     });
 
     const component = shallow(
diff --git a/x-pack/plugins/observability_shared/public/components/page_template/page_template.tsx b/x-pack/plugins/observability_shared/public/components/page_template/page_template.tsx
index 696cda97e3e53c..f2f94ed74e5652 100644
--- a/x-pack/plugins/observability_shared/public/components/page_template/page_template.tsx
+++ b/x-pack/plugins/observability_shared/public/components/page_template/page_template.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
 import { matchPath, useLocation } from 'react-router-dom';
 import useObservable from 'react-use/lib/useObservable';
-import type { Observable } from 'rxjs';
+import type { BehaviorSubject, Observable } from 'rxjs';
 import type { ApplicationStart } from '@kbn/core/public';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
@@ -85,9 +85,13 @@ export interface ObservabilityPageTemplateDependencies {
   navigationSections$: Observable<NavigationSection[]>;
   getPageTemplateServices: () => KibanaPageTemplateKibanaDependencies;
   guidedOnboardingApi: GuidedOnboardingPluginStart['guidedOnboardingApi'];
+  isSidebarEnabled$: BehaviorSubject<boolean>;
 }
 
-export type ObservabilityPageTemplateProps = ObservabilityPageTemplateDependencies &
+export type ObservabilityPageTemplateProps = Omit<
+  ObservabilityPageTemplateDependencies,
+  'isSidebarEnabled$'
+> &
   WrappedPageTemplateProps;
 
 export function ObservabilityPageTemplate({
diff --git a/x-pack/plugins/observability_shared/public/plugin.ts b/x-pack/plugins/observability_shared/public/plugin.ts
index 527d33e8a502e4..7a0ee7a452dde5 100644
--- a/x-pack/plugins/observability_shared/public/plugin.ts
+++ b/x-pack/plugins/observability_shared/public/plugin.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { BehaviorSubject } from 'rxjs';
+
 import type { CoreStart, Plugin } from '@kbn/core/public';
 import type { GuidedOnboardingPluginStart } from '@kbn/guided-onboarding-plugin/public';
 import { createNavigationRegistry } from './components/page_template/helpers/navigation_registry';
@@ -13,6 +15,7 @@ import { updateGlobalNavigation } from './services/update_global_navigation';
 
 export interface ObservabilitySharedStart {
   guidedOnboarding: GuidedOnboardingPluginStart;
+  setIsSidebarEnabled: (isEnabled: boolean) => void;
 }
 
 export type ObservabilitySharedPluginSetup = ReturnType<ObservabilitySharedPlugin['setup']>;
@@ -20,6 +23,11 @@ export type ObservabilitySharedPluginStart = ReturnType<ObservabilitySharedPlugi
 
 export class ObservabilitySharedPlugin implements Plugin {
   private readonly navigationRegistry = createNavigationRegistry();
+  private isSidebarEnabled$: BehaviorSubject<boolean>;
+
+  constructor() {
+    this.isSidebarEnabled$ = new BehaviorSubject<boolean>(true);
+  }
 
   public setup() {
     return {
@@ -39,6 +47,7 @@ export class ObservabilitySharedPlugin implements Plugin {
       navigationSections$: this.navigationRegistry.sections$,
       guidedOnboardingApi: plugins.guidedOnboarding.guidedOnboardingApi,
       getPageTemplateServices: () => ({ coreStart: core }),
+      isSidebarEnabled$: this.isSidebarEnabled$,
     });
 
     return {
@@ -46,6 +55,7 @@ export class ObservabilitySharedPlugin implements Plugin {
         PageTemplate,
       },
       updateGlobalNavigation,
+      setIsSidebarEnabled: (isEnabled: boolean) => this.isSidebarEnabled$.next(isEnabled),
     };
   }
 
diff --git a/x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts
index e35cc40bbc7495..552c3ae1e8c900 100644
--- a/x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts
@@ -183,15 +183,11 @@ describe('ALL - Add Integration', () => {
       cy.get(`[title="${policyName}"]`).click();
       cy.getBySel('PackagePoliciesTableUpgradeButton').click();
       cy.contains(/^Advanced$/).click();
-      cy.getBySel('codeEditorContainer').within(() => {
-        cy.contains(`"${packName}":`);
-      });
+      cy.get('.kibanaCodeEditor').should('contain', `"${packName}":`);
       cy.getBySel('saveIntegration').click();
       cy.get(`a[title="${integrationName}"]`).click();
       cy.contains(/^Advanced$/).click();
-      cy.getBySel('codeEditorContainer').within(() => {
-        cy.contains(`"${packName}":`);
-      });
+      cy.get('.kibanaCodeEditor').should('contain', `"${packName}":`);
       cy.contains('Cancel').click();
       closeModalIfVisible();
       cy.get(`[title="${integrationName}"]`)
diff --git a/x-pack/plugins/osquery/cypress/e2e/all/alerts.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/alerts.cy.ts
index e988cd36425d31..ec0c8c65b7faf6 100644
--- a/x-pack/plugins/osquery/cypress/e2e/all/alerts.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/all/alerts.cy.ts
@@ -122,8 +122,10 @@ describe('Alert Event Details', () => {
     it('adds response actions with osquery with proper validation and form values', () => {
       cy.visit('/app/security/rules');
       cy.contains(ruleName).click();
-      cy.getBySel('editRuleSettingsLink').click({ force: true });
-      cy.getBySel('edit-rule-actions-tab').wait(500).click();
+      cy.getBySel('editRuleSettingsLink').click();
+      cy.getBySel('globalLoadingIndicator').should('exist');
+      cy.getBySel('globalLoadingIndicator').should('not.exist');
+      cy.getBySel('edit-rule-actions-tab').click();
       cy.contains('Response actions are run on each rule execution');
       cy.getBySel(OSQUERY_RESPONSE_ACTION_ADD_BUTTON).click();
       cy.getBySel(RESPONSE_ACTIONS_ITEM_0).within(() => {
@@ -160,8 +162,10 @@ describe('Alert Event Details', () => {
       cy.contains(`${ruleName} was saved`).should('exist');
       closeToastIfVisible();
 
-      cy.getBySel('editRuleSettingsLink').click({ force: true });
-      cy.getBySel('edit-rule-actions-tab').wait(500).click();
+      cy.getBySel('editRuleSettingsLink').click();
+      cy.getBySel('globalLoadingIndicator').should('exist');
+      cy.getBySel('globalLoadingIndicator').should('not.exist');
+      cy.getBySel('edit-rule-actions-tab').click();
       cy.getBySel(RESPONSE_ACTIONS_ITEM_0).within(() => {
         cy.contains('select * from uptime1');
       });
@@ -204,8 +208,10 @@ describe('Alert Event Details', () => {
       cy.contains(`${ruleName} was saved`).should('exist');
       closeToastIfVisible();
 
-      cy.getBySel('editRuleSettingsLink').click({ force: true });
-      cy.getBySel('edit-rule-actions-tab').wait(500).click();
+      cy.getBySel('editRuleSettingsLink').click();
+      cy.getBySel('globalLoadingIndicator').should('exist');
+      cy.getBySel('globalLoadingIndicator').should('not.exist');
+      cy.getBySel('edit-rule-actions-tab').click();
       cy.getBySel(RESPONSE_ACTIONS_ITEM_0).within(() => {
         cy.contains(packName);
         cy.getBySel('comboBoxInput').type(`${multiQueryPackName}{downArrow}{enter}`);
@@ -268,8 +274,10 @@ describe('Alert Event Details', () => {
         'You have queries in the investigation guide. Add them as response actions?';
       cy.visit('/app/security/rules');
       cy.contains(ruleName).click();
-      cy.getBySel('editRuleSettingsLink').click({ force: true });
-      cy.getBySel('edit-rule-actions-tab').wait(500).click();
+      cy.getBySel('editRuleSettingsLink').click();
+      cy.getBySel('globalLoadingIndicator').should('exist');
+      cy.getBySel('globalLoadingIndicator').should('not.exist');
+      cy.getBySel('edit-rule-actions-tab').click();
 
       cy.contains(investigationGuideNote);
       cy.getBySel('osqueryAddInvestigationGuideQueries').click();
@@ -305,9 +313,9 @@ describe('Alert Event Details', () => {
     it('should be able to run live query and add to timeline (-depending on the previous test)', () => {
       const TIMELINE_NAME = 'Untitled timeline';
       loadRuleAlerts(ruleName);
-      cy.getBySel('timeline-context-menu-button').first().click({ force: true });
+      cy.getBySel('timeline-context-menu-button').first().click();
       cy.contains('Run Osquery');
-      cy.getBySel('expand-event').first().click({ force: true });
+      cy.getBySel('expand-event').first().click();
       cy.getBySel('take-action-dropdown-btn').click();
       cy.getBySel('osquery-action-item').click();
       cy.contains('1 agent selected.');
@@ -349,7 +357,7 @@ describe('Alert Event Details', () => {
 
     it('should substitute parameters in investigation guide', () => {
       loadRuleAlerts(ruleName);
-      cy.getBySel('expand-event').first().click({ force: true });
+      cy.getBySel('expand-event').first().click();
       cy.contains('Get processes').click();
       cy.getBySel('flyout-body-osquery').within(() => {
         cy.contains("SELECT * FROM os_version where name='Ubuntu';");
@@ -381,7 +389,7 @@ describe('Alert Event Details', () => {
 
     it('sees osquery results from last action and add to a case', () => {
       loadRuleAlerts(ruleName);
-      cy.getBySel('expand-event').first().click({ force: true });
+      cy.getBySel('expand-event').first().click();
       cy.contains('Osquery Results').click();
       cy.getBySel('osquery-results').should('exist');
       cy.contains('select * from users;');
@@ -431,7 +439,7 @@ describe('Alert Event Details', () => {
     it('can visit discover from response action results', () => {
       const discoverRegex = new RegExp(`action_id: ${UUID_REGEX}`);
       loadRuleAlerts(ruleName);
-      cy.getBySel('expand-event').first().click({ force: true });
+      cy.getBySel('expand-event').first().click();
       cy.contains('Osquery Results').click();
       cy.getBySel('osquery-results').should('exist');
       checkActionItemsInResults({
@@ -472,7 +480,7 @@ describe('Alert Event Details', () => {
     it('can visit lens from response action results', () => {
       const lensRegex = new RegExp(`Action ${UUID_REGEX} results`);
       loadRuleAlerts(ruleName);
-      cy.getBySel('expand-event').first().click({ force: true });
+      cy.getBySel('expand-event').first().click();
       cy.contains('Osquery Results').click();
       cy.getBySel('osquery-results').should('exist');
       checkActionItemsInResults({
@@ -522,7 +530,7 @@ describe('Alert Event Details', () => {
       const timelineRegex = new RegExp(`Added ${UUID_REGEX} to timeline`);
       const filterRegex = new RegExp(`action_id: "${UUID_REGEX}"`);
       loadRuleAlerts(ruleName);
-      cy.getBySel('expand-event').first().click({ force: true });
+      cy.getBySel('expand-event').first().click();
       cy.contains('Osquery Results').click();
       cy.getBySel('osquery-results').should('exist');
       checkActionItemsInResults({
@@ -565,7 +573,7 @@ describe('Alert Event Details', () => {
       let initialNotificationCount: number;
       let updatedNotificationCount: number;
       loadRuleAlerts(ruleName);
-      cy.getBySel('expand-event').first().click({ force: true });
+      cy.getBySel('expand-event').first().click();
       cy.getBySel('osquery-actions-notification')
         .should('not.have.text', '0')
         .then((element) => {
@@ -606,7 +614,7 @@ describe('Alert Event Details', () => {
 
     it('should be able to run take action query against all enrolled agents', () => {
       loadRuleAlerts(ruleName);
-      cy.getBySel('expand-event').first().click({ force: true });
+      cy.getBySel('expand-event').first().click();
       cy.getBySel('take-action-dropdown-btn').click();
       cy.getBySel('osquery-action-item').click();
       cy.getBySel('agentSelection').within(() => {
@@ -620,8 +628,8 @@ describe('Alert Event Details', () => {
       cy.wait(1000);
       submitQuery();
       cy.getBySel('flyout-body-osquery').within(() => {
-        // at least 2 agents should have responded
-        cy.get('[data-grid-row-index]').should('have.length.at.least', 2);
+        // at least 2 agents should have responded, sometimes it takes a while for the agents to respond
+        cy.get('[data-grid-row-index]', { timeout: 6000000 }).should('have.length.at.least', 2);
       });
     });
   });
@@ -643,7 +651,7 @@ describe('Alert Event Details', () => {
 
     it('should substitute params in osquery ran from timelines alerts', () => {
       loadRuleAlerts(ruleName);
-      cy.getBySel('send-alert-to-timeline-button').first().click({ force: true });
+      cy.getBySel('send-alert-to-timeline-button').first().click();
       cy.getBySel('query-events-table').within(() => {
         cy.getBySel('expand-event').first().click();
       });
diff --git a/x-pack/plugins/osquery/cypress/tasks/api_fixtures.ts b/x-pack/plugins/osquery/cypress/tasks/api_fixtures.ts
index ce3be460ed22f9..2a19019ea3ffb7 100644
--- a/x-pack/plugins/osquery/cypress/tasks/api_fixtures.ts
+++ b/x-pack/plugins/osquery/cypress/tasks/api_fixtures.ts
@@ -10,7 +10,7 @@ import type {
   RuleResponse,
 } from '@kbn/security-solution-plugin/common/detection_engine/rule_schema';
 import type { AgentPolicy } from '@kbn/fleet-plugin/common';
-import type { CaseResponse } from '@kbn/cases-plugin/common';
+import type { Case } from '@kbn/cases-plugin/common';
 import type { SavedQuerySOFormData } from '../../public/saved_queries/form/use_saved_query_form';
 import type { LiveQueryDetailsItem } from '../../public/actions/use_live_query_details';
 import type { PackSavedObject, PackItem } from '../../public/packs/types';
@@ -181,7 +181,7 @@ export const cleanupRule = (id: string) => {
 };
 
 export const loadCase = (owner: string) =>
-  request<CaseResponse>({
+  request<Case>({
     method: 'POST',
     url: '/api/cases',
     body: {
diff --git a/x-pack/plugins/osquery/cypress/tasks/live_query.ts b/x-pack/plugins/osquery/cypress/tasks/live_query.ts
index b241366995eda0..51213ee57f8c31 100644
--- a/x-pack/plugins/osquery/cypress/tasks/live_query.ts
+++ b/x-pack/plugins/osquery/cypress/tasks/live_query.ts
@@ -159,7 +159,5 @@ export const takeOsqueryActionWithParams = () => {
   cy.getBySel('osqueryColumnValueSelect').type('platform_like{downArrow}{enter}');
   cy.wait(1000);
   submitQuery();
-  cy.getBySel('dataGridHeader').within(() => {
-    cy.contains('tags');
-  });
+  cy.getBySel('dataGridHeader').should('contain', 'tags', { timeout: 6000000 });
 };
diff --git a/x-pack/plugins/profiling/server/lib/setup/steps/get_fleet_policy_step.ts b/x-pack/plugins/profiling/server/lib/setup/steps/get_fleet_policy_step.ts
index 7f7222a8a6e9d6..a89be862801142 100644
--- a/x-pack/plugins/profiling/server/lib/setup/steps/get_fleet_policy_step.ts
+++ b/x-pack/plugins/profiling/server/lib/setup/steps/get_fleet_policy_step.ts
@@ -101,6 +101,35 @@ export function getFleetPolicyStep({
         ...omit(apmPolicy, 'id', 'revision', 'updated_at', 'updated_by'),
         inputs: modifiedPolicyInputs,
       });
+
+      // We add here the creation of the new package_policy for symbolizer.
+      // We create the new policy and bind it to the Cloud default agent policy;
+      // to do so, force s required to be set to true.
+      const cloudAgentPolicyId = 'policy-elastic-agent-on-cloud';
+      await packagePolicyClient.create(
+        soClient,
+        esClient,
+        {
+          policy_id: cloudAgentPolicyId,
+          enabled: true,
+          package: {
+            name: 'profiler_symbolizer',
+            title: 'Universal Profiling Symbolizer',
+            version: '8.8.0-preview',
+          },
+          name: 'elastic-universal-profiling-symbolizer',
+          namespace: 'default',
+          inputs: [
+            {
+              policy_template: 'universal_profiling_symbolizer',
+              enabled: true,
+              streams: [],
+              type: 'pf-elastic-symbolizer',
+            },
+          ],
+        },
+        { force: true }
+      );
     },
   };
 }
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
index 597396a5837ffc..9dd2deb876c611 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.test.ts
@@ -389,6 +389,49 @@ describe('Put payload schema', () => {
       }
     `);
   });
+
+  test('passes through remote_indices when specified', () => {
+    expect(
+      getPutPayloadSchema(() => basePrivilegeNamesMap).validate({
+        elasticsearch: {
+          remote_indices: [
+            {
+              clusters: ['remote_cluster'],
+              names: ['remote_index'],
+              privileges: ['all'],
+            },
+          ],
+        },
+      })
+    ).toMatchInlineSnapshot(`
+      Object {
+        "elasticsearch": Object {
+          "remote_indices": Array [
+            Object {
+              "clusters": Array [
+                "remote_cluster",
+              ],
+              "names": Array [
+                "remote_index",
+              ],
+              "privileges": Array [
+                "all",
+              ],
+            },
+          ],
+        },
+      }
+    `);
+  });
+
+  // This is important for backwards compatibility
+  test('does not set default value for remote_indices when not specified', () => {
+    expect(getPutPayloadSchema(() => basePrivilegeNamesMap).validate({})).toMatchInlineSnapshot(`
+      Object {
+        "elasticsearch": Object {},
+      }
+    `);
+  });
 });
 
 describe('validateKibanaPrivileges', () => {
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
index a52399d4a04ec0..5c8a07d15000db 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/model/put_payload.ts
@@ -37,7 +37,7 @@ export const transformPutPayloadToElasticsearchRole = (
     metadata: rolePayload.metadata,
     cluster: elasticsearch.cluster || [],
     indices: elasticsearch.indices || [],
-    remote_indices: elasticsearch.remote_indices || [],
+    remote_indices: elasticsearch.remote_indices,
     run_as: elasticsearch.run_as || [],
     applications: [
       ...transformPrivilegesToElasticsearchPrivileges(application, kibana),
diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
index 1e59f7a5d6a0f7..6adbe8975b0a99 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts
@@ -325,7 +325,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [],
               },
@@ -359,7 +359,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -402,7 +402,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -443,7 +443,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -480,6 +480,18 @@ describe('PUT role', () => {
               query: `{ "match": { "title": "foo" } }`,
             },
           ],
+          remote_indices: [
+            {
+              field_security: {
+                grant: ['test-field-security-grant-1', 'test-field-security-grant-2'],
+                except: ['test-field-security-except-1', 'test-field-security-except-2'],
+              },
+              clusters: ['test-cluster-name-1', 'test-cluster-name-2'],
+              names: ['test-index-name-1', 'test-index-name-2'],
+              privileges: ['test-index-privilege-1', 'test-index-privilege-2'],
+              query: `{ "match": { "title": "foo" } }`,
+            },
+          ],
           run_as: ['test-run-as-1', 'test-run-as-2'],
         },
         kibana: [
@@ -539,7 +551,18 @@ describe('PUT role', () => {
                     query: `{ "match": { "title": "foo" } }`,
                   },
                 ],
-                remote_indices: [],
+                remote_indices: [
+                  {
+                    field_security: {
+                      grant: ['test-field-security-grant-1', 'test-field-security-grant-2'],
+                      except: ['test-field-security-except-1', 'test-field-security-except-2'],
+                    },
+                    clusters: ['test-cluster-name-1', 'test-cluster-name-2'],
+                    names: ['test-index-name-1', 'test-index-name-2'],
+                    privileges: ['test-index-privilege-1', 'test-index-privilege-2'],
+                    query: `{ "match": { "title": "foo" } }`,
+                  },
+                ],
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -661,7 +684,7 @@ describe('PUT role', () => {
                     query: `{ "match": { "title": "foo" } }`,
                   },
                 ],
-                remote_indices: [],
+                remote_indices: undefined,
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -765,7 +788,7 @@ describe('PUT role', () => {
                     privileges: ['test-index-privilege-1', 'test-index-privilege-2'],
                   },
                 ],
-                remote_indices: [],
+                remote_indices: undefined,
                 metadata: { foo: 'test-metadata' },
                 run_as: ['test-run-as-1', 'test-run-as-2'],
               },
@@ -803,7 +826,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -848,7 +871,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
@@ -893,7 +916,7 @@ describe('PUT role', () => {
               body: {
                 cluster: [],
                 indices: [],
-                remote_indices: [],
+                remote_indices: undefined,
                 run_as: [],
                 applications: [
                   {
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_case.ts b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_case.ts
index d9c297789ffdc3..fffdd118151125 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_case.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_loaders/index_case.ts
@@ -6,7 +6,7 @@
  */
 
 import type { KbnClient } from '@kbn/test';
-import type { CaseResponse } from '@kbn/cases-plugin/common';
+import type { Case } from '@kbn/cases-plugin/common';
 import { CASES_URL } from '@kbn/cases-plugin/common';
 import type { CasePostRequest } from '@kbn/cases-plugin/common/api';
 import { CaseSeverity, ConnectorTypes } from '@kbn/cases-plugin/common/api';
@@ -14,7 +14,7 @@ import type { AxiosError } from 'axios';
 import { EndpointError } from '../errors';
 
 export interface IndexedCase {
-  data: CaseResponse;
+  data: Case;
   cleanup: () => Promise<{
     /** The ID of the cases that were deleted */
     data: string;
@@ -55,7 +55,7 @@ export const indexCase = async (
   };
 
   const createdCase = (
-    await kbnClient.request<CaseResponse>({
+    await kbnClient.request<Case>({
       method: 'POST',
       path: CASES_URL,
       body: newCaseReq,
diff --git a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
index 76ee903eb6889f..cc270cd1bff7a9 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -561,6 +561,10 @@ export class EndpointDocGenerator extends BaseDataGenerator {
         },
       },
       dll: this.getAlertsDefaultDll(),
+      user: {
+        domain: this.randomString(10),
+        name: this.randomString(10),
+      },
     };
   }
 
@@ -663,6 +667,10 @@ export class EndpointDocGenerator extends BaseDataGenerator {
         },
       },
       dll: this.getAlertsDefaultDll(),
+      user: {
+        domain: this.randomString(10),
+        name: this.randomString(10),
+      },
     };
 
     // shellcode_thread memory alert have an additional process field
@@ -865,6 +873,10 @@ export class EndpointDocGenerator extends BaseDataGenerator {
         },
       },
       dll: this.getAlertsDefaultDll(),
+      user: {
+        domain: this.randomString(10),
+        name: this.randomString(10),
+      },
     };
     return newAlert;
   }
@@ -951,6 +963,9 @@ export class EndpointDocGenerator extends BaseDataGenerator {
       ...detailRecordForEventType,
       event: {
         category: options.eventCategory ? options.eventCategory : ['process'],
+        outcome: options.eventCategory?.includes('authentication')
+          ? this.randomChoice(['success', 'failure'])
+          : '',
         kind: 'event',
         type: options.eventType ? options.eventType : ['start'],
         id: this.seededUUIDv4(),
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 4ab2e1e3d2ed0b..d53212b84a5405 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -703,6 +703,7 @@ export type SafeEndpointEvent = Partial<{
   }>;
   event: Partial<{
     category: ECSField<string>;
+    outcome: ECSField<string>;
     type: ECSField<string>;
     id: ECSField<string>;
     kind: ECSField<string>;
diff --git a/x-pack/plugins/security_solution/common/index.ts b/x-pack/plugins/security_solution/common/index.ts
index 85546afccb694f..3133996d79ed8e 100644
--- a/x-pack/plugins/security_solution/common/index.ts
+++ b/x-pack/plugins/security_solution/common/index.ts
@@ -8,6 +8,7 @@
 // TODO(jbudz): should be removed when upgrading to TS@4.8
 // this is a skip for the errors created when typechecking with isolatedModules
 export {};
+export { APP_UI_ID, SecurityPageName } from './constants';
 export { ELASTIC_SECURITY_RULE_ID } from './detection_engine/constants';
 
 // Careful of exporting anything from this file as any file(s) you export here will cause your page bundle size to increase.
diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_details.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_details.cy.ts
index ac52c58a379286..e6c0d4c1bc6377 100644
--- a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_details.cy.ts
+++ b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/alerts_details.cy.ts
@@ -21,10 +21,9 @@ import { cleanKibana } from '../../tasks/common';
 import { waitForAlertsToPopulate } from '../../tasks/create_new_rule';
 import { esArchiverLoad, esArchiverUnload } from '../../tasks/es_archiver';
 import { login, visit, visitWithoutDateRange } from '../../tasks/login';
-import { getUnmappedRule, getNewRule } from '../../objects/rule';
+import { getUnmappedRule } from '../../objects/rule';
 import { ALERTS_URL } from '../../urls/navigation';
 import { tablePageSelector } from '../../screens/table_pagination';
-import { ALERTS_COUNT } from '../../screens/alerts';
 
 describe('Alert details flyout', () => {
   describe('With unmapped fields', { testIsolation: false }, () => {
@@ -90,55 +89,46 @@ describe('Alert details flyout', () => {
   });
 
   describe('Url state management', { testIsolation: false }, () => {
-    const testRule = getNewRule();
     before(() => {
       cleanKibana();
+      esArchiverLoad('query_alert');
       login();
-      createRule(testRule);
       visit(ALERTS_URL);
       waitForAlertsToPopulate();
     });
 
-    it('should store the flyout state in the url when it is opened', () => {
+    beforeEach(() => {
       expandFirstAlert();
+    });
+
+    it('should store the flyout state in the url when it is opened', () => {
       cy.get(OVERVIEW_RULE).should('be.visible');
       cy.url().should('include', 'eventFlyout=');
     });
 
     it('should remove the flyout state from the url when it is closed', () => {
-      expandFirstAlert();
       cy.get(OVERVIEW_RULE).should('be.visible');
       closeAlertFlyout();
       cy.url().should('not.include', 'eventFlyout=');
     });
 
     it('should open the alert flyout when the page is refreshed', () => {
-      expandFirstAlert();
       cy.get(OVERVIEW_RULE).should('be.visible');
       cy.reload();
       cy.get(OVERVIEW_RULE).should('be.visible');
-      cy.get(OVERVIEW_RULE).then((field) => {
-        expect(field).to.contain(testRule.name);
-      });
+      cy.get(OVERVIEW_RULE).should('contain', 'Endpoint Security');
     });
 
     it('should show the copy link button for the flyout', () => {
-      expandFirstAlert();
       cy.get(COPY_ALERT_FLYOUT_LINK).should('be.visible');
     });
 
-    it('should open the flyout given the custom url', () => {
-      expandFirstAlert();
+    it('should have the `kibana.alert.url` field set', () => {
+      const alertUrl =
+        'http://localhost:5601/app/security/alerts/redirect/eabbdefc23da981f2b74ab58b82622a97bb9878caa11bc914e2adfacc94780f1?index=.alerts-security.alerts-default&timestamp=2023-04-27T11:03:57.906Z';
       openTable();
-      filterBy('_id');
-      cy.get('[data-test-subj="event-field-_id"]')
-        .invoke('text')
-        .then((alertId) => {
-          cy.visit(`http://localhost:5620/app/security/alerts/redirect/${alertId}`);
-          cy.get('[data-test-subj="unifiedQueryInput"]').should('have.text', `_id: ${alertId}`);
-          cy.get(ALERTS_COUNT).should('have.text', '1 alert');
-          cy.get(OVERVIEW_RULE).should('be.visible');
-        });
+      filterBy('kibana.alert.url');
+      cy.get('[data-test-subj="formatted-field-kibana.alert.url"]').should('have.text', alertUrl);
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/building_block_alerts.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/building_block_alerts.cy.ts
index 8d831f29bd653a..fcd98e0f1f1279 100644
--- a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/building_block_alerts.cy.ts
+++ b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/building_block_alerts.cy.ts
@@ -7,6 +7,7 @@
 
 import { getBuildingBlockRule } from '../../objects/rule';
 import { OVERVIEW_ALERTS_HISTOGRAM_EMPTY } from '../../screens/overview';
+import { HIGHLIGHTED_ROWS_IN_TABLE } from '../../screens/rule_details';
 import { OVERVIEW } from '../../screens/security_header';
 import { goToRuleDetails } from '../../tasks/alerts_detection_rules';
 import { createRule } from '../../tasks/api_calls/rules';
@@ -40,6 +41,9 @@ describe('Alerts generated by building block rules', () => {
     // Check that generated events are visible on the Details page
     waitForAlertsToPopulate(EXPECTED_NUMBER_OF_ALERTS);
 
+    // Make sure rows are highlighted
+    cy.get(HIGHLIGHTED_ROWS_IN_TABLE).should('exist');
+
     navigateFromHeaderTo(OVERVIEW);
 
     // Check that generated events are hidden on the Overview page
diff --git a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts
index c16ccf35edbccb..a1a064eee6dc18 100644
--- a/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts
+++ b/x-pack/plugins/security_solution/cypress/e2e/detection_alerts/detection_page_filters.cy.ts
@@ -39,6 +39,7 @@ import {
   addNewFilterGroupControlValues,
   deleteFilterGroupControl,
   discardFilterGroupControls,
+  editFilterGroupControl,
   editFilterGroupControls,
   saveFilterGroupControls,
 } from '../../tasks/common/filter_group';
@@ -97,7 +98,7 @@ const assertFilterControlsWithFilterObject = (filterObject = DEFAULT_DETECTION_P
   });
 };
 
-describe.skip('Detections : Page Filters', { testIsolation: false }, () => {
+describe('Detections : Page Filters', { testIsolation: false }, () => {
   before(() => {
     cleanKibana();
     login();
@@ -116,10 +117,23 @@ describe.skip('Detections : Page Filters', { testIsolation: false }, () => {
   });
 
   context('Alert Page Filters Customization ', { testIsolation: false }, () => {
-    it('Add New Controls', () => {
+    beforeEach(() => {
+      resetFilters();
+    });
+    it('should be able to delete Controls', () => {
+      waitForPageFilters();
+      editFilterGroupControls();
+      deleteFilterGroupControl(3);
+      cy.get(CONTROL_FRAMES).should((sub) => {
+        expect(sub.length).lt(4);
+      });
+      discardFilterGroupControls();
+    });
+    it('should be able to add new Controls', () => {
       const fieldName = 'event.module';
       const label = 'EventModule';
       editFilterGroupControls();
+      deleteFilterGroupControl(3);
       addNewFilterGroupControlValues({
         fieldName,
         label,
@@ -129,18 +143,20 @@ describe.skip('Detections : Page Filters', { testIsolation: false }, () => {
       discardFilterGroupControls();
       cy.get(CONTROL_FRAME_TITLE).should('not.contain.text', label);
     });
-    it('Delete Controls', () => {
-      waitForPageFilters();
+    it('should be able to edit Controls', () => {
+      const fieldName = 'event.module';
+      const label = 'EventModule';
       editFilterGroupControls();
-      deleteFilterGroupControl(3);
-      cy.get(CONTROL_FRAMES).should((sub) => {
-        expect(sub.length).lt(4);
-      });
+      editFilterGroupControl({ idx: 3, fieldName, label });
+      cy.get(CONTROL_FRAME_TITLE).should('contain.text', label);
+      cy.get(FILTER_GROUP_SAVE_CHANGES_POPOVER).should('be.visible');
       discardFilterGroupControls();
+      cy.get(CONTROL_FRAME_TITLE).should('not.contain.text', label);
     });
     it('should not sync to the URL in edit mode but only in view mode', () => {
       cy.url().then((urlString) => {
         editFilterGroupControls();
+        deleteFilterGroupControl(3);
         addNewFilterGroupControlValues({ fieldName: 'event.module', label: 'Event Module' });
         cy.url().should('eq', urlString);
         saveFilterGroupControls();
diff --git a/x-pack/plugins/security_solution/cypress/screens/common/filter_group.ts b/x-pack/plugins/security_solution/cypress/screens/common/filter_group.ts
index f78fbcfa9e4760..b36229a5cbeaaa 100644
--- a/x-pack/plugins/security_solution/cypress/screens/common/filter_group.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/common/filter_group.ts
@@ -45,12 +45,12 @@ export const DETECTION_PAGE_FILTER_GROUP_CONTEXT_MENU = '[data-test-subj="filter
 export const DETECTION_PAGE_FILTER_GROUP_RESET_BUTTON =
   '[data-test-subj="filter-group__context--reset"]';
 
-export const FILTER_GROUP_CONTEXT_EDIT_CONTROLS = '[data-test-subj="filter_group__context--edit"]';
+export const FILTER_GROUP_CONTEXT_EDIT_CONTROLS = '[data-test-subj="filter-group__context--edit"]';
 
-export const FILTER_GROUP_CONTEXT_SAVE_CONTROLS = '[data-test-subj="filter_group__context--save"]';
+export const FILTER_GROUP_CONTEXT_SAVE_CONTROLS = '[data-test-subj="filter-group__context--save"]';
 
 export const FILTER_GROUP_CONTEXT_DISCARD_CHANGES =
-  '[data-test-subj="filter_group__context--discard"]';
+  '[data-test-subj="filter-group__context--discard"]';
 
 export const FILTER_GROUP_ADD_CONTROL = '[data-test-subj="filter-group__add-control"]';
 
diff --git a/x-pack/plugins/security_solution/cypress/screens/rule_details.ts b/x-pack/plugins/security_solution/cypress/screens/rule_details.ts
index 4abb1cad40d057..70c9ac4bc207d6 100644
--- a/x-pack/plugins/security_solution/cypress/screens/rule_details.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/rule_details.ts
@@ -141,3 +141,6 @@ export const THREAT_TECHNIQUE = '[data-test-subj="threatTechniqueLink"]';
 export const THREAT_SUBTECHNIQUE = '[data-test-subj="threatSubtechniqueLink"]';
 
 export const BACK_TO_RULES_TABLE = '[data-test-subj="breadcrumb"][title="Rules"]';
+
+export const HIGHLIGHTED_ROWS_IN_TABLE =
+  '[data-test-subj="euiDataGridBody"] .alertsTableHighlightedRow';
diff --git a/x-pack/plugins/security_solution/cypress/tasks/common/filter_group.ts b/x-pack/plugins/security_solution/cypress/tasks/common/filter_group.ts
index e006e2cc030a4f..e12d705ab1ca7a 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/common/filter_group.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/common/filter_group.ts
@@ -22,6 +22,7 @@ import {
   DETECTION_PAGE_FILTERS_LOADING,
   OPTION_LISTS_LOADING,
   FILTER_GROUP_CONTEXT_DISCARD_CHANGES,
+  FILTER_GROUP_CONTROL_ACTION_EDIT,
 } from '../../screens/common/filter_group';
 import { waitForPageFilters } from '../alerts';
 
@@ -90,3 +91,25 @@ export const deleteFilterGroupControl = (idx: number) => {
   cy.get(FILTER_GROUP_CONTROL_CONFIRM_DIALOG).should('be.visible');
   cy.get(FILTER_GROUP_CONTROL_CONFIRM_BTN).trigger('click');
 };
+
+export const editFilterGroupControl = ({
+  idx,
+  fieldName,
+  label,
+}: {
+  idx: number;
+  fieldName: string;
+  label: string;
+}) => {
+  cy.get(CONTROL_FRAME_TITLE).eq(idx).trigger('mouseover');
+  cy.get(FILTER_GROUP_CONTROL_ACTION_EDIT(idx)).trigger('click', { force: true });
+  const { FIELD_SEARCH, FIELD_PICKER, FIELD_LABEL, SAVE } = FILTER_GROUP_EDIT_CONTROL_PANEL_ITEMS;
+  cy.get(FIELD_SEARCH).type(fieldName);
+  cy.get(FIELD_PICKER(fieldName)).should('exist').trigger('click');
+
+  cy.get(FIELD_LABEL).should('have.value', fieldName);
+  cy.get(FIELD_LABEL).clear();
+  cy.get(FIELD_LABEL).type(label).should('have.value', label);
+  cy.get(SAVE).trigger('click');
+  cy.get(FILTER_GROUP_EDIT_CONTROLS_PANEL).should('not.exist');
+};
diff --git a/x-pack/plugins/security_solution/public/app/deep_links/index.ts b/x-pack/plugins/security_solution/public/app/deep_links/index.ts
index 7ea8a9f51f4064..e0bd41655545c3 100644
--- a/x-pack/plugins/security_solution/public/app/deep_links/index.ts
+++ b/x-pack/plugins/security_solution/public/app/deep_links/index.ts
@@ -78,7 +78,7 @@ import {
   USERS_PATH,
 } from '../../../common/constants';
 import type { ExperimentalFeatures } from '../../../common/experimental_features';
-import { hasCapabilities, subscribeAppLinks } from '../../common/links';
+import { appLinks$, hasCapabilities } from '../../common/links';
 import type { AppLinkItems } from '../../common/links/types';
 
 export const FEATURE = {
@@ -630,7 +630,7 @@ const formatDeepLinks = (appLinks: AppLinkItems): AppDeepLink[] =>
  * Registers any change in appLinks to be updated in app deepLinks
  */
 export const registerDeepLinksUpdater = (appUpdater$: Subject<AppUpdater>): Subscription => {
-  return subscribeAppLinks((appLinks) => {
+  return appLinks$.subscribe((appLinks) => {
     appUpdater$.next(() => ({
       navLinkStatus: AppNavLinkStatus.hidden, // needed to prevent main security link to switch to visible after update
       deepLinks: formatDeepLinks(appLinks),
diff --git a/x-pack/plugins/security_solution/public/common/components/cell_actions/mocks.ts b/x-pack/plugins/security_solution/public/common/components/cell_actions/mocks.ts
new file mode 100644
index 00000000000000..bf9bd77e6b261f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/cell_actions/mocks.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const makeAction = (actionsName: string, icon: string = 'icon', order?: number) => ({
+  id: actionsName,
+  type: actionsName,
+  order,
+  getIconType: () => icon,
+  getDisplayName: () => actionsName,
+  getDisplayNameTooltip: () => actionsName,
+  isCompatible: () => Promise.resolve(true),
+  execute: () => {
+    alert(actionsName);
+    return Promise.resolve();
+  },
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/filter_group/context_menu.tsx b/x-pack/plugins/security_solution/public/common/components/filter_group/context_menu.tsx
index bf672a5fabfa4c..b7dc2f6f32457f 100644
--- a/x-pack/plugins/security_solution/public/common/components/filter_group/context_menu.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/filter_group/context_menu.tsx
@@ -48,7 +48,7 @@ export const FilterGroupContextMenu = () => {
     [toggleContextMenu]
   );
 
-  const resetSelection = useCallback(() => {
+  const resetSelection = useCallback(async () => {
     if (!controlGroupInputUpdates) return;
 
     // remove existing embeddables
@@ -56,9 +56,10 @@ export const FilterGroupContextMenu = () => {
       panels: {},
     });
 
-    initialControls.forEach((control, idx) => {
-      controlGroup?.addOptionsListControl({
-        controlId: String(idx),
+    for (let counter = 0; counter < initialControls.length; counter++) {
+      const control = initialControls[counter];
+      await controlGroup?.addOptionsListControl({
+        controlId: String(counter),
         hideExclude: true,
         hideSort: true,
         hidePanelTitles: true,
@@ -68,9 +69,8 @@ export const FilterGroupContextMenu = () => {
         dataViewId: dataViewId ?? '',
         ...control,
       });
-    });
+    }
 
-    controlGroup?.reload();
     switchToViewMode();
     setShowFiltersChangedBanner(false);
   }, [
diff --git a/x-pack/plugins/security_solution/public/common/components/filter_group/filter_group.test.tsx b/x-pack/plugins/security_solution/public/common/components/filter_group/filter_group.test.tsx
index f066b022af04e7..5da07f8add8647 100644
--- a/x-pack/plugins/security_solution/public/common/components/filter_group/filter_group.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/filter_group/filter_group.test.tsx
@@ -462,14 +462,11 @@ describe(' Filter Group Component ', () => {
 
       controlGroupMock.addOptionsListControl.mockClear();
       controlGroupMock.updateInput.mockClear();
-      controlGroupMock.reload.mockClear();
       fireEvent.click(screen.getByTestId(TEST_IDS.CONTEXT_MENU.RESET));
 
       await waitFor(() => {
         // blanks the input
         expect(controlGroupMock.updateInput.mock.calls.length).toBe(2);
-        expect(controlGroupMock.reload.mock.calls.length).toBe(1);
-
         expect(controlGroupMock.addOptionsListControl.mock.calls.length).toBe(4);
       });
     });
diff --git a/x-pack/plugins/security_solution/public/common/components/filter_group/index.tsx b/x-pack/plugins/security_solution/public/common/components/filter_group/index.tsx
index 533bf19146dad9..a4c61fb9c98a61 100644
--- a/x-pack/plugins/security_solution/public/common/components/filter_group/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/filter_group/index.tsx
@@ -334,7 +334,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
     setShowFiltersChangedBanner(false);
   }, [controlGroup, switchToViewMode, getStoredControlInput, hasPendingChanges]);
 
-  const upsertPersistableControls = useCallback(() => {
+  const upsertPersistableControls = useCallback(async () => {
     const persistableControls = initialControls.filter((control) => control.persist === true);
     if (persistableControls.length > 0) {
       const currentPanels = Object.values(controlGroup?.getInput().panels ?? []) as Array<
@@ -342,7 +342,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
       >;
       const orderedPanels = currentPanels.sort((a, b) => a.order - b.order);
       let filterControlsDeleted = false;
-      persistableControls.forEach((control) => {
+      for (const control of persistableControls) {
         const controlExists = currentPanels.some(
           (currControl) => control.fieldName === currControl.explicitInput.fieldName
         );
@@ -354,7 +354,7 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
           }
 
           // add persitable controls
-          controlGroup?.addOptionsListControl({
+          await controlGroup?.addOptionsListControl({
             title: control.title,
             hideExclude: true,
             hideSort: true,
@@ -367,21 +367,22 @@ const FilterGroupComponent = (props: PropsWithChildren<FilterGroupProps>) => {
             ...control,
           });
         }
-      });
-      orderedPanels.forEach((panel) => {
+      }
+
+      for (const panel of orderedPanels) {
         if (panel.explicitInput.fieldName)
-          controlGroup?.addOptionsListControl({
+          await controlGroup?.addOptionsListControl({
             selectedOptions: [],
             fieldName: panel.explicitInput.fieldName,
             dataViewId: dataViewId ?? '',
             ...panel.explicitInput,
           });
-      });
+      }
     }
   }, [controlGroup, dataViewId, initialControls]);
 
-  const saveChangesHandler = useCallback(() => {
-    upsertPersistableControls();
+  const saveChangesHandler = useCallback(async () => {
+    await upsertPersistableControls();
     switchToViewMode();
     setShowFiltersChangedBanner(false);
   }, [switchToViewMode, upsertPersistableControls]);
diff --git a/x-pack/plugins/security_solution/public/common/components/filter_group/mocks/index.tsx b/x-pack/plugins/security_solution/public/common/components/filter_group/mocks/index.tsx
index 3fa2ff03318cb2..d31285ccb37615 100644
--- a/x-pack/plugins/security_solution/public/common/components/filter_group/mocks/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/filter_group/mocks/index.tsx
@@ -8,7 +8,7 @@
 import type { ControlGroupContainer } from '@kbn/controls-plugin/public';
 import type { Filter } from '@kbn/es-query';
 import type { FC } from 'react';
-import React from 'react';
+import React, { useEffect } from 'react';
 import { TEST_IDS } from '../constants';
 import type { FilterGroupProps } from '../types';
 import { getControlGroupMock } from './control_group';
@@ -61,15 +61,17 @@ import { getControlGroupMock } from './control_group';
  *});
  *
  */
-export function getMockedFilterGroupWithCustomFilters(outputFilters: Filter[] | undefined) {
+export function getMockedFilterGroupWithCustomFilters(outputFilters?: Filter[]) {
   const FilterGroup: FC<FilterGroupProps> = ({ onInit, onFilterChange }) => {
-    if (onInit) {
-      onInit(getControlGroupMock() as unknown as ControlGroupContainer);
-    }
+    useEffect(() => {
+      if (onInit) {
+        onInit(getControlGroupMock() as unknown as ControlGroupContainer);
+      }
 
-    if (onFilterChange) {
-      onFilterChange(outputFilters ?? []);
-    }
+      if (onFilterChange) {
+        onFilterChange(outputFilters ?? []);
+      }
+    }, [onInit, onFilterChange]);
 
     return <div data-test-subj={TEST_IDS.MOCKED_CONTROL} />;
   };
diff --git a/x-pack/plugins/security_solution/public/common/components/link_to/index.ts b/x-pack/plugins/security_solution/public/common/components/link_to/index.ts
index 4630ae0f6f71ef..6b29af13f88270 100644
--- a/x-pack/plugins/security_solution/public/common/components/link_to/index.ts
+++ b/x-pack/plugins/security_solution/public/common/components/link_to/index.ts
@@ -7,10 +7,12 @@
 
 import { isEmpty } from 'lodash/fp';
 import { useCallback } from 'react';
-import { useGetUrlSearch, useGetUrlStateQueryString } from '../navigation/use_get_url_search';
+import {
+  useUrlStateQueryParams,
+  useGetUrlStateQueryParams,
+} from '../navigation/use_url_state_query_params';
 import { useAppUrl } from '../../lib/kibana/hooks';
 import type { SecurityPageName } from '../../../app/types';
-import { needsUrlState } from '../../links';
 
 export { getAlertDetailsUrl, getAlertDetailsTabUrl } from './redirect_to_alerts';
 export { getDetectionEngineUrl, getRuleDetailsUrl } from './redirect_to_detection_engine';
@@ -43,17 +45,17 @@ export type FormatUrl = (path: string, options?: Partial<FormatUrlOptions>) => s
  */
 export const useFormatUrl = (page: SecurityPageName) => {
   const { getAppUrl } = useAppUrl();
-  const search = useGetUrlSearch(page);
+  const queryParams = useUrlStateQueryParams(page);
 
   const formatUrl = useCallback<FormatUrl>(
     (path: string, { absolute = false, skipSearch = false } = {}) => {
-      const formattedPath = formatPath(path, search, skipSearch);
+      const formattedPath = formatPath(path, queryParams, skipSearch);
       return getAppUrl({ deepLinkId: page, path: formattedPath, absolute });
     },
-    [getAppUrl, page, search]
+    [getAppUrl, page, queryParams]
   );
 
-  return { formatUrl, search };
+  return { formatUrl, search: queryParams };
 };
 
 export type GetSecuritySolutionUrl = (param: {
@@ -65,16 +67,16 @@ export type GetSecuritySolutionUrl = (param: {
 
 export const useGetSecuritySolutionUrl = () => {
   const { getAppUrl } = useAppUrl();
-  const getUrlStateQueryString = useGetUrlStateQueryString();
+  const getUrlStateQueryParams = useGetUrlStateQueryParams();
 
   const getSecuritySolutionUrl = useCallback<GetSecuritySolutionUrl>(
     ({ deepLinkId, path = '', absolute = false, skipSearch = false }) => {
-      const search = needsUrlState(deepLinkId) ? getUrlStateQueryString() : '';
+      const search = getUrlStateQueryParams(deepLinkId);
       const formattedPath = formatPath(path, search, skipSearch);
 
       return getAppUrl({ deepLinkId, path: formattedPath, absolute });
     },
-    [getAppUrl, getUrlStateQueryString]
+    [getAppUrl, getUrlStateQueryParams]
   );
 
   return getSecuritySolutionUrl;
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/score/score_health.tsx b/x-pack/plugins/security_solution/public/common/components/ml/score/score_health.tsx
index 4fb1168e1af3a8..ac179b2ac8337c 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/score/score_health.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/ml/score/score_health.tsx
@@ -22,7 +22,7 @@ export const ScoreHealth = React.memo<Props>(({ score }) => {
 
 ScoreHealth.displayName = 'ScoreHealth';
 
-// ಠ_ಠ A hard-fork of the `ml` ml/common/util/anomaly_utils.js#getSeverityColor ಠ_ಠ
+// ಠ_ಠ A hard-fork of the @kbn/ml-anomaly-utils;#getSeverityColor ಠ_ಠ
 //
 // Returns a severity label (one of critical, major, minor, warning, low or unknown)
 // for the supplied normalized anomaly score (a value between 0 and 100), where scores
diff --git a/x-pack/plugins/security_solution/public/common/components/ml/types.ts b/x-pack/plugins/security_solution/public/common/components/ml/types.ts
index 2a969dc3d15cb4..24c0d9314735d0 100644
--- a/x-pack/plugins/security_solution/public/common/components/ml/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/ml/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { Influencer } from '@kbn/ml-plugin/public';
+import type { MlInfluencer } from '@kbn/ml-anomaly-utils';
 import type { FlowTarget } from '../../../../common/search_strategy';
 
 import type { HostsType } from '../../../explore/hosts/store/model';
@@ -31,7 +31,7 @@ export interface Source {
   function_description: string;
   typical: number[];
   actual: number[];
-  influencers: Influencer[];
+  influencers: MlInfluencer[];
 }
 
 export interface CriteriaFields {
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/__mocks__/use_url_state_query_params.ts b/x-pack/plugins/security_solution/public/common/components/navigation/__mocks__/use_url_state_query_params.ts
new file mode 100644
index 00000000000000..453859d3b6f8ef
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/__mocks__/use_url_state_query_params.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 { SecurityPageName } from '../../../../../common/constants';
+
+export const useUrlStateQueryParams = (_pageName: SecurityPageName) => '';
+export const useGetUrlStateQueryParams = () => (_pageName: SecurityPageName) => '';
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/nav_links.test.ts b/x-pack/plugins/security_solution/public/common/components/navigation/nav_links.test.ts
deleted file mode 100644
index c44873414ca111..00000000000000
--- a/x-pack/plugins/security_solution/public/common/components/navigation/nav_links.test.ts
+++ /dev/null
@@ -1,95 +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 { renderHook } from '@testing-library/react-hooks';
-import { SecurityPageName } from '../../../app/types';
-import type { AppLinkItems } from '../../links';
-import { TestProviders } from '../../mock';
-import { useAppNavLinks, useAppRootNavLink } from './nav_links';
-import type { NavLinkItem } from './types';
-
-const mockNavLinks: AppLinkItems = [
-  {
-    description: 'description',
-    id: SecurityPageName.administration,
-    links: [
-      {
-        description: 'description 2',
-        id: SecurityPageName.endpoints,
-        links: [],
-        path: '/path_2',
-        title: 'title 2',
-        sideNavDisabled: true,
-        landingIcon: 'someicon',
-        landingImage: 'someimage',
-        skipUrlState: true,
-      },
-    ],
-    path: '/path',
-    title: 'title',
-  },
-];
-
-jest.mock('../../links', () => ({
-  useAppLinks: () => mockNavLinks,
-}));
-
-const renderUseAppNavLinks = () =>
-  renderHook<{}, NavLinkItem[]>(() => useAppNavLinks(), { wrapper: TestProviders });
-
-const renderUseAppRootNavLink = (id: SecurityPageName) =>
-  renderHook<{ id: SecurityPageName }, NavLinkItem | undefined>(() => useAppRootNavLink(id), {
-    wrapper: TestProviders,
-  });
-
-describe('useAppNavLinks', () => {
-  it('should return all nav links', () => {
-    const { result } = renderUseAppNavLinks();
-    expect(result.current).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "description": "description",
-          "id": "administration",
-          "links": Array [
-            Object {
-              "description": "description 2",
-              "disabled": true,
-              "icon": "someicon",
-              "id": "endpoints",
-              "image": "someimage",
-              "skipUrlState": true,
-              "title": "title 2",
-            },
-          ],
-          "title": "title",
-        },
-      ]
-    `);
-  });
-
-  it('should return a root nav links', () => {
-    const { result } = renderUseAppRootNavLink(SecurityPageName.administration);
-    expect(result.current).toMatchInlineSnapshot(`
-      Object {
-        "description": "description",
-        "id": "administration",
-        "links": Array [
-          Object {
-            "description": "description 2",
-            "disabled": true,
-            "icon": "someicon",
-            "id": "endpoints",
-            "image": "someimage",
-            "skipUrlState": true,
-            "title": "title 2",
-          },
-        ],
-        "title": "title",
-      }
-    `);
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/security_side_nav/security_side_nav.test.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/security_side_nav/security_side_nav.test.tsx
index acf7765ffa9369..a0612e9b638974 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/security_side_nav/security_side_nav.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/security_side_nav/security_side_nav.test.tsx
@@ -51,9 +51,9 @@ jest.mock('../../../links', () => ({
   getAncestorLinksInfo: (id: string) => [{ id }],
 }));
 
-const mockUseAppNavLinks = jest.fn();
-jest.mock('../nav_links', () => ({
-  useAppNavLinks: () => mockUseAppNavLinks(),
+const mockUseNavLinks = jest.fn();
+jest.mock('../../../links/nav_links', () => ({
+  useNavLinks: () => mockUseNavLinks(),
 }));
 jest.mock('../../links', () => ({
   useGetSecuritySolutionLinkProps:
@@ -80,14 +80,14 @@ const renderNav = () =>
 describe('SecuritySideNav', () => {
   beforeEach(() => {
     jest.clearAllMocks();
-    mockUseAppNavLinks.mockReturnValue([alertsNavLink, manageNavLink]);
+    mockUseNavLinks.mockReturnValue([alertsNavLink, manageNavLink]);
     useKibana().services.chrome.hasHeaderBanner$ = jest.fn(() =>
       new BehaviorSubject(false).asObservable()
     );
   });
 
   it('should render main items', () => {
-    mockUseAppNavLinks.mockReturnValue([alertsNavLink]);
+    mockUseNavLinks.mockReturnValue([alertsNavLink]);
     renderNav();
     expect(mockSolutionSideNav).toHaveBeenCalledWith({
       selectedId: SecurityPageName.alerts,
@@ -104,7 +104,7 @@ describe('SecuritySideNav', () => {
   });
 
   it('should render the loader if items are still empty', () => {
-    mockUseAppNavLinks.mockReturnValue([]);
+    mockUseNavLinks.mockReturnValue([]);
     const result = renderNav();
     expect(result.getByTestId('sideNavLoader')).toBeInTheDocument();
     expect(mockSolutionSideNav).not.toHaveBeenCalled();
@@ -121,7 +121,7 @@ describe('SecuritySideNav', () => {
   });
 
   it('should render footer items', () => {
-    mockUseAppNavLinks.mockReturnValue([manageNavLink]);
+    mockUseNavLinks.mockReturnValue([manageNavLink]);
     renderNav();
     expect(mockSolutionSideNav).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -148,7 +148,7 @@ describe('SecuritySideNav', () => {
   });
 
   it('should not render disabled items', () => {
-    mockUseAppNavLinks.mockReturnValue([{ ...alertsNavLink, disabled: true }, manageNavLink]);
+    mockUseNavLinks.mockReturnValue([{ ...alertsNavLink, disabled: true }, manageNavLink]);
     renderNav();
     expect(mockSolutionSideNav).toHaveBeenCalledWith(
       expect.objectContaining({
@@ -163,7 +163,7 @@ describe('SecuritySideNav', () => {
   });
 
   it('should render custom item', () => {
-    mockUseAppNavLinks.mockReturnValue([{ id: SecurityPageName.landing, title: 'get started' }]);
+    mockUseNavLinks.mockReturnValue([{ id: SecurityPageName.landing, title: 'get started' }]);
     renderNav();
     expect(mockSolutionSideNav).toHaveBeenCalledWith(
       expect.objectContaining({
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/security_side_nav/security_side_nav.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/security_side_nav/security_side_nav.tsx
index f647ff1f873e14..b34e069c248601 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/security_side_nav/security_side_nav.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/security_side_nav/security_side_nav.tsx
@@ -13,7 +13,7 @@ import { SecurityPageName } from '../../../../app/types';
 import { getAncestorLinksInfo } from '../../../links';
 import { useRouteSpy } from '../../../utils/route/use_route_spy';
 import { useGetSecuritySolutionLinkProps } from '../../links';
-import { useAppNavLinks } from '../nav_links';
+import { useNavLinks } from '../../../links/nav_links';
 import { useShowTimeline } from '../../../utils/timeline/use_show_timeline';
 import { useIsPolicySettingsBarVisible } from '../../../../management/pages/policy/view/policy_hooks';
 import { track } from '../../../lib/telemetry';
@@ -30,7 +30,7 @@ const isGetStartedNavItem = (id: SecurityPageName) => id === SecurityPageName.la
  * Returns the formatted `items` and `footerItems` to be rendered in the navigation
  */
 const useSolutionSideNavItems = () => {
-  const navLinks = useAppNavLinks();
+  const navLinks = useNavLinks();
   const getSecuritySolutionLinkProps = useGetSecuritySolutionLinkProps(); // adds href and onClick props
 
   const sideNavItems = useMemo(() => {
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
index 647193357b66b9..867cda2bcf4e8f 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/use_security_solution_navigation/use_primary_navigation.tsx
@@ -9,10 +9,12 @@ import React, { useEffect, useState, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import type { KibanaPageTemplateProps } from '@kbn/shared-ux-page-kibana-template';
+import useObservable from 'react-use/lib/useObservable';
 import type { PrimaryNavigationProps } from './types';
 import { usePrimaryNavigationItems } from './use_navigation_items';
 import { useIsGroupedNavigationEnabled } from '../helpers';
 import { SecuritySideNav } from '../security_side_nav';
+import { useKibana } from '../../../lib/kibana';
 
 const translatedNavTitle = i18n.translate('xpack.securitySolution.navigation.mainLabel', {
   defaultMessage: 'Security',
@@ -45,6 +47,14 @@ export const usePrimaryNavigation = ({
     selectedTabId,
   });
 
+  const { isSidebarEnabled$ } = useKibana().services;
+
+  const isSidebarEnabled = useObservable(isSidebarEnabled$);
+
+  if (!isSidebarEnabled) {
+    return undefined;
+  }
+
   return {
     canBeCollapsed: true,
     name: translatedNavTitle,
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/use_get_url_search.tsx b/x-pack/plugins/security_solution/public/common/components/navigation/use_url_state_query_params.tsx
similarity index 50%
rename from x-pack/plugins/security_solution/public/common/components/navigation/use_get_url_search.tsx
rename to x-pack/plugins/security_solution/public/common/components/navigation/use_url_state_query_params.tsx
index 816e35c217ee03..9f5d50d353eb8c 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/use_get_url_search.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/navigation/use_url_state_query_params.tsx
@@ -12,21 +12,20 @@ import { useGlobalQueryString } from '../../utils/global_query_string';
 
 import { getSearch } from './helpers';
 
-export const useGetUrlSearch = (pageName: SecurityPageName) => {
-  const globalQueryString = useGlobalQueryString();
-  const urlSearch = useMemo(
-    () => getSearch(pageName, globalQueryString),
-    [globalQueryString, pageName]
+export const useUrlStateQueryParams = (pageName: SecurityPageName) => {
+  const getUrlStateQueryParams = useGetUrlStateQueryParams();
+  const urlStateQueryParams = useMemo(
+    () => getUrlStateQueryParams(pageName),
+    [getUrlStateQueryParams, pageName]
   );
-
-  return urlSearch;
+  return urlStateQueryParams;
 };
 
-export const useGetUrlStateQueryString = () => {
+export const useGetUrlStateQueryParams = () => {
   const globalQueryString = useGlobalQueryString();
-  const getUrlStateQueryString = useCallback(() => {
-    return globalQueryString.length > 0 ? `?${globalQueryString}` : '';
-  }, [globalQueryString]);
-
-  return getUrlStateQueryString;
+  const getUrlStateQueryParams = useCallback(
+    (pageName: SecurityPageName) => getSearch(pageName, globalQueryString),
+    [globalQueryString]
+  );
+  return getUrlStateQueryParams;
 };
diff --git a/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts b/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
index 399725db133838..46c18e19f12fd8 100644
--- a/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/visualization_actions/types.ts
@@ -5,9 +5,14 @@
  * 2.0.
  */
 
-import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
+import type {
+  DatatableVisualizationState,
+  FormBasedPersistedState,
+  TypedLensByValueInput,
+} from '@kbn/lens-plugin/public';
+import type { DataViewSpec } from '@kbn/data-views-plugin/common';
 import type { Action } from '@kbn/ui-actions-plugin/public';
-import type { Filter } from '@kbn/es-query';
+import type { Filter, Query } from '@kbn/es-query';
 
 import type { InputsModelId } from '../../store/inputs/constants';
 import type { SourcererScopeName } from '../../store/sourcerer/model';
@@ -143,3 +148,36 @@ export interface VisualizationResponse<Hit = {}, Aggregations = {} | undefined>
     hits: Hit[];
   };
 }
+
+export interface SavedObjectReference {
+  id: string;
+  name: string;
+  type: string;
+}
+
+export interface LensDataTableAttributes<TVisType, TVisState> {
+  description?: string;
+  references: SavedObjectReference[];
+  visualizationType: TVisType;
+  state: {
+    query: Query;
+    globalPalette?: {
+      activePaletteId: string;
+      state?: unknown;
+    };
+    filters: Filter[];
+    adHocDataViews?: Record<string, DataViewSpec>;
+    internalReferences?: SavedObjectReference[];
+    datasourceStates: {
+      formBased: FormBasedPersistedState;
+    };
+    visualization: TVisState;
+  };
+  title: string;
+}
+
+export interface LensDataTableEmbeddable {
+  attributes: LensDataTableAttributes<'lnsDatatable', DatatableVisualizationState>;
+  id: string;
+  timeRange: { from: string; to: string; fromStr: string; toStr: string };
+}
diff --git a/x-pack/plugins/security_solution/public/common/hooks/flyout/use_init_flyout_url_param.ts b/x-pack/plugins/security_solution/public/common/hooks/flyout/use_init_flyout_url_param.ts
index 875a87e46e4af4..a67b605841917d 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/flyout/use_init_flyout_url_param.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/flyout/use_init_flyout_url_param.ts
@@ -10,10 +10,10 @@ import { useCallback, useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 
 import {
-  dataTableActions,
   dataTableSelectors,
-  tableDefaults,
   TableId,
+  tableDefaults,
+  dataTableActions,
 } from '@kbn/securitysolution-data-table';
 import { useInitializeUrlParam } from '../../utils/global_query_string';
 import { URL_PARAM_KEY } from '../use_url_state';
@@ -39,16 +39,28 @@ export const useInitFlyoutFromUrlParam = () => {
   }, []);
 
   const loadExpandedDetailFromUrl = useCallback(() => {
-    const { initialized, isLoading, totalCount } = dataTableCurrent;
+    const { initialized, isLoading, totalCount, additionalFilters } = dataTableCurrent;
     const isTableLoaded = initialized && !isLoading && totalCount > 0;
-    if (urlDetails && isTableLoaded) {
-      updateHasLoadedUrlDetails(true);
-      dispatch(
-        dataTableActions.toggleDetailPanel({
-          id: TableId.alertsOnAlertsPage,
-          ...urlDetails,
-        })
-      );
+    if (urlDetails) {
+      if (!additionalFilters.showBuildingBlockAlerts) {
+        // We want to show building block alerts when loading the flyout in case the alert is a building block alert
+        dispatch(
+          dataTableActions.updateShowBuildingBlockAlertsFilter({
+            id: TableId.alertsOnAlertsPage,
+            showBuildingBlockAlerts: true,
+          })
+        );
+      }
+
+      if (isTableLoaded) {
+        updateHasLoadedUrlDetails(true);
+        dispatch(
+          dataTableActions.toggleDetailPanel({
+            id: TableId.alertsOnAlertsPage,
+            ...urlDetails,
+          })
+        );
+      }
     }
   }, [dataTableCurrent, dispatch, urlDetails]);
 
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts b/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts
deleted file mode 100644
index e5e3d048a7b23c..00000000000000
--- a/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_button_href.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import { useState, useEffect } from 'react';
-import type { SavedObjectAttributes } from '@kbn/securitysolution-io-ts-alerting-types';
-import { useKibana } from '../lib/kibana';
-
-export const dashboardRequestBody = (title: string) => ({
-  type: 'dashboard',
-  search: `"${title}"`,
-  fields: ['title'],
-});
-
-export const useDashboardButtonHref = ({
-  to,
-  from,
-  title,
-}: {
-  to?: string;
-  from?: string;
-  title: string;
-}) => {
-  const {
-    dashboard,
-    savedObjects: { client: savedObjectsClient },
-  } = useKibana().services;
-
-  const [buttonHref, setButtonHref] = useState<string | undefined>();
-
-  useEffect(() => {
-    if (dashboard?.locator && savedObjectsClient) {
-      savedObjectsClient.find<SavedObjectAttributes>(dashboardRequestBody(title)).then(
-        async (DashboardsSO?: {
-          savedObjects?: Array<{
-            attributes?: SavedObjectAttributes;
-            id?: string;
-          }>;
-        }) => {
-          if (DashboardsSO?.savedObjects?.length && to && from) {
-            const dashboardUrl = await dashboard?.locator?.getUrl({
-              dashboardId: DashboardsSO.savedObjects[0].id,
-              timeRange: {
-                to,
-                from,
-              },
-            });
-            setButtonHref(dashboardUrl);
-          }
-        }
-      );
-    }
-  }, [dashboard, from, savedObjectsClient, to, title]);
-
-  return {
-    buttonHref,
-  };
-};
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_href.ts b/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_href.ts
new file mode 100644
index 00000000000000..777f48fee4307b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_dashboard_href.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 { useState, useEffect, useMemo } from 'react';
+import { SecurityPageName } from '../../../common/constants';
+import { useUrlStateQueryParams } from '../components/navigation/use_url_state_query_params';
+import { useKibana, useAppUrl } from '../lib/kibana';
+
+export const dashboardRequestBody = (title: string) => ({
+  type: 'dashboard',
+  search: `"${title}"`,
+  fields: ['title'],
+});
+
+export const useDashboardHref = ({ title }: { title: string }): string | undefined => {
+  const { dashboard } = useKibana().services;
+  const { getAppUrl } = useAppUrl();
+  const [dashboardId, setDashboardId] = useState<string | undefined>();
+
+  const params = useUrlStateQueryParams(SecurityPageName.dashboards);
+
+  useEffect(() => {
+    let ignore = false;
+    (async () => {
+      if (dashboard && title) {
+        const findDashboardsService = await dashboard?.findDashboardsService();
+        const { id } = (await findDashboardsService.findByTitle(title)) ?? {};
+        if (!ignore) {
+          setDashboardId(id);
+        }
+      }
+    })();
+    return () => {
+      ignore = true;
+    };
+  }, [dashboard, title]);
+
+  return useMemo(() => {
+    if (dashboardId) {
+      return getAppUrl({
+        deepLinkId: SecurityPageName.dashboards,
+        path: `${dashboardId}${params}`,
+      });
+    } else {
+      return undefined;
+    }
+  }, [dashboardId, getAppUrl, params]);
+};
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 42a34fa08fce37..702e3f2bc39e8d 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kibana/kibana_react.mock.ts
@@ -45,6 +45,8 @@ import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mo
 import { mockApm } from '../apm/service.mock';
 import { cloudExperimentsMock } from '@kbn/cloud-experiments-plugin/common/mocks';
 import { guidedOnboardingMock } from '@kbn/guided-onboarding-plugin/public/mocks';
+import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
+import { of } from 'rxjs';
 
 const mockUiSettings: Record<string, unknown> = {
   [DEFAULT_TIME_RANGE]: { from: 'now-15m', to: 'now', mode: 'quick' },
@@ -104,6 +106,7 @@ export const createStartServicesMock = (
   const fleet = fleetMock.createStartMock();
   const unifiedSearch = unifiedSearchPluginMock.createStartContract();
   const cases = mockCasesContract();
+  const dataViewServiceMock = dataViewPluginMocks.createStartContract();
   cases.helpers.getUICapabilities.mockReturnValue(noCasesPermissions());
   const triggersActionsUi = triggersActionsUiMock.createStart();
   const cloudExperiments = cloudExperimentsMock.createStartMock();
@@ -114,6 +117,7 @@ export const createStartServicesMock = (
     apm,
     cases,
     unifiedSearch,
+    dataViews: dataViewServiceMock,
     data: {
       ...data,
       dataViews: {
@@ -183,6 +187,7 @@ export const createStartServicesMock = (
     triggersActionsUi,
     cloudExperiments,
     guidedOnboarding,
+    isSidebarEnabled$: of(true),
   } as unknown as StartServices;
 };
 
diff --git a/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts b/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts
index e21a5a519fc512..e6d5d67daf2bf8 100644
--- a/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/kuery/index.ts
@@ -97,6 +97,15 @@ export const getBrowserFieldPath = (field: string, browserFields: BrowserFields)
   return [splitFields[0], 'fields', field];
 };
 
+export const getFieldEsTypes = (field: string, browserFields: BrowserFields): string[] => {
+  const pathBrowserField = getBrowserFieldPath(field, browserFields);
+  const browserField = get(pathBrowserField, browserFields);
+  if (browserField != null) {
+    return browserField.esTypes;
+  }
+  return [];
+};
+
 export const checkIfFieldTypeIsDate = (field: string, browserFields: BrowserFields) => {
   const pathBrowserField = getBrowserFieldPath(field, browserFields);
   const browserField = get(pathBrowserField, browserFields);
diff --git a/x-pack/plugins/security_solution/public/common/links/links.ts b/x-pack/plugins/security_solution/public/common/links/links.ts
index de30840d02d9d5..be1f206e339b22 100644
--- a/x-pack/plugins/security_solution/public/common/links/links.ts
+++ b/x-pack/plugins/security_solution/public/common/links/links.ts
@@ -7,7 +7,8 @@
 
 import type { Capabilities } from '@kbn/core/public';
 import { get, isArray } from 'lodash';
-import { useEffect, useState } from 'react';
+import { useMemo } from 'react';
+import useObservable from 'react-use/lib/useObservable';
 import { BehaviorSubject } from 'rxjs';
 import type { SecurityPageName } from '../../../common/constants';
 import type {
@@ -20,72 +21,48 @@ import type {
 } from './types';
 
 /**
- * App links updater, it keeps the value of the app links in sync with all application.
- * It can be updated using `updateAppLinks` or `excludeAppLink`
- * Read it using `subscribeAppLinks` or `useAppLinks` hook.
+ * App links updater, it stores the `appLinkItems` recursive hierarchy and keeps
+ * the value of the app links in sync with all application components.
+ * It can be updated using `updateAppLinks`.
+ * Read it using subscription or `useAppLinks` hook.
  */
-const appLinksUpdater$ = new BehaviorSubject<{
-  links: AppLinkItems;
-  normalizedLinks: NormalizedLinks;
-}>({
-  links: [], // stores the appLinkItems recursive hierarchy
-  normalizedLinks: {}, // stores a flatten normalized object for direct id access
-});
+const appLinksUpdater$ = new BehaviorSubject<AppLinkItems>([]);
+// stores a flatten normalized appLinkItems object for internal direct id access
+const normalizedAppLinksUpdater$ = new BehaviorSubject<NormalizedLinks>({});
 
-const getAppLinksValue = (): AppLinkItems => appLinksUpdater$.getValue().links;
-const getNormalizedLinksValue = (): NormalizedLinks => appLinksUpdater$.getValue().normalizedLinks;
+// AppLinks observable
+export const appLinks$ = appLinksUpdater$.asObservable();
 
 /**
- * Subscribes to the updater to get the app links updates
+ * Updates the app links applying the filter by permissions
  */
-export const subscribeAppLinks = (onChange: (links: AppLinkItems) => void) =>
-  appLinksUpdater$.subscribe(({ links }) => onChange(links));
+export const updateAppLinks = (
+  appLinksToUpdate: AppLinkItems,
+  linksPermissions: LinksPermissions
+) => {
+  const filteredAppLinks = getFilteredAppLinks(appLinksToUpdate, linksPermissions);
+  appLinksUpdater$.next(Object.freeze(filteredAppLinks));
+  normalizedAppLinksUpdater$.next(Object.freeze(getNormalizedLinks(filteredAppLinks)));
+};
 
 /**
  * Hook to get the app links updated value
  */
-export const useAppLinks = (): AppLinkItems => {
-  const [appLinks, setAppLinks] = useState(getAppLinksValue);
-
-  useEffect(() => {
-    const linksSubscription = subscribeAppLinks((newAppLinks) => {
-      setAppLinks(newAppLinks);
-    });
-    return () => linksSubscription.unsubscribe();
-  }, []);
-
-  return appLinks;
-};
+export const useAppLinks = (): AppLinkItems =>
+  useObservable(appLinksUpdater$, appLinksUpdater$.getValue());
+/**
+ * Hook to get the normalized app links updated value
+ */
+export const useNormalizedAppLinks = (): NormalizedLinks =>
+  useObservable(normalizedAppLinksUpdater$, normalizedAppLinksUpdater$.getValue());
 
 /**
  * Hook to check if a link exists in the application links,
  * It can be used to know if a link access is authorized.
  */
 export const useLinkExists = (id: SecurityPageName): boolean => {
-  const [linkExists, setLinkExists] = useState(!!getNormalizedLink(id));
-
-  useEffect(() => {
-    const linksSubscription = subscribeAppLinks(() => {
-      setLinkExists(!!getNormalizedLink(id));
-    });
-    return () => linksSubscription.unsubscribe();
-  }, [id]);
-
-  return linkExists;
-};
-
-/**
- * Updates the app links applying the filter by permissions
- */
-export const updateAppLinks = (
-  appLinksToUpdate: AppLinkItems,
-  linksPermissions: LinksPermissions
-) => {
-  const filteredAppLinks = getFilteredAppLinks(appLinksToUpdate, linksPermissions);
-  appLinksUpdater$.next({
-    links: Object.freeze(filteredAppLinks),
-    normalizedLinks: Object.freeze(getNormalizedLinks(filteredAppLinks)),
-  });
+  const normalizedLinks = useNormalizedAppLinks();
+  return useMemo(() => !!normalizedLinks[id], [normalizedLinks, id]);
 };
 
 /**
@@ -128,6 +105,10 @@ export const needsUrlState = (id: SecurityPageName): boolean => {
   return !getNormalizedLink(id)?.skipUrlState;
 };
 
+export const getLinksWithHiddenTimeline = (): LinkInfo[] => {
+  return Object.values(normalizedAppLinksUpdater$.getValue()).filter((link) => link.hideTimeline);
+};
+
 // Internal functions
 
 /**
@@ -136,8 +117,8 @@ export const needsUrlState = (id: SecurityPageName): boolean => {
 const getNormalizedLinks = (
   currentLinks: AppLinkItems,
   parentId?: SecurityPageName
-): NormalizedLinks => {
-  return currentLinks.reduce<NormalizedLinks>((normalized, { links, ...currentLink }) => {
+): NormalizedLinks =>
+  currentLinks.reduce<NormalizedLinks>((normalized, { links, ...currentLink }) => {
     normalized[currentLink.id] = {
       ...currentLink,
       parentId,
@@ -147,10 +128,9 @@ const getNormalizedLinks = (
     }
     return normalized;
   }, {});
-};
 
 const getNormalizedLink = (id: SecurityPageName): Readonly<NormalizedLink> | undefined =>
-  getNormalizedLinksValue()[id];
+  normalizedAppLinksUpdater$.getValue()[id];
 
 const getFilteredAppLinks = (
   appLinkToFilter: AppLinkItems,
@@ -226,7 +206,3 @@ const isLinkAllowed = (
   }
   return true;
 };
-
-export const getLinksWithHiddenTimeline = (): LinkInfo[] => {
-  return Object.values(getNormalizedLinksValue()).filter((link) => link.hideTimeline);
-};
diff --git a/x-pack/plugins/security_solution/public/common/links/nav_links.test.ts b/x-pack/plugins/security_solution/public/common/links/nav_links.test.ts
new file mode 100644
index 00000000000000..d8decac43a86a6
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/links/nav_links.test.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { AppLinkItems } from './types';
+import { formatNavigationLinks } from './nav_links';
+import { SecurityPageName } from '../../app/types';
+
+const mockNavLinks: AppLinkItems = [
+  {
+    description: 'description',
+    id: SecurityPageName.administration,
+    links: [
+      {
+        description: 'description 2',
+        id: SecurityPageName.endpoints,
+        links: [],
+        path: '/path_2',
+        title: 'title 2',
+        sideNavDisabled: true,
+        landingIcon: 'someicon',
+        landingImage: 'someimage',
+        skipUrlState: true,
+      },
+    ],
+    path: '/path',
+    title: 'title',
+  },
+];
+
+describe('formatNavigationLinks', () => {
+  it('should format links', () => {
+    expect(formatNavigationLinks(mockNavLinks)).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "description": "description",
+          "id": "administration",
+          "links": Array [
+            Object {
+              "description": "description 2",
+              "disabled": true,
+              "icon": "someicon",
+              "id": "endpoints",
+              "image": "someimage",
+              "skipUrlState": true,
+              "title": "title 2",
+            },
+          ],
+          "title": "title",
+        },
+      ]
+    `);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/components/navigation/nav_links.ts b/x-pack/plugins/security_solution/public/common/links/nav_links.ts
similarity index 52%
rename from x-pack/plugins/security_solution/public/common/components/navigation/nav_links.ts
rename to x-pack/plugins/security_solution/public/common/links/nav_links.ts
index 5fff0a96499404..0882bdf233601b 100644
--- a/x-pack/plugins/security_solution/public/common/components/navigation/nav_links.ts
+++ b/x-pack/plugins/security_solution/public/common/links/nav_links.ts
@@ -5,23 +5,13 @@
  * 2.0.
  */
 
-import { useMemo } from 'react';
-import { useAppLinks } from '../../links';
-import type { SecurityPageName } from '../../../app/types';
-import type { NavLinkItem } from './types';
-import type { AppLinkItems } from '../../links/types';
+import useObservable from 'react-use/lib/useObservable';
+import { map } from 'rxjs';
+import { appLinks$ } from './links';
+import type { SecurityPageName } from '../../app/types';
+import type { AppLinkItems, NavigationLink } from './types';
 
-export const useAppNavLinks = (): NavLinkItem[] => {
-  const appLinks = useAppLinks();
-  const navLinks = useMemo(() => formatNavLinkItems(appLinks), [appLinks]);
-  return navLinks;
-};
-
-export const useAppRootNavLink = (linkId: SecurityPageName): NavLinkItem | undefined => {
-  return useAppNavLinks().find(({ id }) => id === linkId);
-};
-
-const formatNavLinkItems = (appLinks: AppLinkItems): NavLinkItem[] =>
+export const formatNavigationLinks = (appLinks: AppLinkItems): NavigationLink[] =>
   appLinks.map((link) => ({
     id: link.id,
     title: link.title,
@@ -33,9 +23,21 @@ const formatNavLinkItems = (appLinks: AppLinkItems): NavLinkItem[] =>
     ...(link.skipUrlState != null ? { skipUrlState: link.skipUrlState } : {}),
     ...(link.isBeta != null ? { isBeta: link.isBeta } : {}),
     ...(link.betaOptions != null ? { betaOptions: link.betaOptions } : {}),
-    ...(link.links && link.links.length
-      ? {
-          links: formatNavLinkItems(link.links),
-        }
-      : {}),
+    ...(link.links?.length && {
+      links: formatNavigationLinks(link.links),
+    }),
   }));
+
+/**
+ * Navigation links observable based on Security AppLinks,
+ * It is used to generate the side navigation items
+ */
+export const navLinks$ = appLinks$.pipe(map(formatNavigationLinks));
+
+export const useNavLinks = (): NavigationLink[] => {
+  return useObservable(navLinks$, []);
+};
+
+export const useRootNavLink = (linkId: SecurityPageName): NavigationLink | undefined => {
+  return useNavLinks().find(({ id }) => id === linkId);
+};
diff --git a/x-pack/plugins/security_solution/public/common/links/types.ts b/x-pack/plugins/security_solution/public/common/links/types.ts
index f9a2c5776262f7..162415fb66a16e 100644
--- a/x-pack/plugins/security_solution/public/common/links/types.ts
+++ b/x-pack/plugins/security_solution/public/common/links/types.ts
@@ -131,3 +131,19 @@ export type AppLinkItems = Readonly<LinkItem[]>;
 export type LinkInfo = Omit<LinkItem, 'links'>;
 export type NormalizedLink = LinkInfo & { parentId?: SecurityPageName };
 export type NormalizedLinks = Partial<Record<SecurityPageName, NormalizedLink>>;
+
+export interface NavigationLink {
+  categories?: LinkCategories;
+  description?: string;
+  disabled?: boolean;
+  icon?: IconType;
+  id: SecurityPageName;
+  links?: NavigationLink[];
+  image?: string;
+  title: string;
+  skipUrlState?: boolean;
+  isBeta?: boolean;
+  betaOptions?: {
+    text: string;
+  };
+}
diff --git a/x-pack/plugins/security_solution/public/dashboards/components/edit_dashboard_button.test.tsx b/x-pack/plugins/security_solution/public/dashboards/components/edit_dashboard_button.test.tsx
index e4cd6fa2069292..43afa552d50fd6 100644
--- a/x-pack/plugins/security_solution/public/dashboards/components/edit_dashboard_button.test.tsx
+++ b/x-pack/plugins/security_solution/public/dashboards/components/edit_dashboard_button.test.tsx
@@ -5,12 +5,16 @@
  * 2.0.
  */
 
-import { render } from '@testing-library/react';
+import type { RenderResult } from '@testing-library/react';
+import { fireEvent, render } from '@testing-library/react';
 import React from 'react';
+import type { Query } from '@kbn/es-query';
+
 import { useKibana } from '../../common/lib/kibana';
-import { createStartServicesMock } from '../../common/lib/kibana/kibana_react.mock';
 import { TestProviders } from '../../common/mock/test_providers';
+import type { EditDashboardButtonComponentProps } from './edit_dashboard_button';
 import { EditDashboardButton } from './edit_dashboard_button';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 
 jest.mock('../../common/lib/kibana/kibana_react', () => {
   return {
@@ -24,18 +28,54 @@ describe('EditDashboardButton', () => {
     to: '2023-03-24T23:59:59.999Z',
   };
 
-  beforeAll(() => {
+  const props = {
+    filters: [],
+    query: { query: '', language: '' } as Query,
+    savedObjectId: 'mockSavedObjectId',
+    timeRange,
+  };
+  const servicesMock = {
+    dashboard: { locator: { getRedirectUrl: jest.fn() } },
+    application: {
+      navigateToApp: jest.fn(),
+      navigateToUrl: jest.fn(),
+    },
+  };
+
+  const renderButton = (testProps: EditDashboardButtonComponentProps) => {
+    return render(
+      <TestProviders>
+        <EditDashboardButton {...testProps} />
+      </TestProviders>
+    );
+  };
+
+  let renderResult: RenderResult;
+  beforeEach(() => {
     (useKibana as jest.Mock).mockReturnValue({
-      services: createStartServicesMock(),
+      services: servicesMock,
     });
+    renderResult = renderButton(props);
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
   });
 
   it('should render', () => {
-    const { queryByTestId } = render(
-      <TestProviders>
-        <EditDashboardButton savedObjectId="mockSavedObjectId" timeRange={timeRange} />
-      </TestProviders>
+    expect(renderResult.queryByTestId('dashboardEditButton')).toBeInTheDocument();
+  });
+
+  it('should render dashboard edit url', () => {
+    fireEvent.click(renderResult.getByTestId('dashboardEditButton'));
+    expect(servicesMock.dashboard?.locator?.getRedirectUrl).toHaveBeenCalledWith(
+      expect.objectContaining({
+        query: props.query,
+        filters: props.filters,
+        timeRange: props.timeRange,
+        dashboardId: props.savedObjectId,
+        viewMode: ViewMode.EDIT,
+      })
     );
-    expect(queryByTestId('dashboardEditButton')).toBeInTheDocument();
   });
 });
diff --git a/x-pack/plugins/security_solution/public/dashboards/components/edit_dashboard_button.tsx b/x-pack/plugins/security_solution/public/dashboards/components/edit_dashboard_button.tsx
index c1089e95787e00..bd360229c7e1f4 100644
--- a/x-pack/plugins/security_solution/public/dashboards/components/edit_dashboard_button.tsx
+++ b/x-pack/plugins/security_solution/public/dashboards/components/edit_dashboard_button.tsx
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import React from 'react';
+import React, { useCallback } from 'react';
 import type { Query, Filter } from '@kbn/es-query';
 import { EuiButton } from '@elastic/eui';
-import { useDashboardAppLink } from '../hooks/use_dashboard_app_link';
+import { ViewMode } from '@kbn/embeddable-plugin/public';
 import { EDIT_DASHBOARD_BUTTON_TITLE } from '../pages/details/translations';
-import { useKibana } from '../../common/lib/kibana';
+import { useKibana, useNavigation } from '../../common/lib/kibana';
 
 export interface EditDashboardButtonComponentProps {
   filters?: Filter[];
@@ -31,24 +31,33 @@ const EditDashboardButtonComponent: React.FC<EditDashboardButtonComponentProps>
   timeRange,
 }) => {
   const {
-    services: { uiSettings },
+    services: { dashboard },
   } = useKibana();
+  const { navigateTo } = useNavigation();
 
-  const { onClick } = useDashboardAppLink({
-    query,
-    filters,
-    timeRange,
-    uiSettings,
-    savedObjectId,
-  });
-
+  const onClick = useCallback(
+    (e) => {
+      e.preventDefault();
+      const url = dashboard?.locator?.getRedirectUrl({
+        query,
+        filters,
+        timeRange,
+        dashboardId: savedObjectId,
+        viewMode: ViewMode.EDIT,
+      });
+      if (url) {
+        navigateTo({ url });
+      }
+    },
+    [dashboard?.locator, query, filters, timeRange, savedObjectId, navigateTo]
+  );
   return (
     <EuiButton
       color="primary"
+      data-test-subj="dashboardEditButton"
       fill
       iconType="pencil"
       onClick={onClick}
-      data-test-subj="dashboardEditButton"
     >
       {EDIT_DASHBOARD_BUTTON_TITLE}
     </EuiButton>
diff --git a/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_app_link.test.tsx b/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_app_link.test.tsx
deleted file mode 100644
index decd108b6d6af1..00000000000000
--- a/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_app_link.test.tsx
+++ /dev/null
@@ -1,133 +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 { renderHook } from '@testing-library/react-hooks';
-import { useNavigation } from '../../common/lib/kibana';
-import { TestProviders } from '../../common/mock';
-import type { UseDashboardAppLinkProps } from './use_dashboard_app_link';
-import { useDashboardAppLink } from './use_dashboard_app_link';
-
-jest.mock('../../common/lib/kibana', () => ({
-  useNavigation: jest.fn(),
-}));
-
-describe('useDashboardAppLink', () => {
-  const mockNavigateTo = jest.fn();
-  const filters = [
-    {
-      meta: {
-        index: 'security-solution-default',
-        type: 'phrase',
-        key: 'event.action',
-        params: {
-          query: 'host',
-        },
-        disabled: false,
-        negate: false,
-        alias: null,
-      },
-      query: {
-        match_phrase: {
-          'event.action': 'host',
-        },
-      },
-      $state: {
-        store: 'appState',
-      },
-    },
-  ];
-  const props = {
-    query: {
-      language: 'kuery',
-      query: '',
-    },
-    filters: [],
-    timeRange: {
-      from: '2023-03-24T00:00:00.000Z',
-      fromStr: 'now/d',
-      to: '2023-03-24T23:59:59.999Z',
-      toStr: 'now/d',
-    },
-    uiSettings: {
-      get: jest.fn(),
-    },
-    savedObjectId: 'e2937420-c8ba-11ed-a7eb-3d08ee4d53cb',
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-    (useNavigation as jest.Mock).mockReturnValue({
-      getAppUrl: jest
-        .fn()
-        .mockReturnValue('/app/dashboards#/view/e2937420-c8ba-11ed-a7eb-3d08ee4d53cb'),
-      navigateTo: mockNavigateTo,
-    });
-  });
-  it('create links to Dashboard app - with filters', () => {
-    const testProps = { ...props, filters } as unknown as UseDashboardAppLinkProps;
-
-    const { result } = renderHook(() => useDashboardAppLink(testProps), {
-      wrapper: TestProviders,
-    });
-    expect(result.current.href).toMatchInlineSnapshot(
-      `"/app/dashboards#/view/e2937420-c8ba-11ed-a7eb-3d08ee4d53cb?_g=(filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:security-solution-default,key:event.action,negate:!f,params:(query:host),type:phrase),query:(match_phrase:(event.action:host)))),query:(language:kuery,query:''),time:(from:now%2Fd,to:now%2Fd))"`
-    );
-  });
-
-  it('create links to Dashboard app - with query', () => {
-    const testProps = {
-      ...props,
-      query: {
-        language: 'kuery',
-        query: '@timestamp : *',
-      },
-    } as unknown as UseDashboardAppLinkProps;
-
-    const { result } = renderHook(() => useDashboardAppLink(testProps), { wrapper: TestProviders });
-    expect(result.current.href).toMatchInlineSnapshot(
-      `"/app/dashboards#/view/e2937420-c8ba-11ed-a7eb-3d08ee4d53cb?_g=(filters:!(),query:(language:kuery,query:'@timestamp%20:%20*'),time:(from:now%2Fd,to:now%2Fd))"`
-    );
-  });
-
-  it('create links to Dashboard app - with absolute time', () => {
-    const testProps = {
-      ...props,
-      timeRange: {
-        from: '2023-03-24T00:00:00.000Z',
-        to: '2023-03-24T23:59:59.999Z',
-      },
-    } as unknown as UseDashboardAppLinkProps;
-
-    const { result } = renderHook(() => useDashboardAppLink(testProps), { wrapper: TestProviders });
-    expect(result.current.href).toMatchInlineSnapshot(
-      `"/app/dashboards#/view/e2937420-c8ba-11ed-a7eb-3d08ee4d53cb?_g=(filters:!(),query:(language:kuery,query:''),time:(from:'2023-03-24T00:00:00.000Z',to:'2023-03-24T23:59:59.999Z'))"`
-    );
-  });
-
-  it('navigate to dashboard app with preserved states', () => {
-    const testProps = {
-      ...props,
-      timeRange: {
-        from: '2023-03-24T00:00:00.000Z',
-        to: '2023-03-24T23:59:59.999Z',
-      },
-    } as unknown as UseDashboardAppLinkProps;
-
-    const { result } = renderHook(() => useDashboardAppLink(testProps), {
-      wrapper: TestProviders,
-    });
-    result.current.onClick({
-      preventDefault: jest.fn(),
-    } as unknown as React.MouseEvent<HTMLButtonElement>);
-
-    expect(mockNavigateTo).toHaveBeenCalledWith(
-      expect.objectContaining({
-        url: "/app/dashboards#/view/e2937420-c8ba-11ed-a7eb-3d08ee4d53cb?_g=(filters:!(),query:(language:kuery,query:''),time:(from:'2023-03-24T00:00:00.000Z',to:'2023-03-24T23:59:59.999Z'))",
-      })
-    );
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_app_link.tsx b/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_app_link.tsx
deleted file mode 100644
index 1bf8a16f1ce199..00000000000000
--- a/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_app_link.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 { createDashboardEditUrl, DASHBOARD_APP_ID } from '@kbn/dashboard-plugin/public';
-import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/public';
-import type { IUiSettingsClient } from '@kbn/core/public';
-import { useMemo } from 'react';
-import type { Filter, Query } from '@kbn/es-query';
-import { useNavigation } from '../../common/lib/kibana';
-
-const GLOBAL_STATE_STORAGE_KEY = '_g';
-
-export interface UseDashboardAppLinkProps {
-  query?: Query;
-  filters?: Filter[];
-  timeRange: {
-    from: string;
-    to: string;
-    fromStr?: string | undefined;
-    toStr?: string | undefined;
-  };
-  uiSettings: IUiSettingsClient;
-  savedObjectId: string | undefined;
-}
-
-export const useDashboardAppLink = ({
-  query,
-  filters,
-  timeRange: { from, fromStr, to, toStr },
-  uiSettings,
-  savedObjectId,
-}: UseDashboardAppLinkProps) => {
-  const { navigateTo, getAppUrl } = useNavigation();
-  const useHash = uiSettings.get('state:storeInSessionStorage');
-
-  let editDashboardUrl = useMemo(
-    () =>
-      getAppUrl({
-        appId: DASHBOARD_APP_ID,
-        path: `#${createDashboardEditUrl(savedObjectId)}`,
-      }),
-    [getAppUrl, savedObjectId]
-  );
-
-  editDashboardUrl = setStateToKbnUrl(
-    GLOBAL_STATE_STORAGE_KEY,
-    {
-      time: { from: fromStr ?? from, to: toStr ?? to },
-      filters,
-      query,
-    },
-    { useHash, storeInHashQuery: true },
-    editDashboardUrl
-  );
-
-  const editDashboardLinkProps = useMemo(
-    () => ({
-      onClick: (ev: React.MouseEvent<HTMLButtonElement>) => {
-        ev.preventDefault();
-        navigateTo({ url: editDashboardUrl });
-      },
-      href: editDashboardUrl,
-    }),
-    [editDashboardUrl, navigateTo]
-  );
-  return editDashboardLinkProps;
-};
diff --git a/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_view_prompt_state.test.tsx b/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_view_prompt_state.test.tsx
index b309d0a646a58a..6fd7fb3e2de10c 100644
--- a/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_view_prompt_state.test.tsx
+++ b/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_view_prompt_state.test.tsx
@@ -38,20 +38,4 @@ describe('useDashboardViewPromptState', () => {
       }
     `);
   });
-
-  it('returns IndicesNotFound state', () => {
-    const { result } = renderHook<
-      DashboardViewPromptState | null,
-      Partial<EuiEmptyPromptProps> | null
-    >(() => useDashboardViewPromptState(DashboardViewPromptState.IndicesNotFound));
-    expect(result.current).toMatchInlineSnapshot(`
-      Object {
-        "color": "danger",
-        "iconType": "error",
-        "title": <h2>
-          Indices not found
-        </h2>,
-      }
-    `);
-  });
 });
diff --git a/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_view_prompt_state.tsx b/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_view_prompt_state.tsx
index 20c0be416bb3de..babf644a6c4d68 100644
--- a/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_view_prompt_state.tsx
+++ b/x-pack/plugins/security_solution/public/dashboards/hooks/use_dashboard_view_prompt_state.tsx
@@ -11,7 +11,6 @@ import * as i18n from '../pages/details/translations';
 
 export enum DashboardViewPromptState {
   NoReadPermission = 'NoReadPermission',
-  IndicesNotFound = 'IndicesNotFound',
 }
 
 const dashboardViewPromptState: Record<DashboardViewPromptState, Partial<EuiEmptyPromptProps>> = {
@@ -21,11 +20,6 @@ const dashboardViewPromptState: Record<DashboardViewPromptState, Partial<EuiEmpt
     title: <h2>{i18n.DASHBOARD_NO_READ_PERMISSION_TITLE}</h2>,
     body: <p>{i18n.DASHBOARD_NO_READ_PERMISSION_DESCRIPTION}</p>,
   },
-  [DashboardViewPromptState.IndicesNotFound]: {
-    color: 'danger',
-    iconType: 'error',
-    title: <h2>{i18n.DASHBOARD_INDICES_NOT_FOUND_TITLE}</h2>,
-  },
 };
 
 export const useDashboardViewPromptState = (
diff --git a/x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx b/x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx
index f87d4b1d71f07a..410906b29ae738 100644
--- a/x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/dashboards/pages/details/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useState, useCallback, useEffect, useMemo } from 'react';
+import React, { useState, useCallback, useMemo } from 'react';
 import { LEGACY_DASHBOARD_APP_ID } from '@kbn/dashboard-plugin/public';
 import type { DashboardAPI } from '@kbn/dashboard-plugin/public';
 
@@ -49,8 +49,9 @@ const DashboardViewComponent: React.FC = () => {
 
   const { show: canReadDashboard, showWriteControls } =
     useCapabilities<DashboardCapabilities>(LEGACY_DASHBOARD_APP_ID);
-  const [currentState, setCurrentState] = useState<DashboardViewPromptState | null>(
-    canReadDashboard ? null : DashboardViewPromptState.NoReadPermission
+  const errorState = useMemo(
+    () => (canReadDashboard ? null : DashboardViewPromptState.NoReadPermission),
+    [canReadDashboard]
   );
   const [dashboardDetails, setDashboardDetails] = useState<DashboardDetails | undefined>();
   const onDashboardContainerLoaded = useCallback((dashboard: DashboardAPI) => {
@@ -67,12 +68,6 @@ const DashboardViewComponent: React.FC = () => {
   const dashboardExists = useMemo(() => dashboardDetails != null, [dashboardDetails]);
   const { detailName: savedObjectId } = useParams<{ detailName?: string }>();
 
-  useEffect(() => {
-    if (!indicesExist) {
-      setCurrentState(DashboardViewPromptState.IndicesNotFound);
-    }
-  }, [indicesExist]);
-
   return (
     <>
       {indicesExist && (
@@ -92,7 +87,7 @@ const DashboardViewComponent: React.FC = () => {
           )}
         </HeaderPage>
 
-        {indicesExist && (
+        {!errorState && (
           <DashboardRenderer
             query={query}
             filters={filters}
@@ -104,7 +99,7 @@ const DashboardViewComponent: React.FC = () => {
           />
         )}
 
-        <StatusPropmpt currentState={currentState} />
+        <StatusPropmpt currentState={errorState} />
         <SpyRoute
           pageName={SecurityPageName.dashboards}
           state={{ dashboardName: dashboardDetails?.title }}
diff --git a/x-pack/plugins/security_solution/public/dashboards/pages/landing_page/index.test.tsx b/x-pack/plugins/security_solution/public/dashboards/pages/landing_page/index.test.tsx
index bfc035a0add124..7ea6ae6198ccb2 100644
--- a/x-pack/plugins/security_solution/public/dashboards/pages/landing_page/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/dashboards/pages/landing_page/index.test.tsx
@@ -49,8 +49,8 @@ const APP_DASHBOARD_LINKS: NavLinkItem = {
 const URL = '/path/to/dashboards';
 
 const mockAppManageLink = jest.fn(() => APP_DASHBOARD_LINKS);
-jest.mock('../../../common/components/navigation/nav_links', () => ({
-  useAppRootNavLink: () => mockAppManageLink(),
+jest.mock('../../../common/links/nav_links', () => ({
+  useRootNavLink: () => mockAppManageLink(),
 }));
 
 const CREATE_DASHBOARD_LINK = { isLoading: false, url: URL };
diff --git a/x-pack/plugins/security_solution/public/dashboards/pages/landing_page/index.tsx b/x-pack/plugins/security_solution/public/dashboards/pages/landing_page/index.tsx
index d6d9be365fc302..4e1e48d09793cf 100644
--- a/x-pack/plugins/security_solution/public/dashboards/pages/landing_page/index.tsx
+++ b/x-pack/plugins/security_solution/public/dashboards/pages/landing_page/index.tsx
@@ -14,7 +14,7 @@ import { DashboardsTable } from '../../../common/components/dashboards/dashboard
 import { LandingImageCards } from '../../../landing_pages/components/landing_links_images';
 import { SecurityPageName } from '../../../../common/constants';
 import { useCapabilities, useNavigateTo } from '../../../common/lib/kibana';
-import { useAppRootNavLink } from '../../../common/components/navigation/nav_links';
+import { useRootNavLink } from '../../../common/links/nav_links';
 import { useCreateSecurityDashboardLink } from '../../../common/containers/dashboards/use_create_security_dashboard_link';
 import { Title } from '../../../common/components/header_page/title';
 import { LinkButton } from '../../../common/components/links/helpers';
@@ -54,7 +54,7 @@ const Header: React.FC<{ canCreateDashboard: boolean }> = ({ canCreateDashboard
 };
 
 export const DashboardsLandingPage = () => {
-  const dashboardLinks = useAppRootNavLink(SecurityPageName.dashboards)?.links ?? [];
+  const dashboardLinks = useRootNavLink(SecurityPageName.dashboards)?.links ?? [];
   const { show: canReadDashboard, createNew: canCreateDashboard } =
     useCapabilities<DashboardCapabilities>(LEGACY_DASHBOARD_APP_ID);
 
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.test.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.test.tsx
index 20a8e0d1f2f94a..5cd752fcf516d3 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.test.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.test.tsx
@@ -8,8 +8,12 @@
 import React from 'react';
 import { render, waitFor, cleanup } from '@testing-library/react';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { MaintenanceWindowStatus } from '@kbn/alerting-plugin/common';
+import {
+  MaintenanceWindowStatus,
+  MAINTENANCE_WINDOW_FEATURE_ID,
+} from '@kbn/alerting-plugin/common';
 import type { MaintenanceWindow } from '@kbn/alerting-plugin/common';
+import { useKibana } from '../../../../common/lib/kibana';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { useAppToastsMock } from '../../../../common/hooks/use_app_toasts.mock';
 import { MaintenanceWindowCallout } from './maintenance_window_callout';
@@ -22,6 +26,8 @@ jest.mock('./api', () => ({
   fetchActiveMaintenanceWindows: jest.fn(() => Promise.resolve([])),
 }));
 
+jest.mock('../../../../common/lib/kibana');
+
 const RUNNING_MAINTENANCE_WINDOW_1: Partial<MaintenanceWindow> = {
   title: 'Maintenance window 1',
   id: '63057284-ac31-42ba-fe22-adfe9732e5ae',
@@ -46,6 +52,9 @@ const UPCOMING_MAINTENANCE_WINDOW: Partial<MaintenanceWindow> = {
   ],
 };
 
+const useKibanaMock = useKibana as jest.Mock;
+const fetchActiveMaintenanceWindowsMock = fetchActiveMaintenanceWindows as jest.Mock;
+
 describe('MaintenanceWindowCallout', () => {
   let appToastsMock: jest.Mocked<ReturnType<typeof useAppToastsMock.create>>;
 
@@ -54,6 +63,18 @@ describe('MaintenanceWindowCallout', () => {
 
     appToastsMock = useAppToastsMock.create();
     (useAppToasts as jest.Mock).mockReturnValue(appToastsMock);
+    useKibanaMock.mockReturnValue({
+      services: {
+        application: {
+          capabilities: {
+            [MAINTENANCE_WINDOW_FEATURE_ID]: {
+              save: true,
+              show: true,
+            },
+          },
+        },
+      },
+    });
   });
 
   afterEach(() => {
@@ -62,7 +83,7 @@ describe('MaintenanceWindowCallout', () => {
   });
 
   it('should be visible if currently there is at least one "running" maintenance window', async () => {
-    (fetchActiveMaintenanceWindows as jest.Mock).mockResolvedValue([RUNNING_MAINTENANCE_WINDOW_1]);
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([RUNNING_MAINTENANCE_WINDOW_1]);
 
     const { findByText } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
 
@@ -70,7 +91,7 @@ describe('MaintenanceWindowCallout', () => {
   });
 
   it('should be visible if currently there are multiple "running" maintenance windows', async () => {
-    (fetchActiveMaintenanceWindows as jest.Mock).mockResolvedValue([
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([
       RUNNING_MAINTENANCE_WINDOW_1,
       RUNNING_MAINTENANCE_WINDOW_2,
     ]);
@@ -81,7 +102,7 @@ describe('MaintenanceWindowCallout', () => {
   });
 
   it('should NOT be visible if currently there are no active (running or upcoming) maintenance windows', async () => {
-    (fetchActiveMaintenanceWindows as jest.Mock).mockResolvedValue([]);
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([]);
 
     const { container } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
 
@@ -89,7 +110,7 @@ describe('MaintenanceWindowCallout', () => {
   });
 
   it('should NOT be visible if currently there are no "running" maintenance windows', async () => {
-    (fetchActiveMaintenanceWindows as jest.Mock).mockResolvedValue([UPCOMING_MAINTENANCE_WINDOW]);
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([UPCOMING_MAINTENANCE_WINDOW]);
 
     const { container } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
 
@@ -121,7 +142,7 @@ describe('MaintenanceWindowCallout', () => {
     };
 
     const mockError = new Error('Network error');
-    (fetchActiveMaintenanceWindows as jest.Mock).mockRejectedValue(mockError);
+    fetchActiveMaintenanceWindowsMock.mockRejectedValue(mockError);
 
     render(<MaintenanceWindowCallout />, { wrapper: createReactQueryWrapper() });
 
@@ -133,4 +154,44 @@ describe('MaintenanceWindowCallout', () => {
       });
     });
   });
+
+  it('should return null if window maintenance privilege is NONE', async () => {
+    useKibanaMock.mockReturnValue({
+      services: {
+        application: {
+          capabilities: {
+            [MAINTENANCE_WINDOW_FEATURE_ID]: {
+              save: false,
+              show: false,
+            },
+          },
+        },
+      },
+    });
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([RUNNING_MAINTENANCE_WINDOW_1]);
+
+    const { container } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
+
+    expect(container).toBeEmptyDOMElement();
+  });
+
+  it('should work as expected if window maintenance privilege is READ ', async () => {
+    useKibanaMock.mockReturnValue({
+      services: {
+        application: {
+          capabilities: {
+            [MAINTENANCE_WINDOW_FEATURE_ID]: {
+              save: false,
+              show: true,
+            },
+          },
+        },
+      },
+    });
+    fetchActiveMaintenanceWindowsMock.mockResolvedValue([RUNNING_MAINTENANCE_WINDOW_1]);
+
+    const { findByText } = render(<MaintenanceWindowCallout />, { wrapper: TestProviders });
+
+    expect(await findByText('A maintenance window is currently running')).toBeInTheDocument();
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.tsx
index 878347dc37c98e..5a1d21b39a65bb 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/maintenance_window_callout.tsx
@@ -7,12 +7,28 @@
 
 import React from 'react';
 import { EuiCallOut } from '@elastic/eui';
-import { MaintenanceWindowStatus } from '@kbn/alerting-plugin/common';
+import {
+  MaintenanceWindowStatus,
+  MAINTENANCE_WINDOW_FEATURE_ID,
+} from '@kbn/alerting-plugin/common';
 import { useFetchActiveMaintenanceWindows } from './use_fetch_active_maintenance_windows';
 import * as i18n from './translations';
+import { useKibana } from '../../../../common/lib/kibana';
 
 export function MaintenanceWindowCallout(): JSX.Element | null {
-  const { data } = useFetchActiveMaintenanceWindows();
+  const {
+    application: { capabilities },
+  } = useKibana().services;
+
+  const isMaintenanceWindowDisabled =
+    !capabilities[MAINTENANCE_WINDOW_FEATURE_ID].show &&
+    !capabilities[MAINTENANCE_WINDOW_FEATURE_ID].save;
+  const { data } = useFetchActiveMaintenanceWindows({ enabled: !isMaintenanceWindowDisabled });
+
+  if (isMaintenanceWindowDisabled) {
+    return null;
+  }
+
   const activeMaintenanceWindows = data || [];
 
   if (activeMaintenanceWindows.some(({ status }) => status === MaintenanceWindowStatus.Running)) {
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/use_fetch_active_maintenance_windows.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/use_fetch_active_maintenance_windows.ts
index 3603cafbda935a..69aecfa794357e 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/use_fetch_active_maintenance_windows.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/maintenance_window_callout/use_fetch_active_maintenance_windows.ts
@@ -5,19 +5,21 @@
  * 2.0.
  */
 
+import type { UseQueryOptions } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { INTERNAL_ALERTING_API_GET_ACTIVE_MAINTENANCE_WINDOWS_PATH } from '@kbn/alerting-plugin/common';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import * as i18n from './translations';
 import { fetchActiveMaintenanceWindows } from './api';
 
-export const useFetchActiveMaintenanceWindows = () => {
+export const useFetchActiveMaintenanceWindows = ({ enabled }: Pick<UseQueryOptions, 'enabled'>) => {
   const { addError } = useAppToasts();
 
   return useQuery(
     ['GET', INTERNAL_ALERTING_API_GET_ACTIVE_MAINTENANCE_WINDOWS_PATH],
     ({ signal }) => fetchActiveMaintenanceWindows(signal),
     {
+      enabled,
       refetchInterval: 60000,
       onError: (error) => {
         addError(error, { title: i18n.FETCH_ERROR, toastMessage: i18n.FETCH_ERROR_DESCRIPTION });
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/helpers.test.tsx
index 4aa68e524f846d..519a7975c58915 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/helpers.test.tsx
@@ -4,9 +4,16 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import type { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import type { Embeddable } from '@kbn/embeddable-plugin/public';
 
-import { formatAlertsData, showInitialLoadingSpinner } from './helpers';
+import {
+  createResetGroupByFieldAction,
+  formatAlertsData,
+  showInitialLoadingSpinner,
+} from './helpers';
 import { result, textResult, stackedByBooleanField, stackedByTextField } from './mock_data';
+import type { LensDataTableEmbeddable } from '../../../../common/components/visualization_actions/types';
 
 describe('helpers', () => {
   describe('showInitialLoadingSpinner', () => {
@@ -47,3 +54,103 @@ describe('formatAlertsData', () => {
     expect(res).toEqual(textResult);
   });
 });
+
+describe('createResetGroupByFieldAction', () => {
+  let action: Action;
+  const embeddable = {
+    getInput: jest.fn().mockReturnValue({
+      attributes: {
+        title: 'test',
+        description: '',
+        visualizationType: 'lnsDatatable',
+        state: {
+          visualization: {
+            columns: [
+              {
+                columnId: '2881fedd-54b7-42ba-8c97-5175dec86166',
+                isTransposed: false,
+                width: 362,
+              },
+              {
+                columnId: 'f04a71a3-399f-4d32-9efc-8a005e989991',
+                isTransposed: false,
+              },
+              {
+                columnId: '75ce269b-ee9c-4c7d-a14e-9226ba0fe059',
+                isTransposed: false,
+                hidden: true,
+              },
+            ],
+            layerId: '03b95315-16ce-4146-a76a-621f9d4422f9',
+            layerType: 'data',
+          },
+        },
+      },
+    } as unknown as Embeddable<LensDataTableEmbeddable>),
+    updateInput: jest.fn(),
+  };
+
+  const context = {
+    embeddable,
+  } as unknown as ActionExecutionContext<Embeddable<LensDataTableEmbeddable>>;
+  const mockCallback = jest.fn();
+  beforeAll(async () => {
+    action = createResetGroupByFieldAction({ callback: mockCallback });
+    await action.execute(context);
+  });
+  test('should return a correct id', () => {
+    expect(action.id).toEqual('resetGroupByField');
+  });
+
+  test('should return display name', () => {
+    expect(action.getDisplayName(context)).toEqual('Reset group by fields');
+  });
+
+  test('should return an icon', () => {
+    expect(action.getIconType(context)).toEqual('editorRedo');
+  });
+
+  test('should return icon type', () => {
+    expect(action.type).toEqual('actionButton');
+  });
+
+  test('should execute callback', () => {
+    expect(mockCallback).toHaveBeenCalled();
+  });
+
+  test('should unhide all the columns', () => {
+    expect(embeddable.updateInput).toHaveBeenCalledWith(
+      expect.objectContaining({
+        attributes: {
+          description: '',
+          state: {
+            visualization: {
+              columns: [
+                {
+                  columnId: '2881fedd-54b7-42ba-8c97-5175dec86166',
+                  hidden: false,
+                  isTransposed: false,
+                  width: 362,
+                },
+                {
+                  columnId: 'f04a71a3-399f-4d32-9efc-8a005e989991',
+                  hidden: false,
+                  isTransposed: false,
+                },
+                {
+                  columnId: '75ce269b-ee9c-4c7d-a14e-9226ba0fe059',
+                  hidden: false,
+                  isTransposed: false,
+                },
+              ],
+              layerId: '03b95315-16ce-4146-a76a-621f9d4422f9',
+              layerType: 'data',
+            },
+          },
+          title: 'test',
+          visualizationType: 'lnsDatatable',
+        },
+      })
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/helpers.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/helpers.tsx
index db84fc4b775bd8..52b38ee048a2b0 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_kpis/alerts_histogram_panel/helpers.tsx
@@ -9,8 +9,12 @@ import type { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesW
 import { isEmpty } from 'lodash/fp';
 import moment from 'moment';
 
+import type { Action, ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
+import type { Embeddable } from '@kbn/embeddable-plugin/public';
 import type { HistogramData, AlertsAggregation, AlertsBucket, AlertsGroupBucket } from './types';
 import type { AlertSearchResponse } from '../../../containers/detection_engine/alerts/types';
+import { RESET_GROUP_BY_FIELDS } from '../../../../common/components/chart_settings_popover/configurations/default/translations';
+import type { LensDataTableEmbeddable } from '../../../../common/components/visualization_actions/types';
 
 const EMPTY_ALERTS_DATA: HistogramData[] = [];
 
@@ -119,3 +123,61 @@ export const buildCombinedQueries = (query?: string) => {
     return [];
   }
 };
+
+interface CreateResetGroupByFieldActionProps {
+  callback?: () => void;
+  order?: number;
+}
+
+type CreateResetGroupByFieldAction = (params?: CreateResetGroupByFieldActionProps) => Action;
+export const createResetGroupByFieldAction: CreateResetGroupByFieldAction = ({
+  callback,
+  order,
+} = {}) => ({
+  id: 'resetGroupByField',
+  getDisplayName(): string {
+    return RESET_GROUP_BY_FIELDS;
+  },
+  getIconType(): string | undefined {
+    return 'editorRedo';
+  },
+  type: 'actionButton',
+  async isCompatible(): Promise<boolean> {
+    return true;
+  },
+  async execute({
+    embeddable,
+  }: ActionExecutionContext<{
+    embeddable: Embeddable<LensDataTableEmbeddable>;
+  }>): Promise<void> {
+    callback?.();
+
+    const input = embeddable.getInput();
+    const {
+      attributes: {
+        state: {
+          visualization: { columns },
+        },
+      },
+    } = input;
+
+    // Unhide all the columns
+    embeddable.updateInput({
+      ...input,
+      attributes: {
+        ...input.attributes,
+        state: {
+          ...input.attributes.state,
+          visualization: {
+            ...input.attributes.state.visualization,
+            columns: columns.map((c) => ({
+              ...c,
+              hidden: false,
+            })),
+          },
+        },
+      },
+    });
+  },
+  order,
+});
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 7af2fa33eefba4..d0b2f9b4db08b0 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
@@ -78,7 +78,7 @@ jest.mock('../../../../common/lib/kibana', () => {
   };
 });
 
-jest.mock('../../../../common/components/navigation/use_get_url_search');
+jest.mock('../../../../common/components/navigation/use_url_state_query_params');
 
 const defaultUseQueryAlertsReturn = {
   loading: true,
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.test.tsx
index 4a57d7cac8e737..04a20e3675642c 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.test.tsx
@@ -155,15 +155,9 @@ describe('GroupedAlertsTable', () => {
       if (i.skip) {
         return mockQueryResponse;
       }
-      if (i.query.aggs.groupByFields.multi_terms != null) {
-        return {
-          ...mockQueryResponse,
-          data: groupingSearchResponse.ruleName,
-        };
-      }
       return {
         ...mockQueryResponse,
-        data: i.query.aggs.groupByFields.terms.field != null ? groupingSearchResponse.hostName : {},
+        data: groupingSearchResponse,
       };
     });
   });
@@ -214,6 +208,78 @@ describe('GroupedAlertsTable', () => {
     expect(within(level0).getByTestId('alerts-table')).toBeInTheDocument();
   });
 
+  it('Query gets passed correctly', () => {
+    jest
+      .spyOn(window.localStorage, 'getItem')
+      .mockReturnValue(getMockStorageState(['kibana.alert.rule.name']));
+
+    render(
+      <TestProviders store={store}>
+        <GroupedAlertsTable {...testProps} />
+      </TestProviders>
+    );
+    expect(mockUseQueryAlerts).toHaveBeenLastCalledWith({
+      indexName: 'test',
+      query: {
+        _source: false,
+        aggs: {
+          groupByFields: {
+            aggs: {
+              bucket_truncate: {
+                bucket_sort: { from: 0, size: 25, sort: [{ unitsCount: { order: 'desc' } }] },
+              },
+              countSeveritySubAggregation: { cardinality: { field: 'kibana.alert.severity' } },
+              hostsCountAggregation: { cardinality: { field: 'host.name' } },
+              description: { terms: { field: 'kibana.alert.rule.description', size: 1 } },
+              ruleTags: { terms: { field: 'kibana.alert.rule.tags' } },
+              severitiesSubAggregation: { terms: { field: 'kibana.alert.severity' } },
+              unitsCount: { cardinality: { field: 'kibana.alert.uuid' } },
+              usersCountAggregation: { cardinality: { field: 'user.name' } },
+            },
+            multi_terms: {
+              size: 10000,
+              terms: [
+                { field: 'kibana.alert.rule.name', missing: '-' },
+                { field: 'kibana.alert.rule.name', missing: '--' },
+              ],
+            },
+          },
+          groupsCount: { cardinality: { field: 'kibana.alert.rule.name' } },
+          unitsCount: {
+            value_count: {
+              field: 'kibana.alert.rule.name',
+              missing: '-',
+            },
+          },
+          unitsCountWithoutNull: {
+            value_count: {
+              field: 'kibana.alert.rule.name',
+            },
+          },
+        },
+        query: {
+          bool: {
+            filter: [
+              { bool: { filter: [], must: [], must_not: [], should: [] } },
+              {
+                range: {
+                  '@timestamp': {
+                    gte: '2020-07-07T08:20:18.966Z',
+                    lte: '2020-07-08T08:20:18.966Z',
+                  },
+                },
+              },
+            ],
+          },
+        },
+        runtime_mappings: {},
+        size: 0,
+      },
+      queryName: 'securitySolutionUI fetchAlerts grouping',
+      skip: false,
+    });
+  });
+
   it('renders grouping table in second accordion level when 2 groups are selected', async () => {
     jest
       .spyOn(window.localStorage, 'getItem')
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.tsx
index 99ae3f4ff3433a..968e415f382145 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.tsx
@@ -132,10 +132,6 @@ const GroupedAlertsTableComponent: React.FC<AlertsTableComponentProps> = (props)
     setPageIndex((curr) => curr.map(() => DEFAULT_PAGE_INDEX));
   }, []);
 
-  useEffect(() => {
-    resetAllPagination();
-  }, [resetAllPagination, selectedGroups]);
-
   const setPageVar = useCallback(
     (newNumber: number, groupingLevel: number, pageType: 'index' | 'size') => {
       if (pageType === 'index') {
@@ -158,23 +154,31 @@ const GroupedAlertsTableComponent: React.FC<AlertsTableComponentProps> = (props)
     [setStoragePageSize]
   );
 
-  const nonGroupingFilters = useRef({
+  const paginationResetTriggers = useRef({
     defaultFilters: props.defaultFilters,
     globalFilters: props.globalFilters,
     globalQuery: props.globalQuery,
+    selectedGroups,
   });
 
   useEffect(() => {
-    const nonGrouping = {
+    const triggers = {
       defaultFilters: props.defaultFilters,
       globalFilters: props.globalFilters,
       globalQuery: props.globalQuery,
+      selectedGroups,
     };
-    if (!isEqual(nonGroupingFilters.current, nonGrouping)) {
+    if (!isEqual(paginationResetTriggers.current, triggers)) {
       resetAllPagination();
-      nonGroupingFilters.current = nonGrouping;
+      paginationResetTriggers.current = triggers;
     }
-  }, [props.defaultFilters, props.globalFilters, props.globalQuery, resetAllPagination]);
+  }, [
+    props.defaultFilters,
+    props.globalFilters,
+    props.globalQuery,
+    resetAllPagination,
+    selectedGroups,
+  ]);
 
   const getLevel = useCallback(
     (level: number, selectedGroup: string, parentGroupingFilter?: string) => {
@@ -184,6 +188,7 @@ const GroupedAlertsTableComponent: React.FC<AlertsTableComponentProps> = (props)
           return getLevel(
             level + 1,
             selectedGroups[level + 1],
+            // stringify because if the filter is passed as an object, it will cause unnecessary re-rendering
             JSON.stringify([
               ...groupingFilters,
               ...(parentGroupingFilter ? JSON.parse(parentGroupingFilter) : []),
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx
index cf8a8128cb166f..316c0eabe0ab3e 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx
@@ -15,7 +15,8 @@ import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import type { DynamicGroupingProps } from '@kbn/securitysolution-grouping/src';
 import type { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/types';
 import type { TableIdLiteral } from '@kbn/securitysolution-data-table';
-import { combineQueries } from '../../../common/lib/kuery';
+import { parseGroupingQuery } from '@kbn/securitysolution-grouping/src';
+import { combineQueries, getFieldEsTypes } from '../../../common/lib/kuery';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 import type { AlertsGroupingAggregation } from './grouping_settings/types';
 import type { Status } from '../../../../common/detection_engine/schemas/common';
@@ -140,17 +141,32 @@ export const GroupedSubLevelComponent: React.FC<AlertsTableComponentProps> = ({
     }
   }, [defaultFilters, globalFilters, globalQuery, parentGroupingFilter]);
 
+  const selectedGroupEsTypes = useMemo(
+    () => getFieldEsTypes(selectedGroup, browserFields),
+    [selectedGroup, browserFields]
+  );
+
   const queryGroups = useMemo(() => {
     return getAlertsGroupingQuery({
       additionalFilters,
       selectedGroup,
+      selectedGroupEsTypes,
       from,
       runtimeMappings,
       to,
       pageSize,
       pageIndex,
     });
-  }, [additionalFilters, from, pageIndex, pageSize, runtimeMappings, selectedGroup, to]);
+  }, [
+    additionalFilters,
+    from,
+    pageIndex,
+    pageSize,
+    runtimeMappings,
+    selectedGroup,
+    selectedGroupEsTypes,
+    to,
+  ]);
 
   const emptyGlobalQuery = useMemo(() => getGlobalQuery([]), [getGlobalQuery]);
 
@@ -177,6 +193,11 @@ export const GroupedSubLevelComponent: React.FC<AlertsTableComponentProps> = ({
     skip: isNoneGroup([selectedGroup]),
   });
 
+  const aggs = useMemo(
+    () => parseGroupingQuery(alertsGroupsData?.aggregations),
+    [alertsGroupsData]
+  );
+
   useEffect(() => {
     if (!isNoneGroup([selectedGroup])) {
       setAlertsQuery(queryGroups);
@@ -225,7 +246,10 @@ export const GroupedSubLevelComponent: React.FC<AlertsTableComponentProps> = ({
     () =>
       getGrouping({
         activePage: pageIndex,
-        data: alertsGroupsData?.aggregations,
+        data: {
+          ...alertsGroupsData?.aggregations,
+          ...aggs,
+        },
         groupingLevel,
         inspectButton: inspect,
         isLoading: loading || isLoadingGroups,
@@ -238,20 +262,21 @@ export const GroupedSubLevelComponent: React.FC<AlertsTableComponentProps> = ({
         takeActionItems: getTakeActionItems,
       }),
     [
-      alertsGroupsData?.aggregations,
       getGrouping,
-      getTakeActionItems,
+      pageIndex,
+      alertsGroupsData,
+      aggs,
       groupingLevel,
       inspect,
-      isLoadingGroups,
       loading,
-      pageIndex,
+      isLoadingGroups,
       pageSize,
       renderChildComponent,
       onGroupClose,
       selectedGroup,
-      setPageIndex,
+      getTakeActionItems,
       setPageSize,
+      setPageIndex,
     ]
   );
 };
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_panel_renderers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_panel_renderers.test.tsx
index ff70bfe8e47cec..2038bddea952eb 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_panel_renderers.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_panel_renderers.test.tsx
@@ -5,51 +5,74 @@
  * 2.0.
  */
 
-import { shallow } from 'enzyme';
-
 import { renderGroupPanel } from '.';
+import { render } from '@testing-library/react';
 
 describe('renderGroupPanel', () => {
   it('renders correctly when the field renderer exists', () => {
-    const wrapperRuleName = shallow(
-      renderGroupPanel('kibana.alert.rule.name', {
-        key: ['Rule name test', 'Some description'],
-        doc_count: 10,
-      })!
+    let { getByTestId } = render(
+      renderGroupPanel(
+        'kibana.alert.rule.name',
+        {
+          key: ['Rule name test', 'Some description'],
+          doc_count: 10,
+        },
+        'This is a null group!'
+      )!
     );
 
-    expect(wrapperRuleName.find('[data-test-subj="rule-name-group-renderer"]')).toBeTruthy();
-    const wrapperHostName = shallow(
-      renderGroupPanel('host.name', {
-        key: 'Host',
-        doc_count: 2,
-      })!
+    expect(getByTestId('rule-name-group-renderer')).toBeInTheDocument();
+    const result1 = render(
+      renderGroupPanel(
+        'host.name',
+        {
+          key: 'Host',
+          doc_count: 2,
+        },
+        'This is a null group!'
+      )!
     );
+    getByTestId = result1.getByTestId;
+
+    expect(getByTestId('host-name-group-renderer')).toBeInTheDocument();
 
-    expect(wrapperHostName.find('[data-test-subj="host-name-group-renderer"]')).toBeTruthy();
-    const wrapperUserName = shallow(
-      renderGroupPanel('user.name', {
-        key: 'User test',
-        doc_count: 1,
-      })!
+    const result2 = render(
+      renderGroupPanel(
+        'user.name',
+        {
+          key: 'User test',
+          doc_count: 1,
+        },
+        'This is a null group!'
+      )!
     );
+    getByTestId = result2.getByTestId;
 
-    expect(wrapperUserName.find('[data-test-subj="host-name-group-renderer"]')).toBeTruthy();
-    const wrapperSourceIp = shallow(
-      renderGroupPanel('source.ip', {
-        key: 'sourceIp',
-        doc_count: 23,
-      })!
+    expect(getByTestId('host-name-group-renderer')).toBeInTheDocument();
+    const result3 = render(
+      renderGroupPanel(
+        'source.ip',
+        {
+          key: 'sourceIp',
+          doc_count: 23,
+        },
+        'This is a null group!'
+      )!
     );
+    getByTestId = result3.getByTestId;
 
-    expect(wrapperSourceIp.find('[data-test-subj="source-ip-group-renderer"]')).toBeTruthy();
+    expect(getByTestId('source-ip-group-renderer')).toBeInTheDocument();
   });
 
   it('returns undefined when the renderer does not exist', () => {
-    const wrapper = renderGroupPanel('process.name', {
-      key: 'process',
-      doc_count: 10,
-    });
+    const wrapper = renderGroupPanel(
+      'process.name',
+      {
+        key: 'process',
+        doc_count: 10,
+      },
+      'This is a null group!'
+    );
 
     expect(wrapper).toBeUndefined();
   });
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_panel_renderers.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_panel_renderers.tsx
index ffea45007fc6da..ac703e496d6178 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_panel_renderers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_panel_renderers.tsx
@@ -11,6 +11,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiIcon,
+  EuiIconTip,
   EuiText,
   EuiTextColor,
   EuiTitle,
@@ -18,32 +19,35 @@ import {
 import { euiThemeVars } from '@kbn/ui-theme';
 import { isArray } from 'lodash/fp';
 import React from 'react';
-import type { RawBucket } from '@kbn/securitysolution-grouping';
+import type { GroupPanelRenderer } from '@kbn/securitysolution-grouping/src';
 import type { AlertsGroupingAggregation } from './types';
 import { firstNonNullValue } from '../../../../../common/endpoint/models/ecs_safety_helpers';
 import type { GenericBuckets } from '../../../../../common/search_strategy';
 import { PopoverItems } from '../../../../common/components/popover_items';
 import { COLUMN_TAGS } from '../../../pages/detection_engine/rules/translations';
 
-export const renderGroupPanel = (
-  selectedGroup: string,
-  bucket: RawBucket<AlertsGroupingAggregation>
+export const renderGroupPanel: GroupPanelRenderer<AlertsGroupingAggregation> = (
+  selectedGroup,
+  bucket,
+  nullGroupMessage
 ) => {
   switch (selectedGroup) {
     case 'kibana.alert.rule.name':
       return isArray(bucket.key) ? (
         <RuleNameGroupContent
           ruleName={bucket.key[0]}
-          ruleDescription={bucket.key[1]}
+          ruleDescription={
+            firstNonNullValue(firstNonNullValue(bucket.description?.buckets)?.key) ?? ''
+          }
           tags={bucket.ruleTags?.buckets}
         />
       ) : undefined;
     case 'host.name':
-      return <HostNameGroupContent hostName={bucket.key} />;
+      return <HostNameGroupContent hostName={bucket.key} nullGroupMessage={nullGroupMessage} />;
     case 'user.name':
-      return <UserNameGroupContent userName={bucket.key} />;
+      return <UserNameGroupContent userName={bucket.key} nullGroupMessage={nullGroupMessage} />;
     case 'source.ip':
-      return <SourceIpGroupContent sourceIp={bucket.key} />;
+      return <SourceIpGroupContent sourceIp={bucket.key} nullGroupMessage={nullGroupMessage} />;
   }
 };
 
@@ -89,66 +93,82 @@ const RuleNameGroupContent = React.memo<{
 });
 RuleNameGroupContent.displayName = 'RuleNameGroup';
 
-const HostNameGroupContent = React.memo<{ hostName: string | string[] }>(({ hostName }) => (
-  <EuiFlexGroup
-    data-test-subj="host-name-group-renderer"
-    gutterSize="s"
-    alignItems="center"
-    justifyContent="center"
-  >
-    <EuiFlexItem
-      grow={false}
-      style={{
-        backgroundColor: euiThemeVars.euiColorVis1_behindText,
-        borderRadius: '50%',
-      }}
-    >
-      <EuiIcon type="database" size="l" style={{ padding: 4 }} />
-    </EuiFlexItem>
-
-    <EuiFlexItem>
-      <EuiTitle size="xs">
-        <h5>{hostName}</h5>
-      </EuiTitle>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-));
-HostNameGroupContent.displayName = 'HostNameGroupContent';
-
-const UserNameGroupContent = React.memo<{ userName: string | string[] }>(({ userName }) => {
-  const userNameValue = firstNonNullValue(userName) ?? '-';
-  return (
-    <EuiFlexGroup data-test-subj="user-name-group-renderer" gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false}>
-        <EuiAvatar name={userNameValue} color={euiThemeVars.euiColorVis0} />
+const HostNameGroupContent = React.memo<{ hostName: string | string[]; nullGroupMessage?: string }>(
+  ({ hostName, nullGroupMessage }) => (
+    <EuiFlexGroup data-test-subj="host-name-group-renderer" gutterSize="s" alignItems="center">
+      <EuiFlexItem
+        grow={false}
+        style={{
+          backgroundColor: euiThemeVars.euiColorVis1_behindText,
+          borderRadius: '50%',
+        }}
+      >
+        <EuiIcon type="database" size="l" style={{ padding: 4 }} />
       </EuiFlexItem>
 
-      <EuiFlexItem>
+      <EuiFlexItem grow={false}>
         <EuiTitle size="xs">
-          <h5>{userName}</h5>
+          <h5>{hostName}</h5>
         </EuiTitle>
       </EuiFlexItem>
+      {nullGroupMessage && (
+        <EuiFlexItem grow={false}>
+          <EuiIconTip content={nullGroupMessage} position="right" />
+        </EuiFlexItem>
+      )}
     </EuiFlexGroup>
-  );
-});
+  )
+);
+HostNameGroupContent.displayName = 'HostNameGroupContent';
+
+const UserNameGroupContent = React.memo<{ userName: string | string[]; nullGroupMessage?: string }>(
+  ({ userName, nullGroupMessage }) => {
+    const userNameValue = firstNonNullValue(userName) ?? '-';
+    return (
+      <EuiFlexGroup data-test-subj="user-name-group-renderer" gutterSize="s" alignItems="center">
+        <EuiFlexItem grow={false}>
+          <EuiAvatar name={userNameValue} color={euiThemeVars.euiColorVis0} />
+        </EuiFlexItem>
+
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xs">
+            <h5>{userName}</h5>
+          </EuiTitle>
+        </EuiFlexItem>
+        {nullGroupMessage && (
+          <EuiFlexItem grow={false}>
+            <EuiIconTip content={nullGroupMessage} position="right" />
+          </EuiFlexItem>
+        )}
+      </EuiFlexGroup>
+    );
+  }
+);
 UserNameGroupContent.displayName = 'UserNameGroupContent';
 
-const SourceIpGroupContent = React.memo<{ sourceIp: string | string[] }>(({ sourceIp }) => (
-  <EuiFlexGroup data-test-subj="source-ip-group-renderer" gutterSize="s" alignItems="center">
-    <EuiFlexItem
-      grow={false}
-      style={{
-        backgroundColor: euiThemeVars.euiColorVis3_behindText,
-        borderRadius: '50%',
-      }}
-    >
-      <EuiIcon style={{ padding: 4 }} type="ip" size="l" />
-    </EuiFlexItem>
-    <EuiFlexItem>
-      <EuiTitle size="xs">
-        <h5>{sourceIp}</h5>
-      </EuiTitle>
-    </EuiFlexItem>
-  </EuiFlexGroup>
-));
+const SourceIpGroupContent = React.memo<{ sourceIp: string | string[]; nullGroupMessage?: string }>(
+  ({ sourceIp, nullGroupMessage }) => (
+    <EuiFlexGroup data-test-subj="source-ip-group-renderer" gutterSize="s" alignItems="center">
+      <EuiFlexItem
+        grow={false}
+        style={{
+          backgroundColor: euiThemeVars.euiColorVis3_behindText,
+          borderRadius: '50%',
+        }}
+      >
+        <EuiIcon style={{ padding: 4 }} type="ip" size="l" />
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiTitle size="xs">
+          <h5>{sourceIp}</h5>
+        </EuiTitle>
+      </EuiFlexItem>
+      {nullGroupMessage && (
+        <EuiFlexItem grow={false}>
+          <EuiIconTip content={nullGroupMessage} position="right" />
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  )
+);
 SourceIpGroupContent.displayName = 'SourceIpGroupContent';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/mock.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/mock.ts
index 9e0b4e63715aa9..c9717c2a1ad2b0 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/mock.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/mock.ts
@@ -8,1729 +8,1339 @@
 import { mockAlertSearchResponse } from '../../../../common/components/alerts_treemap/lib/mocks/mock_alert_search_response';
 
 export const groupingSearchResponse = {
-  ruleName: {
-    ...mockAlertSearchResponse,
-    hits: {
-      total: {
-        value: 6048,
-        relation: 'eq',
-      },
-      max_score: null,
-      hits: [],
-    },
-    aggregations: {
-      groupsCount: {
-        value: 32,
-      },
-      groupByFields: {
-        doc_count_error_upper_bound: 0,
-        sum_other_doc_count: 0,
-        buckets: [
-          {
-            key: ['critical hosts [Duplicate]', 'f'],
-            key_as_string: 'critical hosts [Duplicate]|f',
-            doc_count: 300,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 300,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 300,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 300,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 300,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['critical hosts [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'critical hosts [Duplicate] [Duplicate]|f',
-            doc_count: 300,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 300,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 300,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 300,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 300,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['high hosts [Duplicate]', 'f'],
-            key_as_string: 'high hosts [Duplicate]|f',
-            doc_count: 300,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 300,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 300,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 300,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'high',
-                  doc_count: 300,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['high hosts [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'high hosts [Duplicate] [Duplicate]|f',
-            doc_count: 300,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 300,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 300,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 300,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'high',
-                  doc_count: 300,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['low hosts  [Duplicate]', 'f'],
-            key_as_string: 'low hosts  [Duplicate]|f',
-            doc_count: 300,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 300,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 300,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 300,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'low',
-                  doc_count: 300,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['low hosts  [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'low hosts  [Duplicate] [Duplicate]|f',
-            doc_count: 300,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 300,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 300,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 300,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'low',
-                  doc_count: 300,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['medium hosts [Duplicate]', 'f'],
-            key_as_string: 'medium hosts [Duplicate]|f',
-            doc_count: 300,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 300,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 300,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 300,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'medium',
-                  doc_count: 300,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['medium hosts [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'medium hosts [Duplicate] [Duplicate]|f',
-            doc_count: 300,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 300,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 300,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 300,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'medium',
-                  doc_count: 300,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['critical users  [Duplicate]', 'f'],
-            key_as_string: 'critical users  [Duplicate]|f',
-            doc_count: 273,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 273,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 273,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 273,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 273,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-          {
-            key: ['critical users  [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'critical users  [Duplicate] [Duplicate]|f',
-            doc_count: 273,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 273,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 273,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 273,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 273,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-          {
-            key: ['high users  [Duplicate]', 'f'],
-            key_as_string: 'high users  [Duplicate]|f',
-            doc_count: 273,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 273,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 273,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 273,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'high',
-                  doc_count: 273,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-          {
-            key: ['high users  [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'high users  [Duplicate] [Duplicate]|f',
-            doc_count: 273,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 273,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 273,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 273,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'high',
-                  doc_count: 273,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-          {
-            key: ['low users [Duplicate]', 'f'],
-            key_as_string: 'low users [Duplicate]|f',
-            doc_count: 273,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 273,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 273,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 273,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'low',
-                  doc_count: 273,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-          {
-            key: ['low users [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'low users [Duplicate] [Duplicate]|f',
-            doc_count: 273,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 273,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 273,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 273,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'low',
-                  doc_count: 273,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-          {
-            key: ['medium users [Duplicate]', 'f'],
-            key_as_string: 'medium users [Duplicate]|f',
-            doc_count: 273,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 273,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 273,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 273,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'medium',
-                  doc_count: 273,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-          {
-            key: ['medium users [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'medium users [Duplicate] [Duplicate]|f',
-            doc_count: 273,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 273,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 273,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 273,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'medium',
-                  doc_count: 273,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-          {
-            key: ['critical hosts', 'f'],
-            key_as_string: 'critical hosts|f',
-            doc_count: 100,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 100,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 100,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 100,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 100,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['critical hosts [Duplicate] [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'critical hosts [Duplicate] [Duplicate] [Duplicate]|f',
-            doc_count: 100,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 100,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 100,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 100,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 100,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['high hosts', 'f'],
-            key_as_string: 'high hosts|f',
-            doc_count: 100,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 100,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 100,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 100,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'high',
-                  doc_count: 100,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['high hosts [Duplicate] [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'high hosts [Duplicate] [Duplicate] [Duplicate]|f',
-            doc_count: 100,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 100,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 100,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 100,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'high',
-                  doc_count: 100,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['low hosts ', 'f'],
-            key_as_string: 'low hosts |f',
-            doc_count: 100,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 100,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 100,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 100,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'low',
-                  doc_count: 100,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['low hosts  [Duplicate] [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'low hosts  [Duplicate] [Duplicate] [Duplicate]|f',
-            doc_count: 100,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 100,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 100,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 100,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'low',
-                  doc_count: 100,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['medium hosts', 'f'],
-            key_as_string: 'medium hosts|f',
-            doc_count: 100,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 100,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 100,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 100,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'medium',
-                  doc_count: 100,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['medium hosts [Duplicate] [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'medium hosts [Duplicate] [Duplicate] [Duplicate]|f',
-            doc_count: 100,
-            hostsCountAggregation: {
-              value: 30,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 100,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 100,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 100,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'medium',
-                  doc_count: 100,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: ['critical users  [Duplicate] [Duplicate] [Duplicate]', 'f'],
-            key_as_string: 'critical users  [Duplicate] [Duplicate] [Duplicate]|f',
-            doc_count: 91,
-            hostsCountAggregation: {
-              value: 10,
-            },
-            ruleTags: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'cool',
-                  doc_count: 91,
-                },
-                {
-                  key: 'rule',
-                  doc_count: 91,
-                },
-              ],
-            },
-            unitsCount: {
-              value: 91,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 91,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 91,
-            },
-          },
-        ],
-      },
-      unitsCount: {
-        value: 6048,
-      },
+  ...mockAlertSearchResponse,
+  hits: {
+    total: {
+      value: 6048,
+      relation: 'eq',
     },
+    max_score: null,
+    hits: [],
   },
-  hostName: {
-    ...mockAlertSearchResponse,
-    hits: {
-      total: {
-        value: 900,
-        relation: 'eq',
-      },
-      max_score: null,
-      hits: [],
+  aggregations: {
+    groupsCount: {
+      value: 32,
+    },
+    groupByFields: {
+      doc_count_error_upper_bound: 0,
+      sum_other_doc_count: 0,
+      buckets: [
+        {
+          key: ['critical hosts [Duplicate]', 'critical hosts [Duplicate]'],
+          key_as_string: 'critical hosts [Duplicate]|critical hosts [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['critical hosts [Duplicate] [Duplicate]', 'critical hosts [Duplicate] [Duplicate]'],
+          key_as_string:
+            'critical hosts [Duplicate] [Duplicate]|critical hosts [Duplicate] [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['high hosts [Duplicate]', 'high hosts [Duplicate]'],
+          key_as_string: 'high hosts [Duplicate]|high hosts [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['high hosts [Duplicate] [Duplicate]', 'high hosts [Duplicate] [Duplicate]'],
+          key_as_string: 'high hosts [Duplicate] [Duplicate]|high hosts [Duplicate] [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['low hosts  [Duplicate]', 'low hosts  [Duplicate]'],
+          key_as_string: 'low hosts  [Duplicate]|low hosts  [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['low hosts  [Duplicate] [Duplicate]', 'low hosts  [Duplicate] [Duplicate]'],
+          key_as_string: 'low hosts  [Duplicate] [Duplicate]|low hosts  [Duplicate] [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['medium hosts [Duplicate]', 'medium hosts [Duplicate]'],
+          key_as_string: 'medium hosts [Duplicate]|medium hosts [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['medium hosts [Duplicate] [Duplicate]', 'medium hosts [Duplicate] [Duplicate]'],
+          key_as_string:
+            'medium hosts [Duplicate] [Duplicate]|medium hosts [Duplicate] [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['critical users  [Duplicate]', 'critical users  [Duplicate]'],
+          key_as_string: 'critical users  [Duplicate]|critical users  [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: [
+            'critical users  [Duplicate] [Duplicate]',
+            'critical users  [Duplicate] [Duplicate]',
+          ],
+          key_as_string:
+            'critical users  [Duplicate] [Duplicate]|critical users  [Duplicate] [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['high users  [Duplicate]', 'high users  [Duplicate]'],
+          key_as_string: 'high users  [Duplicate]|high users  [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['high users  [Duplicate] [Duplicate]', 'high users  [Duplicate] [Duplicate]'],
+          key_as_string: 'high users  [Duplicate] [Duplicate]|high users  [Duplicate] [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['low users [Duplicate]', 'low users [Duplicate]'],
+          key_as_string: 'low users [Duplicate]|low users [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['low users [Duplicate] [Duplicate]', 'low users [Duplicate] [Duplicate]'],
+          key_as_string: 'low users [Duplicate] [Duplicate]|low users [Duplicate] [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['medium users [Duplicate]', 'medium users [Duplicate]'],
+          key_as_string: 'medium users [Duplicate]|medium users [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['medium users [Duplicate] [Duplicate]', 'medium users [Duplicate] [Duplicate]'],
+          key_as_string:
+            'medium users [Duplicate] [Duplicate]|medium users [Duplicate] [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['critical hosts', 'critical hosts'],
+          key_as_string: 'critical hosts|critical hosts',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: [
+            'critical hosts [Duplicate] [Duplicate] [Duplicate]',
+            'critical hosts [Duplicate] [Duplicate] [Duplicate]',
+          ],
+          key_as_string:
+            'critical hosts [Duplicate] [Duplicate] [Duplicate]|critical hosts [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['high hosts', 'high hosts'],
+          key_as_string: 'high hosts|high hosts',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: [
+            'high hosts [Duplicate] [Duplicate] [Duplicate]',
+            'high hosts [Duplicate] [Duplicate] [Duplicate]',
+          ],
+          key_as_string:
+            'high hosts [Duplicate] [Duplicate] [Duplicate]|high hosts [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['low hosts ', 'low hosts '],
+          key_as_string: 'low hosts |low hosts ',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: [
+            'low hosts  [Duplicate] [Duplicate] [Duplicate]',
+            'low hosts  [Duplicate] [Duplicate] [Duplicate]',
+          ],
+          key_as_string:
+            'low hosts  [Duplicate] [Duplicate] [Duplicate]|low hosts  [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['medium hosts', 'medium hosts'],
+          key_as_string: 'medium hosts|medium hosts',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: [
+            'medium hosts [Duplicate] [Duplicate] [Duplicate]',
+            'medium hosts [Duplicate] [Duplicate] [Duplicate]',
+          ],
+          key_as_string:
+            'medium hosts [Duplicate] [Duplicate] [Duplicate]|medium hosts [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: [
+            'critical users  [Duplicate] [Duplicate] [Duplicate]',
+            'critical users  [Duplicate] [Duplicate] [Duplicate]',
+          ],
+          key_as_string:
+            'critical users  [Duplicate] [Duplicate] [Duplicate]|critical users  [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 91,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 91,
+              },
+              {
+                key: 'rule',
+                doc_count: 91,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 91,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 91,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+      ],
+    },
+    description: {
+      doc_count_error_upper_bound: 0,
+      sum_other_doc_count: 0,
+      buckets: [
+        {
+          key: 'f',
+          doc_count: 1,
+        },
+      ],
     },
-    aggregations: {
-      groupsCount: {
-        value: 40,
-      },
-      groupByFields: {
-        doc_count_error_upper_bound: 0,
-        sum_other_doc_count: 0,
-        buckets: [
-          {
-            key: 'Host-f0m6ngo8fo',
-            doc_count: 75,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 75,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 75,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 25,
-            },
-          },
-          {
-            key: 'Host-4aijlqggv8',
-            doc_count: 63,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 63,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 63,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 21,
-            },
-          },
-          {
-            key: 'Host-e50lhbdm91',
-            doc_count: 51,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 51,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 51,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 17,
-            },
-          },
-          {
-            key: 'sqp',
-            doc_count: 42,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 42,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 42,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'sUl',
-            doc_count: 33,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 33,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 33,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'vLJ',
-            doc_count: 30,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 30,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 30,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'Host-n28uwmsqmd',
-            doc_count: 27,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 27,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 27,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 9,
-            },
-          },
-          {
-            key: 'JaE',
-            doc_count: 27,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 27,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 27,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'CUA',
-            doc_count: 24,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 24,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 24,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'FWT',
-            doc_count: 24,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 24,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 24,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'ZqT',
-            doc_count: 24,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 24,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 24,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'mmn',
-            doc_count: 24,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 24,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 24,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'xRS',
-            doc_count: 24,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 24,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 24,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'HiC',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'Host-d7zbfvl3zz',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 7,
-            },
-          },
-          {
-            key: 'Nnc',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'OqH',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'Vaw',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'XPg',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'qBS',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'rwt',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'xVJ',
-            doc_count: 21,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 21,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 21,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'Bxg',
-            doc_count: 18,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 18,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 18,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'efP',
-            doc_count: 18,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 18,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 18,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-          {
-            key: 'qcb',
-            doc_count: 18,
-            rulesCountAggregation: {
-              value: 3,
-            },
-            unitsCount: {
-              value: 18,
-            },
-            severitiesSubAggregation: {
-              doc_count_error_upper_bound: 0,
-              sum_other_doc_count: 0,
-              buckets: [
-                {
-                  key: 'critical',
-                  doc_count: 18,
-                },
-              ],
-            },
-            countSeveritySubAggregation: {
-              value: 1,
-            },
-            usersCountAggregation: {
-              value: 0,
-            },
-          },
-        ],
-      },
-      unitsCount: {
-        value: 900,
-      },
+    unitsCount: {
+      value: 6048,
     },
   },
 };
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/query_builder.test.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/query_builder.test.ts
index b4f8568da2c604..30cf3c5b0be24c 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/query_builder.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/query_builder.test.ts
@@ -15,6 +15,7 @@ describe('getAlertsGroupingQuery', () => {
       pageIndex: 0,
       pageSize: 25,
       runtimeMappings: {},
+      selectedGroupEsTypes: ['keyword'],
       selectedGroup: 'kibana.alert.rule.name',
       additionalFilters: [
         {
@@ -44,6 +45,12 @@ describe('getAlertsGroupingQuery', () => {
       _source: false,
       aggs: {
         unitsCount: {
+          value_count: {
+            field: 'kibana.alert.rule.name',
+            missing: '-',
+          },
+        },
+        unitsCountWithoutNull: {
           value_count: {
             field: 'kibana.alert.rule.name',
           },
@@ -60,11 +67,23 @@ describe('getAlertsGroupingQuery', () => {
                 field: 'kibana.alert.uuid',
               },
             },
+            description: {
+              terms: {
+                field: 'kibana.alert.rule.description',
+                size: 1,
+              },
+            },
             bucket_truncate: {
               bucket_sort: {
                 from: 0,
                 size: 25,
-                sort: undefined,
+                sort: [
+                  {
+                    unitsCount: {
+                      order: 'desc',
+                    },
+                  },
+                ],
               },
             },
             countSeveritySubAggregation: {
@@ -98,9 +117,11 @@ describe('getAlertsGroupingQuery', () => {
             terms: [
               {
                 field: 'kibana.alert.rule.name',
+                missing: '-',
               },
               {
-                field: 'kibana.alert.rule.description',
+                field: 'kibana.alert.rule.name',
+                missing: '--',
               },
             ],
           },
@@ -152,6 +173,7 @@ describe('getAlertsGroupingQuery', () => {
       pageIndex: 0,
       pageSize: 25,
       runtimeMappings: {},
+      selectedGroupEsTypes: ['keyword'],
       selectedGroup: 'process.name',
       additionalFilters: [
         {
@@ -181,6 +203,12 @@ describe('getAlertsGroupingQuery', () => {
       _source: false,
       aggs: {
         unitsCount: {
+          value_count: {
+            field: 'process.name',
+            missing: '-',
+          },
+        },
+        unitsCountWithoutNull: {
           value_count: {
             field: 'process.name',
           },
@@ -201,7 +229,13 @@ describe('getAlertsGroupingQuery', () => {
               bucket_sort: {
                 from: 0,
                 size: 25,
-                sort: undefined,
+                sort: [
+                  {
+                    unitsCount: {
+                      order: 'desc',
+                    },
+                  },
+                ],
               },
             },
             rulesCountAggregation: {
@@ -210,9 +244,18 @@ describe('getAlertsGroupingQuery', () => {
               },
             },
           },
-          terms: {
-            field: 'process.name',
+          multi_terms: {
             size: 10000,
+            terms: [
+              {
+                field: 'process.name',
+                missing: '-',
+              },
+              {
+                field: 'process.name',
+                missing: '--',
+              },
+            ],
           },
         },
       },
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/query_builder.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/query_builder.ts
index 921a8d3e3d43f1..b7503778e2de5b 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/query_builder.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/query_builder.ts
@@ -10,14 +10,6 @@ import type { BoolQuery } from '@kbn/es-query';
 import type { NamedAggregation } from '@kbn/securitysolution-grouping';
 import { isNoneGroup, getGroupingQuery } from '@kbn/securitysolution-grouping';
 
-const getGroupFields = (groupValue: string) => {
-  if (groupValue === 'kibana.alert.rule.name') {
-    return [groupValue, 'kibana.alert.rule.description'];
-  } else {
-    return [groupValue];
-  }
-};
-
 interface AlertsGroupingQueryParams {
   additionalFilters: Array<{
     bool: BoolQuery;
@@ -27,6 +19,7 @@ interface AlertsGroupingQueryParams {
   pageSize: number;
   runtimeMappings: MappingRuntimeFields;
   selectedGroup: string;
+  selectedGroupEsTypes: string[];
   to: string;
 }
 
@@ -37,26 +30,21 @@ export const getAlertsGroupingQuery = ({
   pageSize,
   runtimeMappings,
   selectedGroup,
+  selectedGroupEsTypes,
   to,
 }: AlertsGroupingQueryParams) =>
   getGroupingQuery({
     additionalFilters,
     from,
-    groupByFields: !isNoneGroup([selectedGroup]) ? getGroupFields(selectedGroup) : [],
+    groupByField: selectedGroup,
     statsAggregations: !isNoneGroup([selectedGroup])
       ? getAggregationsByGroupField(selectedGroup)
       : [],
     pageNumber: pageIndex * pageSize,
-    rootAggregations: [
-      {
-        unitsCount: { value_count: { field: selectedGroup } },
-      },
-      ...(!isNoneGroup([selectedGroup])
-        ? [{ groupsCount: { cardinality: { field: selectedGroup } } }]
-        : []),
-    ],
     runtimeMappings,
+    selectedGroupEsTypes,
     size: pageSize,
+    sort: [{ unitsCount: { order: 'desc' } }],
     to,
   });
 
@@ -74,6 +62,14 @@ const getAggregationsByGroupField = (field: string): NamedAggregation[] => {
     case 'kibana.alert.rule.name':
       aggMetrics.push(
         ...[
+          {
+            description: {
+              terms: {
+                field: 'kibana.alert.rule.description',
+                size: 1,
+              },
+            },
+          },
           {
             countSeveritySubAggregation: {
               cardinality: {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/types.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/types.ts
index 72d3d95b867892..d271551f83460f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/types.ts
@@ -12,6 +12,9 @@ export interface AlertsGroupingAggregation {
   unitsCount?: {
     value?: NumberOrNull;
   };
+  description?: {
+    buckets?: GenericBuckets[];
+  };
   severitiesSubAggregation?: {
     buckets?: GenericBuckets[];
   };
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index 44958844bae18c..aedb45acdf3ef4 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -12,13 +12,14 @@ import type { FC } from 'react';
 import React, { useRef, useEffect, useState, useCallback, useMemo } from 'react';
 import { Storage } from '@kbn/kibana-utils-plugin/public';
 import type { AlertsTableStateProps } from '@kbn/triggers-actions-ui-plugin/public/application/sections/alerts_table/alerts_table_state';
+import type { Alert } from '@kbn/triggers-actions-ui-plugin/public/types';
+import { ALERT_BUILDING_BLOCK_TYPE } from '@kbn/rule-data-utils';
 import styled from 'styled-components';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import { getEsQueryConfig } from '@kbn/data-plugin/public';
 import {
   dataTableActions,
   dataTableSelectors,
-  getColumnHeaders,
   tableDefaults,
   TableId,
 } from '@kbn/securitysolution-data-table';
@@ -40,15 +41,19 @@ import { getDataTablesInStorageByIds } from '../../../timelines/containers/local
 import { useSourcererDataView } from '../../../common/containers/sourcerer';
 import { SourcererScopeName } from '../../../common/store/sourcerer/model';
 import { useKibana } from '../../../common/lib/kibana';
-import { useShallowEqualSelector } from '../../../common/hooks/use_selector';
+import { useDeepEqualSelector, useShallowEqualSelector } from '../../../common/hooks/use_selector';
 import { getColumns } from '../../configurations/security_solution_detections';
 import { buildTimeRangeFilter } from './helpers';
 import { eventsViewerSelector } from '../../../common/components/events_viewer/selectors';
 import type { State } from '../../../common/store';
 import * as i18n from './translations';
+import { eventRenderedViewColumns } from '../../configurations/security_solution_detections/columns';
 
 const { updateIsLoading, updateTotalCount } = dataTableActions;
 
+// Highlight rows with building block alerts
+const shouldHighlightRow = (alert: Alert) => !!alert[ALERT_BUILDING_BLOCK_TYPE];
+
 const storage = new Storage(localStorage);
 
 interface GridContainerProps {
@@ -91,6 +96,7 @@ interface DetectionEngineAlertTableProps {
   isLoading?: boolean;
   onRuleChange?: () => void;
 }
+
 export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
   configId,
   flyoutSize,
@@ -119,9 +125,13 @@ export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
   const { browserFields, indexPattern: indexPatterns } = useSourcererDataView(sourcererScope);
   const license = useLicense();
 
-  const getGlobalInputs = inputsSelectors.globalSelector();
-  const globalInputs = useSelector((state: State) => getGlobalInputs(state));
-  const { query: globalQuery, filters: globalFilters } = globalInputs;
+  const getGlobalFiltersQuerySelector = useMemo(
+    () => inputsSelectors.globalFiltersQuerySelector(),
+    []
+  );
+  const getGlobalQuerySelector = useMemo(() => inputsSelectors.globalQuerySelector(), []);
+  const globalQuery = useDeepEqualSelector(getGlobalQuerySelector);
+  const globalFilters = useDeepEqualSelector(getGlobalFiltersQuerySelector);
 
   const getTable = useMemo(() => dataTableSelectors.getTableByIdSelector(), []);
 
@@ -168,11 +178,11 @@ export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
   });
 
   const finalBoolQuery: AlertsTableStateProps['query'] = useMemo(() => {
-    if (!combinedQuery || combinedQuery.kqlError || !combinedQuery.filterQuery) {
+    if (combinedQuery?.kqlError || !combinedQuery?.filterQuery) {
       return { bool: {} };
     }
-    return { bool: { filter: JSON.parse(combinedQuery.filterQuery) } };
-  }, [combinedQuery]);
+    return { bool: { filter: JSON.parse(combinedQuery?.filterQuery) } };
+  }, [combinedQuery?.filterQuery, combinedQuery?.kqlError]);
 
   const isEventRenderedView = tableView === VIEW_SELECTION.eventRenderedView;
 
@@ -200,21 +210,16 @@ export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
   const columnsFormStorage = dataTableStorage?.[TableId.alertsOnAlertsPage]?.columns ?? [];
   const alertColumns = columnsFormStorage.length ? columnsFormStorage : getColumns(license);
 
-  const evenRenderedColumns = useMemo(
-    () => getColumnHeaders(alertColumns, browserFields, true),
-    [alertColumns, browserFields]
-  );
-
-  const finalColumns = useMemo(
-    () => (isEventRenderedView ? evenRenderedColumns : alertColumns),
-    [evenRenderedColumns, alertColumns, isEventRenderedView]
-  );
-
   const finalBrowserFields = useMemo(
     () => (isEventRenderedView ? {} : browserFields),
     [isEventRenderedView, browserFields]
   );
 
+  const finalColumns = useMemo(
+    () => (isEventRenderedView ? eventRenderedViewColumns : alertColumns),
+    [alertColumns, isEventRenderedView]
+  );
+
   const onAlertTableUpdate: AlertsTableStateProps['onUpdate'] = useCallback(
     ({ isLoading: isAlertTableLoading, totalCount, refresh }) => {
       dispatch(
@@ -255,6 +260,7 @@ export const AlertsTableComponent: FC<DetectionEngineAlertTableProps> = ({
       query: finalBoolQuery,
       showExpandToDetails: false,
       gridStyle,
+      shouldHighlightRow,
       rowHeightsOptions,
       columns: finalColumns,
       browserFields: finalBrowserFields,
diff --git a/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.test.tsx
new file mode 100644
index 00000000000000..1035f08bb902f4
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.test.tsx
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ComponentProps } from 'react';
+import React from 'react';
+
+import { render, screen, waitFor } from '@testing-library/react';
+import { TestProviders } from '../../../common/mock';
+import { DetectionPageFilterSet } from '.';
+import { TEST_IDS } from '../../../common/components/filter_group/constants';
+import { createStartServicesMock } from '../../../common/lib/kibana/kibana_react.mock';
+import type { DataView } from '@kbn/data-views-plugin/common';
+import { useKibana } from '../../../common/lib/kibana';
+import { FilterGroup } from '../../../common/components/filter_group';
+import { getMockedFilterGroupWithCustomFilters } from '../../../common/components/filter_group/mocks';
+import type { DataViewsServicePublic } from '@kbn/data-views-plugin/public';
+
+jest.mock('../../../common/components/filter_group');
+
+jest.mock('../../../common/lib/kibana');
+
+const basicKibanaServicesMock = createStartServicesMock();
+
+const getFieldByNameMock = jest.fn(() => true);
+
+const mockedDataViewServiceGetter = jest.fn(() => {
+  return Promise.resolve({
+    getFieldByName: getFieldByNameMock,
+  } as unknown as DataView);
+});
+
+const getKibanaServiceWithMockedGetter = (
+  mockedDataViewGetter: DataViewsServicePublic['get'] = mockedDataViewServiceGetter
+) => {
+  return {
+    ...basicKibanaServicesMock,
+    dataViews: {
+      ...basicKibanaServicesMock.dataViews,
+      clearInstanceCache: jest.fn(),
+      get: mockedDataViewGetter,
+    },
+  };
+};
+
+const kibanaServiceDefaultMock = getKibanaServiceWithMockedGetter();
+
+const onFilterChangeMock = jest.fn();
+
+const TestComponent = (props: Partial<ComponentProps<typeof DetectionPageFilterSet>> = {}) => {
+  return (
+    <TestProviders>
+      <DetectionPageFilterSet
+        chainingSystem="HIERARCHICAL"
+        dataViewId=""
+        onFilterChange={onFilterChangeMock}
+        {...props}
+      />
+    </TestProviders>
+  );
+};
+
+describe('Detection Page Filters', () => {
+  beforeAll(() => {
+    (FilterGroup as jest.Mock).mockImplementation(getMockedFilterGroupWithCustomFilters());
+    (useKibana as jest.Mock).mockReturnValue({
+      services: {
+        ...kibanaServiceDefaultMock,
+      },
+    });
+  });
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('should renders correctly', async () => {
+    render(<TestComponent />);
+    expect(screen.getByTestId(TEST_IDS.FILTER_LOADING)).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.getByTestId(TEST_IDS.MOCKED_CONTROL)).toBeInTheDocument();
+    });
+  });
+
+  it('should check all the fields till any absent field is found', async () => {
+    render(<TestComponent />);
+    expect(screen.getByTestId(TEST_IDS.FILTER_LOADING)).toBeInTheDocument();
+    await waitFor(() => {
+      expect(getFieldByNameMock).toHaveBeenCalledTimes(4);
+      expect(kibanaServiceDefaultMock.dataViews.clearInstanceCache).toHaveBeenCalledTimes(0);
+    });
+  });
+
+  it('should stop checking fields if blank field is found and clear the cache', async () => {
+    const getFieldByNameLocalMock = jest.fn(() => false);
+    const mockGetter = jest.fn(() =>
+      Promise.resolve({ getFieldByName: getFieldByNameLocalMock } as unknown as DataView)
+    );
+    const modifiedKibanaServicesMock = getKibanaServiceWithMockedGetter(mockGetter);
+    (useKibana as jest.Mock).mockReturnValueOnce({ services: modifiedKibanaServicesMock });
+
+    render(<TestComponent />);
+    expect(screen.getByTestId(TEST_IDS.FILTER_LOADING)).toBeInTheDocument();
+    await waitFor(() => {
+      expect(getFieldByNameLocalMock).toHaveBeenCalledTimes(1);
+      expect(modifiedKibanaServicesMock.dataViews.clearInstanceCache).toHaveBeenCalledTimes(1);
+      expect(screen.getByTestId(TEST_IDS.MOCKED_CONTROL)).toBeInTheDocument();
+    });
+  });
+
+  it('should call onFilterChange', async () => {
+    const filtersToTest = [
+      {
+        meta: {
+          index: 'security-solution-default',
+          key: 'kibana.alert.severity',
+        },
+        query: {
+          match_phrase: {
+            'kibana.alert.severity': 'low',
+          },
+        },
+      },
+    ];
+    (FilterGroup as jest.Mock).mockImplementationOnce(
+      getMockedFilterGroupWithCustomFilters(filtersToTest)
+    );
+    render(<TestComponent />);
+
+    await waitFor(() => {
+      expect(onFilterChangeMock).toHaveBeenNthCalledWith(1, [
+        {
+          ...filtersToTest[0],
+          meta: {
+            ...filtersToTest[0].meta,
+            disabled: false,
+          },
+        },
+      ]);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.tsx b/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.tsx
index 1454c63ffb3989..d096f56f7faa58 100644
--- a/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/detection_page_filters/index.tsx
@@ -41,8 +41,8 @@ const FilterItemSetComponent = (props: FilterItemSetProps) => {
           setLoadingPageFilters(false);
           return;
         }
-        setLoadingPageFilters(false);
       }
+      setLoadingPageFilters(false);
     })();
   }, [dataViewId, dataViewService]);
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx
index 06368eadc30df1..938d8a8a6411f4 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/step_rule_actions/translations.tsx
@@ -40,6 +40,6 @@ export const RULE_SNOOZE_DESCRIPTION = i18n.translate(
 export const SNOOZED_ACTIONS_WARNING = i18n.translate(
   'xpack.securitySolution.detectionEngine.createRule.stepRuleActions.snoozedActionsWarning',
   {
-    defaultMessage: 'Actions will not be preformed until it is unsnoozed.',
+    defaultMessage: 'Actions will not be performed until it is unsnoozed.',
   }
 );
diff --git a/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/mock/data.ts b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/mock/data.ts
new file mode 100644
index 00000000000000..45637d28cd9ae8
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/mock/data.ts
@@ -0,0 +1,1696 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const browserFields = {
+  host: {
+    fields: {
+      'host.name': {
+        category: 'host',
+        description:
+          'Name of the host. It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.',
+        name: 'host.name',
+        type: 'string',
+        searchable: true,
+        aggregatable: true,
+        format: 'string',
+        indexes: [
+          'apm-*-transaction*',
+          'traces-apm*',
+          'auditbeat-*',
+          'endgame-*',
+          'filebeat-*',
+          'logs-*',
+          'packetbeat-*',
+          'winlogbeat-*',
+        ],
+      },
+    },
+  },
+};
+
+export const columns = [
+  {
+    columnHeaderType: 'not-filtered',
+    displayAsText: 'Host Name',
+    id: 'host.name',
+    initialWidth: 30,
+  },
+];
+
+export const data = [
+  [
+    {
+      field: 'kibana.alert.rule.updated_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'host.os.name.text',
+      value: ['Debian GNU/Linux'],
+    },
+    {
+      field: 'host.hostname',
+      value: ['bastion00'],
+    },
+    {
+      field: 'host.mac',
+      value: ['42-01-0A-C8-00-2E'],
+    },
+    {
+      field: 'service.type',
+      value: ['system'],
+    },
+    {
+      field: 'signal.rule.enabled',
+      value: ['true'],
+    },
+    {
+      field: 'host.os.version',
+      value: ['10 (buster)'],
+    },
+    {
+      field: 'signal.rule.max_signals',
+      value: [100],
+    },
+    {
+      field: 'source.geo.region_name',
+      value: ['Iowa'],
+    },
+    {
+      field: 'signal.rule.updated_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'kibana.alert.risk_score',
+      value: [21],
+    },
+    {
+      field: 'source.geo.city_name',
+      value: ['Council Bluffs'],
+    },
+    {
+      field: 'host.os.type',
+      value: ['linux'],
+    },
+    {
+      field: 'signal.original_event.end',
+      value: ['2022-10-14T14:00:24.296Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.module',
+      value: ['system'],
+    },
+    {
+      field: 'kibana.alert.rule.interval',
+      value: ['5m'],
+    },
+    {
+      field: 'kibana.alert.rule.type',
+      value: ['query'],
+    },
+    {
+      field: 'agent.hostname',
+      value: ['bastion00.siem.estc.dev'],
+    },
+    {
+      field: 'kibana.alert.original_event.end',
+      value: ['2022-10-14T14:00:24.296Z'],
+    },
+    {
+      field: 'kibana.alert.rule.immutable',
+      value: ['false'],
+    },
+    {
+      field: 'source.port',
+      value: [56296],
+    },
+    {
+      field: 'client.port',
+      value: [56296],
+    },
+    {
+      field: 'host.containerized',
+      value: [false],
+    },
+    {
+      field: 'destination.bytes',
+      value: [6564],
+    },
+    {
+      field: 'kibana.alert.rule.version',
+      value: ['1'],
+    },
+    {
+      field: 'source.as.number',
+      value: [396982],
+    },
+    {
+      field: 'event.end',
+      value: ['2022-10-14T14:00:24.296Z'],
+    },
+    {
+      field: 'process.entity_id',
+      value: ['rR78V6MnxUY7Go9O'],
+    },
+    {
+      field: 'host.ip',
+      value: ['10.200.0.46', 'fe80::4001:aff:fec8:2e'],
+    },
+    {
+      field: 'agent.type',
+      value: ['auditbeat'],
+    },
+    {
+      field: 'signal.original_event.category',
+      value: ['network'],
+    },
+    {
+      field: 'process.executable.text',
+      value: ['/usr/local/bin/traefik'],
+    },
+    {
+      field: 'related.ip',
+      value: ['10.200.0.46', '35.226.77.71'],
+    },
+    {
+      field: 'server.port',
+      value: [9200],
+    },
+    {
+      field: 'host.id',
+      value: ['a415f7ec8a9af33894317958f24e185f'],
+    },
+    {
+      field: 'timestamp',
+      value: [1666873459714],
+    },
+    {
+      field: 'signal.rule.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'kibana.alert.rule.indices',
+      value: [
+        'apm-*-transaction*',
+        'auditbeat-*',
+        'endgame-*',
+        'filebeat-*',
+        'logs-*',
+        'packetbeat-*',
+        'traces-apm*',
+        'winlogbeat-*',
+        '-*elastic-cloud-logs-*',
+      ],
+    },
+    {
+      field: 'signal.rule.updated_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'cloud.account.id',
+      value: ['elastic-siem'],
+    },
+    {
+      field: 'host.os.platform',
+      value: ['debian'],
+    },
+    {
+      field: 'kibana.alert.rule.severity',
+      value: ['low'],
+    },
+    {
+      field: 'signal.original_event.duration',
+      value: ['647874250'],
+    },
+    {
+      field: 'kibana.version',
+      value: ['8.8.0'],
+    },
+    {
+      field: 'signal.ancestors.type',
+      value: ['event', 'signal'],
+    },
+    {
+      field: 'cloud.instance.name',
+      value: ['bastion00'],
+    },
+    {
+      field: 'user.name.text',
+      value: ['traefik'],
+    },
+    {
+      field: 'kibana.alert.ancestors.id',
+      value: [
+        '4z_L1oMBiIcG4Y9J2nxd',
+        '75e2a3903daac549c05eb3aebe90b3ef6d1921b74c4870ee518643a46f778a31',
+      ],
+    },
+    {
+      field: 'kibana.alert.rule.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.name.text',
+      value: ['traefik'],
+    },
+    {
+      field: 'kibana.alert.rule.description',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'kibana.alert.rule.producer',
+      value: ['siem'],
+    },
+    {
+      field: 'kibana.alert.rule.to',
+      value: ['now'],
+    },
+    {
+      field: 'signal.rule.id',
+      value: ['023a0260-e348-11ed-bd43-632e972150d6'],
+    },
+    {
+      field: 'system.audit.socket.uid',
+      value: [1018],
+    },
+    {
+      field: 'signal.rule.risk_score',
+      value: [21],
+    },
+    {
+      field: 'signal.reason',
+      value: [
+        'network event with process traefik, source 35.226.77.71:56296, destination 10.200.0.46:9200, by traefik on bastion00.siem.estc.dev created low alert Custom Rule.',
+      ],
+    },
+    {
+      field: 'process.created',
+      value: ['2022-01-31T13:14:05.210Z'],
+    },
+    {
+      field: 'user.risk.calculated_score_norm',
+      value: [31.238997],
+    },
+    {
+      field: 'host.os.name',
+      value: ['Debian GNU/Linux'],
+    },
+    {
+      field: 'signal.status',
+      value: ['open'],
+    },
+    {
+      field: 'client.as.organization.name.text',
+      value: ['GOOGLE-CLOUD-PLATFORM'],
+    },
+    {
+      field: 'flow.final',
+      value: [true],
+    },
+    {
+      field: 'kibana.alert.rule.uuid',
+      value: ['023a0260-e348-11ed-bd43-632e972150d6'],
+    },
+    {
+      field: 'kibana.alert.original_event.category',
+      value: ['network'],
+    },
+    {
+      field: 'client.ip',
+      value: ['35.226.77.71'],
+    },
+    {
+      field: 'process.name',
+      value: ['traefik'],
+    },
+    {
+      field: 'client.as.number',
+      value: [396982],
+    },
+    {
+      field: 'kibana.alert.ancestors.index',
+      value: ['.ds-auditbeat-8.5.0-2022.10.03-000001', 'auditbeat-bulk'],
+    },
+    {
+      field: 'agent.version',
+      value: ['8.5.0'],
+    },
+    {
+      field: 'host.os.family',
+      value: ['debian'],
+    },
+    {
+      field: 'kibana.alert.rule.from',
+      value: ['now-6000000300s'],
+    },
+    {
+      field: 'kibana.alert.rule.parameters',
+      value: [
+        {
+          description: 'Custom Rule',
+          risk_score: 21,
+          severity: 'low',
+          building_block_type: 'default',
+          license: '',
+          meta: {
+            from: '100000000m',
+            kibana_siem_app_url: 'http://localhost:5601/app/security',
+          },
+          author: [],
+          false_positives: [],
+          from: 'now-6000000300s',
+          rule_id: 'caf0db0c-c7e2-455e-89b8-6b0d73619ae5',
+          max_signals: 100,
+          risk_score_mapping: [],
+          severity_mapping: [],
+          threat: [],
+          to: 'now',
+          references: [],
+          version: 1,
+          exceptions_list: [],
+          immutable: false,
+          related_integrations: [],
+          required_fields: [],
+          setup: '',
+          type: 'query',
+          language: 'kuery',
+          index: [
+            'apm-*-transaction*',
+            'auditbeat-*',
+            'endgame-*',
+            'filebeat-*',
+            'logs-*',
+            'packetbeat-*',
+            'traces-apm*',
+            'winlogbeat-*',
+            '-*elastic-cloud-logs-*',
+          ],
+          query: '*',
+          filters: [],
+        },
+      ],
+    },
+    {
+      field: 'signal.original_event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'client.packets',
+      value: [10],
+    },
+    {
+      field: 'group.id',
+      value: ['1019'],
+    },
+    {
+      field: 'signal.depth',
+      value: [2],
+    },
+    {
+      field: 'kibana.alert.original_event.start',
+      value: ['2022-10-14T14:00:23.649Z'],
+    },
+    {
+      field: 'signal.rule.immutable',
+      value: ['false'],
+    },
+    {
+      field: 'signal.rule.name',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'event.module',
+      value: ['system'],
+    },
+    {
+      field: 'host.os.kernel',
+      value: ['4.19.0-17-cloud-amd64'],
+    },
+    {
+      field: 'kibana.alert.rule.license',
+      value: [''],
+    },
+    {
+      field: 'kibana.alert.original_event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'network.type',
+      value: ['ipv4'],
+    },
+    {
+      field: 'source.as.organization.name.text',
+      value: ['GOOGLE-CLOUD-PLATFORM'],
+    },
+    {
+      field: 'signal.rule.description',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'source.geo.continent_name',
+      value: ['North America'],
+    },
+    {
+      field: 'source.as.organization.name',
+      value: ['GOOGLE-CLOUD-PLATFORM'],
+    },
+    {
+      field: 'process.args',
+      value: ['/usr/local/bin/traefik', '--configfile=/etc/traefik/traefik.yml'],
+    },
+    {
+      field: 'client.bytes',
+      value: [1495],
+    },
+    {
+      field: 'kibana.space_ids',
+      value: ['default'],
+    },
+    {
+      field: 'flow.complete',
+      value: [true],
+    },
+    {
+      field: 'kibana.alert.severity',
+      value: ['low'],
+    },
+    {
+      field: 'signal.ancestors.depth',
+      value: [0, 1],
+    },
+    {
+      field: 'event.category',
+      value: ['network'],
+    },
+    {
+      field: 'host.risk.calculated_score_norm',
+      value: [17.08461],
+    },
+    {
+      field: 'client.geo.country_iso_code',
+      value: ['US'],
+    },
+    {
+      field: 'kibana.alert.ancestors.depth',
+      value: [0, 1],
+    },
+    {
+      field: 'source.ip',
+      value: ['35.226.77.71'],
+    },
+    {
+      field: 'agent.name',
+      value: ['bastion00.siem.estc.dev'],
+    },
+    {
+      field: 'network.community_id',
+      value: ['1:IjFQUo1K34NyjD8pxAitVL9mqdw='],
+    },
+    {
+      field: 'system.audit.socket.euid',
+      value: [1018],
+    },
+    {
+      field: 'group.name',
+      value: ['traefik'],
+    },
+    {
+      field: 'source.packets',
+      value: [10],
+    },
+    {
+      field: 'user.id',
+      value: ['1018'],
+    },
+    {
+      field: 'system.audit.socket.gid',
+      value: [1019],
+    },
+    {
+      field: 'related.user',
+      value: ['traefik'],
+    },
+    {
+      field: 'host.architecture',
+      value: ['x86_64'],
+    },
+    {
+      field: 'kibana.alert.start',
+      value: ['2023-04-25T09:03:15.535Z'],
+    },
+    {
+      field: 'cloud.provider',
+      value: ['gcp'],
+    },
+    {
+      field: 'cloud.machine.type',
+      value: ['e2-small'],
+    },
+    {
+      field: 'kibana.alert.original_event.type',
+      value: ['info', 'connection'],
+    },
+    {
+      field: 'signal.original_event.module',
+      value: ['system'],
+    },
+    {
+      field: 'agent.id',
+      value: ['bb1e5c8f-10ba-48b0-bee1-da60886ba59c'],
+    },
+    {
+      field: 'signal.rule.from',
+      value: ['now-6000000300s'],
+    },
+    {
+      field: 'kibana.alert.rule.enabled',
+      value: ['true'],
+    },
+    {
+      field: 'signal.original_event.start',
+      value: ['2022-10-14T14:00:23.649Z'],
+    },
+    {
+      field: 'event.start',
+      value: ['2022-10-14T14:00:23.649Z'],
+    },
+    {
+      field: 'kibana.alert.ancestors.type',
+      value: ['event', 'signal'],
+    },
+    {
+      field: 'destination.port',
+      value: [9200],
+    },
+    {
+      field: 'user.name',
+      value: ['traefik'],
+    },
+    {
+      field: 'signal.ancestors.index',
+      value: ['.ds-auditbeat-8.5.0-2022.10.03-000001', 'auditbeat-bulk'],
+    },
+    {
+      field: 'destination.packets',
+      value: [9],
+    },
+    {
+      field: 'kibana.alert.original_event.duration',
+      value: ['647874250'],
+    },
+    {
+      field: 'cloud.instance.id',
+      value: ['2730026390719231438'],
+    },
+    {
+      field: 'client.geo.region_name',
+      value: ['Iowa'],
+    },
+    {
+      field: 'signal.original_event.type',
+      value: ['info', 'connection'],
+    },
+    {
+      field: 'kibana.alert.rule.max_signals',
+      value: [100],
+    },
+    {
+      field: 'kibana.alert.rule.risk_score',
+      value: [21],
+    },
+    {
+      field: 'host.os.codename',
+      value: ['buster'],
+    },
+    {
+      field: 'signal.original_event.dataset',
+      value: ['socket'],
+    },
+    {
+      field: 'kibana.alert.rule.consumer',
+      value: ['siem'],
+    },
+    {
+      field: 'destination.ip',
+      value: ['10.200.0.46'],
+    },
+    {
+      field: 'kibana.alert.rule.category',
+      value: ['Custom Query Rule'],
+    },
+    {
+      field: 'event.duration',
+      value: [647874250],
+    },
+    {
+      field: 'event.action',
+      value: ['exec'],
+    },
+    {
+      field: '@timestamp',
+      value: ['2023-04-25T09:03:15.516Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'host.risk.calculated_level',
+      value: ['Unknown'],
+    },
+    {
+      field: 'agent.ephemeral_id',
+      value: ['71eae441-3269-4828-9496-99a6fd42cb91'],
+    },
+    {
+      field: 'kibana.alert.rule.execution.uuid',
+      value: ['3e763264-9eab-4c6b-98e8-d51367491275'],
+    },
+    {
+      field: 'kibana.alert.uuid',
+      value: ['7d3194c7158fb9edb10541ccdd81f8c2b9c9d3c50b82c14457c959a2fcbcb22a'],
+    },
+    {
+      field: 'kibana.alert.rule.meta.kibana_siem_app_url',
+      value: ['http://localhost:5601/app/security'],
+    },
+    {
+      field: 'signal.rule.license',
+      value: [''],
+    },
+    {
+      field: 'kibana.alert.rule.rule_id',
+      value: ['caf0db0c-c7e2-455e-89b8-6b0d73619ae5'],
+    },
+    {
+      field: 'kibana.alert.ancestors.rule',
+      value: ['532e0020-4a0c-11ed-9aa3-574e520c127d'],
+    },
+    {
+      field: 'cloud.project.id',
+      value: ['elastic-siem'],
+    },
+    {
+      field: 'signal.rule.type',
+      value: ['query'],
+    },
+    {
+      field: 'server.ip',
+      value: ['10.200.0.46'],
+    },
+    {
+      field: 'user.risk.calculated_level',
+      value: ['Low'],
+    },
+    {
+      field: 'kibana.alert.url',
+      value: [
+        'http://localhost:5601/app/security/alerts/redirect/7d3194c7158fb9edb10541ccdd81f8c2b9c9d3c50b82c14457c959a2fcbcb22a?index=.alerts-security.alerts-default&timestamp=2023-04-25T09:03:15.516Z',
+      ],
+    },
+    {
+      field: 'kibana.alert.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.pid',
+      value: [31349],
+    },
+    {
+      field: 'system.audit.socket.egid',
+      value: [1019],
+    },
+    {
+      field: 'signal.rule.interval',
+      value: ['5m'],
+    },
+    {
+      field: 'cloud.availability_zone',
+      value: ['us-central1-c'],
+    },
+    {
+      field: 'signal.rule.created_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'kibana.alert.rule.created_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'system.audit.socket.kernel_sock_address',
+      value: ['0xffff97d5d9608900'],
+    },
+    {
+      field: 'kibana.alert.rule.name',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'client.as.organization.name',
+      value: ['GOOGLE-CLOUD-PLATFORM'],
+    },
+    {
+      field: 'host.name',
+      value: ['bastion00.siem.estc.dev'],
+    },
+    {
+      field: 'client.geo.country_name',
+      value: ['United States'],
+    },
+    {
+      field: 'source.geo.region_iso_code',
+      value: ['US-IA'],
+    },
+    {
+      field: 'event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'signal.rule.created_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'kibana.alert.workflow_status',
+      value: ['open'],
+    },
+    {
+      field: 'network.packets',
+      value: [19],
+    },
+    {
+      field: 'kibana.alert.reason',
+      value: [
+        'network event with process traefik, source 35.226.77.71:56296, destination 10.200.0.46:9200, by traefik on bastion00.siem.estc.dev created low alert Custom Rule.',
+      ],
+    },
+    {
+      field: 'signal.ancestors.id',
+      value: [
+        '4z_L1oMBiIcG4Y9J2nxd',
+        '75e2a3903daac549c05eb3aebe90b3ef6d1921b74c4870ee518643a46f778a31',
+      ],
+    },
+    {
+      field: 'signal.original_time',
+      value: ['2022-10-27T12:24:19.714Z'],
+    },
+    {
+      field: 'cloud.service.name',
+      value: ['GCE'],
+    },
+    {
+      field: 'ecs.version',
+      value: ['8.0.0'],
+    },
+    {
+      field: 'signal.rule.severity',
+      value: ['low'],
+    },
+    {
+      field: 'kibana.alert.depth',
+      value: [2],
+    },
+    {
+      field: 'kibana.alert.rule.revision',
+      value: [0],
+    },
+    {
+      field: 'signal.rule.version',
+      value: ['1'],
+    },
+    {
+      field: 'client.geo.continent_name',
+      value: ['North America'],
+    },
+    {
+      field: 'server.bytes',
+      value: [6564],
+    },
+    {
+      field: 'kibana.alert.status',
+      value: ['active'],
+    },
+    {
+      field: 'kibana.alert.last_detected',
+      value: ['2023-04-25T09:03:15.535Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.dataset',
+      value: ['socket'],
+    },
+    {
+      field: 'kibana.alert.rule.rule_type_id',
+      value: ['siem.queryRule'],
+    },
+    {
+      field: 'signal.rule.rule_id',
+      value: ['caf0db0c-c7e2-455e-89b8-6b0d73619ae5'],
+    },
+    {
+      field: 'source.geo.country_iso_code',
+      value: ['US'],
+    },
+    {
+      field: 'network.bytes',
+      value: [8059],
+    },
+    {
+      field: 'network.direction',
+      value: ['ingress'],
+    },
+    {
+      field: 'process.executable',
+      value: ['/usr/local/bin/traefik'],
+    },
+    {
+      field: 'source.bytes',
+      value: [1495],
+    },
+    {
+      field: 'client.geo.city_name',
+      value: ['Council Bluffs'],
+    },
+    {
+      field: 'client.geo.region_iso_code',
+      value: ['US-IA'],
+    },
+    {
+      field: 'kibana.alert.rule.updated_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'server.packets',
+      value: [9],
+    },
+    {
+      field: 'network.transport',
+      value: ['tcp'],
+    },
+    {
+      field: 'signal.original_event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'kibana.alert.rule.created_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'signal.rule.to',
+      value: ['now'],
+    },
+    {
+      field: 'event.type',
+      value: ['info', 'connection'],
+    },
+    {
+      field: 'process.entry_leader.entity_id',
+      value: ['some99'],
+    },
+    {
+      field: 'source.geo.country_name',
+      value: ['United States'],
+    },
+    {
+      field: 'kibana.alert.rule.meta.from',
+      value: ['100000000m'],
+    },
+    {
+      field: 'event.dataset',
+      value: ['socket'],
+    },
+    {
+      field: 'kibana.alert.original_time',
+      value: ['2022-10-27T12:24:19.714Z'],
+    },
+    {
+      field: '_id',
+      value: '7d3194c7158fb9edb10541ccdd81f8c2b9c9d3c50b82c14457c959a2fcbcb22a',
+    },
+    {
+      field: '_index',
+      value: '.internal.alerts-security.alerts-default-000001',
+    },
+  ],
+  [
+    {
+      field: 'kibana.alert.severity',
+      value: ['low'],
+    },
+    {
+      field: 'host.os.full.text',
+      value: ['Windows Server 2019 Datacenter 1809 (10.0.17763.3406)'],
+    },
+    {
+      field: 'kibana.alert.rule.updated_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'signal.ancestors.depth',
+      value: [0, 1],
+    },
+    {
+      field: 'event.category',
+      value: ['file'],
+    },
+    {
+      field: 'host.risk.calculated_score_norm',
+      value: [31.092354],
+    },
+    {
+      field: 'host.os.name.text',
+      value: ['Windows'],
+    },
+    {
+      field: 'process.parent.pid',
+      value: [652],
+    },
+    {
+      field: 'host.hostname',
+      value: ['siem-windows-endpoint'],
+    },
+    {
+      field: 'signal.original_event.created',
+      value: ['2022-10-14T14:00:27.258Z'],
+    },
+    {
+      field: 'host.mac',
+      value: ['42:01:0a:c8:00:df'],
+    },
+    {
+      field: 'process.code_signature.exists',
+      value: [true],
+    },
+    {
+      field: 'elastic.agent.id',
+      value: ['2ea4b363-6a3f-449e-9d4e-c73ccf28f693'],
+    },
+    {
+      field: 'kibana.alert.ancestors.depth',
+      value: [0, 1],
+    },
+    {
+      field: 'signal.rule.enabled',
+      value: ['true'],
+    },
+    {
+      field: 'host.os.version',
+      value: ['1809 (10.0.17763.3406)'],
+    },
+    {
+      field: 'signal.rule.max_signals',
+      value: [100],
+    },
+    {
+      field: 'signal.rule.updated_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'kibana.alert.risk_score',
+      value: [21],
+    },
+    {
+      field: 'event.agent_id_status',
+      value: ['verified'],
+    },
+    {
+      field: 'kibana.alert.original_event.id',
+      value: ['MnfiZLkz1DywMGBf++++9ApC'],
+    },
+    {
+      field: 'file.path.text',
+      value: ['C:\\ProgramData\\winlogbeat\\.winlogbeat.yml.new'],
+    },
+    {
+      field: 'host.os.type',
+      value: ['windows'],
+    },
+    {
+      field: 'user.id',
+      value: ['S-1-5-18'],
+    },
+    {
+      field: 'process.Ext.ancestry',
+      value: [
+        'MmVhNGIzNjMtNmEzZi00NDllLTlkNGUtYzczY2NmMjhmNjkzLTY1Mi0xNjY0ODA2NTI4Ljc4NTg5NTAw',
+        'MmVhNGIzNjMtNmEzZi00NDllLTlkNGUtYzczY2NmMjhmNjkzLTUzNi0xNjY0ODA2NTI3LjEwNDI2NTQwMA==',
+      ],
+    },
+    {
+      field: 'kibana.alert.original_event.module',
+      value: ['endpoint'],
+    },
+    {
+      field: 'kibana.alert.rule.interval',
+      value: ['5m'],
+    },
+    {
+      field: 'kibana.alert.rule.type',
+      value: ['query'],
+    },
+    {
+      field: 'signal.original_event.sequence',
+      value: [940441],
+    },
+    {
+      field: 'host.architecture',
+      value: ['x86_64'],
+    },
+    {
+      field: 'kibana.alert.start',
+      value: ['2023-04-25T09:03:15.535Z'],
+    },
+    {
+      field: 'kibana.alert.rule.immutable',
+      value: ['false'],
+    },
+    {
+      field: 'process.Ext.code_signature.status',
+      value: ['trusted'],
+    },
+    {
+      field: 'kibana.alert.original_event.type',
+      value: ['creation'],
+    },
+    {
+      field: 'signal.original_event.module',
+      value: ['endpoint'],
+    },
+    {
+      field: 'agent.id',
+      value: ['2ea4b363-6a3f-449e-9d4e-c73ccf28f693'],
+    },
+    {
+      field: 'signal.rule.from',
+      value: ['now-6000000300s'],
+    },
+    {
+      field: 'kibana.alert.rule.enabled',
+      value: ['true'],
+    },
+    {
+      field: 'kibana.alert.rule.version',
+      value: ['1'],
+    },
+    {
+      field: 'kibana.alert.ancestors.type',
+      value: ['event', 'signal'],
+    },
+    {
+      field: 'file.Ext.windows.zone_identifier',
+      value: [-1],
+    },
+    {
+      field: 'user.name',
+      value: ['SYSTEM'],
+    },
+    {
+      field: 'signal.ancestors.index',
+      value: ['.ds-logs-endpoint.events.file-default-2022.10.08-000003', 'auditbeat-bulk'],
+    },
+    {
+      field: 'process.entity_id',
+      value: [
+        'MmVhNGIzNjMtNmEzZi00NDllLTlkNGUtYzczY2NmMjhmNjkzLTE3MDQtMTY2NDgwNjcwNi4yODUzODk4MDA=',
+      ],
+    },
+    {
+      field: 'host.ip',
+      value: ['10.200.0.223', 'fe80::eda9:848c:24ae:431d', '127.0.0.1', '::1'],
+    },
+    {
+      field: 'agent.type',
+      value: ['endpoint'],
+    },
+    {
+      field: 'signal.original_event.category',
+      value: ['file'],
+    },
+    {
+      field: 'process.executable.text',
+      value: ['C:\\Program Files\\Winlogbeat\\winlogbeat.exe'],
+    },
+    {
+      field: 'signal.original_event.id',
+      value: ['MnfiZLkz1DywMGBf++++9ApC'],
+    },
+    {
+      field: 'user.domain',
+      value: ['NT AUTHORITY'],
+    },
+    {
+      field: 'host.id',
+      value: ['526e76a2-1c82-4245-a179-4fcde1e608fc'],
+    },
+    {
+      field: 'process.Ext.code_signature.subject_name',
+      value: ['Elasticsearch, Inc.'],
+    },
+    {
+      field: 'timestamp',
+      value: [1666873459714],
+    },
+    {
+      field: 'signal.original_event.type',
+      value: ['creation'],
+    },
+    {
+      field: 'kibana.alert.rule.max_signals',
+      value: [100],
+    },
+    {
+      field: 'kibana.alert.rule.risk_score',
+      value: [21],
+    },
+    {
+      field: 'file.name',
+      value: ['.winlogbeat.yml.new'],
+    },
+    {
+      field: 'signal.rule.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.code_signature.status',
+      value: ['trusted'],
+    },
+    {
+      field: 'signal.original_event.dataset',
+      value: ['endpoint.events.file'],
+    },
+    {
+      field: 'kibana.alert.rule.consumer',
+      value: ['siem'],
+    },
+    {
+      field: 'kibana.alert.rule.indices',
+      value: [
+        'apm-*-transaction*',
+        'auditbeat-*',
+        'endgame-*',
+        'filebeat-*',
+        'logs-*',
+        'packetbeat-*',
+        'traces-apm*',
+        'winlogbeat-*',
+        '-*elastic-cloud-logs-*',
+      ],
+    },
+    {
+      field: 'kibana.alert.rule.category',
+      value: ['Custom Query Rule'],
+    },
+    {
+      field: 'host.os.Ext.variant',
+      value: ['Windows Server 2019 Datacenter'],
+    },
+    {
+      field: 'event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'event.ingested',
+      value: ['2022-10-14T14:00:50.000Z'],
+    },
+    {
+      field: '@timestamp',
+      value: ['2023-04-25T09:03:15.515Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'signal.rule.updated_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'host.os.platform',
+      value: ['windows'],
+    },
+    {
+      field: 'kibana.alert.rule.severity',
+      value: ['low'],
+    },
+    {
+      field: 'kibana.alert.original_event.agent_id_status',
+      value: ['verified'],
+    },
+    {
+      field: 'data_stream.dataset',
+      value: ['endpoint.events.file'],
+    },
+    {
+      field: 'host.risk.calculated_level',
+      value: ['Low'],
+    },
+    {
+      field: 'kibana.alert.rule.execution.uuid',
+      value: ['3e763264-9eab-4c6b-98e8-d51367491275'],
+    },
+    {
+      field: 'kibana.alert.uuid',
+      value: ['1066d5c3675d7eef4b9e84af64e795be39d1896ec791049eb87a39eb9675a2aa'],
+    },
+    {
+      field: 'kibana.alert.rule.meta.kibana_siem_app_url',
+      value: ['http://localhost:5601/app/security'],
+    },
+    {
+      field: 'kibana.version',
+      value: ['8.8.0'],
+    },
+    {
+      field: 'event.id',
+      value: ['MnfiZLkz1DywMGBf++++9ApC'],
+    },
+    {
+      field: 'signal.rule.license',
+      value: [''],
+    },
+    {
+      field: 'signal.ancestors.type',
+      value: ['event', 'signal'],
+    },
+    {
+      field: 'kibana.alert.rule.rule_id',
+      value: ['caf0db0c-c7e2-455e-89b8-6b0d73619ae5'],
+    },
+    {
+      field: 'kibana.alert.ancestors.rule',
+      value: ['532e0020-4a0c-11ed-9aa3-574e520c127d'],
+    },
+    {
+      field: 'user.name.text',
+      value: ['SYSTEM'],
+    },
+    {
+      field: 'file.path',
+      value: ['C:\\ProgramData\\winlogbeat\\.winlogbeat.yml.new'],
+    },
+    {
+      field: 'signal.rule.type',
+      value: ['query'],
+    },
+    {
+      field: 'kibana.alert.ancestors.id',
+      value: [
+        'cyjM1oMBw7Pvz6uQMxM4',
+        'd46d9fecad3a03741575f552c994ec9c9e5d1089557d49d125255bcd8d863a99',
+      ],
+    },
+    {
+      field: 'kibana.alert.rule.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.name.text',
+      value: ['winlogbeat.exe'],
+    },
+    {
+      field: 'host.os.full',
+      value: ['Windows Server 2019 Datacenter 1809 (10.0.17763.3406)'],
+    },
+    {
+      field: 'user.risk.calculated_level',
+      value: ['High'],
+    },
+    {
+      field: 'kibana.alert.url',
+      value: [
+        'http://localhost:5601/app/security/alerts/redirect/1066d5c3675d7eef4b9e84af64e795be39d1896ec791049eb87a39eb9675a2aa?index=.alerts-security.alerts-default&timestamp=2023-04-25T09:03:15.515Z',
+      ],
+    },
+    {
+      field: 'kibana.alert.rule.description',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'kibana.alert.building_block_type',
+      value: ['default'],
+    },
+    {
+      field: 'process.pid',
+      value: [1704],
+    },
+    {
+      field: 'kibana.alert.rule.producer',
+      value: ['siem'],
+    },
+    {
+      field: 'signal.rule.interval',
+      value: ['5m'],
+    },
+    {
+      field: 'signal.rule.created_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'kibana.alert.rule.to',
+      value: ['now'],
+    },
+    {
+      field: 'kibana.alert.rule.created_by',
+      value: ['elastic'],
+    },
+    {
+      field: 'kibana.alert.original_event.ingested',
+      value: ['2022-10-14T14:00:50.000Z'],
+    },
+    {
+      field: 'signal.rule.id',
+      value: ['023a0260-e348-11ed-bd43-632e972150d6'],
+    },
+    {
+      field: 'process.code_signature.subject_name',
+      value: ['Elasticsearch, Inc.'],
+    },
+    {
+      field: 'signal.rule.risk_score',
+      value: [21],
+    },
+    {
+      field: 'signal.reason',
+      value: [
+        'file event with process winlogbeat.exe, file .winlogbeat.yml.new, by SYSTEM on siem-windows-endpoint created low alert Custom Rule.',
+      ],
+    },
+    {
+      field: 'user.risk.calculated_score_norm',
+      value: [75.22127],
+    },
+    {
+      field: 'host.os.name',
+      value: ['Windows'],
+    },
+    {
+      field: 'kibana.alert.rule.name',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'host.name',
+      value: ['siem-windows-endpoint'],
+    },
+    {
+      field: 'signal.status',
+      value: ['open'],
+    },
+    {
+      field: 'event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'process.code_signature.trusted',
+      value: [true],
+    },
+    {
+      field: 'signal.rule.created_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'kibana.alert.workflow_status',
+      value: ['open'],
+    },
+    {
+      field: 'kibana.alert.original_event.created',
+      value: ['2022-10-14T14:00:27.258Z'],
+    },
+    {
+      field: 'kibana.alert.rule.uuid',
+      value: ['023a0260-e348-11ed-bd43-632e972150d6'],
+    },
+    {
+      field: 'kibana.alert.original_event.category',
+      value: ['file'],
+    },
+    {
+      field: 'kibana.alert.reason',
+      value: [
+        'file event with process winlogbeat.exe, file .winlogbeat.yml.new, by SYSTEM on siem-windows-endpoint created low alert Custom Rule.',
+      ],
+    },
+    {
+      field: 'data_stream.type',
+      value: ['logs'],
+    },
+    {
+      field: 'signal.ancestors.id',
+      value: [
+        'cyjM1oMBw7Pvz6uQMxM4',
+        'd46d9fecad3a03741575f552c994ec9c9e5d1089557d49d125255bcd8d863a99',
+      ],
+    },
+    {
+      field: 'signal.original_time',
+      value: ['2022-10-27T12:24:19.714Z'],
+    },
+    {
+      field: 'process.name',
+      value: ['winlogbeat.exe'],
+    },
+    {
+      field: 'file.Ext.header_bytes',
+      value: ['7570646174655f74696d653a20323032'],
+    },
+    {
+      field: 'ecs.version',
+      value: ['1.11.0'],
+    },
+    {
+      field: 'signal.rule.severity',
+      value: ['low'],
+    },
+    {
+      field: 'kibana.alert.ancestors.index',
+      value: ['.ds-logs-endpoint.events.file-default-2022.10.08-000003', 'auditbeat-bulk'],
+    },
+    {
+      field: 'event.created',
+      value: ['2022-10-14T14:00:27.258Z'],
+    },
+    {
+      field: 'process.Ext.code_signature.trusted',
+      value: [true],
+    },
+    {
+      field: 'file.extension',
+      value: ['new'],
+    },
+    {
+      field: 'agent.version',
+      value: ['8.5.0-SNAPSHOT'],
+    },
+    {
+      field: 'kibana.alert.depth',
+      value: [2],
+    },
+    {
+      field: 'process.thread.id',
+      value: [4100],
+    },
+    {
+      field: 'host.os.family',
+      value: ['windows'],
+    },
+    {
+      field: 'kibana.alert.rule.from',
+      value: ['now-6000000300s'],
+    },
+    {
+      field: 'kibana.alert.rule.revision',
+      value: [0],
+    },
+    {
+      field: 'kibana.alert.rule.parameters',
+      value: [
+        {
+          description: 'Custom Rule',
+          risk_score: 21,
+          severity: 'low',
+          building_block_type: 'default',
+          license: '',
+          meta: {
+            from: '100000000m',
+            kibana_siem_app_url: 'http://localhost:5601/app/security',
+          },
+          author: [],
+          false_positives: [],
+          from: 'now-6000000300s',
+          rule_id: 'caf0db0c-c7e2-455e-89b8-6b0d73619ae5',
+          max_signals: 100,
+          risk_score_mapping: [],
+          severity_mapping: [],
+          threat: [],
+          to: 'now',
+          references: [],
+          version: 1,
+          exceptions_list: [],
+          immutable: false,
+          related_integrations: [],
+          required_fields: [],
+          setup: '',
+          type: 'query',
+          language: 'kuery',
+          index: [
+            'apm-*-transaction*',
+            'auditbeat-*',
+            'endgame-*',
+            'filebeat-*',
+            'logs-*',
+            'packetbeat-*',
+            'traces-apm*',
+            'winlogbeat-*',
+            '-*elastic-cloud-logs-*',
+          ],
+          query: '*',
+          filters: [],
+        },
+      ],
+    },
+    {
+      field: 'signal.rule.version',
+      value: ['1'],
+    },
+    {
+      field: 'signal.original_event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'file.Ext.monotonic_id',
+      value: [157727],
+    },
+    {
+      field: 'kibana.alert.status',
+      value: ['active'],
+    },
+    {
+      field: 'kibana.alert.last_detected',
+      value: ['2023-04-25T09:03:15.535Z'],
+    },
+    {
+      field: 'kibana.alert.original_event.dataset',
+      value: ['endpoint.events.file'],
+    },
+    {
+      field: 'signal.depth',
+      value: [2],
+    },
+    {
+      field: 'signal.rule.immutable',
+      value: ['false'],
+    },
+    {
+      field: 'event.sequence',
+      value: [940441],
+    },
+    {
+      field: 'kibana.alert.rule.rule_type_id',
+      value: ['siem.queryRule'],
+    },
+    {
+      field: 'signal.rule.name',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'signal.rule.rule_id',
+      value: ['caf0db0c-c7e2-455e-89b8-6b0d73619ae5'],
+    },
+    {
+      field: 'event.module',
+      value: ['endpoint'],
+    },
+    {
+      field: 'host.os.kernel',
+      value: ['1809 (10.0.17763.3406)'],
+    },
+    {
+      field: 'kibana.alert.rule.license',
+      value: [''],
+    },
+    {
+      field: 'kibana.alert.original_event.kind',
+      value: ['signal'],
+    },
+    {
+      field: 'process.executable',
+      value: ['C:\\Program Files\\Winlogbeat\\winlogbeat.exe'],
+    },
+    {
+      field: 'file.Ext.entropy',
+      value: [5.273971112252894],
+    },
+    {
+      field: 'signal.rule.description',
+      value: ['Custom Rule'],
+    },
+    {
+      field: 'kibana.alert.rule.updated_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'data_stream.namespace',
+      value: ['default'],
+    },
+    {
+      field: 'file.size',
+      value: [1408],
+    },
+    {
+      field: 'message',
+      value: ['Endpoint file event'],
+    },
+    {
+      field: 'process.Ext.code_signature.exists',
+      value: [true],
+    },
+    {
+      field: 'kibana.alert.original_event.sequence',
+      value: [940441],
+    },
+    {
+      field: 'signal.original_event.action',
+      value: ['exec'],
+    },
+    {
+      field: 'kibana.alert.rule.created_at',
+      value: ['2023-04-25T09:03:13.384Z'],
+    },
+    {
+      field: 'signal.rule.to',
+      value: ['now'],
+    },
+    {
+      field: 'event.type',
+      value: ['creation'],
+    },
+    {
+      field: 'process.entry_leader.entity_id',
+      value: ['some98'],
+    },
+    {
+      field: 'kibana.space_ids',
+      value: ['default'],
+    },
+    {
+      field: 'kibana.alert.rule.meta.from',
+      value: ['100000000m'],
+    },
+    {
+      field: 'event.dataset',
+      value: ['endpoint.events.file'],
+    },
+    {
+      field: 'kibana.alert.original_time',
+      value: ['2022-10-27T12:24:19.714Z'],
+    },
+    {
+      field: '_id',
+      value: '1066d5c3675d7eef4b9e84af64e795be39d1896ec791049eb87a39eb9675a2aa',
+    },
+    {
+      field: '_index',
+      value: '.internal.alerts-security.alerts-default-000001',
+    },
+  ],
+];
diff --git a/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_cell_actions.test.tsx b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_cell_actions.test.tsx
new file mode 100644
index 00000000000000..16228ec4983580
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_cell_actions.test.tsx
@@ -0,0 +1,148 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  createSecuritySolutionStorageMock,
+  mockGlobalState,
+  SUB_PLUGINS_REDUCER,
+  TestProviders,
+} from '../../../common/mock';
+import { TableId } from '@kbn/securitysolution-data-table';
+import { renderHook } from '@testing-library/react-hooks';
+import { getUseCellActionsHook } from './use_cell_actions';
+import { columns as mockColumns, data as mockData } from './mock/data';
+import type {
+  EuiDataGridColumn,
+  EuiDataGridColumnCellAction,
+  EuiDataGridColumnCellActionProps,
+  EuiDataGridRefProps,
+} from '@elastic/eui';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { render, screen } from '@testing-library/react';
+import type { ComponentProps, JSXElementConstructor, PropsWithChildren } from 'react';
+import React from 'react';
+import { makeAction } from '../../../common/components/cell_actions/mocks';
+import { VIEW_SELECTION } from '../../../../common/constants';
+import { createStore } from '../../../common/store';
+import { createStartServicesMock } from '@kbn/timelines-plugin/public/mock';
+import { BehaviorSubject } from 'rxjs';
+
+const useCellActions = getUseCellActionsHook(TableId.test);
+
+const mockDataGridRef: {
+  current: EuiDataGridRefProps;
+} = {
+  current: {
+    closeCellPopover: jest.fn(),
+    setIsFullScreen: jest.fn(),
+    setFocusedCell: jest.fn(),
+    openCellPopover: jest.fn(),
+  },
+};
+
+const renderCellAction = (
+  columnCellAction: EuiDataGridColumnCellAction,
+  props: Partial<EuiDataGridColumnCellActionProps> = {}
+) => {
+  const CellActions = columnCellAction as JSXElementConstructor<EuiDataGridColumnCellActionProps>;
+  return render(
+    <CellActions
+      Component={EuiButtonEmpty}
+      colIndex={0}
+      rowIndex={0}
+      columnId={''}
+      isExpanded={false}
+      {...props}
+    />
+  );
+};
+
+const compatibleActions = [makeAction('action1')];
+
+const withCustomPropsAndCellActions = (props: ComponentProps<typeof TestProviders>) => {
+  const TestProviderWithCustomProps = (_props: PropsWithChildren<Record<string, unknown>>) => (
+    <TestProviders {...props}> {_props.children}</TestProviders>
+  );
+  TestProviderWithCustomProps.displayName = 'TestProviderWithCustomProps';
+  return TestProviderWithCustomProps;
+};
+
+const TestProviderWithActions = withCustomPropsAndCellActions({ cellActions: compatibleActions });
+
+const mockedStateWithEventRenderedView: typeof mockGlobalState = {
+  ...mockGlobalState,
+  dataTable: {
+    ...mockGlobalState.dataTable,
+    tableById: {
+      ...mockGlobalState.dataTable.tableById,
+      [TableId.test]: {
+        ...mockGlobalState.dataTable.tableById[TableId.test],
+        viewMode: VIEW_SELECTION.eventRenderedView,
+      },
+    },
+  },
+};
+export const kibanaObservable = new BehaviorSubject(createStartServicesMock());
+const { storage } = createSecuritySolutionStorageMock();
+
+const TestProviderWithCustomStateAndActions = withCustomPropsAndCellActions({
+  cellActions: compatibleActions,
+  store: createStore(
+    mockedStateWithEventRenderedView,
+    SUB_PLUGINS_REDUCER,
+    kibanaObservable,
+    storage
+  ),
+});
+
+describe('getUseCellActionsHook', () => {
+  it('should render cell actions correctly for gridView view', async () => {
+    const { result, waitForNextUpdate } = renderHook(
+      () =>
+        useCellActions({
+          columns: mockColumns as unknown as EuiDataGridColumn[],
+          data: mockData,
+          dataGridRef: mockDataGridRef,
+          ecsData: [],
+          pageSize: 10,
+        }),
+      {
+        wrapper: TestProviderWithActions,
+      }
+    );
+
+    await waitForNextUpdate();
+
+    const cellAction = result.current.getCellActions('host.name', 0)[0];
+
+    renderCellAction(cellAction);
+
+    expect(screen.getByTestId('dataGridColumnCellAction-action1')).toBeInTheDocument();
+  });
+
+  it('should not render cell actions correctly for eventRendered view', async () => {
+    const { result, waitForNextUpdate } = renderHook(
+      () =>
+        useCellActions({
+          columns: mockColumns as unknown as EuiDataGridColumn[],
+          data: mockData,
+          dataGridRef: mockDataGridRef,
+          ecsData: [],
+          pageSize: 10,
+        }),
+      {
+        wrapper: TestProviderWithCustomStateAndActions,
+      }
+    );
+
+    const cellAction = result.current.getCellActions('host.name', 0);
+
+    await waitForNextUpdate();
+
+    expect(cellAction).toHaveLength(0);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.test.tsx
new file mode 100644
index 00000000000000..60ed09ab4d0022
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.test.tsx
@@ -0,0 +1,132 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Router } from 'react-router-dom';
+import { AlertDetailsRedirect } from './alert_details_redirect';
+import {
+  createSecuritySolutionStorageMock,
+  mockGlobalState,
+  SUB_PLUGINS_REDUCER,
+  TestProviders,
+} from '../../../common/mock';
+import { createStore } from '../../../common/store';
+import { kibanaObservable } from '@kbn/timelines-plugin/public/mock';
+import {
+  ALERTS_PATH,
+  ALERT_DETAILS_REDIRECT_PATH,
+  DEFAULT_ALERTS_INDEX,
+} from '../../../../common/constants';
+import { mockHistory } from '../../../common/utils/route/mocks';
+
+jest.mock('../../../common/lib/kibana');
+
+const testAlertId = 'test-alert-id';
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useParams: () => ({
+    alertId: testAlertId,
+  }),
+}));
+
+const testIndex = '.someTestIndex';
+const testTimestamp = '2023-04-20T12:00:00.000Z';
+const mockPathname = `${ALERT_DETAILS_REDIRECT_PATH}/${testAlertId}`;
+
+describe('AlertDetailsRedirect', () => {
+  const { storage } = createSecuritySolutionStorageMock();
+  const store = createStore(mockGlobalState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+  afterEach(() => {
+    mockHistory.replace.mockClear();
+  });
+
+  describe('with index and timestamp query parameters set', () => {
+    it('redirects to the expected path with the correct query parameters', () => {
+      const testSearch = `?index=${testIndex}&timestamp=${testTimestamp}`;
+      const historyMock = {
+        ...mockHistory,
+        location: {
+          hash: '',
+          pathname: mockPathname,
+          search: testSearch,
+          state: '',
+        },
+      };
+      render(
+        <TestProviders store={store}>
+          <Router history={historyMock}>
+            <AlertDetailsRedirect />
+          </Router>
+        </TestProviders>
+      );
+
+      expect(historyMock.replace).toHaveBeenCalledWith({
+        hash: '',
+        pathname: ALERTS_PATH,
+        search: `?query=(language:kuery,query:'_id: ${testAlertId}')&timerange=(global:(linkTo:!(timeline,socTrends),timerange:(from:'${testTimestamp}',kind:absolute,to:'2023-04-20T12:05:00.000Z')),timeline:(linkTo:!(global,socTrends),timerange:(from:'2020-07-07T08:20:18.966Z',fromStr:now/d,kind:relative,to:'2020-07-08T08:20:18.966Z',toStr:now/d)))&eventFlyout=(panelView:eventDetail,params:(eventId:${testAlertId},indexName:${testIndex}))`,
+        state: undefined,
+      });
+    });
+  });
+
+  describe('with only index query parameter set', () => {
+    it('redirects to the expected path with the default global timestamp settings', () => {
+      const testSearch = `?index=${testIndex}`;
+      const historyMock = {
+        ...mockHistory,
+        location: {
+          hash: '',
+          pathname: mockPathname,
+          search: testSearch,
+          state: '',
+        },
+      };
+      render(
+        <TestProviders store={store}>
+          <Router history={historyMock}>
+            <AlertDetailsRedirect />
+          </Router>
+        </TestProviders>
+      );
+
+      expect(historyMock.replace).toHaveBeenCalledWith({
+        hash: '',
+        pathname: ALERTS_PATH,
+        search: `?query=(language:kuery,query:'_id: ${testAlertId}')&timerange=(global:(linkTo:!(timeline,socTrends),timerange:(from:'2020-07-07T08:20:18.966Z',kind:absolute,to:'2020-07-08T08:25:18.966Z')),timeline:(linkTo:!(global,socTrends),timerange:(from:'2020-07-07T08:20:18.966Z',fromStr:now/d,kind:relative,to:'2020-07-08T08:20:18.966Z',toStr:now/d)))&eventFlyout=(panelView:eventDetail,params:(eventId:${testAlertId},indexName:${testIndex}))`,
+        state: undefined,
+      });
+    });
+  });
+
+  describe('with no query parameters set', () => {
+    it('redirects to the expected path with the proper default alerts index and default global timestamp setting', () => {
+      const historyMock = {
+        ...mockHistory,
+        location: {
+          hash: '',
+          pathname: mockPathname,
+          search: '',
+          state: '',
+        },
+      };
+      render(
+        <TestProviders store={store}>
+          <Router history={historyMock}>
+            <AlertDetailsRedirect />
+          </Router>
+        </TestProviders>
+      );
+
+      expect(historyMock.replace).toHaveBeenCalledWith({
+        hash: '',
+        pathname: ALERTS_PATH,
+        search: `?query=(language:kuery,query:'_id: ${testAlertId}')&timerange=(global:(linkTo:!(timeline,socTrends),timerange:(from:'2020-07-07T08:20:18.966Z',kind:absolute,to:'2020-07-08T08:25:18.966Z')),timeline:(linkTo:!(global,socTrends),timerange:(from:'2020-07-07T08:20:18.966Z',fromStr:now/d,kind:relative,to:'2020-07-08T08:20:18.966Z',toStr:now/d)))&eventFlyout=(panelView:eventDetail,params:(eventId:${testAlertId},indexName:.internal${DEFAULT_ALERTS_INDEX}-default))`,
+        state: undefined,
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx b/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx
index c44fcfdd7e509b..ec8bf7c1526e30 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx
@@ -32,9 +32,9 @@ export const AlertDetailsRedirect = () => {
 
   // Default to the existing global timerange if we don't get this query param for whatever reason
   const fromTime = timestamp ?? globalTimerange.from;
-  // Add 1 millisecond to the alert timestamp as the alert table is non-inclusive of the end time
-  // So we have to extend slightly beyond the range of the timestamp of the given alert
-  const toTime = moment(timestamp ?? globalTimerange.to).add('1', 'millisecond');
+  // Add 5 minutes to the alert timestamp as the alert table is non-inclusive of the end time
+  // This also provides padding time if the user clears the `_id` filter after redirect to see other alerts
+  const toTime = moment(timestamp ?? globalTimerange.to).add('5', 'minutes');
 
   const timerange = encode({
     global: {
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/chart_panels/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/chart_panels/index.tsx
index 713f18bb908ad1..05954a5d0fbbc4 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/chart_panels/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/chart_panels/index.tsx
@@ -6,7 +6,6 @@
  */
 
 import type { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import type { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import type { Filter, Query } from '@kbn/es-query';
 import { EuiFlexItem, EuiLoadingContent } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
@@ -30,9 +29,9 @@ import {
 } from '../../../components/alerts_kpis/common/config';
 import { AlertsCountPanel } from '../../../components/alerts_kpis/alerts_count_panel';
 import { GROUP_BY_LABEL } from '../../../components/alerts_kpis/common/translations';
-import { RESET_GROUP_BY_FIELDS } from '../../../../common/components/chart_settings_popover/configurations/default/translations';
 import { useQueryToggle } from '../../../../common/containers/query_toggle';
 import type { AddFilterProps } from '../../../components/alerts_kpis/common/types';
+import { createResetGroupByFieldAction } from '../../../components/alerts_kpis/alerts_histogram_panel/helpers';
 
 const TREND_CHART_HEIGHT = 280; // px
 const CHART_PANEL_HEIGHT = 375; // px
@@ -124,33 +123,18 @@ const ChartPanelsComponent: React.FC<Props> = ({
     onResetStackByField1();
   }, [onResetStackByField0, onResetStackByField1]);
 
-  const resetGroupByFieldAction = useMemo(
-    () => [
-      {
-        id: 'resetGroupByField',
+  const handleResetGroupByFieldAction = useCallback(() => {
+    onReset();
+    updateCommonStackBy0(DEFAULT_STACK_BY_FIELD);
 
-        getDisplayName(context: ActionExecutionContext<object>): string {
-          return RESET_GROUP_BY_FIELDS;
-        },
-        getIconType(context: ActionExecutionContext<object>): string | undefined {
-          return 'editorRedo';
-        },
-        type: 'actionButton',
-        async isCompatible(context: ActionExecutionContext<object>): Promise<boolean> {
-          return true;
-        },
-        async execute(context: ActionExecutionContext<object>): Promise<void> {
-          onReset();
-          updateCommonStackBy0(DEFAULT_STACK_BY_FIELD);
+    if (updateCommonStackBy1 != null) {
+      updateCommonStackBy1(DEFAULT_STACK_BY_FIELD1);
+    }
+  }, [onReset, updateCommonStackBy0, updateCommonStackBy1]);
 
-          if (updateCommonStackBy1 != null) {
-            updateCommonStackBy1(DEFAULT_STACK_BY_FIELD1);
-          }
-        },
-        order: 5,
-      },
-    ],
-    [onReset, updateCommonStackBy0, updateCommonStackBy1]
+  const resetGroupByFieldAction = useMemo(
+    () => [createResetGroupByFieldAction({ callback: handleResetGroupByFieldAction, order: 5 })],
+    [handleResetGroupByFieldAction]
   );
 
   const chartOptionsContextMenu = useCallback(
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
index 13836e658eee72..c340c08ad7268e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
@@ -29,9 +29,10 @@ import { createFilterManagerMock } from '@kbn/data-plugin/public/query/filter_ma
 import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { createStubDataView } from '@kbn/data-views-plugin/common/data_view.stub';
 import { useListsConfig } from '../../containers/detection_engine/lists/use_lists_config';
-import type { FilterGroupProps } from '../../../common/components/filter_group/types';
 import { FilterGroup } from '../../../common/components/filter_group';
 import type { AlertsTableComponentProps } from '../../components/alerts_table/alerts_grouping';
+import { getMockedFilterGroupWithCustomFilters } from '../../../common/components/filter_group/mocks';
+import { TableId } from '@kbn/securitysolution-data-table';
 
 // Test will fail because we will to need to mock some core services to make the test work
 // For now let's forget about SiemSearchBar and QueryBar
@@ -171,7 +172,46 @@ const state: State = {
 };
 
 const { storage } = createSecuritySolutionStorageMock();
-const store = createStore(state, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+
+const getStoreWithCustomState = (newState: State = state) => {
+  return createStore(newState, SUB_PLUGINS_REDUCER, kibanaObservable, storage);
+};
+
+const store = getStoreWithCustomState();
+
+const stateWithBuildingBlockAlertsEnabled: State = {
+  ...state,
+  dataTable: {
+    ...state.dataTable,
+    tableById: {
+      ...state.dataTable.tableById,
+      [TableId.test]: {
+        ...state.dataTable.tableById[TableId.test],
+        additionalFilters: {
+          showOnlyThreatIndicatorAlerts: false,
+          showBuildingBlockAlerts: true,
+        },
+      },
+    },
+  },
+};
+
+const stateWithThreatIndicatorsAlertEnabled: State = {
+  ...state,
+  dataTable: {
+    ...state.dataTable,
+    tableById: {
+      ...state.dataTable.tableById,
+      [TableId.test]: {
+        ...state.dataTable.tableById[TableId.test],
+        additionalFilters: {
+          showOnlyThreatIndicatorAlerts: true,
+          showBuildingBlockAlerts: false,
+        },
+      },
+    },
+  },
+};
 
 jest.mock('../../components/alerts_table/timeline_actions/use_add_bulk_to_timeline', () => ({
   useAddBulkToTimelineAction: jest.fn(() => {}),
@@ -230,69 +270,136 @@ describe('DetectionEnginePageComponent', () => {
     });
   });
 
-  it('the pageFiltersUpdateHandler updates status when a multi status filter is passed', async () => {
-    (FilterGroup as jest.Mock).mockImplementationOnce(({ onFilterChange }: FilterGroupProps) => {
-      if (onFilterChange) {
-        // once with status
-        onFilterChange([
-          {
-            meta: {
-              index: 'security-solution-default',
-              key: 'kibana.alert.workflow_status',
-              params: ['open', 'acknowledged'],
-            },
-          },
-        ]);
-      }
-      return <span />;
-    });
+  it('should pass building block filter to the alert Page Controls', async () => {
+    const MockedFilterGroup = FilterGroup as jest.Mock;
+    MockedFilterGroup.mockImplementationOnce(getMockedFilterGroupWithCustomFilters());
     await waitFor(() => {
       render(
-        <TestProviders store={store}>
+        <TestProviders store={getStoreWithCustomState(stateWithBuildingBlockAlertsEnabled)}>
           <Router history={mockHistory}>
             <DetectionEnginePage />
           </Router>
         </TestProviders>
       );
     });
-    // when statusFilter updates, we call mockStatusCapture in test mocks
-    expect(mockStatusCapture).toHaveBeenNthCalledWith(1, []);
-    expect(mockStatusCapture).toHaveBeenNthCalledWith(2, ['open', 'acknowledged']);
-  });
 
-  it('the pageFiltersUpdateHandler updates status when a single status filter is passed', async () => {
-    (FilterGroup as jest.Mock).mockImplementationOnce(({ onFilterChange }: FilterGroupProps) => {
-      if (onFilterChange) {
-        // once with status
-        onFilterChange([
+    expect(MockedFilterGroup).toHaveBeenCalledWith(
+      expect.objectContaining({
+        filters: [
           {
             meta: {
-              index: 'security-solution-default',
-              key: 'kibana.alert.workflow_status',
+              alias: null,
+              negate: true,
               disabled: false,
+              type: 'exists',
+              key: 'kibana.alert.building_block_type',
+              value: 'exists',
             },
             query: {
-              match_phrase: {
-                'kibana.alert.workflow_status': 'open',
+              exists: {
+                field: 'kibana.alert.building_block_type',
               },
             },
           },
+        ],
+      }),
+      expect.anything()
+    );
+  });
+
+  it('should pass threat Indicator filter to the alert Page Controls', async () => {
+    const MockedFilterGroup = FilterGroup as jest.Mock;
+    MockedFilterGroup.mockImplementationOnce(getMockedFilterGroupWithCustomFilters());
+
+    await waitFor(() => {
+      render(
+        <TestProviders store={getStoreWithCustomState(stateWithThreatIndicatorsAlertEnabled)}>
+          <Router history={mockHistory}>
+            <DetectionEnginePage />
+          </Router>
+        </TestProviders>
+      );
+    });
+
+    expect(MockedFilterGroup).toHaveBeenCalledWith(
+      expect.objectContaining({
+        filters: [
           {
             meta: {
-              index: 'security-solution-default',
-              key: 'kibana.alert.severity',
+              alias: null,
+              negate: true,
               disabled: false,
+              type: 'exists',
+              key: 'kibana.alert.building_block_type',
+              value: 'exists',
             },
             query: {
-              match_phrase: {
-                'kibana.alert.severity': 'low',
+              exists: {
+                field: 'kibana.alert.building_block_type',
               },
             },
           },
-        ]);
-      }
-      return <span />;
+        ],
+      }),
+      expect.anything()
+    );
+  });
+
+  it('the pageFiltersUpdateHandler updates status when a multi status filter is passed', async () => {
+    (FilterGroup as jest.Mock).mockImplementationOnce(
+      getMockedFilterGroupWithCustomFilters([
+        {
+          meta: {
+            index: 'security-solution-default',
+            key: 'kibana.alert.workflow_status',
+            params: ['open', 'acknowledged'],
+          },
+        },
+      ])
+    );
+    await waitFor(() => {
+      render(
+        <TestProviders store={store}>
+          <Router history={mockHistory}>
+            <DetectionEnginePage />
+          </Router>
+        </TestProviders>
+      );
     });
+    // when statusFilter updates, we call mockStatusCapture in test mocks
+    expect(mockStatusCapture).toHaveBeenNthCalledWith(1, []);
+    expect(mockStatusCapture).toHaveBeenNthCalledWith(2, ['open', 'acknowledged']);
+  });
+
+  it('the pageFiltersUpdateHandler updates status when a single status filter is passed', async () => {
+    (FilterGroup as jest.Mock).mockImplementationOnce(
+      getMockedFilterGroupWithCustomFilters([
+        {
+          meta: {
+            index: 'security-solution-default',
+            key: 'kibana.alert.workflow_status',
+            disabled: false,
+          },
+          query: {
+            match_phrase: {
+              'kibana.alert.workflow_status': 'open',
+            },
+          },
+        },
+        {
+          meta: {
+            index: 'security-solution-default',
+            key: 'kibana.alert.severity',
+            disabled: false,
+          },
+          query: {
+            match_phrase: {
+              'kibana.alert.severity': 'low',
+            },
+          },
+        },
+      ])
+    );
     await waitFor(() => {
       render(
         <TestProviders store={store}>
@@ -308,26 +415,22 @@ describe('DetectionEnginePageComponent', () => {
   });
 
   it('the pageFiltersUpdateHandler clears status when no status filter is passed', async () => {
-    (FilterGroup as jest.Mock).mockImplementationOnce(({ onFilterChange }: FilterGroupProps) => {
-      if (onFilterChange) {
-        // once with status
-        onFilterChange([
-          {
-            meta: {
-              index: 'security-solution-default',
-              key: 'kibana.alert.severity',
-              disabled: false,
-            },
-            query: {
-              match_phrase: {
-                'kibana.alert.severity': 'low',
-              },
+    (FilterGroup as jest.Mock).mockImplementationOnce(
+      getMockedFilterGroupWithCustomFilters([
+        {
+          meta: {
+            index: 'security-solution-default',
+            key: 'kibana.alert.severity',
+            disabled: false,
+          },
+          query: {
+            match_phrase: {
+              'kibana.alert.severity': 'low',
             },
           },
-        ]);
-      }
-      return <span />;
-    });
+        },
+      ])
+    );
     await waitFor(() => {
       render(
         <TestProviders store={store}>
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
index 1ccfaea4584ee4..27c9a27e130b4f 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
@@ -77,13 +77,13 @@ import { useKibana } from '../../../common/lib/kibana';
 import { NoPrivileges } from '../../../common/components/no_privileges';
 import { HeaderPage } from '../../../common/components/header_page';
 import { LandingPageComponent } from '../../../common/components/landing_page';
-import { DetectionPageFilterSet } from '../../components/detection_page_filters';
 import type { FilterGroupHandler } from '../../../common/components/filter_group/types';
 import type { Status } from '../../../../common/detection_engine/schemas/common/schemas';
 import { AlertsTableFilterGroup } from '../../components/alerts_table/alerts_filter_group';
 import { GroupedAlertsTable } from '../../components/alerts_table/alerts_grouping';
 import { AlertsTableComponent } from '../../components/alerts_table';
 import type { AddFilterProps } from '../../components/alerts_kpis/common/types';
+import { DetectionPageFilterSet } from '../../components/detection_page_filters';
 /**
  * Need a 100% height here to account for the graph/analyze tool, which sets no explicit height parameters, but fills the available space.
  */
@@ -172,6 +172,14 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
 
   const { filterManager } = data.query;
 
+  const topLevelFilters = useMemo(() => {
+    return [
+      ...filters,
+      ...buildShowBuildingBlockFilter(showBuildingBlockAlerts),
+      ...buildThreatMatchFilter(showOnlyThreatIndicatorAlerts),
+    ];
+  }, [showBuildingBlockAlerts, showOnlyThreatIndicatorAlerts, filters]);
+
   const alertPageFilters = useMemo(() => {
     if (arePageFiltersEnabled) {
       return detectionPageFilters;
@@ -230,13 +238,8 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
   );
 
   const alertsDefaultFilters = useMemo(
-    () => [
-      ...filters,
-      ...buildShowBuildingBlockFilter(showBuildingBlockAlerts),
-      ...buildThreatMatchFilter(showOnlyThreatIndicatorAlerts),
-      ...(alertPageFilters ?? []),
-    ],
-    [filters, showBuildingBlockAlerts, showOnlyThreatIndicatorAlerts, alertPageFilters]
+    () => [...topLevelFilters, ...(alertPageFilters ?? [])],
+    [topLevelFilters, alertPageFilters]
   );
 
   // AlertsTable manages global filters itself, so not including `filters`
@@ -350,7 +353,7 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
         <DetectionPageFilterSet
           dataViewId={dataViewId}
           onFilterChange={pageFiltersUpdateHandler}
-          filters={filters}
+          filters={topLevelFilters}
           query={query}
           timeRange={{
             from,
@@ -362,10 +365,10 @@ const DetectionEnginePageComponent: React.FC<DetectionEngineComponentProps> = ({
         />
       ),
     [
+      topLevelFilters,
       arePageFiltersEnabled,
       dataViewId,
       statusFilter,
-      filters,
       onFilterGroupChangedCallback,
       pageFiltersUpdateHandler,
       showUpdating,
diff --git a/x-pack/plugins/security_solution/public/explore/components/risk_score/risk_details_tab_body/index.tsx b/x-pack/plugins/security_solution/public/explore/components/risk_score/risk_details_tab_body/index.tsx
index 514fabdb16a96c..1bfec441d36421 100644
--- a/x-pack/plugins/security_solution/public/explore/components/risk_score/risk_details_tab_body/index.tsx
+++ b/x-pack/plugins/security_solution/public/explore/components/risk_score/risk_details_tab_body/index.tsx
@@ -30,7 +30,7 @@ import type { HostRiskScore, UserRiskScore } from '../../../../../common/search_
 import { buildEntityNameFilter, RiskScoreEntity } from '../../../../../common/search_strategy';
 import type { UsersComponentsQueryProps } from '../../../users/pages/navigation/types';
 import type { HostsComponentsQueryProps } from '../../../hosts/pages/navigation/types';
-import { useDashboardButtonHref } from '../../../../common/hooks/use_dashboard_button_href';
+import { useDashboardHref } from '../../../../common/hooks/use_dashboard_href';
 import { RiskScoresNoDataDetected } from '../risk_score_onboarding/risk_score_no_data_detected';
 
 const StyledEuiFlexGroup = styled(EuiFlexGroup)`
@@ -62,11 +62,7 @@ const RiskDetailsTabBodyComponent: React.FC<
       : usersSelectors.userRiskScoreSeverityFilterSelector()(state)
   );
 
-  const { buttonHref } = useDashboardButtonHref({
-    to: endDate,
-    from: startDate,
-    title: getDashboardTitle(riskEntity),
-  });
+  const buttonHref = useDashboardHref({ title: getDashboardTitle(riskEntity) });
 
   const timerange = useMemo(
     () => ({
@@ -182,6 +178,8 @@ const RiskDetailsTabBodyComponent: React.FC<
             isDisabled={!buttonHref}
             data-test-subj={`risky-${riskEntity}s-view-dashboard-button`}
             target="_blank"
+            iconType="popout"
+            iconSide="right"
           >
             {i18n.VIEW_DASHBOARD_BUTTON}
           </EuiButton>
diff --git a/x-pack/plugins/security_solution/public/explore/network/components/embeddables/embedded_map.test.tsx b/x-pack/plugins/security_solution/public/explore/network/components/embeddables/embedded_map.test.tsx
index 4a78cd89399210..a4a709b9e6f1ad 100644
--- a/x-pack/plugins/security_solution/public/explore/network/components/embeddables/embedded_map.test.tsx
+++ b/x-pack/plugins/security_solution/public/explore/network/components/embeddables/embedded_map.test.tsx
@@ -17,6 +17,7 @@ import { createEmbeddable } from './create_embeddable';
 import { useSourcererDataView } from '../../../../common/containers/sourcerer';
 import { getLayerList } from './map_config';
 import { useIsFieldInIndexPattern } from '../../../containers/fields';
+import { buildTimeRangeFilter } from '../../../../detections/components/alerts_table/helpers';
 
 jest.mock('./create_embeddable');
 jest.mock('./map_config');
@@ -62,6 +63,7 @@ const packetbeatDataView = { id: '28995490-023d-11eb-bcb6-6ba0578012a9', title:
 const mockSelector = {
   kibanaDataViews: [filebeatDataView, packetbeatDataView],
 };
+const mockUpdateInput = jest.fn();
 const embeddableValue = {
   destroyed: false,
   enhancements: { dynamicActions: {} },
@@ -88,7 +90,7 @@ const embeddableValue = {
   setEventHandlers: jest.fn(),
   setRenderTooltipContent: jest.fn(),
   type: 'map',
-  updateInput: jest.fn(),
+  updateInput: mockUpdateInput,
 };
 const testProps = {
   endDate: '2019-08-28T05:50:57.877Z',
@@ -122,6 +124,20 @@ describe('EmbeddedMapComponent', () => {
     });
   });
 
+  test('calls updateInput with time range filter', async () => {
+    render(
+      <TestProviders>
+        <EmbeddedMapComponent {...testProps} />
+      </TestProviders>
+    );
+    await waitFor(() => {
+      expect(mockUpdateInput).toHaveBeenCalledTimes(2);
+      expect(mockUpdateInput).toHaveBeenNthCalledWith(2, {
+        filters: buildTimeRangeFilter(testProps.startDate, testProps.endDate),
+      });
+    });
+  });
+
   test('renders services.embeddable.EmbeddablePanel', async () => {
     const { getByTestId, queryByTestId } = render(
       <TestProviders>
diff --git a/x-pack/plugins/security_solution/public/explore/network/components/embeddables/embedded_map.tsx b/x-pack/plugins/security_solution/public/explore/network/components/embeddables/embedded_map.tsx
index 8e94720398d704..e7869b3be61374 100644
--- a/x-pack/plugins/security_solution/public/explore/network/components/embeddables/embedded_map.tsx
+++ b/x-pack/plugins/security_solution/public/explore/network/components/embeddables/embedded_map.tsx
@@ -16,6 +16,7 @@ import type { ErrorEmbeddable } from '@kbn/embeddable-plugin/public';
 import { isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
 import type { MapEmbeddable } from '@kbn/maps-plugin/public/embeddable';
 import { isEqual } from 'lodash/fp';
+import { buildTimeRangeFilter } from '../../../../detections/components/alerts_table/helpers';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { useIsFieldInIndexPattern } from '../../../containers/fields';
 import { Loader } from '../../../../common/components/loader';
@@ -242,22 +243,19 @@ export const EmbeddedMapComponent = ({
     }
   }, [embeddable, query]);
 
-  useEffect(() => {
-    if (embeddable != null) {
-      embeddable.updateInput({ filters });
-    }
-  }, [embeddable, filters]);
+  const timeRangeFilter = useMemo(
+    () => buildTimeRangeFilter(startDate, endDate),
+    [startDate, endDate]
+  );
 
-  // DateRange updated useEffect
   useEffect(() => {
-    if (embeddable != null && startDate != null && endDate != null) {
-      const timeRange = {
-        from: new Date(startDate).toISOString(),
-        to: new Date(endDate).toISOString(),
-      };
-      embeddable.updateInput({ timeRange });
+    if (embeddable != null) {
+      // pass time range as filter instead of via timeRange param
+      // if user's data view does not have a time field, the timeRange param is not applied
+      // using filter will always apply the time range
+      embeddable.updateInput({ filters: [...filters, ...timeRangeFilter] });
     }
-  }, [embeddable, startDate, endDate]);
+  }, [embeddable, filters, timeRangeFilter]);
 
   const setDefaultMapVisibility = useCallback(
     (isOpen: boolean) => {
diff --git a/x-pack/plugins/security_solution/public/index.ts b/x-pack/plugins/security_solution/public/index.ts
index 1f6f121e042093..7ac596d087fca3 100644
--- a/x-pack/plugins/security_solution/public/index.ts
+++ b/x-pack/plugins/security_solution/public/index.ts
@@ -7,10 +7,10 @@
 
 import type { PluginInitializerContext } from '@kbn/core/public';
 import { Plugin } from './plugin';
-import type { PluginSetup } from './types';
+import type { PluginSetup, PluginStart } from './types';
 export type { TimelineModel } from './timelines/store/timeline/model';
 
 export const plugin = (context: PluginInitializerContext): Plugin => new Plugin(context);
 
-export type { PluginSetup };
+export type { PluginSetup, PluginStart };
 export { Plugin };
diff --git a/x-pack/plugins/security_solution/public/landing_pages/pages/explore.tsx b/x-pack/plugins/security_solution/public/landing_pages/pages/explore.tsx
index 17a0d7569b9653..26dd3009e1d03a 100644
--- a/x-pack/plugins/security_solution/public/landing_pages/pages/explore.tsx
+++ b/x-pack/plugins/security_solution/public/landing_pages/pages/explore.tsx
@@ -7,14 +7,14 @@
 import React from 'react';
 import { SecurityPageName } from '../../app/types';
 import { HeaderPage } from '../../common/components/header_page';
-import { useAppRootNavLink } from '../../common/components/navigation/nav_links';
+import { useRootNavLink } from '../../common/links/nav_links';
 import { SecuritySolutionPageWrapper } from '../../common/components/page_wrapper';
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { LandingLinksImages } from '../components/landing_links_images';
 import { EXPLORE_PAGE_TITLE } from './translations';
 
 export const ExploreLandingPage = () => {
-  const exploreLinks = useAppRootNavLink(SecurityPageName.exploreLanding)?.links ?? [];
+  const exploreLinks = useRootNavLink(SecurityPageName.exploreLanding)?.links ?? [];
 
   return (
     <SecuritySolutionPageWrapper>
diff --git a/x-pack/plugins/security_solution/public/landing_pages/pages/manage.test.tsx b/x-pack/plugins/security_solution/public/landing_pages/pages/manage.test.tsx
index 67eb06b60cca69..e900fad75546a1 100644
--- a/x-pack/plugins/security_solution/public/landing_pages/pages/manage.test.tsx
+++ b/x-pack/plugins/security_solution/public/landing_pages/pages/manage.test.tsx
@@ -10,14 +10,14 @@ import React from 'react';
 import { SecurityPageName } from '../../app/types';
 import { TestProviders } from '../../common/mock';
 import { ManagementCategories } from './manage';
-import type { NavLinkItem } from '../../common/components/navigation/types';
+import type { NavigationLink } from '../../common/links';
 
 const RULES_ITEM_LABEL = 'elastic rules!';
 const EXCEPTIONS_ITEM_LABEL = 'exceptional!';
 const CATEGORY_1_LABEL = 'first tests category';
 const CATEGORY_2_LABEL = 'second tests category';
 
-const defaultAppManageLink: NavLinkItem = {
+const defaultAppManageLink: NavigationLink = {
   id: SecurityPageName.administration,
   title: 'admin',
   categories: [
@@ -47,8 +47,8 @@ const defaultAppManageLink: NavLinkItem = {
 };
 
 const mockAppManageLink = jest.fn(() => defaultAppManageLink);
-jest.mock('../../common/components/navigation/nav_links', () => ({
-  useAppRootNavLink: () => mockAppManageLink(),
+jest.mock('../../common/links/nav_links', () => ({
+  useRootNavLink: () => mockAppManageLink(),
 }));
 
 describe('ManagementCategories', () => {
diff --git a/x-pack/plugins/security_solution/public/landing_pages/pages/manage.tsx b/x-pack/plugins/security_solution/public/landing_pages/pages/manage.tsx
index cb77921a0b6739..37e2391801caca 100644
--- a/x-pack/plugins/security_solution/public/landing_pages/pages/manage.tsx
+++ b/x-pack/plugins/security_solution/public/landing_pages/pages/manage.tsx
@@ -10,8 +10,8 @@ import styled from 'styled-components';
 
 import { SecurityPageName } from '../../app/types';
 import { HeaderPage } from '../../common/components/header_page';
-import { useAppRootNavLink } from '../../common/components/navigation/nav_links';
-import type { NavLinkItem } from '../../common/components/navigation/types';
+import { useRootNavLink } from '../../common/links/nav_links';
+import type { NavigationLink } from '../../common/links';
 import { SecuritySolutionPageWrapper } from '../../common/components/page_wrapper';
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { LandingLinksIcons } from '../components/landing_links_icons';
@@ -30,14 +30,14 @@ const StyledEuiHorizontalRule = styled(EuiHorizontalRule)`
   margin-bottom: ${({ theme }) => theme.eui.euiSizeL};
 `;
 
-type ManagementCategories = Array<{ label: string; links: NavLinkItem[] }>;
+type ManagementCategories = Array<{ label: string; links: NavigationLink[] }>;
 const useManagementCategories = (): ManagementCategories => {
-  const { links = [], categories = [] } = useAppRootNavLink(SecurityPageName.administration) ?? {};
+  const { links = [], categories = [] } = useRootNavLink(SecurityPageName.administration) ?? {};
 
   const manageLinksById = Object.fromEntries(links.map((link) => [link.id, link]));
 
   return categories.reduce<ManagementCategories>((acc, { label, linkIds }) => {
-    const linksItem = linkIds.reduce<NavLinkItem[]>((linksAcc, linkId) => {
+    const linksItem = linkIds.reduce<NavigationLink[]>((linksAcc, linkId) => {
       if (manageLinksById[linkId]) {
         linksAcc.push(manageLinksById[linkId]);
       }
diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/isolate.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/isolate.cy.ts
index 392e2ed310ccd8..cc949b39404e9a 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/isolate.cy.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/isolate.cy.ts
@@ -7,7 +7,7 @@
 
 import { getEndpointListPath } from '../../../common/routing';
 import {
-  checkEndpointListForOnlyIsolatedHosts,
+  checkEndpointIsIsolated,
   checkFlyoutEndpointIsolation,
   filterOutIsolatedHosts,
   interceptActionRequests,
@@ -30,8 +30,10 @@ import { indexEndpointRuleAlerts } from '../../tasks/index_endpoint_rule_alerts'
 
 describe('Isolate command', () => {
   describe('from Manage', () => {
-    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
-    let isolatedEndpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
+    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts> | undefined;
+    let isolatedEndpointData: ReturnTypeFromChainable<typeof indexEndpointHosts> | undefined;
+    let isolatedEndpointHostnames: [string, string];
+    let endpointHostnames: [string, string];
 
     before(() => {
       indexEndpointHosts({
@@ -40,6 +42,10 @@ describe('Isolate command', () => {
         isolation: false,
       }).then((indexEndpoints) => {
         endpointData = indexEndpoints;
+        endpointHostnames = [
+          endpointData.data.hosts[0].host.name,
+          endpointData.data.hosts[1].host.name,
+        ];
       });
 
       indexEndpointHosts({
@@ -48,64 +54,68 @@ describe('Isolate command', () => {
         isolation: true,
       }).then((indexEndpoints) => {
         isolatedEndpointData = indexEndpoints;
+        isolatedEndpointHostnames = [
+          isolatedEndpointData.data.hosts[0].host.name,
+          isolatedEndpointData.data.hosts[1].host.name,
+        ];
       });
     });
 
     after(() => {
       if (endpointData) {
         endpointData.cleanup();
-        // @ts-expect-error ignore setting to undefined
         endpointData = undefined;
       }
 
       if (isolatedEndpointData) {
         isolatedEndpointData.cleanup();
-        // @ts-expect-error ignore setting to undefined
         isolatedEndpointData = undefined;
       }
     });
+
     beforeEach(() => {
       login();
     });
+
     it('should allow filtering endpoint by Isolated status', () => {
       cy.visit(APP_PATH + getEndpointListPath({ name: 'endpointList' }));
       closeAllToasts();
       filterOutIsolatedHosts();
-      cy.contains('Showing 2 endpoints');
-      checkEndpointListForOnlyIsolatedHosts();
+      isolatedEndpointHostnames.forEach(checkEndpointIsIsolated);
+      endpointHostnames.forEach((hostname) => {
+        cy.contains(hostname).should('not.exist');
+      });
     });
   });
 
   describe('from Alerts', () => {
-    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
-    let alertData: ReturnTypeFromChainable<typeof indexEndpointRuleAlerts>;
+    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts> | undefined;
+    let alertData: ReturnTypeFromChainable<typeof indexEndpointRuleAlerts> | undefined;
     let hostname: string;
 
     before(() => {
-      indexEndpointHosts({ withResponseActions: false, isolation: false })
-        .then((indexEndpoints) => {
+      indexEndpointHosts({ withResponseActions: false, isolation: false }).then(
+        (indexEndpoints) => {
           endpointData = indexEndpoints;
           hostname = endpointData.data.hosts[0].host.name;
-        })
-        .then(() => {
+
           return indexEndpointRuleAlerts({
             endpointAgentId: endpointData.data.hosts[0].agent.id,
             endpointHostname: endpointData.data.hosts[0].host.name,
             endpointIsolated: false,
           });
-        });
+        }
+      );
     });
 
     after(() => {
       if (endpointData) {
         endpointData.cleanup();
-        // @ts-expect-error ignore setting to undefined
         endpointData = undefined;
       }
 
       if (alertData) {
         alertData.cleanup();
-        // @ts-expect-error ignore setting to undefined
         alertData = undefined;
       }
     });
@@ -180,9 +190,9 @@ describe('Isolate command', () => {
   });
 
   describe('from Cases', () => {
-    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
-    let caseData: ReturnTypeFromChainable<typeof indexNewCase>;
-    let alertData: ReturnTypeFromChainable<typeof indexEndpointRuleAlerts>;
+    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts> | undefined;
+    let caseData: ReturnTypeFromChainable<typeof indexNewCase> | undefined;
+    let alertData: ReturnTypeFromChainable<typeof indexEndpointRuleAlerts> | undefined;
     let caseAlertActions: ReturnType<typeof addAlertsToCase>;
     let alertId: string;
     let caseUrlPath: string;
@@ -198,41 +208,39 @@ describe('Isolate command', () => {
         .then((indexEndpoints) => {
           endpointData = indexEndpoints;
           hostname = endpointData.data.hosts[0].host.name;
-        })
-        .then(() => {
+
           return indexEndpointRuleAlerts({
             endpointAgentId: endpointData.data.hosts[0].agent.id,
             endpointHostname: endpointData.data.hosts[0].host.name,
             endpointIsolated: false,
-          }).then((indexedAlert) => {
-            alertData = indexedAlert;
-            alertId = alertData.alerts[0]._id;
           });
         })
-        .then(() => {
-          caseAlertActions = addAlertsToCase({
-            caseId: caseData.data.id,
-            alertIds: [alertId],
-          });
+        .then((indexedAlert) => {
+          alertData = indexedAlert;
+          alertId = alertData.alerts[0]._id;
+
+          if (caseData) {
+            caseAlertActions = addAlertsToCase({
+              caseId: caseData.data.id,
+              alertIds: [alertId],
+            });
+          }
         });
     });
 
     after(() => {
       if (caseData) {
         caseData.cleanup();
-        // @ts-expect-error ignore setting to undefined
         caseData = undefined;
       }
 
       if (endpointData) {
         endpointData.cleanup();
-        // @ts-expect-error ignore setting to undefined
         endpointData = undefined;
       }
 
       if (alertData) {
         alertData.cleanup();
-        // @ts-expect-error ignore setting to undefined
         alertData = undefined;
       }
     });
diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/policy_response.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/policy_response.cy.ts
index 3100d4a64fec74..63d9f26514ba54 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/policy_response.cy.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/policy_response.cy.ts
@@ -15,7 +15,8 @@ import { navigateToFleetAgentDetails } from '../../screens/fleet';
 import { EndpointPolicyResponseGenerator } from '../../../../../common/endpoint/data_generators/endpoint_policy_response_generator';
 import { descriptions } from '../../../components/policy_response/policy_response_friendly_names';
 
-describe('Endpoint Policy Response', () => {
+// FLAKY: https://github.com/elastic/security-team/issues/6518
+describe.skip('Endpoint Policy Response', () => {
   let loadedEndpoint: CyIndexEndpointHosts;
   let endpointMetadata: HostMetadata;
   let loadedPolicyResponse: IndexedEndpointPolicyResponse;
diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/response_actions.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/response_actions.cy.ts
index f98850f8002c81..baca2aec7474d6 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/response_actions.cy.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/response_actions.cy.ts
@@ -150,7 +150,7 @@ describe('Response actions', () => {
       cleanupRule(ruleId);
     });
 
-    // flaky
+    // FLAKY: https://github.com/elastic/security-team/issues/6518
     it.skip('All response action controls are disabled', () => {
       visitRuleActions(ruleId);
       cy.getByTestSubj('response-actions-wrapper').within(() => {
diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/response_console.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/response_console.cy.ts
new file mode 100644
index 00000000000000..2877a91f6b63ce
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/mocked_data/response_console.cy.ts
@@ -0,0 +1,230 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 { ActionDetails } from '../../../../../common/endpoint/types';
+import type { ReturnTypeFromChainable } from '../../types';
+import { indexEndpointHosts } from '../../tasks/index_endpoint_hosts';
+import {
+  checkReturnedProcessesTable,
+  inputConsoleCommand,
+  openResponseConsoleFromEndpointList,
+  performCommandInputChecks,
+  submitCommand,
+  waitForEndpointListPageToBeLoaded,
+} from '../../tasks/response_console';
+import {
+  checkEndpointIsIsolated,
+  checkEndpointIsNotIsolated,
+  interceptActionRequests,
+  sendActionResponse,
+} from '../../tasks/isolate';
+import { login } from '../../tasks/login';
+
+describe('Response console', () => {
+  beforeEach(() => {
+    login();
+  });
+
+  describe('Isolate command', () => {
+    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
+    let endpointHostname: string;
+    let isolateRequestResponse: ActionDetails;
+
+    before(() => {
+      indexEndpointHosts({ withResponseActions: false, isolation: false }).then(
+        (indexEndpoints) => {
+          endpointData = indexEndpoints;
+          endpointHostname = endpointData.data.hosts[0].host.name;
+        }
+      );
+    });
+
+    after(() => {
+      if (endpointData) {
+        endpointData.cleanup();
+        // @ts-expect-error ignore setting to undefined
+        endpointData = undefined;
+      }
+    });
+
+    it('should isolate host from response console', () => {
+      waitForEndpointListPageToBeLoaded(endpointHostname);
+      checkEndpointIsNotIsolated(endpointHostname);
+      openResponseConsoleFromEndpointList();
+      performCommandInputChecks('isolate');
+      interceptActionRequests((responseBody) => {
+        isolateRequestResponse = responseBody;
+      }, 'isolate');
+
+      submitCommand();
+      cy.contains('Action pending.').should('exist');
+      cy.wait('@isolate').then(() => {
+        sendActionResponse(isolateRequestResponse);
+      });
+      cy.contains('Action completed.', { timeout: 120000 }).should('exist');
+      waitForEndpointListPageToBeLoaded(endpointHostname);
+      checkEndpointIsIsolated(endpointHostname);
+    });
+  });
+
+  describe('Release command', () => {
+    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
+    let endpointHostname: string;
+    let releaseRequestResponse: ActionDetails;
+
+    before(() => {
+      indexEndpointHosts({ withResponseActions: false, isolation: true }).then((indexEndpoints) => {
+        endpointData = indexEndpoints;
+        endpointHostname = endpointData.data.hosts[0].host.name;
+      });
+    });
+
+    after(() => {
+      if (endpointData) {
+        endpointData.cleanup();
+        // @ts-expect-error ignore setting to undefined
+        endpointData = undefined;
+      }
+    });
+
+    it('should release host from response console', () => {
+      waitForEndpointListPageToBeLoaded(endpointHostname);
+      checkEndpointIsIsolated(endpointHostname);
+      openResponseConsoleFromEndpointList();
+      performCommandInputChecks('release');
+      interceptActionRequests((responseBody) => {
+        releaseRequestResponse = responseBody;
+      }, 'release');
+      submitCommand();
+      cy.contains('Action pending.').should('exist');
+      cy.wait('@release').then(() => {
+        sendActionResponse(releaseRequestResponse);
+      });
+      cy.contains('Action completed.', { timeout: 120000 }).should('exist');
+      waitForEndpointListPageToBeLoaded(endpointHostname);
+      checkEndpointIsNotIsolated(endpointHostname);
+    });
+  });
+
+  describe('Processes command', () => {
+    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
+    let endpointHostname: string;
+    let processesRequestResponse: ActionDetails;
+
+    before(() => {
+      indexEndpointHosts({ withResponseActions: false, isolation: false }).then(
+        (indexEndpoints) => {
+          endpointData = indexEndpoints;
+          endpointHostname = endpointData.data.hosts[0].host.name;
+        }
+      );
+    });
+
+    after(() => {
+      if (endpointData) {
+        endpointData.cleanup();
+        // @ts-expect-error ignore setting to undefined
+        endpointData = undefined;
+      }
+    });
+
+    it('should return processes from response console', () => {
+      waitForEndpointListPageToBeLoaded(endpointHostname);
+      openResponseConsoleFromEndpointList();
+      performCommandInputChecks('processes');
+      interceptActionRequests((responseBody) => {
+        processesRequestResponse = responseBody;
+      }, 'processes');
+      submitCommand();
+      cy.contains('Action pending.').should('exist');
+      cy.wait('@processes').then(() => {
+        sendActionResponse(processesRequestResponse);
+      });
+      cy.getByTestSubj('getProcessesSuccessCallout', { timeout: 120000 }).within(() => {
+        checkReturnedProcessesTable();
+      });
+    });
+  });
+
+  describe('Kill process command', () => {
+    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
+    let endpointHostname: string;
+    let killProcessRequestResponse: ActionDetails;
+
+    before(() => {
+      indexEndpointHosts({ withResponseActions: false, isolation: false }).then(
+        (indexEndpoints) => {
+          endpointData = indexEndpoints;
+          endpointHostname = endpointData.data.hosts[0].host.name;
+        }
+      );
+    });
+
+    after(() => {
+      if (endpointData) {
+        endpointData.cleanup();
+        // @ts-expect-error ignore setting to undefined
+        endpointData = undefined;
+      }
+    });
+
+    it('should kill process from response console', () => {
+      waitForEndpointListPageToBeLoaded(endpointHostname);
+      openResponseConsoleFromEndpointList();
+      inputConsoleCommand(`kill-process --pid 1`);
+
+      interceptActionRequests((responseBody) => {
+        killProcessRequestResponse = responseBody;
+      }, 'kill-process');
+      submitCommand();
+      cy.contains('Action pending.').should('exist');
+      cy.wait('@kill-process').then(() => {
+        sendActionResponse(killProcessRequestResponse);
+      });
+      cy.contains('Action completed.', { timeout: 120000 }).should('exist');
+    });
+  });
+
+  describe('Suspend process command', () => {
+    let endpointData: ReturnTypeFromChainable<typeof indexEndpointHosts>;
+    let endpointHostname: string;
+    let suspendProcessRequestResponse: ActionDetails;
+
+    before(() => {
+      indexEndpointHosts({ withResponseActions: false, isolation: false }).then(
+        (indexEndpoints) => {
+          endpointData = indexEndpoints;
+          endpointHostname = endpointData.data.hosts[0].host.name;
+        }
+      );
+    });
+
+    after(() => {
+      if (endpointData) {
+        endpointData.cleanup();
+        // @ts-expect-error ignore setting to undefined
+        endpointData = undefined;
+      }
+    });
+
+    it('should suspend process from response console', () => {
+      waitForEndpointListPageToBeLoaded(endpointHostname);
+      openResponseConsoleFromEndpointList();
+      inputConsoleCommand(`suspend-process --pid 1`);
+
+      interceptActionRequests((responseBody) => {
+        suspendProcessRequestResponse = responseBody;
+      }, 'suspend-process');
+      submitCommand();
+      cy.contains('Action pending.').should('exist');
+      cy.wait('@suspend-process').then(() => {
+        sendActionResponse(suspendProcessRequestResponse);
+      });
+      cy.contains('Action completed.', { timeout: 120000 }).should('exist');
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/cypress/support/data_loaders.ts b/x-pack/plugins/security_solution/public/management/cypress/support/data_loaders.ts
index ffcca01a6f1e96..bd0438542dc735 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/support/data_loaders.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/support/data_loaders.ts
@@ -8,7 +8,10 @@
 // / <reference types="cypress" />
 
 import type { CasePostRequest } from '@kbn/cases-plugin/common/api';
-import { sendEndpointActionResponse } from '../../../../scripts/endpoint/agent_emulator/services/endpoint_response_actions';
+import {
+  sendEndpointActionResponse,
+  sendFleetActionResponse,
+} from '../../../../scripts/endpoint/common/response_actions';
 import type { DeleteAllEndpointDataResponse } from '../../../../scripts/endpoint/common/delete_all_endpoint_data';
 import { deleteAllEndpointData } from '../../../../scripts/endpoint/common/delete_all_endpoint_data';
 import { waitForEndpointToStreamData } from '../../../../scripts/endpoint/common/endpoint_metadata_services';
@@ -21,11 +24,7 @@ import {
   deleteIndexedEndpointPolicyResponse,
   indexEndpointPolicyResponse,
 } from '../../../../common/endpoint/data_loaders/index_endpoint_policy_response';
-import type {
-  ActionDetails,
-  HostPolicyResponse,
-  LogsEndpointActionResponse,
-} from '../../../../common/endpoint/types';
+import type { ActionDetails, HostPolicyResponse } from '../../../../common/endpoint/types';
 import type { IndexEndpointHostsCyTaskOptions } from '../types';
 import type {
   IndexedEndpointRuleAlerts,
@@ -162,9 +161,17 @@ export const dataLoaders = (
     sendHostActionResponse: async (data: {
       action: ActionDetails;
       state: { state?: 'success' | 'failure' };
-    }): Promise<LogsEndpointActionResponse> => {
+    }): Promise<null> => {
       const { esClient } = await stackServicesPromise;
-      return sendEndpointActionResponse(esClient, data.action, { state: data.state.state });
+      const fleetResponse = await sendFleetActionResponse(esClient, data.action, {
+        state: data.state.state,
+      });
+
+      if (!fleetResponse.error) {
+        await sendEndpointActionResponse(esClient, data.action, { state: data.state.state });
+      }
+
+      return null;
     },
 
     deleteAllEndpointData: async ({
@@ -195,7 +202,12 @@ export const dataLoadersForRealEndpoints = (
       options: Omit<CreateAndEnrollEndpointHostOptions, 'log' | 'kbnClient'>
     ): Promise<CreateAndEnrollEndpointHostResponse> => {
       const { kbnClient, log } = await stackServicesPromise;
-      return createAndEnrollEndpointHost({ ...options, log, kbnClient }).then((newHost) => {
+      return createAndEnrollEndpointHost({
+        useClosestVersionMatch: true,
+        ...options,
+        log,
+        kbnClient,
+      }).then((newHost) => {
         return waitForEndpointToStreamData(kbnClient, newHost.agentId, 120000).then(() => {
           return newHost;
         });
diff --git a/x-pack/plugins/security_solution/public/management/cypress/tasks/api_fixtures.ts b/x-pack/plugins/security_solution/public/management/cypress/tasks/api_fixtures.ts
index 3b8b7cfae63401..708c10ac3cc4d0 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/tasks/api_fixtures.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/tasks/api_fixtures.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { CaseResponse } from '@kbn/cases-plugin/common';
+import type { Case } from '@kbn/cases-plugin/common';
 import type { RuleResponse } from '../../../../common/detection_engine/rule_schema';
 import { request } from './common';
 
@@ -69,7 +69,7 @@ export const loadRule = (includeResponseActions = true) =>
   }).then((response) => response.body);
 
 export const loadCase = (owner: string) =>
-  request<CaseResponse>({
+  request<Case>({
     method: 'POST',
     url: '/api/cases',
     body: {
diff --git a/x-pack/plugins/security_solution/public/management/cypress/tasks/isolate.ts b/x-pack/plugins/security_solution/public/management/cypress/tasks/isolate.ts
index 8a05d790e19bdd..cf9ae47b1209d0 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/tasks/isolate.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/tasks/isolate.ts
@@ -143,3 +143,18 @@ export const checkEndpointListForOnlyUnIsolatedHosts = (): void =>
   checkEndpointListForIsolatedHosts(false);
 export const checkEndpointListForOnlyIsolatedHosts = (): void =>
   checkEndpointListForIsolatedHosts(true);
+
+export const checkEndpointIsolationStatus = (
+  endpointHostname: string,
+  expectIsolated: boolean
+): void => {
+  const chainer = expectIsolated ? 'contain.text' : 'not.contain.text';
+
+  cy.contains(endpointHostname).parents('td').siblings('td').eq(0).should(chainer, 'Isolated');
+};
+
+export const checkEndpointIsIsolated = (endpointHostname: string): void =>
+  checkEndpointIsolationStatus(endpointHostname, true);
+
+export const checkEndpointIsNotIsolated = (endpointHostname: string): void =>
+  checkEndpointIsolationStatus(endpointHostname, false);
diff --git a/x-pack/plugins/security_solution/public/management/cypress/tasks/response_console.ts b/x-pack/plugins/security_solution/public/management/cypress/tasks/response_console.ts
index 5932bc6abf3ec2..9e5d2adc7d6e84 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/tasks/response_console.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/tasks/response_console.ts
@@ -7,6 +7,7 @@
 
 import { closeAllToasts } from './close_all_toasts';
 import { APP_ENDPOINTS_PATH } from '../../../../common/constants';
+import Chainable = Cypress.Chainable;
 
 export const waitForEndpointListPageToBeLoaded = (endpointHostname: string): void => {
   cy.visit(APP_ENDPOINTS_PATH);
@@ -56,3 +57,16 @@ export const performCommandInputChecks = (command: string) => {
   selectCommandFromHelpMenu(command);
   checkInputForCommandPresence(command);
 };
+
+export const checkReturnedProcessesTable = (): Chainable<JQuery<HTMLTableRowElement>> => {
+  ['USER', 'PID', 'ENTITY ID', 'COMMAND'].forEach((header) => {
+    cy.contains(header);
+  });
+
+  return cy
+    .get('tbody')
+    .find('tr')
+    .then((rows) => {
+      expect(rows.length).to.be.greaterThan(0);
+    });
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts b/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
index 740cf00acba9e9..560aadf29a1f48 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
@@ -1081,4 +1081,187 @@ export const AdvancedPolicySchema: AdvancedPolicySchemaType[] = [
       }
     ),
   },
+  {
+    key: 'windows.advanced.events.callstacks.emit_in_events',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.events.callstacks.emit_in_events',
+      {
+        defaultMessage:
+          'If set, callstacks will be included in regular events where they are collected. Otherwise, they are only included in events that trigger behavioral protection rules. Note that setting this may significantly increase data volumes. Default: false',
+      }
+    ),
+  },
+  {
+    key: 'windows.advanced.events.callstacks.process',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.events.callstacks.process',
+      {
+        defaultMessage: 'Collect callstacks during process events?  Default: true',
+      }
+    ),
+  },
+  {
+    key: 'windows.advanced.events.callstacks.image_load',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.events.callstacks.image_load',
+      {
+        defaultMessage: 'Collect callstacks during image/library load events?  Default: true',
+      }
+    ),
+  },
+  {
+    key: 'windows.advanced.events.callstacks.file',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.events.callstacks.file',
+      {
+        defaultMessage: 'Collect callstacks during file events?  Default: true',
+      }
+    ),
+  },
+  {
+    key: 'windows.advanced.events.callstacks.registry',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.events.callstacks.registry',
+      {
+        defaultMessage: 'Collect callstacks during registry events?  Default: true',
+      }
+    ),
+  },
+  {
+    key: 'windows.advanced.artifacts.global.proxy_url',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.global.proxy_url',
+      {
+        defaultMessage:
+          'Proxy server to use when downloading global artifact manifests. Default: none',
+      }
+    ),
+  },
+  {
+    key: 'windows.advanced.artifacts.global.proxy_disable',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.global.proxy_disable',
+      {
+        defaultMessage:
+          'If the proxy setting should be used when downloading global artifact manifests. Default: false',
+      }
+    ),
+  },
+  {
+    key: 'windows.advanced.artifacts.user.proxy_url',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.user.proxy_url',
+      {
+        defaultMessage:
+          'Proxy server to use when downloading user artifact manifests. Default: none',
+      }
+    ),
+  },
+  {
+    key: 'windows.advanced.artifacts.user.proxy_disable',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.artifacts.user.proxy_disable',
+      {
+        defaultMessage:
+          'If the proxy setting should be used when downloading user artifact manifests. Default: false',
+      }
+    ),
+  },
+  {
+    key: 'mac.advanced.artifacts.global.proxy_url',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.global.proxy_url',
+      {
+        defaultMessage:
+          'Proxy server to use when downloading global artifact manifests. Default: none',
+      }
+    ),
+  },
+  {
+    key: 'mac.advanced.artifacts.global.proxy_disable',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.global.proxy_disable',
+      {
+        defaultMessage:
+          'If the proxy setting should be used when downloading global artifact manifests. Default: false',
+      }
+    ),
+  },
+  {
+    key: 'mac.advanced.artifacts.user.proxy_url',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.user.proxy_url',
+      {
+        defaultMessage:
+          'Proxy server to use when downloading user artifact manifests. Default: none',
+      }
+    ),
+  },
+  {
+    key: 'mac.advanced.artifacts.user.proxy_disable',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.mac.advanced.artifacts.user.proxy_disable',
+      {
+        defaultMessage:
+          'If the proxy setting should be used when downloading user artifact manifests. Default: false',
+      }
+    ),
+  },
+  {
+    key: 'linux.advanced.artifacts.global.proxy_url',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.global.proxy_url',
+      {
+        defaultMessage:
+          'Proxy server to use when downloading global artifact manifests. Default: none',
+      }
+    ),
+  },
+  {
+    key: 'linux.advanced.artifacts.global.proxy_disable',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.global.proxy_disable',
+      {
+        defaultMessage:
+          'If the proxy setting should be used when downloading global artifact manifests. Default: false',
+      }
+    ),
+  },
+  {
+    key: 'linux.advanced.artifacts.user.proxy_url',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.user.proxy_url',
+      {
+        defaultMessage:
+          'Proxy server to use when downloading user artifact manifests. Default: none',
+      }
+    ),
+  },
+  {
+    key: 'linux.advanced.artifacts.user.proxy_disable',
+    first_supported_version: '8.8',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.linux.advanced.artifacts.user.proxy_disable',
+      {
+        defaultMessage:
+          'If the proxy setting should be used when downloading user artifact manifests. Default: false',
+      }
+    ),
+  },
 ];
diff --git a/x-pack/plugins/security_solution/public/overview/components/detection_response/cases_table/use_case_items.ts b/x-pack/plugins/security_solution/public/overview/components/detection_response/cases_table/use_case_items.ts
index 5bb453e566ae97..6961fc5fbe90e5 100644
--- a/x-pack/plugins/security_solution/public/overview/components/detection_response/cases_table/use_case_items.ts
+++ b/x-pack/plugins/security_solution/public/overview/components/detection_response/cases_table/use_case_items.ts
@@ -7,8 +7,7 @@
 
 import { useState, useEffect, useMemo } from 'react';
 
-import type { CaseStatuses } from '@kbn/cases-plugin/common';
-import type { Cases } from '@kbn/cases-plugin/common/ui';
+import type { CaseStatuses, CasesUI } from '@kbn/cases-plugin/common';
 
 import { v4 as uuidv4 } from 'uuid';
 import { APP_ID } from '../../../../../common/constants';
@@ -103,7 +102,7 @@ export const useCaseItems: UseCaseItems = ({ skip }) => {
   return { items, isLoading, updatedAt };
 };
 
-function parseCases(casesResponse: Cases): CaseItem[] {
+function parseCases(casesResponse: CasesUI): CaseItem[] {
   const allCases = casesResponse.cases || [];
 
   return allCases.reduce<CaseItem[]>((accumulated, currentCase) => {
diff --git a/x-pack/plugins/security_solution/public/plugin.tsx b/x-pack/plugins/security_solution/public/plugin.tsx
index 61ec29d9564147..14b886920613b4 100644
--- a/x-pack/plugins/security_solution/public/plugin.tsx
+++ b/x-pack/plugins/security_solution/public/plugin.tsx
@@ -7,7 +7,7 @@
 
 import { i18n } from '@kbn/i18n';
 import type { Subscription } from 'rxjs';
-import { Subject } from 'rxjs';
+import { BehaviorSubject, Subject } from 'rxjs';
 import { combineLatestWith } from 'rxjs/operators';
 import type * as H from 'history';
 import type {
@@ -45,6 +45,7 @@ import {
 import { getDeepLinks, registerDeepLinksUpdater } from './app/deep_links';
 import type { LinksPermissions } from './common/links';
 import { updateAppLinks } from './common/links';
+import { navLinks$ } from './common/links/nav_links';
 import { licenseService } from './common/hooks/use_license';
 import type { SecuritySolutionUiConfigType } from './common/types';
 import { ExperimentalFeaturesService } from './common/experimental_features_service';
@@ -86,6 +87,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
   private telemetry: TelemetryService;
 
   readonly experimentalFeatures: ExperimentalFeatures;
+  private isSidebarEnabled$: BehaviorSubject<boolean>;
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.config = this.initializerContext.config.get<SecuritySolutionUiConfigType>();
@@ -93,7 +95,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     this.kibanaVersion = initializerContext.env.packageInfo.version;
     this.kibanaBranch = initializerContext.env.packageInfo.branch;
     this.prebuiltRulesPackageVersion = this.config.prebuiltRulesPackageVersion;
-
+    this.isSidebarEnabled$ = new BehaviorSubject<boolean>(true);
     this.telemetry = new TelemetryService();
   }
   private appUpdater$ = new Subject<AppUpdater>();
@@ -168,6 +170,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
           getPluginWrapper: () => SecuritySolutionTemplateWrapper,
         },
         savedObjectsManagement: startPluginsDeps.savedObjectsManagement,
+        isSidebarEnabled$: this.isSidebarEnabled$,
         telemetry: this.telemetry.start(),
       };
       return services;
@@ -245,7 +248,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     };
   }
 
-  public start(core: CoreStart, plugins: StartPlugins) {
+  public start(core: CoreStart, plugins: StartPlugins): PluginStart {
     KibanaServices.init({
       ...core,
       ...plugins,
@@ -306,7 +309,11 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     // Not using await to prevent blocking start execution
     this.registerAppLinks(core, plugins);
 
-    return {};
+    return {
+      navLinks$,
+      setIsSidebarEnabled: (isSidebarEnabled: boolean) =>
+        this.isSidebarEnabled$.next(isSidebarEnabled),
+    };
   }
 
   public stop() {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
index 5da2a90ce14e42..508f0ffb63a4b8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/flyout/add_to_case_button/index.tsx
@@ -10,7 +10,7 @@ import { EuiButton, EuiContextMenuPanel, EuiContextMenuItem, EuiPopover } from '
 import React, { useCallback, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
 
-import type { Case } from '@kbn/cases-plugin/common';
+import type { CaseUI } from '@kbn/cases-plugin/common';
 import { APP_ID, APP_UI_ID } from '../../../../../common/constants';
 import { timelineSelectors } from '../../../store/timeline';
 import { setInsertTimeline, showTimeline } from '../../../store/timeline/actions';
@@ -49,7 +49,7 @@ const AddToCaseButtonComponent: React.FC<Props> = ({ timelineId }) => {
   const [isCaseModalOpen, openCaseModal] = useState(false);
 
   const onRowClick = useCallback(
-    async (theCase?: Case) => {
+    async (theCase?: CaseUI) => {
       openCaseModal(false);
       await navigateToApp(APP_UI_ID, {
         deepLinkId: SecurityPageName.case,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/constants.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/constants.ts
index 4b4f3c39628f69..6fdecfb1c1317d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/constants.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/constants.ts
@@ -7,6 +7,6 @@
 
 export const MANAGED_USER_INDEX = ['logs-entityanalytics_azure.users-*'];
 export const MANAGED_USER_PACKAGE_NAME = 'entityanalytics_azure';
-export const INSTALL_INTEGRATION_HREF = `/app/fleet/integrations/${MANAGED_USER_PACKAGE_NAME}/add-integration`;
+export const INSTALL_INTEGRATION_HREF = `/detail/${MANAGED_USER_PACKAGE_NAME}/overview`;
 export const ONE_WEEK_IN_HOURS = 24 * 7;
 export const MANAGED_USER_QUERY_ID = 'managedUserDetailsQuery';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.ts b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.ts
index 13d3b07676238b..6e197ad52e4ff9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/hooks.ts
@@ -117,7 +117,7 @@ export const useManagedUser = (userName: string) => {
     }
   }, [from, search, to, userName, isInitializing]);
 
-  const { data: installedIntegrations } = useInstalledIntegrations({
+  const { data: installedIntegrations, isLoading: loadingIntegrations } = useInstalledIntegrations({
     packages: [MANAGED_USER_PACKAGE_NAME],
   });
 
@@ -156,7 +156,7 @@ export const useManagedUser = (userName: string) => {
   return useMemo(
     () => ({
       details: managedUserDetails,
-      isLoading: loadingManagedUser,
+      isLoading: loadingManagedUser || loadingIntegrations,
       isIntegrationEnabled,
       firstSeen: {
         date: firstSeen,
@@ -167,6 +167,7 @@ export const useManagedUser = (userName: string) => {
     [
       firstSeen,
       isIntegrationEnabled,
+      loadingIntegrations,
       lastSeen,
       loadingFirstSeen,
       loadingLastSeen,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.test.tsx
index fe08629c853673..442252e494800d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.test.tsx
@@ -78,4 +78,34 @@ describe('ManagedUser', () => {
 
     expect(getByTestId('managedUser-data')).toHaveTextContent('123456, 654321');
   });
+
+  it('it renders the call out when the integration is disabled', () => {
+    const { queryByTestId } = render(
+      <TestProviders>
+        <ManagedUser
+          {...{
+            ...mockProps,
+            managedUser: { ...mockManagedUser, isIntegrationEnabled: false },
+          }}
+        />
+      </TestProviders>
+    );
+
+    expect(queryByTestId('managedUser-integration-disable-callout')).toBeInTheDocument();
+  });
+
+  it("it doesn't show the call out when the user is loading", () => {
+    const { queryByTestId } = render(
+      <TestProviders>
+        <ManagedUser
+          {...{
+            ...mockProps,
+            managedUser: { ...mockManagedUser, isLoading: true, isIntegrationEnabled: false },
+          }}
+        />
+      </TestProviders>
+    );
+
+    expect(queryByTestId('managedUser-integration-disable-callout')).not.toBeInTheDocument();
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx
index 873a7a5bde78a0..fd05fb82905092 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/new_user_detail/managed_user.tsx
@@ -29,6 +29,7 @@ import { FormattedRelativePreferenceDate } from '../../../../common/components/f
 import type { ManagedUserData } from './types';
 import { INSTALL_INTEGRATION_HREF, MANAGED_USER_QUERY_ID, ONE_WEEK_IN_HOURS } from './constants';
 import { InspectButton, InspectButtonContainer } from '../../../../common/components/inspect';
+import { useAppUrl } from '../../../../common/lib/kibana';
 
 export const ManagedUser = ({
   managedUser,
@@ -49,8 +50,14 @@ export const ManagedUser = ({
     () => getManagedUserTableColumns(contextID, isDraggable),
     [isDraggable, contextID]
   );
+  const { getAppUrl } = useAppUrl();
 
-  if (!managedUser.isIntegrationEnabled) {
+  const installedIntegrationHref = useMemo(
+    () => getAppUrl({ appId: 'integrations', path: INSTALL_INTEGRATION_HREF }),
+    [getAppUrl]
+  );
+
+  if (!managedUser.isLoading && !managedUser.isIntegrationEnabled) {
     return (
       <>
         <EuiTitle size="s">
@@ -62,7 +69,7 @@ export const ManagedUser = ({
             title={<h2>{i18n.NO_ACTIVE_INTEGRATION_TITLE}</h2>}
             body={<p>{i18n.NO_ACTIVE_INTEGRATION_TEXT}</p>}
             actions={
-              <EuiButton fill href={INSTALL_INTEGRATION_HREF}>
+              <EuiButton fill href={installedIntegrationHref}>
                 {i18n.ADD_EXTERNAL_INTEGRATION_BUTTON}
               </EuiButton>
             }
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index e6e10a9c5b3dda..ba5bd460ba376f 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import type { BehaviorSubject, Observable } from 'rxjs';
+
 import type { AppLeaveHandler, CoreStart } from '@kbn/core/public';
 import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
@@ -46,6 +48,7 @@ import type { CloudExperimentsPluginStart } from '@kbn/cloud-experiments-plugin/
 import type { GuidedOnboardingPluginStart } from '@kbn/guided-onboarding-plugin/public';
 import type { DataViewsServicePublic } from '@kbn/data-views-plugin/public';
 import type { SavedObjectsManagementPluginStart } from '@kbn/saved-objects-management-plugin/public';
+
 import type { ResolverPluginSetup } from './resolver/types';
 import type { Inspect } from '../common/search_strategy';
 import type { Detections } from './detections';
@@ -62,6 +65,8 @@ import type { CloudDefend } from './cloud_defend';
 import type { ThreatIntelligence } from './threat_intelligence';
 import type { SecuritySolutionTemplateWrapper } from './app/home/template_wrapper';
 import type { Explore } from './explore';
+import type { NavigationLink } from './common/links';
+
 import type { TelemetryClientStart } from './common/lib/telemetry';
 import type { Dashboards } from './dashboards';
 
@@ -127,14 +132,18 @@ export type StartServices = CoreStart &
       getPluginWrapper: () => typeof SecuritySolutionTemplateWrapper;
     };
     savedObjectsManagement: SavedObjectsManagementPluginStart;
+    isSidebarEnabled$: BehaviorSubject<boolean>;
     telemetry: TelemetryClientStart;
   };
 
 export interface PluginSetup {
   resolver: () => Promise<ResolverPluginSetup>;
 }
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface PluginStart {}
+
+export interface PluginStart {
+  navLinks$: Observable<NavigationLink[]>;
+  setIsSidebarEnabled: (isSidebarEnabled: boolean) => void;
+}
 
 export interface AppObservableLibs {
   kibana: CoreStart;
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/agent_emulator/services/action_responder.ts b/x-pack/plugins/security_solution/scripts/endpoint/agent_emulator/services/action_responder.ts
index 8b91273a7cae7e..8686698dfdfc6f 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/agent_emulator/services/action_responder.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/agent_emulator/services/action_responder.ts
@@ -9,12 +9,9 @@ import { set } from '@kbn/safer-lodash-set';
 import type { Client } from '@elastic/elasticsearch';
 import type { ToolingLog } from '@kbn/tooling-log';
 import type { KbnClient } from '@kbn/test';
+import { sendEndpointActionResponse, sendFleetActionResponse } from '../../common/response_actions';
 import { BaseRunningService } from '../../common/base_running_service';
-import {
-  fetchEndpointActionList,
-  sendEndpointActionResponse,
-  sendFleetActionResponse,
-} from './endpoint_response_actions';
+import { fetchEndpointActionList } from './endpoint_response_actions';
 import type { ActionDetails } from '../../../../common/endpoint/types';
 
 /**
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/agent_emulator/services/endpoint_response_actions.ts b/x-pack/plugins/security_solution/scripts/endpoint/agent_emulator/services/endpoint_response_actions.ts
index 25c2e5f6327be5..03443882ad3692 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/agent_emulator/services/endpoint_response_actions.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/agent_emulator/services/endpoint_response_actions.ts
@@ -6,43 +6,9 @@
  */
 
 import type { KbnClient } from '@kbn/test';
-import type { Client } from '@elastic/elasticsearch';
-import { AGENT_ACTIONS_RESULTS_INDEX } from '@kbn/fleet-plugin/common';
-import * as cborx from 'cbor-x';
-import { basename } from 'path';
-import { generateFileMetadataDocumentMock } from '../../../../server/endpoint/services/actions/mocks';
-import { getFileDownloadId } from '../../../../common/endpoint/service/response_actions/get_file_download_id';
-import { checkInFleetAgent } from '../../common/fleet_services';
-import { sendEndpointMetadataUpdate } from '../../common/endpoint_metadata_services';
-import { FleetActionGenerator } from '../../../../common/endpoint/data_generators/fleet_action_generator';
-import {
-  ENDPOINT_ACTION_RESPONSES_INDEX,
-  BASE_ENDPOINT_ACTION_ROUTE,
-  FILE_STORAGE_DATA_INDEX,
-  FILE_STORAGE_METADATA_INDEX,
-} from '../../../../common/endpoint/constants';
-import type {
-  ActionDetails,
-  ActionListApiResponse,
-  EndpointActionData,
-  EndpointActionResponse,
-  LogsEndpointActionResponse,
-  GetProcessesActionOutputContent,
-  ResponseActionGetFileOutputContent,
-  ResponseActionGetFileParameters,
-  FileUploadMetadata,
-  ResponseActionExecuteOutputContent,
-} from '../../../../common/endpoint/types';
+import { BASE_ENDPOINT_ACTION_ROUTE } from '../../../../common/endpoint/constants';
+import type { ActionListApiResponse } from '../../../../common/endpoint/types';
 import type { EndpointActionListRequestQuery } from '../../../../common/endpoint/schema/actions';
-import { EndpointActionGenerator } from '../../../../common/endpoint/data_generators/endpoint_action_generator';
-
-const ES_INDEX_OPTIONS = { headers: { 'X-elastic-product-origin': 'fleet' } };
-
-export const fleetActionGenerator = new FleetActionGenerator();
-
-export const endpointActionGenerator = new EndpointActionGenerator();
-
-export const sleep = (ms: number = 1000) => new Promise((r) => setTimeout(r, ms));
 
 export const fetchEndpointActionList = async (
   kbn: KbnClient,
@@ -76,279 +42,3 @@ export const fetchEndpointActionList = async (
     throw error;
   }
 };
-
-export const sendFleetActionResponse = async (
-  esClient: Client,
-  action: ActionDetails,
-  { state }: { state?: 'success' | 'failure' } = {}
-): Promise<EndpointActionResponse> => {
-  const fleetResponse = fleetActionGenerator.generateResponse({
-    action_id: action.id,
-    agent_id: action.agents[0],
-    action_response: {
-      endpoint: {
-        ack: true,
-      },
-    },
-  });
-
-  // 20% of the time we generate an error
-  if (state === 'failure' || (!state && fleetActionGenerator.randomFloat() < 0.2)) {
-    fleetResponse.action_response = {};
-    fleetResponse.error = 'Agent failed to deliver message to endpoint due to unknown error';
-  } else {
-    // show it as success (generator currently always generates a `error`, so delete it)
-    delete fleetResponse.error;
-  }
-
-  await esClient.index(
-    {
-      index: AGENT_ACTIONS_RESULTS_INDEX,
-      body: fleetResponse,
-      refresh: 'wait_for',
-    },
-    ES_INDEX_OPTIONS
-  );
-
-  return fleetResponse;
-};
-
-export const sendEndpointActionResponse = async (
-  esClient: Client,
-  action: ActionDetails,
-  { state }: { state?: 'success' | 'failure' } = {}
-): Promise<LogsEndpointActionResponse> => {
-  const endpointResponse = endpointActionGenerator.generateResponse({
-    agent: { id: action.agents[0] },
-    EndpointActions: {
-      action_id: action.id,
-      data: {
-        command: action.command as EndpointActionData['command'],
-        comment: '',
-        ...getOutputDataIfNeeded(action),
-      },
-      started_at: action.startedAt,
-    },
-  });
-
-  // 20% of the time we generate an error
-  if (state === 'failure' || (state !== 'success' && endpointActionGenerator.randomFloat() < 0.2)) {
-    endpointResponse.error = {
-      message: 'Endpoint encountered an error and was unable to apply action to host',
-    };
-
-    if (
-      endpointResponse.EndpointActions.data.command === 'get-file' &&
-      endpointResponse.EndpointActions.data.output
-    ) {
-      (
-        endpointResponse.EndpointActions.data.output.content as ResponseActionGetFileOutputContent
-      ).code = endpointActionGenerator.randomGetFileFailureCode();
-    }
-
-    if (
-      endpointResponse.EndpointActions.data.command === 'execute' &&
-      endpointResponse.EndpointActions.data.output
-    ) {
-      (
-        endpointResponse.EndpointActions.data.output.content as ResponseActionExecuteOutputContent
-      ).stderr = 'execute command timed out';
-    }
-  }
-
-  await esClient.index({
-    index: ENDPOINT_ACTION_RESPONSES_INDEX,
-    body: endpointResponse,
-    refresh: 'wait_for',
-  });
-
-  // ------------------------------------------
-  // Post Action Response tasks
-  // ------------------------------------------
-
-  // For isolate, If the response is not an error, then also send a metadata update
-  if (action.command === 'isolate' && !endpointResponse.error) {
-    for (const agentId of action.agents) {
-      await Promise.all([
-        sendEndpointMetadataUpdate(esClient, agentId, {
-          Endpoint: {
-            state: {
-              isolation: true,
-            },
-          },
-        }),
-
-        checkInFleetAgent(esClient, agentId),
-      ]);
-    }
-  }
-
-  // For UnIsolate, if response is not an Error, then also send metadata update
-  if (action.command === 'unisolate' && !endpointResponse.error) {
-    for (const agentId of action.agents) {
-      await Promise.all([
-        sendEndpointMetadataUpdate(esClient, agentId, {
-          Endpoint: {
-            state: {
-              isolation: false,
-            },
-          },
-        }),
-
-        checkInFleetAgent(esClient, agentId),
-      ]);
-    }
-  }
-
-  // For `get-file`, upload a file to ES
-  if ((action.command === 'execute' || action.command === 'get-file') && !endpointResponse.error) {
-    const filePath =
-      action.command === 'execute'
-        ? '/execute/file/path'
-        : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          (
-            action as ActionDetails<
-              ResponseActionGetFileOutputContent,
-              ResponseActionGetFileParameters
-            >
-          )?.parameters?.path!;
-
-    const fileName = basename(filePath.replace(/\\/g, '/'));
-    const fileMetaDoc: FileUploadMetadata = generateFileMetadataDocumentMock({
-      action_id: action.id,
-      agent_id: action.agents[0],
-      contents: [
-        {
-          sha256: '8d61673c9d782297b3c774ded4e3d88f31a8869a8f25cf5cdd402ba6822d1d28',
-          file_name: fileName ?? 'bad_file.txt',
-          path: filePath,
-          size: 4,
-          type: 'file',
-        },
-      ],
-      file: {
-        attributes: ['archive', 'compressed'],
-        ChunkSize: 4194304,
-        compression: 'deflate',
-        hash: {
-          sha256: '8d61673c9d782297b3c774ded4e3d88f31a8869a8f25cf5cdd402ba6822d1d28',
-        },
-        mime_type: 'application/zip',
-        name: action.command === 'execute' ? 'full-output.zip' : 'upload.zip',
-        extension: 'zip',
-        size: 125,
-        Status: 'READY',
-        type: 'file',
-      },
-      src: 'endpoint',
-    });
-
-    // Index the file's metadata
-    const fileMeta = await esClient.index({
-      index: FILE_STORAGE_METADATA_INDEX,
-      id: getFileDownloadId(action, action.agents[0]),
-      body: fileMetaDoc,
-      refresh: 'wait_for',
-    });
-
-    // Index the file content (just one chunk)
-    // call to `.index()` copied from File plugin here:
-    // https://github.com/elastic/kibana/blob/main/src/plugins/files/server/blob_storage_service/adapters/es/content_stream/content_stream.ts#L195
-    await esClient
-      .index(
-        {
-          index: FILE_STORAGE_DATA_INDEX,
-          id: `${fileMeta._id}.0`,
-          document: cborx.encode({
-            bid: fileMeta._id,
-            last: true,
-            data: Buffer.from(
-              'UEsDBAoACQAAAFZeRFWpAsDLHwAAABMAAAAMABwAYmFkX2ZpbGUudHh0VVQJAANTVjxjU1Y8Y3V4CwABBPUBAAAEFAAAAMOcoyEq/Q4VyG02U9O0LRbGlwP/y5SOCfRKqLz1rsBQSwcIqQLAyx8AAAATAAAAUEsBAh4DCgAJAAAAVl5EVakCwMsfAAAAEwAAAAwAGAAAAAAAAQAAAKSBAAAAAGJhZF9maWxlLnR4dFVUBQADU1Y8Y3V4CwABBPUBAAAEFAAAAFBLBQYAAAAAAQABAFIAAAB1AAAAAAA=',
-              'base64'
-            ),
-          }),
-          refresh: 'wait_for',
-        },
-        {
-          headers: {
-            'content-type': 'application/cbor',
-            accept: 'application/json',
-          },
-        }
-      )
-      .then(() => sleep(2000));
-  }
-
-  return endpointResponse;
-};
-
-type ResponseOutput<TOutputContent extends object = object> = Pick<
-  LogsEndpointActionResponse<TOutputContent>['EndpointActions']['data'],
-  'output'
->;
-
-const getOutputDataIfNeeded = (action: ActionDetails): ResponseOutput => {
-  const commentUppercase = (action?.comment ?? '').toUpperCase();
-
-  switch (action.command) {
-    case 'running-processes':
-      return {
-        output: {
-          type: 'json',
-          content: {
-            entries: endpointActionGenerator.randomResponseActionProcesses(100),
-          },
-        },
-      } as ResponseOutput<GetProcessesActionOutputContent>;
-
-    case 'get-file':
-      return {
-        output: {
-          type: 'json',
-          content: {
-            code: 'ra_get-file_success_done',
-            zip_size: 123,
-            contents: [
-              {
-                type: 'file',
-                path: (
-                  action as ActionDetails<
-                    ResponseActionGetFileOutputContent,
-                    ResponseActionGetFileParameters
-                  >
-                ).parameters?.path,
-                size: 1234,
-                file_name: 'bad_file.txt',
-                sha256: '9558c5cb39622e9b3653203e772b129d6c634e7dbd7af1b244352fc1d704601f',
-              },
-            ],
-          },
-        },
-      } as ResponseOutput<ResponseActionGetFileOutputContent>;
-
-    case 'execute':
-      const executeOutput: Partial<ResponseActionExecuteOutputContent> = {
-        output_file_id: getFileDownloadId(action, action.agents[0]),
-      };
-
-      // Error?
-      if (commentUppercase.indexOf('EXECUTE:FAILURE') > -1) {
-        executeOutput.stdout = '';
-        executeOutput.stdout_truncated = false;
-        executeOutput.output_file_stdout_truncated = false;
-      } else {
-        executeOutput.stderr = '';
-        executeOutput.stderr_truncated = false;
-        executeOutput.output_file_stderr_truncated = false;
-      }
-
-      return {
-        output: endpointActionGenerator.generateExecuteActionResponseOutput({
-          content: executeOutput,
-        }),
-      } as ResponseOutput<ResponseActionExecuteOutputContent>;
-
-    default:
-      return { output: undefined };
-  }
-};
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/agent_downloads_service.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/agent_downloads_service.ts
new file mode 100644
index 00000000000000..ed5d0296d61a45
--- /dev/null
+++ b/x-pack/plugins/security_solution/scripts/endpoint/common/agent_downloads_service.ts
@@ -0,0 +1,161 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { mkdir, readdir, stat, unlink } from 'fs/promises';
+import { join } from 'path';
+import fs from 'fs';
+import nodeFetch from 'node-fetch';
+import { finished } from 'stream/promises';
+import { SettingsStorage } from './settings_storage';
+
+export interface DownloadedAgentInfo {
+  filename: string;
+  directory: string;
+  fullFilePath: string;
+}
+
+interface AgentDownloadStorageSettings {
+  /**
+   * Last time a cleanup was ran. Date in ISO format
+   */
+  lastCleanup: string;
+
+  /**
+   * The max file age in milliseconds. Defaults to 2 days
+   */
+  maxFileAge: number;
+}
+
+/**
+ * Class for managing Agent Downloads on the local disk
+ * @private
+ */
+class AgentDownloadStorage extends SettingsStorage<AgentDownloadStorageSettings> {
+  private downloadsFolderExists = false;
+  private readonly downloadsDirName = 'agent_download_storage';
+  private readonly downloadsDirFullPath: string;
+
+  constructor() {
+    super('agent_download_storage_settings.json', {
+      defaultSettings: {
+        maxFileAge: 1.728e8, // 2 days
+        lastCleanup: new Date().toISOString(),
+      },
+    });
+
+    this.downloadsDirFullPath = this.buildPath(this.downloadsDirName);
+  }
+
+  protected async ensureExists(): Promise<void> {
+    await super.ensureExists();
+
+    if (!this.downloadsFolderExists) {
+      await mkdir(this.downloadsDirFullPath, { recursive: true });
+      this.downloadsFolderExists = true;
+    }
+  }
+
+  public getPathsForUrl(agentDownloadUrl: string): DownloadedAgentInfo {
+    const filename = agentDownloadUrl.replace(/^https?:\/\//gi, '').replace(/\//g, '#');
+    const directory = this.downloadsDirFullPath;
+    const fullFilePath = this.buildPath(join(this.downloadsDirName, filename));
+
+    return {
+      filename,
+      directory,
+      fullFilePath,
+    };
+  }
+
+  public async downloadAndStore(agentDownloadUrl: string): Promise<DownloadedAgentInfo> {
+    // TODO: should we add "retry" attempts to file downloads?
+
+    await this.ensureExists();
+
+    const newDownloadInfo = this.getPathsForUrl(agentDownloadUrl);
+
+    // If download is already present on disk, then just return that info. No need to re-download it
+    if (fs.existsSync(newDownloadInfo.fullFilePath)) {
+      return newDownloadInfo;
+    }
+
+    try {
+      const outputStream = fs.createWriteStream(newDownloadInfo.fullFilePath);
+      const { body } = await nodeFetch(agentDownloadUrl);
+
+      await finished(body.pipe(outputStream));
+    } catch (e) {
+      // Try to clean up download case it failed halfway through
+      await unlink(newDownloadInfo.fullFilePath);
+
+      throw e;
+    }
+
+    return newDownloadInfo;
+  }
+
+  public async cleanupDownloads(): Promise<{ deleted: string[] }> {
+    const settings = await this.get();
+    const maxAgeDate = new Date();
+    const response: { deleted: string[] } = { deleted: [] };
+
+    maxAgeDate.setMilliseconds(settings.maxFileAge * -1); // `* -1` to set time back
+
+    // If cleanup already happen within the file age, then nothing to do. Exit.
+    if (settings.lastCleanup > maxAgeDate.toISOString()) {
+      return response;
+    }
+
+    await this.save({
+      ...settings,
+      lastCleanup: new Date().toISOString(),
+    });
+
+    const deleteFilePromises: Array<Promise<unknown>> = [];
+    const allFiles = await readdir(this.downloadsDirFullPath);
+
+    for (const fileName of allFiles) {
+      const filePath = join(this.downloadsDirFullPath, fileName);
+      const fileStats = await stat(filePath);
+
+      if (fileStats.isFile() && fileStats.birthtime < maxAgeDate) {
+        deleteFilePromises.push(unlink(filePath));
+        response.deleted.push(filePath);
+      }
+    }
+
+    await Promise.allSettled(deleteFilePromises);
+
+    return response;
+  }
+}
+
+const agentDownloadsClient = new AgentDownloadStorage();
+
+/**
+ * Downloads the agent file provided via the input URL to a local folder on disk. If the file
+ * already exists on disk, then no download is actually done - the information about the cached
+ * version is returned instead
+ * @param agentDownloadUrl
+ */
+export const downloadAndStoreAgent = async (
+  agentDownloadUrl: string
+): Promise<DownloadedAgentInfo & { url: string }> => {
+  const downloadedAgent = await agentDownloadsClient.downloadAndStore(agentDownloadUrl);
+
+  return {
+    url: agentDownloadUrl,
+    ...downloadedAgent,
+  };
+};
+
+/**
+ * Cleans up the old agent downloads on disk.
+ */
+export const cleanupDownloads = async (): ReturnType<AgentDownloadStorage['cleanupDownloads']> => {
+  return agentDownloadsClient.cleanupDownloads();
+};
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/endpoint_host_services.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/endpoint_host_services.ts
index 4bb03324f172ee..5b249ee2384362 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/common/endpoint_host_services.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/common/endpoint_host_services.ts
@@ -10,6 +10,8 @@ import type { KbnClient } from '@kbn/test';
 import type { ToolingLog } from '@kbn/tooling-log';
 import execa from 'execa';
 import assert from 'assert';
+import type { DownloadedAgentInfo } from './agent_downloads_service';
+import { cleanupDownloads, downloadAndStoreAgent } from './agent_downloads_service';
 import {
   fetchAgentPolicyEnrollmentKey,
   fetchFleetServerUrl,
@@ -28,6 +30,10 @@ export interface CreateAndEnrollEndpointHostOptions
   version?: string;
   /** The name for the host. Will also be the name of the VM */
   hostname?: string;
+  /** If `version` should be exact, or if this is `true`, then the closest version will be used. Defaults to `false` */
+  useClosestVersionMatch?: boolean;
+  /** If the local cache of agent downloads should be used. Defaults to `true` */
+  useCache?: boolean;
 }
 
 export interface CreateAndEnrollEndpointHostResponse {
@@ -47,8 +53,14 @@ export const createAndEnrollEndpointHost = async ({
   memory,
   hostname,
   version = kibanaPackageJson.version,
+  useClosestVersionMatch = false,
+  useCache = true,
 }: CreateAndEnrollEndpointHostOptions): Promise<CreateAndEnrollEndpointHostResponse> => {
-  const [vm, agentDownloadUrl, fleetServerUrl, enrollmentToken] = await Promise.all([
+  let cacheCleanupPromise: ReturnType<typeof cleanupDownloads> = Promise.resolve({
+    deleted: [],
+  });
+
+  const [vm, agentDownload, fleetServerUrl, enrollmentToken] = await Promise.all([
     createMultipassVm({
       vmName: hostname ?? `test-host-${Math.random().toString().substring(2, 6)}`,
       disk,
@@ -56,15 +68,33 @@ export const createAndEnrollEndpointHost = async ({
       memory,
     }),
 
-    getAgentDownloadUrl(version, true, log),
+    getAgentDownloadUrl(version, useClosestVersionMatch, log).then<{
+      url: string;
+      cache?: DownloadedAgentInfo;
+    }>((url) => {
+      if (useCache) {
+        cacheCleanupPromise = cleanupDownloads();
+
+        return downloadAndStoreAgent(url).then((cache) => {
+          return {
+            url,
+            cache,
+          };
+        });
+      }
+
+      return { url };
+    }),
 
     fetchFleetServerUrl(kbnClient),
 
     fetchAgentPolicyEnrollmentKey(kbnClient, agentPolicyId),
   ]);
 
+  log.verbose(await execa('multipass', ['info', vm.vmName]));
+
   // Some validations before we proceed
-  assert(agentDownloadUrl, 'Missing agent download URL');
+  assert(agentDownload.url, 'Missing agent download URL');
   assert(fleetServerUrl, 'Fleet server URL not set');
   assert(enrollmentToken, `No enrollment token for agent policy id [${agentPolicyId}]`);
 
@@ -76,11 +106,22 @@ export const createAndEnrollEndpointHost = async ({
     kbnClient,
     log,
     fleetServerUrl,
-    agentDownloadUrl,
+    agentDownloadUrl: agentDownload.url,
+    cachedAgentDownload: agentDownload.cache,
     enrollmentToken,
     vmName: vm.vmName,
   });
 
+  await cacheCleanupPromise.then((results) => {
+    if (results.deleted.length > 0) {
+      log.verbose(`Agent Downloads cache directory was cleaned up and the following ${
+        results.deleted.length
+      } were deleted:
+${results.deleted.join('\n')}
+`);
+    }
+  });
+
   return {
     hostname: vm.vmName,
     agentId,
@@ -143,6 +184,7 @@ interface EnrollHostWithFleetOptions {
   log: ToolingLog;
   vmName: string;
   agentDownloadUrl: string;
+  cachedAgentDownload?: DownloadedAgentInfo;
   fleetServerUrl: string;
   enrollmentToken: string;
 }
@@ -153,16 +195,35 @@ const enrollHostWithFleet = async ({
   vmName,
   fleetServerUrl,
   agentDownloadUrl,
+  cachedAgentDownload,
   enrollmentToken,
 }: EnrollHostWithFleetOptions): Promise<{ agentId: string }> => {
   const agentDownloadedFile = agentDownloadUrl.substring(agentDownloadUrl.lastIndexOf('/') + 1);
   const vmDirName = agentDownloadedFile.replace(/\.tar\.gz$/, '');
 
-  await execa.command(
-    `multipass exec ${vmName} -- curl -L ${agentDownloadUrl} -o ${agentDownloadedFile}`
-  );
-  await execa.command(`multipass exec ${vmName} -- tar -zxf ${agentDownloadedFile}`);
-  await execa.command(`multipass exec ${vmName} -- rm -f ${agentDownloadedFile}`);
+  if (cachedAgentDownload) {
+    log.verbose(
+      `Installing agent on host using cached download from [${cachedAgentDownload.fullFilePath}]`
+    );
+
+    // mount local folder on VM
+    await execa.command(
+      `multipass mount ${cachedAgentDownload.directory} ${vmName}:~/_agent_downloads`
+    );
+    await execa.command(
+      `multipass exec ${vmName} -- tar -zxf _agent_downloads/${cachedAgentDownload.filename}`
+    );
+    await execa.command(`multipass unmount ${vmName}:~/_agent_downloads`);
+  } else {
+    log.verbose(`downloading and installing agent from URL [${agentDownloadUrl}]`);
+
+    // download into VM
+    await execa.command(
+      `multipass exec ${vmName} -- curl -L ${agentDownloadUrl} -o ${agentDownloadedFile}`
+    );
+    await execa.command(`multipass exec ${vmName} -- tar -zxf ${agentDownloadedFile}`);
+    await execa.command(`multipass exec ${vmName} -- rm -f ${agentDownloadedFile}`);
+  }
 
   const agentInstallArguments = [
     'exec',
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/response_actions.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/response_actions.ts
new file mode 100644
index 00000000000000..cac110ce0cde16
--- /dev/null
+++ b/x-pack/plugins/security_solution/scripts/endpoint/common/response_actions.ts
@@ -0,0 +1,311 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 { basename } from 'path';
+import * as cborx from 'cbor-x';
+import { AGENT_ACTIONS_RESULTS_INDEX } from '@kbn/fleet-plugin/common';
+import { FleetActionGenerator } from '../../../common/endpoint/data_generators/fleet_action_generator';
+import { EndpointActionGenerator } from '../../../common/endpoint/data_generators/endpoint_action_generator';
+import type {
+  ActionDetails,
+  EndpointActionData,
+  EndpointActionResponse,
+  FileUploadMetadata,
+  GetProcessesActionOutputContent,
+  LogsEndpointActionResponse,
+  ResponseActionExecuteOutputContent,
+  ResponseActionGetFileOutputContent,
+  ResponseActionGetFileParameters,
+} from '../../../common/endpoint/types';
+import { getFileDownloadId } from '../../../common/endpoint/service/response_actions/get_file_download_id';
+import {
+  ENDPOINT_ACTION_RESPONSES_INDEX,
+  FILE_STORAGE_DATA_INDEX,
+  FILE_STORAGE_METADATA_INDEX,
+} from '../../../common/endpoint/constants';
+import { sendEndpointMetadataUpdate } from './endpoint_metadata_services';
+import { checkInFleetAgent } from './fleet_services';
+import { generateFileMetadataDocumentMock } from '../../../server/endpoint/services/actions/mocks';
+
+const ES_INDEX_OPTIONS = { headers: { 'X-elastic-product-origin': 'fleet' } };
+export const fleetActionGenerator = new FleetActionGenerator();
+export const endpointActionGenerator = new EndpointActionGenerator();
+export const sleep = (ms: number = 1000) => new Promise((r) => setTimeout(r, ms));
+
+export const sendFleetActionResponse = async (
+  esClient: Client,
+  action: ActionDetails,
+  { state }: { state?: 'success' | 'failure' } = {}
+): Promise<EndpointActionResponse> => {
+  const fleetResponse = fleetActionGenerator.generateResponse({
+    action_id: action.id,
+    agent_id: action.agents[0],
+    action_response: {
+      endpoint: {
+        ack: true,
+      },
+    },
+  });
+
+  // 20% of the time we generate an error
+  if (state === 'failure' || (!state && fleetActionGenerator.randomFloat() < 0.2)) {
+    fleetResponse.action_response = {};
+    fleetResponse.error = 'Agent failed to deliver message to endpoint due to unknown error';
+  } else {
+    // show it as success (generator currently always generates a `error`, so delete it)
+    delete fleetResponse.error;
+  }
+
+  await esClient.index(
+    {
+      index: AGENT_ACTIONS_RESULTS_INDEX,
+      body: fleetResponse,
+      refresh: 'wait_for',
+    },
+    ES_INDEX_OPTIONS
+  );
+
+  return fleetResponse;
+};
+export const sendEndpointActionResponse = async (
+  esClient: Client,
+  action: ActionDetails,
+  { state }: { state?: 'success' | 'failure' } = {}
+): Promise<LogsEndpointActionResponse> => {
+  const endpointResponse = endpointActionGenerator.generateResponse({
+    agent: { id: action.agents[0] },
+    EndpointActions: {
+      action_id: action.id,
+      data: {
+        command: action.command as EndpointActionData['command'],
+        comment: '',
+        ...getOutputDataIfNeeded(action),
+      },
+      started_at: action.startedAt,
+    },
+  });
+
+  // 20% of the time we generate an error
+  if (state === 'failure' || (state !== 'success' && endpointActionGenerator.randomFloat() < 0.2)) {
+    endpointResponse.error = {
+      message: 'Endpoint encountered an error and was unable to apply action to host',
+    };
+
+    if (
+      endpointResponse.EndpointActions.data.command === 'get-file' &&
+      endpointResponse.EndpointActions.data.output
+    ) {
+      (
+        endpointResponse.EndpointActions.data.output.content as ResponseActionGetFileOutputContent
+      ).code = endpointActionGenerator.randomGetFileFailureCode();
+    }
+
+    if (
+      endpointResponse.EndpointActions.data.command === 'execute' &&
+      endpointResponse.EndpointActions.data.output
+    ) {
+      (
+        endpointResponse.EndpointActions.data.output.content as ResponseActionExecuteOutputContent
+      ).stderr = 'execute command timed out';
+    }
+  }
+
+  await esClient.index({
+    index: ENDPOINT_ACTION_RESPONSES_INDEX,
+    body: endpointResponse,
+    refresh: 'wait_for',
+  });
+
+  // ------------------------------------------
+  // Post Action Response tasks
+  // ------------------------------------------
+
+  // For isolate, If the response is not an error, then also send a metadata update
+  if (action.command === 'isolate' && !endpointResponse.error) {
+    for (const agentId of action.agents) {
+      await Promise.all([
+        sendEndpointMetadataUpdate(esClient, agentId, {
+          Endpoint: {
+            state: {
+              isolation: true,
+            },
+          },
+        }),
+
+        checkInFleetAgent(esClient, agentId),
+      ]);
+    }
+  }
+
+  // For UnIsolate, if response is not an Error, then also send metadata update
+  if (action.command === 'unisolate' && !endpointResponse.error) {
+    for (const agentId of action.agents) {
+      await Promise.all([
+        sendEndpointMetadataUpdate(esClient, agentId, {
+          Endpoint: {
+            state: {
+              isolation: false,
+            },
+          },
+        }),
+
+        checkInFleetAgent(esClient, agentId),
+      ]);
+    }
+  }
+
+  // For `get-file`, upload a file to ES
+  if ((action.command === 'execute' || action.command === 'get-file') && !endpointResponse.error) {
+    const filePath =
+      action.command === 'execute'
+        ? '/execute/file/path'
+        : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          (
+            action as ActionDetails<
+              ResponseActionGetFileOutputContent,
+              ResponseActionGetFileParameters
+            >
+          )?.parameters?.path!;
+
+    const fileName = basename(filePath.replace(/\\/g, '/'));
+    const fileMetaDoc: FileUploadMetadata = generateFileMetadataDocumentMock({
+      action_id: action.id,
+      agent_id: action.agents[0],
+      contents: [
+        {
+          sha256: '8d61673c9d782297b3c774ded4e3d88f31a8869a8f25cf5cdd402ba6822d1d28',
+          file_name: fileName ?? 'bad_file.txt',
+          path: filePath,
+          size: 4,
+          type: 'file',
+        },
+      ],
+      file: {
+        attributes: ['archive', 'compressed'],
+        ChunkSize: 4194304,
+        compression: 'deflate',
+        hash: {
+          sha256: '8d61673c9d782297b3c774ded4e3d88f31a8869a8f25cf5cdd402ba6822d1d28',
+        },
+        mime_type: 'application/zip',
+        name: action.command === 'execute' ? 'full-output.zip' : 'upload.zip',
+        extension: 'zip',
+        size: 125,
+        Status: 'READY',
+        type: 'file',
+      },
+      src: 'endpoint',
+    });
+
+    // Index the file's metadata
+    const fileMeta = await esClient.index({
+      index: FILE_STORAGE_METADATA_INDEX,
+      id: getFileDownloadId(action, action.agents[0]),
+      body: fileMetaDoc,
+      refresh: 'wait_for',
+    });
+
+    // Index the file content (just one chunk)
+    // call to `.index()` copied from File plugin here:
+    // https://github.com/elastic/kibana/blob/main/src/plugins/files/server/blob_storage_service/adapters/es/content_stream/content_stream.ts#L195
+    await esClient
+      .index(
+        {
+          index: FILE_STORAGE_DATA_INDEX,
+          id: `${fileMeta._id}.0`,
+          document: cborx.encode({
+            bid: fileMeta._id,
+            last: true,
+            data: Buffer.from(
+              'UEsDBAoACQAAAFZeRFWpAsDLHwAAABMAAAAMABwAYmFkX2ZpbGUudHh0VVQJAANTVjxjU1Y8Y3V4CwABBPUBAAAEFAAAAMOcoyEq/Q4VyG02U9O0LRbGlwP/y5SOCfRKqLz1rsBQSwcIqQLAyx8AAAATAAAAUEsBAh4DCgAJAAAAVl5EVakCwMsfAAAAEwAAAAwAGAAAAAAAAQAAAKSBAAAAAGJhZF9maWxlLnR4dFVUBQADU1Y8Y3V4CwABBPUBAAAEFAAAAFBLBQYAAAAAAQABAFIAAAB1AAAAAAA=',
+              'base64'
+            ),
+          }),
+          refresh: 'wait_for',
+        },
+        {
+          headers: {
+            'content-type': 'application/cbor',
+            accept: 'application/json',
+          },
+        }
+      )
+      .then(() => sleep(2000));
+  }
+
+  return endpointResponse;
+};
+type ResponseOutput<TOutputContent extends object = object> = Pick<
+  LogsEndpointActionResponse<TOutputContent>['EndpointActions']['data'],
+  'output'
+>;
+const getOutputDataIfNeeded = (action: ActionDetails): ResponseOutput => {
+  const commentUppercase = (action?.comment ?? '').toUpperCase();
+
+  switch (action.command) {
+    case 'running-processes':
+      return {
+        output: {
+          type: 'json',
+          content: {
+            entries: endpointActionGenerator.randomResponseActionProcesses(100),
+          },
+        },
+      } as ResponseOutput<GetProcessesActionOutputContent>;
+
+    case 'get-file':
+      return {
+        output: {
+          type: 'json',
+          content: {
+            code: 'ra_get-file_success_done',
+            zip_size: 123,
+            contents: [
+              {
+                type: 'file',
+                path: (
+                  action as ActionDetails<
+                    ResponseActionGetFileOutputContent,
+                    ResponseActionGetFileParameters
+                  >
+                ).parameters?.path,
+                size: 1234,
+                file_name: 'bad_file.txt',
+                sha256: '9558c5cb39622e9b3653203e772b129d6c634e7dbd7af1b244352fc1d704601f',
+              },
+            ],
+          },
+        },
+      } as ResponseOutput<ResponseActionGetFileOutputContent>;
+
+    case 'execute':
+      const executeOutput: Partial<ResponseActionExecuteOutputContent> = {
+        output_file_id: getFileDownloadId(action, action.agents[0]),
+      };
+
+      // Error?
+      if (commentUppercase.indexOf('EXECUTE:FAILURE') > -1) {
+        executeOutput.stdout = '';
+        executeOutput.stdout_truncated = false;
+        executeOutput.output_file_stdout_truncated = false;
+      } else {
+        executeOutput.stderr = '';
+        executeOutput.stderr_truncated = false;
+        executeOutput.output_file_stderr_truncated = false;
+      }
+
+      return {
+        output: endpointActionGenerator.generateExecuteActionResponseOutput({
+          content: executeOutput,
+        }),
+      } as ResponseOutput<ResponseActionExecuteOutputContent>;
+
+    default:
+      return { output: undefined };
+  }
+};
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/common/settings_storage.ts b/x-pack/plugins/security_solution/scripts/endpoint/common/settings_storage.ts
index d68da4bfc92b6f..6fa4e762d5e9d6 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/common/settings_storage.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/common/settings_storage.ts
@@ -28,10 +28,8 @@ export class SettingsStorage<TSettingsDef extends object = object> {
   private dirExists: boolean = false;
 
   constructor(fileName: string, options: SettingStorageOptions<TSettingsDef> = {}) {
-    const {
-      directory = join(homedir(), '.kibanaSecuritySolutionCliTools'),
-      defaultSettings = {} as TSettingsDef,
-    } = options;
+    const { directory = SettingsStorage.getDirectory(), defaultSettings = {} as TSettingsDef } =
+      options;
 
     this.options = {
       directory,
@@ -41,7 +39,17 @@ export class SettingsStorage<TSettingsDef extends object = object> {
     this.settingsFileFullPath = join(this.options.directory, fileName);
   }
 
-  private async ensureExists(): Promise<void> {
+  /** Returns the default path to the directory where settings are saved to. */
+  public static getDirectory(): string {
+    return join(homedir(), '.kibanaSecuritySolutionCliTools');
+  }
+
+  /** Build a path using the root directory of where settings are saved */
+  protected buildPath(path: string): string {
+    return join(this.options.directory, path);
+  }
+
+  protected async ensureExists(): Promise<void> {
     if (!this.dirExists) {
       await mkdir(this.options.directory, { recursive: true });
       this.dirExists = true;
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/endpoint_agent_runner/elastic_endpoint.ts b/x-pack/plugins/security_solution/scripts/endpoint/endpoint_agent_runner/elastic_endpoint.ts
index 68ff4951f77d4c..f35901e263d58a 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/endpoint_agent_runner/elastic_endpoint.ts
+++ b/x-pack/plugins/security_solution/scripts/endpoint/endpoint_agent_runner/elastic_endpoint.ts
@@ -7,7 +7,6 @@
 
 import { userInfo } from 'os';
 import execa from 'execa';
-import nodeFetch from 'node-fetch';
 import {
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   packagePolicyRouteService,
@@ -15,35 +14,14 @@ import {
   type UpdatePackagePolicy,
 } from '@kbn/fleet-plugin/common';
 import chalk from 'chalk';
+import { createAndEnrollEndpointHost } from '../common/endpoint_host_services';
 import { getEndpointPackageInfo } from '../../../common/endpoint/utils/package';
 import { indexFleetEndpointPolicy } from '../../../common/endpoint/data_loaders/index_fleet_endpoint_policy';
-import {
-  fetchAgentPolicyEnrollmentKey,
-  fetchAgentPolicyList,
-  fetchFleetServerUrl,
-  waitForHostToEnroll,
-} from '../common/fleet_services';
+import { fetchAgentPolicyList } from '../common/fleet_services';
 import { getRuntimeServices } from './runtime';
 import { type PolicyData, ProtectionModes } from '../../../common/endpoint/types';
 import { dump } from './utils';
 
-interface ElasticArtifactSearchResponse {
-  manifest: {
-    'last-update-time': string;
-    'seconds-since-last-update': number;
-  };
-  packages: {
-    [packageFileName: string]: {
-      architecture: string;
-      os: string[];
-      type: string;
-      asc_url: string;
-      sha_url: string;
-      url: string;
-    };
-  };
-}
-
 export const enrollEndpointHost = async (): Promise<string | undefined> => {
   let vmName;
   const {
@@ -61,81 +39,26 @@ export const enrollEndpointHost = async (): Promise<string | undefined> => {
     const policyId: string = policy || (await getOrCreateAgentPolicyId());
 
     if (!policyId) {
-      throw new Error(`No valid policy id provide or unable to create it`);
+      throw new Error(`No valid policy id provided or unable to create it`);
     }
 
     if (!version) {
       throw new Error(`No 'version' specified`);
     }
 
-    const [fleetServerHostUrl, enrollmentToken] = await Promise.all([
-      fetchFleetServerUrl(kbnClient),
-      fetchAgentPolicyEnrollmentKey(kbnClient, policyId),
-    ]);
-
-    if (!fleetServerHostUrl) {
-      throw new Error(`Fleet setting does not have a Fleet Server host defined!`);
-    }
-
-    if (!enrollmentToken) {
-      throw new Error(`No API enrollment key found for policy id [${policyId}]`);
-    }
-
     vmName = `${username}-dev-${uniqueId}`;
 
     log.info(`Creating VM named: ${vmName}`);
 
-    await execa.command(`multipass launch --name ${vmName} --disk 8G`);
-
-    log.verbose(await execa('multipass', ['info', vmName]));
-
-    const agentDownloadUrl = await getAgentDownloadUrl(version);
-    const agentDownloadedFile = agentDownloadUrl.substring(agentDownloadUrl.lastIndexOf('/') + 1);
-    const vmDirName = agentDownloadedFile.replace(/\.tar\.gz$/, '');
-
-    log.info(`Downloading and installing agent`);
-    log.verbose(`Agent download:\n    ${agentDownloadUrl}`);
-
-    await execa.command(
-      `multipass exec ${vmName} -- curl -L ${agentDownloadUrl} -o ${agentDownloadedFile}`
-    );
-    await execa.command(`multipass exec ${vmName} -- tar -zxf ${agentDownloadedFile}`);
-    await execa.command(`multipass exec ${vmName} -- rm -f ${agentDownloadedFile}`);
-
-    const agentInstallArguments = [
-      'exec',
-
-      vmName,
-
-      '--working-directory',
-      `/home/ubuntu/${vmDirName}`,
-
-      '--',
-
-      'sudo',
-
-      './elastic-agent',
-
-      'install',
-
-      '--insecure',
-
-      '--force',
-
-      '--url',
-      fleetServerHostUrl,
-
-      '--enrollment-token',
-      enrollmentToken,
-    ];
-
-    log.info(`Enrolling elastic agent with Fleet`);
-    log.verbose(`Command: multipass ${agentInstallArguments.join(' ')}`);
-
-    await execa(`multipass`, agentInstallArguments);
-
-    log.info(`Waiting for Agent to check-in with Fleet`);
-    await waitForHostToEnroll(kbnClient, vmName);
+    await createAndEnrollEndpointHost({
+      kbnClient,
+      log,
+      hostname: vmName,
+      agentPolicyId: policyId,
+      version,
+      useClosestVersionMatch: false,
+      disk: '8G',
+    });
 
     log.info(`VM created using Multipass.
     VM Name: ${vmName}
@@ -155,36 +78,6 @@ export const enrollEndpointHost = async (): Promise<string | undefined> => {
   return vmName;
 };
 
-const getAgentDownloadUrl = async (version: string): Promise<string> => {
-  const { log } = getRuntimeServices();
-  const downloadArch =
-    { arm64: 'arm64', x64: 'x86_64' }[process.arch] ?? `UNSUPPORTED_ARCHITECTURE_${process.arch}`;
-  const agentFile = `elastic-agent-${version}-linux-${downloadArch}.tar.gz`;
-  const artifactSearchUrl = `https://artifacts-api.elastic.co/v1/search/${version}/${agentFile}`;
-
-  log.verbose(`Retrieving elastic agent download URL from:\n    ${artifactSearchUrl}`);
-
-  const searchResult: ElasticArtifactSearchResponse = await nodeFetch(artifactSearchUrl).then(
-    (response) => {
-      if (!response.ok) {
-        throw new Error(
-          `Failed to search elastic's artifact repository: ${response.statusText} (HTTP ${response.status})`
-        );
-      }
-
-      return response.json();
-    }
-  );
-
-  log.verbose(searchResult);
-
-  if (!searchResult.packages[agentFile]) {
-    throw new Error(`Unable to find an Agent download URL for version [${version}]`);
-  }
-
-  return searchResult.packages[agentFile].url;
-};
-
 const getOrCreateAgentPolicyId = async (): Promise<string> => {
   const { kbnClient, log } = getRuntimeServices();
   const username = userInfo().username.toLowerCase();
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
index d9944df4ad0ba8..e308619ed0f470 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
@@ -7,7 +7,7 @@
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
-import type { MlAnomalyRecordDoc as Anomaly } from '@kbn/ml-plugin/server';
+import type { MlAnomalyRecordDoc as Anomaly } from '@kbn/ml-anomaly-utils';
 import type { Filter } from '@kbn/es-query';
 
 export type { Anomaly };
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
index 4f3a0734869488..1222df99500145 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.test.ts
@@ -12,12 +12,14 @@ import {
   convertStringToBase64,
   getExistingPrepackagedTimelines,
   getAllTimeline,
+  getDraftTimeline,
   resolveTimelineOrNull,
   updatePartialSavedTimeline,
 } from '.';
 import { convertSavedObjectToSavedTimeline } from './convert_saved_object_to_savedtimeline';
 import { getNotesByTimelineId } from '../notes/saved_object';
 import { getAllPinnedEventsByTimelineId } from '../pinned_events';
+import { TimelineType } from '../../../../../common/types/timeline';
 import type {
   AllTimelinesResponse,
   ResolvedTimelineWithOutcomeSavedObject,
@@ -90,8 +92,8 @@ describe('saved_object', () => {
     });
 
     test('should send correct options if countsOnly is true', async () => {
-      const contsOnly = true;
-      await getExistingPrepackagedTimelines(mockRequest, contsOnly);
+      const countsOnly = true;
+      await getExistingPrepackagedTimelines(mockRequest, countsOnly);
       expect(mockFindSavedObject).toBeCalledWith({
         filter:
           'siem-ui-timeline.attributes.timelineType: template and not siem-ui-timeline.attributes.status: draft and siem-ui-timeline.attributes.status: immutable',
@@ -102,8 +104,8 @@ describe('saved_object', () => {
     });
 
     test('should send correct options if countsOnly is false', async () => {
-      const contsOnly = false;
-      await getExistingPrepackagedTimelines(mockRequest, contsOnly);
+      const countsOnly = false;
+      await getExistingPrepackagedTimelines(mockRequest, countsOnly);
       expect(mockFindSavedObject).toBeCalledWith({
         filter:
           'siem-ui-timeline.attributes.timelineType: template and not siem-ui-timeline.attributes.status: draft and siem-ui-timeline.attributes.status: immutable',
@@ -112,12 +114,12 @@ describe('saved_object', () => {
     });
 
     test('should send correct options if pageInfo is given', async () => {
-      const contsOnly = false;
+      const countsOnly = false;
       const pageInfo = {
         pageSize: 10,
         pageIndex: 1,
       };
-      await getExistingPrepackagedTimelines(mockRequest, contsOnly, pageInfo);
+      await getExistingPrepackagedTimelines(mockRequest, countsOnly, pageInfo);
       expect(mockFindSavedObject).toBeCalledWith({
         filter:
           'siem-ui-timeline.attributes.timelineType: template and not siem-ui-timeline.attributes.status: draft and siem-ui-timeline.attributes.status: immutable',
@@ -419,4 +421,45 @@ describe('saved_object', () => {
       expect(resp.attributes.savedQueryId).toBeNull();
     });
   });
+
+  describe('get draft timelines', () => {
+    let mockFindSavedObject: jest.Mock;
+    let mockRequest: FrameworkRequest;
+
+    beforeEach(() => {
+      mockFindSavedObject = jest.fn().mockResolvedValue({ saved_objects: [], total: 0 });
+      mockRequest = {
+        user: {
+          username: 'username',
+        },
+        context: {
+          core: {
+            savedObjects: {
+              client: {
+                find: mockFindSavedObject,
+              },
+            },
+          },
+        },
+      } as unknown as FrameworkRequest;
+    });
+
+    afterEach(() => {
+      mockFindSavedObject.mockClear();
+      (getNotesByTimelineId as jest.Mock).mockClear();
+      (getAllPinnedEventsByTimelineId as jest.Mock).mockClear();
+    });
+
+    test('should get draft filtered by current user', async () => {
+      await getDraftTimeline(mockRequest, TimelineType.default);
+      expect(mockFindSavedObject).toBeCalledWith({
+        filter:
+          'not siem-ui-timeline.attributes.timelineType: template and siem-ui-timeline.attributes.status: draft and not siem-ui-timeline.attributes.status: immutable and siem-ui-timeline.attributes.updatedBy: username and siem-ui-timeline.attributes.createdBy: username',
+        sortField: 'created',
+        sortOrder: 'desc',
+        perPage: 1,
+        type: 'siem-ui-timeline',
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
index 76fb5031b2e166..f03ec40773ff41 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/saved_object/timelines/index.ts
@@ -173,6 +173,13 @@ const getTimelineFavoriteFilter = ({
 const combineFilters = (filters: Array<string | null>) =>
   filters.filter((f) => f != null).join(' and ');
 
+const getTimelinesCreatedAndUpdatedByCurrentUser = ({ request }: { request: FrameworkRequest }) => {
+  const username = request.user?.username ?? UNAUTHENTICATED_USER;
+  const updatedBy = `siem-ui-timeline.attributes.updatedBy: ${username}`;
+  const createdBy = `siem-ui-timeline.attributes.createdBy: ${username}`;
+  return combineFilters([updatedBy, createdBy]);
+};
+
 export const getExistingPrepackagedTimelines = async (
   request: FrameworkRequest,
   countsOnly?: boolean,
@@ -279,10 +286,14 @@ export const getDraftTimeline = async (
   request: FrameworkRequest,
   timelineType: TimelineTypeLiteralWithNull
 ): Promise<ResponseTimelines> => {
+  const filter = combineFilters([
+    getTimelineTypeFilter(timelineType ?? null, TimelineStatus.draft),
+    getTimelinesCreatedAndUpdatedByCurrentUser({ request }),
+  ]);
   const options: SavedObjectsFindOptions = {
     type: timelineSavedObjectType,
     perPage: 1,
-    filter: getTimelineTypeFilter(timelineType, TimelineStatus.draft),
+    filter,
     sortField: 'created',
     sortOrder: 'desc',
   };
diff --git a/x-pack/plugins/security_solution/tsconfig.json b/x-pack/plugins/security_solution/tsconfig.json
index 748130f6be7b15..5ab440f404d80c 100644
--- a/x-pack/plugins/security_solution/tsconfig.json
+++ b/x-pack/plugins/security_solution/tsconfig.json
@@ -156,5 +156,6 @@
     "@kbn/core-lifecycle-browser",
     "@kbn/ecs",
     "@kbn/url-state",
+    "@kbn/ml-anomaly-utils"
   ]
 }
diff --git a/x-pack/plugins/serverless/kibana.jsonc b/x-pack/plugins/serverless/kibana.jsonc
index af79877f1079fb..5a724f7641a6a2 100644
--- a/x-pack/plugins/serverless/kibana.jsonc
+++ b/x-pack/plugins/serverless/kibana.jsonc
@@ -14,8 +14,9 @@
     ],
     "requiredPlugins": [
       "kibanaReact",
+      "management",
     ],
     "optionalPlugins": [],
     "requiredBundles": []
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/serverless/public/plugin.tsx b/x-pack/plugins/serverless/public/plugin.tsx
index 9c9debe3e9f217..20f4634fb7fa09 100644
--- a/x-pack/plugins/serverless/public/plugin.tsx
+++ b/x-pack/plugins/serverless/public/plugin.tsx
@@ -13,23 +13,43 @@ import { CoreSetup, CoreStart, Plugin, PluginInitializerContext } from '@kbn/cor
 import { ProjectSwitcher, ProjectSwitcherKibanaProvider } from '@kbn/serverless-project-switcher';
 import { ProjectType } from '@kbn/serverless-types';
 
-import { ServerlessPluginSetup, ServerlessPluginStart } from './types';
+import {
+  ServerlessPluginSetup,
+  ServerlessPluginStart,
+  ServerlessPluginSetupDependencies,
+  ServerlessPluginStartDependencies,
+} from './types';
 import { ServerlessConfig } from './config';
 import { API_SWITCH_PROJECT as projectChangeAPIUrl } from '../common';
 
-export class ServerlessPlugin implements Plugin<ServerlessPluginSetup, ServerlessPluginStart> {
+export class ServerlessPlugin
+  implements
+    Plugin<
+      ServerlessPluginSetup,
+      ServerlessPluginStart,
+      ServerlessPluginSetupDependencies,
+      ServerlessPluginStartDependencies
+    >
+{
   private readonly config: ServerlessConfig;
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.config = this.initializerContext.config.get<ServerlessConfig>();
   }
 
-  public setup(_core: CoreSetup): ServerlessPluginSetup {
+  public setup(
+    _core: CoreSetup,
+    _dependencies: ServerlessPluginSetupDependencies
+  ): ServerlessPluginSetup {
     return {};
   }
 
-  public start(core: CoreStart): ServerlessPluginStart {
+  public start(
+    core: CoreStart,
+    dependencies: ServerlessPluginStartDependencies
+  ): ServerlessPluginStart {
     const { developer } = this.config;
+    const { management } = dependencies;
 
     if (developer && developer.projectSwitcher && developer.projectSwitcher.enabled) {
       const { currentType } = developer.projectSwitcher;
@@ -40,6 +60,7 @@ export class ServerlessPlugin implements Plugin<ServerlessPluginSetup, Serverles
     }
 
     core.chrome.setChromeStyle('project');
+    management.setIsSidebarEnabled(false);
 
     return {};
   }
diff --git a/x-pack/plugins/serverless/public/types.ts b/x-pack/plugins/serverless/public/types.ts
index 92a804b34a948e..9e8d9df34cb570 100644
--- a/x-pack/plugins/serverless/public/types.ts
+++ b/x-pack/plugins/serverless/public/types.ts
@@ -5,8 +5,18 @@
  * 2.0.
  */
 
+import type { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public';
+
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ServerlessPluginSetup {}
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface ServerlessPluginStart {}
+
+export interface ServerlessPluginSetupDependencies {
+  management: ManagementSetup;
+}
+
+export interface ServerlessPluginStartDependencies {
+  management: ManagementStart;
+}
diff --git a/x-pack/plugins/serverless/tsconfig.json b/x-pack/plugins/serverless/tsconfig.json
index 91ea373bb42700..75c3b77afc9bb3 100644
--- a/x-pack/plugins/serverless/tsconfig.json
+++ b/x-pack/plugins/serverless/tsconfig.json
@@ -14,11 +14,12 @@
     "target/**/*"
   ],
   "kbn_references": [
-    "@kbn/core",
     "@kbn/config-schema",
+    "@kbn/core",
     "@kbn/kibana-react-plugin",
-    "@kbn/utils",
+    "@kbn/management-plugin",
     "@kbn/serverless-project-switcher",
     "@kbn/serverless-types",
+    "@kbn/utils",
   ]
 }
diff --git a/x-pack/plugins/serverless_observability/.gitignore b/x-pack/plugins/serverless_observability/.gitignore
new file mode 100644
index 00000000000000..c3dca1b96fcc25
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/.gitignore
@@ -0,0 +1,2 @@
+/build
+/target
diff --git a/x-pack/plugins/serverless_observability/README.mdx b/x-pack/plugins/serverless_observability/README.mdx
new file mode 100755
index 00000000000000..fa2dde090f4b7d
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/README.mdx
@@ -0,0 +1,3 @@
+# Serverless Observability project plugin
+
+This plugin contains configuration and code used to create a Serverless Observability project.  It leverages universal configuration and other APIs in the [`serverless`](../serverless/README.mdx) plugin to configure Kibana.
\ No newline at end of file
diff --git a/x-pack/plugins/serverless_observability/common/index.ts b/x-pack/plugins/serverless_observability/common/index.ts
new file mode 100644
index 00000000000000..d6a5ea767034cb
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/common/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const PLUGIN_ID = 'serverlessObservability';
+export const PLUGIN_NAME = 'serverlessObservability';
diff --git a/x-pack/plugins/serverless_observability/kibana.jsonc b/x-pack/plugins/serverless_observability/kibana.jsonc
new file mode 100644
index 00000000000000..12d528dd33ac27
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/kibana.jsonc
@@ -0,0 +1,22 @@
+{
+  "type": "plugin",
+  "id": "@kbn/serverless-observability",
+  "owner": "@elastic/appex-sharedux",
+  "description": "Serverless customizations for observability.",
+  "plugin": {
+    "id": "serverlessObservability",
+    "server": true,
+    "browser": true,
+    "configPath": [
+      "xpack",
+      "serverless",
+      "observability"
+    ],
+    "requiredPlugins": [
+      "serverless",
+      "observabilityShared"
+    ],
+    "optionalPlugins": [],
+    "requiredBundles": []
+  }
+}
diff --git a/x-pack/plugins/serverless_observability/package.json b/x-pack/plugins/serverless_observability/package.json
new file mode 100644
index 00000000000000..64b310d7eabaed
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@kbn/serverless-observability",
+  "version": "1.0.0",
+  "license": "Elastic License 2.0",
+  "private": true,
+  "scripts": {
+    "build": "yarn plugin-helpers build",
+    "plugin-helpers": "node ../../../scripts/plugin_helpers",
+    "kbn": "node ../../../scripts/kbn"
+  }
+}
\ No newline at end of file
diff --git a/x-pack/plugins/serverless_observability/public/index.ts b/x-pack/plugins/serverless_observability/public/index.ts
new file mode 100644
index 00000000000000..a785b68735375e
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/public/index.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 { ServerlessObservabilityPlugin } from './plugin';
+
+// This exports static code and TypeScript types,
+// as well as, Kibana Platform `plugin()` initializer.
+export function plugin() {
+  return new ServerlessObservabilityPlugin();
+}
+
+export type {
+  ServerlessObservabilityPluginSetup,
+  ServerlessObservabilityPluginStart,
+} from './types';
diff --git a/x-pack/plugins/serverless_observability/public/plugin.ts b/x-pack/plugins/serverless_observability/public/plugin.ts
new file mode 100644
index 00000000000000..48da91bb4ea269
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/public/plugin.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import {
+  ServerlessObservabilityPluginSetup,
+  ServerlessObservabilityPluginStart,
+  ServerlessObservabilityPluginSetupDependencies,
+  ServerlessObservabilityPluginStartDependencies,
+} from './types';
+
+export class ServerlessObservabilityPlugin
+  implements Plugin<ServerlessObservabilityPluginSetup, ServerlessObservabilityPluginStart>
+{
+  public setup(
+    _core: CoreSetup,
+    _setupDeps: ServerlessObservabilityPluginSetupDependencies
+  ): ServerlessObservabilityPluginSetup {
+    return {};
+  }
+
+  public start(
+    _core: CoreStart,
+    { observabilityShared }: ServerlessObservabilityPluginStartDependencies
+  ): ServerlessObservabilityPluginStart {
+    observabilityShared.setIsSidebarEnabled(false);
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/x-pack/plugins/serverless_observability/public/types.ts b/x-pack/plugins/serverless_observability/public/types.ts
new file mode 100644
index 00000000000000..417a9c1701c849
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/public/types.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ServerlessPluginSetup, ServerlessPluginStart } from '@kbn/serverless/public';
+import {
+  ObservabilitySharedPluginSetup,
+  ObservabilitySharedPluginStart,
+} from '@kbn/observability-shared-plugin/public';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessObservabilityPluginSetup {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessObservabilityPluginStart {}
+
+export interface ServerlessObservabilityPluginSetupDependencies {
+  observabilityShared: ObservabilitySharedPluginSetup;
+  serverless: ServerlessPluginSetup;
+}
+
+export interface ServerlessObservabilityPluginStartDependencies {
+  observabilityShared: ObservabilitySharedPluginStart;
+  serverless: ServerlessPluginStart;
+}
diff --git a/x-pack/plugins/serverless_observability/server/config.ts b/x-pack/plugins/serverless_observability/server/config.ts
new file mode 100644
index 00000000000000..599a9f2bd77698
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/server/config.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 { schema, TypeOf } from '@kbn/config-schema';
+import { PluginConfigDescriptor } from '@kbn/core/server';
+
+export * from './types';
+
+const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: false }),
+});
+
+type ConfigType = TypeOf<typeof configSchema>;
+
+export const config: PluginConfigDescriptor<ConfigType> = {
+  schema: configSchema,
+};
+
+export type ServerlessObservabilityConfig = TypeOf<typeof configSchema>;
diff --git a/x-pack/plugins/serverless_observability/server/index.ts b/x-pack/plugins/serverless_observability/server/index.ts
new file mode 100644
index 00000000000000..c45e363a429bfb
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/server/index.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 { PluginInitializerContext } from '@kbn/core/server';
+
+import { ServerlessObservabilityPlugin } from './plugin';
+export { config } from './config';
+
+//  This exports static code and TypeScript types,
+//  as well as, Kibana Platform `plugin()` initializer.
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new ServerlessObservabilityPlugin(initializerContext);
+}
+
+export type {
+  ServerlessObservabilityPluginSetup,
+  ServerlessObservabilityPluginStart,
+} from './types';
diff --git a/x-pack/plugins/serverless_observability/server/plugin.ts b/x-pack/plugins/serverless_observability/server/plugin.ts
new file mode 100644
index 00000000000000..8b28ba2b0a4ac4
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/server/plugin.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { PluginInitializerContext, Plugin } from '@kbn/core/server';
+
+import { ServerlessObservabilityPluginSetup, ServerlessObservabilityPluginStart } from './types';
+
+export class ServerlessObservabilityPlugin
+  implements Plugin<ServerlessObservabilityPluginSetup, ServerlessObservabilityPluginStart>
+{
+  constructor(_initializerContext: PluginInitializerContext) {}
+
+  public setup() {
+    return {};
+  }
+
+  public start() {
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/x-pack/plugins/serverless_observability/server/types.ts b/x-pack/plugins/serverless_observability/server/types.ts
new file mode 100644
index 00000000000000..f8a587103e8862
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/server/types.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessObservabilityPluginSetup {}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessObservabilityPluginStart {}
diff --git a/x-pack/plugins/serverless_observability/tsconfig.json b/x-pack/plugins/serverless_observability/tsconfig.json
new file mode 100644
index 00000000000000..d3cc73ef6a7a66
--- /dev/null
+++ b/x-pack/plugins/serverless_observability/tsconfig.json
@@ -0,0 +1,23 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types"
+  },
+  "include": [
+    "index.ts",
+    "common/**/*.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "server/**/*.ts",
+    "../../../typings/**/*"
+  ],
+  "exclude": [
+    "target/**/*"
+  ],
+  "kbn_references": [
+    "@kbn/core",
+    "@kbn/config-schema",
+    "@kbn/serverless",
+    "@kbn/observability-shared-plugin",
+  ]
+}
diff --git a/x-pack/plugins/serverless_search/.gitignore b/x-pack/plugins/serverless_search/.gitignore
new file mode 100644
index 00000000000000..c3dca1b96fcc25
--- /dev/null
+++ b/x-pack/plugins/serverless_search/.gitignore
@@ -0,0 +1,2 @@
+/build
+/target
diff --git a/x-pack/plugins/serverless_search/README.mdx b/x-pack/plugins/serverless_search/README.mdx
new file mode 100755
index 00000000000000..0b89338e5cae5f
--- /dev/null
+++ b/x-pack/plugins/serverless_search/README.mdx
@@ -0,0 +1,3 @@
+# Serverless Search project plugin
+
+This plugin contains configuration and code used to create a Serverless Search project.  It leverages universal configuration and other APIs in the [`serverless`](../serverless/README.mdx) plugin to configure Kibana.
\ No newline at end of file
diff --git a/x-pack/plugins/event_log/server/routes/index.ts b/x-pack/plugins/serverless_search/common/index.ts
similarity index 73%
rename from x-pack/plugins/event_log/server/routes/index.ts
rename to x-pack/plugins/serverless_search/common/index.ts
index be9b64342a9741..539748f2cea384 100644
--- a/x-pack/plugins/event_log/server/routes/index.ts
+++ b/x-pack/plugins/serverless_search/common/index.ts
@@ -5,4 +5,5 @@
  * 2.0.
  */
 
-export { findRoute } from './find';
+export const PLUGIN_ID = 'serverlessSearch';
+export const PLUGIN_NAME = 'serverlessSearch';
diff --git a/x-pack/plugins/serverless_search/kibana.jsonc b/x-pack/plugins/serverless_search/kibana.jsonc
new file mode 100644
index 00000000000000..b548823567ce06
--- /dev/null
+++ b/x-pack/plugins/serverless_search/kibana.jsonc
@@ -0,0 +1,23 @@
+{
+  "type": "plugin",
+  "id": "@kbn/serverless-search",
+  "owner": "@elastic/appex-sharedux",
+  "description": "Serverless customizations for search.",
+  "plugin": {
+    "id": "serverlessSearch",
+    "server": true,
+    "browser": true,
+    "configPath": [
+      "xpack",
+      "serverless",
+      "search"
+    ],
+    "requiredPlugins": [
+      "serverless",
+      "enterpriseSearch",
+      "management"
+    ],
+    "optionalPlugins": [],
+    "requiredBundles": []
+  }
+}
diff --git a/x-pack/plugins/serverless_search/package.json b/x-pack/plugins/serverless_search/package.json
new file mode 100644
index 00000000000000..b7820231076eee
--- /dev/null
+++ b/x-pack/plugins/serverless_search/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@kbn/serverless-search",
+  "version": "1.0.0",
+  "license": "Elastic License 2.0",
+  "private": true,
+  "scripts": {
+    "build": "yarn plugin-helpers build",
+    "plugin-helpers": "node ../../../scripts/plugin_helpers",
+    "kbn": "node ../../../scripts/kbn"
+  }
+}
diff --git a/x-pack/plugins/serverless_search/public/index.ts b/x-pack/plugins/serverless_search/public/index.ts
new file mode 100644
index 00000000000000..5031ccc61d1ac5
--- /dev/null
+++ b/x-pack/plugins/serverless_search/public/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ServerlessSearchPlugin } from './plugin';
+
+// This exports static code and TypeScript types,
+// as well as, Kibana Platform `plugin()` initializer.
+export function plugin() {
+  return new ServerlessSearchPlugin();
+}
+
+export type { ServerlessSearchPluginSetup, ServerlessSearchPluginStart } from './types';
diff --git a/x-pack/plugins/serverless_search/public/plugin.ts b/x-pack/plugins/serverless_search/public/plugin.ts
new file mode 100644
index 00000000000000..62a83cff6f4778
--- /dev/null
+++ b/x-pack/plugins/serverless_search/public/plugin.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import {
+  ServerlessSearchPluginSetup,
+  ServerlessSearchPluginSetupDependencies,
+  ServerlessSearchPluginStart,
+  ServerlessSearchPluginStartDependencies,
+} from './types';
+
+export class ServerlessSearchPlugin
+  implements Plugin<ServerlessSearchPluginSetup, ServerlessSearchPluginStart>
+{
+  public setup(
+    _core: CoreSetup,
+    _setupDeps: ServerlessSearchPluginSetupDependencies
+  ): ServerlessSearchPluginSetup {
+    return {};
+  }
+
+  public start(
+    _core: CoreStart,
+    _startDeps: ServerlessSearchPluginStartDependencies
+  ): ServerlessSearchPluginStart {
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/x-pack/plugins/serverless_search/public/types.ts b/x-pack/plugins/serverless_search/public/types.ts
new file mode 100644
index 00000000000000..ad66e6df85c748
--- /dev/null
+++ b/x-pack/plugins/serverless_search/public/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 { ServerlessPluginSetup, ServerlessPluginStart } from '@kbn/serverless/public';
+import { ManagementSetup, ManagementStart } from '@kbn/management-plugin/public';
+import {
+  EnterpriseSearchPublicSetup,
+  EnterpriseSearchPublicStart,
+} from '@kbn/enterprise-search-plugin/public';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessSearchPluginSetup {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessSearchPluginStart {}
+
+export interface ServerlessSearchPluginSetupDependencies {
+  enterpriseSearch: EnterpriseSearchPublicSetup;
+  management: ManagementSetup;
+  serverless: ServerlessPluginSetup;
+}
+
+export interface ServerlessSearchPluginStartDependencies {
+  enterpriseSearch: EnterpriseSearchPublicStart;
+  management: ManagementStart;
+  serverless: ServerlessPluginStart;
+}
diff --git a/x-pack/plugins/serverless_search/server/config.ts b/x-pack/plugins/serverless_search/server/config.ts
new file mode 100644
index 00000000000000..546c594aaabfbc
--- /dev/null
+++ b/x-pack/plugins/serverless_search/server/config.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 { schema, TypeOf } from '@kbn/config-schema';
+import { PluginConfigDescriptor } from '@kbn/core/server';
+
+export * from './types';
+
+const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: false }),
+});
+
+type ConfigType = TypeOf<typeof configSchema>;
+
+export const config: PluginConfigDescriptor<ConfigType> = {
+  schema: configSchema,
+};
+
+export type ServerlessSearchConfig = TypeOf<typeof configSchema>;
diff --git a/x-pack/plugins/serverless_search/server/index.ts b/x-pack/plugins/serverless_search/server/index.ts
new file mode 100644
index 00000000000000..90e0b170d4a714
--- /dev/null
+++ b/x-pack/plugins/serverless_search/server/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { PluginInitializerContext } from '@kbn/core/server';
+
+import { ServerlessSearchPlugin } from './plugin';
+export { config } from './config';
+
+//  This exports static code and TypeScript types,
+//  as well as, Kibana Platform `plugin()` initializer.
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new ServerlessSearchPlugin(initializerContext);
+}
+
+export type { ServerlessSearchPluginSetup, ServerlessSearchPluginStart } from './types';
diff --git a/x-pack/plugins/serverless_search/server/plugin.ts b/x-pack/plugins/serverless_search/server/plugin.ts
new file mode 100644
index 00000000000000..99d9bf01da0df2
--- /dev/null
+++ b/x-pack/plugins/serverless_search/server/plugin.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { PluginInitializerContext, Plugin } from '@kbn/core/server';
+
+import { ServerlessSearchPluginSetup, ServerlessSearchPluginStart } from './types';
+
+export class ServerlessSearchPlugin
+  implements Plugin<ServerlessSearchPluginSetup, ServerlessSearchPluginStart>
+{
+  constructor(_initializerContext: PluginInitializerContext) {}
+
+  public setup() {
+    return {};
+  }
+
+  public start() {
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/x-pack/plugins/serverless_search/server/types.ts b/x-pack/plugins/serverless_search/server/types.ts
new file mode 100644
index 00000000000000..6011e2eb60fa01
--- /dev/null
+++ b/x-pack/plugins/serverless_search/server/types.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessSearchPluginSetup {}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessSearchPluginStart {}
diff --git a/x-pack/plugins/serverless_search/tsconfig.json b/x-pack/plugins/serverless_search/tsconfig.json
new file mode 100644
index 00000000000000..c8150e5a71926c
--- /dev/null
+++ b/x-pack/plugins/serverless_search/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types"
+  },
+  "include": [
+    "index.ts",
+    "common/**/*.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "server/**/*.ts",
+    "../../../typings/**/*"
+  ],
+  "exclude": [
+    "target/**/*"
+  ],
+  "kbn_references": [
+    "@kbn/core",
+    "@kbn/config-schema",
+    "@kbn/enterprise-search-plugin",
+    "@kbn/management-plugin",
+    "@kbn/serverless",
+  ]
+}
diff --git a/x-pack/plugins/serverless_security/.gitignore b/x-pack/plugins/serverless_security/.gitignore
new file mode 100644
index 00000000000000..c3dca1b96fcc25
--- /dev/null
+++ b/x-pack/plugins/serverless_security/.gitignore
@@ -0,0 +1,2 @@
+/build
+/target
diff --git a/x-pack/plugins/serverless_security/README.mdx b/x-pack/plugins/serverless_security/README.mdx
new file mode 100755
index 00000000000000..6e76917417cc46
--- /dev/null
+++ b/x-pack/plugins/serverless_security/README.mdx
@@ -0,0 +1,3 @@
+# Serverless Security project plugin
+
+This plugin contains configuration and code used to create a Serverless Security project.  It leverages universal configuration and other APIs in the [`serverless`](../serverless/README.mdx) plugin to configure Kibana.
\ No newline at end of file
diff --git a/x-pack/plugins/lens/public/shared_components/query_input/index.ts b/x-pack/plugins/serverless_security/common/index.ts
similarity index 71%
rename from x-pack/plugins/lens/public/shared_components/query_input/index.ts
rename to x-pack/plugins/serverless_security/common/index.ts
index b2934de9168228..0dc5be6ddf9bbf 100644
--- a/x-pack/plugins/lens/public/shared_components/query_input/index.ts
+++ b/x-pack/plugins/serverless_security/common/index.ts
@@ -5,5 +5,5 @@
  * 2.0.
  */
 
-export { QueryInput } from './query_input';
-export { validateQuery, isQueryValid } from './helpers';
+export const PLUGIN_ID = 'serverlessSecurity';
+export const PLUGIN_NAME = 'serverlessSecurity';
diff --git a/x-pack/plugins/serverless_security/kibana.jsonc b/x-pack/plugins/serverless_security/kibana.jsonc
new file mode 100644
index 00000000000000..99def198e6b466
--- /dev/null
+++ b/x-pack/plugins/serverless_security/kibana.jsonc
@@ -0,0 +1,24 @@
+{
+  "type": "plugin",
+  "id": "@kbn/serverless-security",
+  "owner": "@elastic/appex-sharedux",
+  "description": "Serverless customizations for security.",
+  "plugin": {
+    "id": "serverlessSecurity",
+    "server": true,
+    "browser": true,
+    "configPath": [
+      "xpack",
+      "serverless",
+      "security"
+    ],
+    "requiredPlugins": [
+      "serverless",
+      "security",
+      "securitySolution",
+      "kibanaReact"
+    ],
+    "optionalPlugins": [],
+    "requiredBundles": []
+  }
+}
\ No newline at end of file
diff --git a/x-pack/plugins/serverless_security/package.json b/x-pack/plugins/serverless_security/package.json
new file mode 100644
index 00000000000000..0154207c22d6f1
--- /dev/null
+++ b/x-pack/plugins/serverless_security/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@kbn/serverless-security",
+  "version": "1.0.0",
+  "license": "Elastic License 2.0",
+  "private": true,
+  "scripts": {
+    "build": "yarn plugin-helpers build",
+    "plugin-helpers": "node ../../../scripts/plugin_helpers",
+    "kbn": "node ../../../scripts/kbn"
+  }
+}
\ No newline at end of file
diff --git a/x-pack/plugins/serverless_security/public/index.ts b/x-pack/plugins/serverless_security/public/index.ts
new file mode 100644
index 00000000000000..ce7b6e989f4caf
--- /dev/null
+++ b/x-pack/plugins/serverless_security/public/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ServerlessSecurityPlugin } from './plugin';
+
+// This exports static code and TypeScript types,
+// as well as, Kibana Platform `plugin()` initializer.
+export function plugin() {
+  return new ServerlessSecurityPlugin();
+}
+
+export type { ServerlessSecurityPluginSetup, ServerlessSecurityPluginStart } from './types';
diff --git a/x-pack/plugins/serverless_security/public/plugin.ts b/x-pack/plugins/serverless_security/public/plugin.ts
new file mode 100644
index 00000000000000..4e7fa19a0945b3
--- /dev/null
+++ b/x-pack/plugins/serverless_security/public/plugin.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 { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import {
+  ServerlessSecurityPluginSetup,
+  ServerlessSecurityPluginStart,
+  ServerlessSecurityPluginSetupDependencies,
+  ServerlessSecurityPluginStartDependencies,
+} from './types';
+
+export class ServerlessSecurityPlugin
+  implements
+    Plugin<
+      ServerlessSecurityPluginSetup,
+      ServerlessSecurityPluginStart,
+      ServerlessSecurityPluginSetupDependencies,
+      ServerlessSecurityPluginStartDependencies
+    >
+{
+  public setup(
+    _core: CoreSetup,
+    _setupDeps: ServerlessSecurityPluginSetupDependencies
+  ): ServerlessSecurityPluginSetup {
+    return {};
+  }
+
+  public start(
+    _core: CoreStart,
+    { securitySolution }: ServerlessSecurityPluginStartDependencies
+  ): ServerlessSecurityPluginStart {
+    securitySolution.setIsSidebarEnabled(false);
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/x-pack/plugins/serverless_security/public/types.ts b/x-pack/plugins/serverless_security/public/types.ts
new file mode 100644
index 00000000000000..1fc18893ce1fdf
--- /dev/null
+++ b/x-pack/plugins/serverless_security/public/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 { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/public';
+import {
+  PluginSetup as SecuritySolutionPluginSetup,
+  PluginStart as SecuritySolutionPluginStart,
+} from '@kbn/security-solution-plugin/public';
+import { ServerlessPluginSetup, ServerlessPluginStart } from '@kbn/serverless/public';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessSecurityPluginSetup {}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessSecurityPluginStart {}
+
+export interface ServerlessSecurityPluginSetupDependencies {
+  security: SecurityPluginSetup;
+  securitySolution: SecuritySolutionPluginSetup;
+  serverless: ServerlessPluginSetup;
+}
+
+export interface ServerlessSecurityPluginStartDependencies {
+  security: SecurityPluginStart;
+  securitySolution: SecuritySolutionPluginStart;
+  serverless: ServerlessPluginStart;
+}
diff --git a/x-pack/plugins/serverless_security/server/config.ts b/x-pack/plugins/serverless_security/server/config.ts
new file mode 100644
index 00000000000000..758b22de1514e3
--- /dev/null
+++ b/x-pack/plugins/serverless_security/server/config.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 { schema, TypeOf } from '@kbn/config-schema';
+import { PluginConfigDescriptor } from '@kbn/core/server';
+
+export * from './types';
+
+const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: false }),
+});
+
+type ConfigType = TypeOf<typeof configSchema>;
+
+export const config: PluginConfigDescriptor<ConfigType> = {
+  schema: configSchema,
+};
+
+export type ServerlessSecurityConfig = TypeOf<typeof configSchema>;
diff --git a/x-pack/plugins/serverless_security/server/index.ts b/x-pack/plugins/serverless_security/server/index.ts
new file mode 100644
index 00000000000000..b2b6c8564f7888
--- /dev/null
+++ b/x-pack/plugins/serverless_security/server/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { PluginInitializerContext } from '@kbn/core/server';
+
+import { ServerlessSecurityPlugin } from './plugin';
+export { config } from './config';
+
+//  This exports static code and TypeScript types,
+//  as well as, Kibana Platform `plugin()` initializer.
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new ServerlessSecurityPlugin(initializerContext);
+}
+
+export type { ServerlessSecurityPluginSetup, ServerlessSecurityPluginStart } from './types';
diff --git a/x-pack/plugins/serverless_security/server/plugin.ts b/x-pack/plugins/serverless_security/server/plugin.ts
new file mode 100644
index 00000000000000..7dfbae3b64a67b
--- /dev/null
+++ b/x-pack/plugins/serverless_security/server/plugin.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 { PluginInitializerContext, Plugin } from '@kbn/core/server';
+
+import {
+  ServerlessSecurityPluginSetup,
+  ServerlessSecurityPluginStart,
+  ServerlessSecurityPluginSetupDependencies,
+  ServerlessSecurityPluginStartDependencies,
+} from './types';
+
+export class ServerlessSecurityPlugin
+  implements
+    Plugin<
+      ServerlessSecurityPluginSetup,
+      ServerlessSecurityPluginStart,
+      ServerlessSecurityPluginSetupDependencies,
+      ServerlessSecurityPluginStartDependencies
+    >
+{
+  constructor(_initializerContext: PluginInitializerContext) {}
+
+  public setup() {
+    return {};
+  }
+
+  public start() {
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/x-pack/plugins/serverless_security/server/types.ts b/x-pack/plugins/serverless_security/server/types.ts
new file mode 100644
index 00000000000000..be7167d0303158
--- /dev/null
+++ b/x-pack/plugins/serverless_security/server/types.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 { SecurityPluginSetup, SecurityPluginStart } from '@kbn/security-plugin/server';
+import {
+  PluginSetup as SecuritySolutionPluginSetup,
+  PluginStart as SecuritySolutionPluginStart,
+} from '@kbn/security-solution-plugin/server';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessSecurityPluginSetup {}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ServerlessSecurityPluginStart {}
+
+export interface ServerlessSecurityPluginSetupDependencies {
+  security: SecurityPluginSetup;
+  securitySolution: SecuritySolutionPluginSetup;
+}
+
+export interface ServerlessSecurityPluginStartDependencies {
+  security: SecurityPluginStart;
+  securitySolution: SecuritySolutionPluginStart;
+}
diff --git a/x-pack/plugins/serverless_security/tsconfig.json b/x-pack/plugins/serverless_security/tsconfig.json
new file mode 100644
index 00000000000000..ddf77b288e6287
--- /dev/null
+++ b/x-pack/plugins/serverless_security/tsconfig.json
@@ -0,0 +1,24 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types"
+  },
+  "include": [
+    "index.ts",
+    "common/**/*.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "server/**/*.ts",
+    "../../../typings/**/*"
+  ],
+  "exclude": [
+    "target/**/*"
+  ],
+  "kbn_references": [
+    "@kbn/core",
+    "@kbn/config-schema",
+    "@kbn/security-plugin",
+    "@kbn/security-solution-plugin",
+    "@kbn/serverless",
+  ]
+}
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/slack/action_form.test.tsx b/x-pack/plugins/stack_connectors/public/connector_types/slack/action_form.test.tsx
new file mode 100644
index 00000000000000..32eb23f9a167fb
--- /dev/null
+++ b/x-pack/plugins/stack_connectors/public/connector_types/slack/action_form.test.tsx
@@ -0,0 +1,177 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 { ActionForm } from '@kbn/triggers-actions-ui-plugin/public/application/sections/action_connector_form/action_form';
+import { TypeRegistry } from '@kbn/triggers-actions-ui-plugin/public/application/type_registry';
+import { ActionTypeModel } from '@kbn/triggers-actions-ui-plugin/public/types';
+import type { ApplicationStart } from '@kbn/core/public';
+import { useKibana } from '@kbn/triggers-actions-ui-plugin/public/common/lib/kibana';
+import { IToasts } from '@kbn/core/public';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
+import { getConnectorType as getSlackConnectorType } from './slack';
+import { getSlackApiConnectorType } from '../slack_api';
+
+jest.mock('@kbn/triggers-actions-ui-plugin/public/common/lib/kibana');
+jest.mock('@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting', () => ({
+  useUiSetting: jest.fn(() => false),
+  useUiSetting$: jest.fn((value: string) => ['0,0']),
+}));
+jest.mock('@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api/connectors');
+jest.mock(
+  '@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api/connector_types'
+);
+jest.mock(
+  '@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api/execute',
+  () => ({
+    executeAction: async () => ({
+      status: 'ok',
+      data: {
+        ok: true,
+        channels: [
+          {
+            id: 'channel-id',
+            name: 'channel-name',
+          },
+        ],
+      },
+      connector_id: '.slack_api',
+    }),
+  })
+);
+const { loadAllActions } = jest.requireMock(
+  '@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api/connectors'
+);
+const { loadActionTypes } = jest.requireMock(
+  '@kbn/triggers-actions-ui-plugin/public/application/lib/action_connector_api/connector_types'
+);
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
+
+// GET api/actions/connector_types?feature_id=alerting
+loadActionTypes.mockResolvedValue([
+  {
+    enabled: true,
+    enabledInConfig: true,
+    enabledInLicense: true,
+    id: '.slack',
+    minimumLicenseRequired: 'basic',
+    name: 'Slack',
+    supportedFeatureIds: ['alerting', 'uptime', 'siem'],
+  },
+  {
+    enabled: true,
+    enabledInConfig: true,
+    enabledInLicense: true,
+    id: '.slack_api',
+    minimumLicenseRequired: 'basic',
+    name: 'Slack API',
+    supportedFeatureIds: ['alerting', 'siem'],
+  },
+]);
+
+// GET api/actions/connectors
+loadAllActions.mockResolvedValue([
+  {
+    actionTypeId: '.slack_api',
+    config: {},
+    id: 'connector-id',
+    isDeprecated: false,
+    isMissingSecrets: false,
+    isPreconfigured: false,
+    name: 'webapi',
+    referencedByCount: 0,
+  },
+]);
+
+const actionTypeRegistry = new TypeRegistry<ActionTypeModel>();
+actionTypeRegistry.register(getSlackConnectorType());
+actionTypeRegistry.register(getSlackApiConnectorType());
+
+const baseProps = {
+  actions: [],
+  defaultActionGroupId: 'metrics.inventory_threshold.fired',
+  hasSummary: true,
+  featureId: 'alerting',
+  recoveryActionGroup: 'recovered',
+  actionTypeRegistry,
+  minimumThrottleInterval: [1, 'm'] as [number | undefined, string],
+  setActions: jest.fn(),
+  setActionIdByIndex: jest.fn(),
+  setActionParamsProperty: jest.fn(),
+  setActionFrequencyProperty: jest.fn(),
+  setActionAlertsFilterProperty: jest.fn(),
+};
+
+const mockToasts = {
+  danger: jest.fn(),
+  warning: jest.fn(),
+};
+
+jest.mock('@kbn/triggers-actions-ui-plugin/public', () => {
+  const original = jest.requireActual('@kbn/triggers-actions-ui-plugin/public');
+  return {
+    ...original,
+    useKibana: () => ({
+      ...original.useKibana(),
+      notifications: { toasts: mockToasts },
+    }),
+  };
+});
+
+describe('ActionForm - Slack API Connector', () => {
+  beforeAll(() => {
+    useKibanaMock().services.notifications.toasts = {
+      addSuccess: jest.fn(),
+      addError: jest.fn(),
+      addDanger: jest.fn(),
+    } as unknown as IToasts;
+
+    useKibanaMock().services.application.capabilities = {
+      actions: {
+        delete: true,
+        save: true,
+        show: true,
+      },
+    } as unknown as ApplicationStart['capabilities'];
+  });
+
+  test('show error message when no channel has been selected', async () => {
+    const testActions = [
+      {
+        id: 'connector-id',
+        actionTypeId: '.slack_api',
+        group: 'metrics.inventory_threshold.fired',
+        params: {
+          subAction: 'postMessage',
+          subActionParams: {
+            text: 'text',
+            channels: [], // no channel selected
+          },
+        },
+        frequency: {
+          notifyWhen: 'onActionGroupChange' as 'onActionGroupChange',
+          throttle: null,
+          summary: false,
+        },
+      },
+    ];
+
+    const testProps = {
+      ...baseProps,
+      actions: testActions,
+    };
+
+    render(
+      <IntlProvider locale="en">
+        <ActionForm {...testProps} />
+      </IntlProvider>
+    );
+
+    expect(await screen.findByText('Selected channel is required.')).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/synthetics/e2e/journeys/synthetics/alert_rules/default_status_alert.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/synthetics/alert_rules/default_status_alert.journey.ts
index b9fc467fc0befd..2373b9712a7530 100644
--- a/x-pack/plugins/synthetics/e2e/journeys/synthetics/alert_rules/default_status_alert.journey.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/synthetics/alert_rules/default_status_alert.journey.ts
@@ -58,6 +58,7 @@ journey(`DefaultStatusAlert`, async ({ page, params }) => {
     await page.isDisabled(byTestId('xpack.synthetics.toggleAlertFlyout'));
     await page.click(byTestId('xpack.synthetics.toggleAlertFlyout'));
     await page.waitForSelector('text=Edit rule');
+    expect(await page.locator(`[data-test-subj="intervalFormRow"]`).count()).toEqual(0);
     await page.click(byTestId('saveEditedRuleButton'));
     await page.waitForSelector("text=Updated 'Synthetics internal alert'");
   });
diff --git a/x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts b/x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts
index 357ab213819eb6..d4110ca7508c3c 100644
--- a/x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts
+++ b/x-pack/plugins/synthetics/e2e/journeys/synthetics/management_list.journey.ts
@@ -25,7 +25,7 @@ journey(`MonitorManagementList`, async ({ page, params }) => {
 
   const pageBaseUrl = 'http://localhost:5620/app/synthetics/monitors';
   const searchBarInput = page.locator(
-    '[placeholder="Search by name, url, host, tag, project or location"]'
+    '[placeholder="Search by name, URL, host, tag, project or location"]'
   );
 
   page.setDefaultTimeout(60 * 1000);
@@ -72,12 +72,12 @@ journey(`MonitorManagementList`, async ({ page, params }) => {
     await page.click('span >> text="Journey / Page"');
     await page.click('[aria-label="Apply the selected filters for Type"]');
     expect(page.url()).toBe(`${pageBaseUrl}?monitorTypes=%5B%22browser%22%5D`);
-    await page.click('[placeholder="Search by name, url, host, tag, project or location"]');
+    await page.click('[placeholder="Search by name, URL, host, tag, project or location"]');
     await Promise.all([
       page.waitForNavigation({
         url: `${pageBaseUrl}?monitorTypes=%5B%22browser%22%5D&query=3`,
       }),
-      page.fill('[placeholder="Search by name, url, host, tag, project or location"]', '3'),
+      page.fill('[placeholder="Search by name, URL, host, tag, project or location"]', '3'),
     ]);
     await page.click('text=1-1');
     await page.waitForSelector('text=Showing 1-1 of 1 Configuration');
diff --git a/x-pack/plugins/synthetics/kibana.jsonc b/x-pack/plugins/synthetics/kibana.jsonc
index 1cc3b45f4637d3..9ed7f52cb67c7e 100644
--- a/x-pack/plugins/synthetics/kibana.jsonc
+++ b/x-pack/plugins/synthetics/kibana.jsonc
@@ -40,7 +40,6 @@
       "fleet",
       "kibanaReact",
       "kibanaUtils",
-      "ml",
       "observability",
       "spaces",
       "indexLifecycleManagement"
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx
index 0ff7d0518e7d65..96c00d08843b53 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx
@@ -100,8 +100,8 @@ export const ToggleAlertFlyoutButton = () => {
 };
 
 const noWritePermissionsTooltipContent = i18n.translate(
-  'xpack.synthetics.alertDropdown.noWritePermissions',
+  'xpack.synthetics.alertDropdown.noPermissions',
   {
-    defaultMessage: 'You need read-write access to Uptime to create alerts in this app.',
+    defaultMessage: 'You do not have sufficient permissions to perform this action.',
   }
 );
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/monitor_details_panel.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/monitor_details_panel.tsx
index 5cddb55074c24e..dffc3b1f357b68 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/monitor_details_panel.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/components/monitor_details_panel.tsx
@@ -235,7 +235,7 @@ const TAGS_LABEL = i18n.translate('xpack.synthetics.management.monitorList.tags'
 });
 
 const ENABLED_LABEL = i18n.translate('xpack.synthetics.detailsPanel.monitorDetails.enabled', {
-  defaultMessage: 'Enabled',
+  defaultMessage: 'Enabled (all locations)',
 });
 
 const MONITOR_TYPE_LABEL = i18n.translate(
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/browser_steps_list.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/browser_steps_list.tsx
index ccec4c1e8f60de..fc534b1408f397 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/browser_steps_list.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/monitor_test_result/browser_steps_list.tsx
@@ -306,6 +306,7 @@ const StyleForStepStatus = ({
     <EuiText
       css={{
         fontWeight: euiTheme.font.weight.bold,
+        whiteSpace: 'nowrap',
       }}
       size={textSize}
       color={euiTheme.colors[getTextColorForMonitorStatus(status)] as CSSProperties['color']}
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/wrappers/service_allowed_wrapper.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/wrappers/service_allowed_wrapper.tsx
index bbed7797e94e3c..32fa6cba8f5a1c 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/common/wrappers/service_allowed_wrapper.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/common/wrappers/service_allowed_wrapper.tsx
@@ -51,13 +51,13 @@ const REQUEST_ACCESS_LABEL = i18n.translate('xpack.synthetics.monitorManagement.
 });
 
 export const MONITOR_MANAGEMENT_LABEL = i18n.translate('xpack.synthetics.monitorManagement.label', {
-  defaultMessage: 'Monitor Management',
+  defaultMessage: 'Synthetics App',
 });
 
 const LOADING_MONITOR_MANAGEMENT_LABEL = i18n.translate(
   'xpack.synthetics.monitorManagement.loading.label',
   {
-    defaultMessage: 'Loading Monitor Management',
+    defaultMessage: 'Loading Synthetics App',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/form_fields/service_locations.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/form_fields/service_locations.tsx
index 5c6d242f87b374..e59ca668ac81c7 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/form_fields/service_locations.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/getting_started/form_fields/service_locations.tsx
@@ -31,7 +31,7 @@ export const ServiceLocationsField = ({
     <EuiFormRow
       fullWidth
       label={LOCATIONS_LABEL}
-      helpText={!errors?.[ConfigKey.LOCATIONS] ? SELECT_ONE_OR_MORE_LOCATIONS : undefined}
+      helpText={!errors?.[ConfigKey.LOCATIONS] ? SELECT_ONE_OR_MORE_LOCATIONS_DETAILS : undefined}
       isInvalid={!!errors?.[ConfigKey.LOCATIONS]}
       error={SELECT_ONE_OR_MORE_LOCATIONS}
     >
@@ -70,6 +70,13 @@ const SELECT_ONE_OR_MORE_LOCATIONS = i18n.translate(
   }
 );
 
+const SELECT_ONE_OR_MORE_LOCATIONS_DETAILS = i18n.translate(
+  'xpack.synthetics.monitorManagement.selectOneOrMoreLocationsDetails',
+  {
+    defaultMessage: 'Select locations where monitors will be executed.',
+  }
+);
+
 const LOCATIONS_LABEL = i18n.translate('xpack.synthetics.monitorManagement.locationsLabel', {
   defaultMessage: 'Locations',
 });
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
index 6a3d2fda361f0a..d20453be1c2ed4 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitor_add_edit/steps/read_only_callout.tsx
@@ -22,7 +22,7 @@ export const ReadOnlyCallout = ({ projectId }: { projectId?: string }) => {
       <p>
         <FormattedMessage
           id="xpack.synthetics.project.readOnly.callout.content"
-          defaultMessage="This monitor was added from an external project: {projectId}. From this page, you can only enable, disable, or remove it. To make configuration changes, you have to edit its source file and push it again from that project."
+          defaultMessage="This monitor was added from an external project: {projectId}. From this page, you can only enable and disable the monitor and its alerts, or remove it. To make configuration changes, you have to edit its source file and push it again from that project."
           values={{ projectId: <strong>{projectId}</strong> }}
         />
       </p>
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/common/search_field.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/common/search_field.tsx
index 01e9beda8a7e1d..5ff1eaf742fca8 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/common/search_field.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/common/search_field.tsx
@@ -56,5 +56,5 @@ export function SearchField() {
 }
 
 const PLACEHOLDER_TEXT = i18n.translate('xpack.synthetics.monitorManagement.filter.placeholder', {
-  defaultMessage: `Search by name, url, host, tag, project or location`,
+  defaultMessage: `Search by name, URL, host, tag, project or location`,
 });
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/labels.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/labels.ts
index ff297267dcb62d..45100e71fda61f 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/labels.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/labels.ts
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 export const LOADING_LABEL = i18n.translate(
   'xpack.synthetics.monitorManagement.manageMonitorLoadingLabel',
   {
-    defaultMessage: 'Loading Monitor Management',
+    defaultMessage: 'Loading Synthetics App',
   }
 );
 
@@ -24,14 +24,14 @@ export const LEARN_MORE_LABEL = i18n.translate(
 export const CALLOUT_MANAGEMENT_DISABLED = i18n.translate(
   'xpack.synthetics.monitorManagement.callout.disabled',
   {
-    defaultMessage: 'Monitor Management is currently disabled',
+    defaultMessage: 'Synthetics App is currently disabled',
   }
 );
 
 export const CALLOUT_MANAGEMENT_CONTACT_ADMIN = i18n.translate(
   'xpack.synthetics.monitorManagement.callout.disabled.adminContact',
   {
-    defaultMessage: 'Monitor Management will be enabled when an admin visits the Synthetics app.',
+    defaultMessage: 'Synthetics App will be enabled when an admin visits the Synthetics app.',
   }
 );
 
@@ -39,28 +39,28 @@ export const CALLOUT_MANAGEMENT_DESCRIPTION = i18n.translate(
   'xpack.synthetics.monitorManagement.callout.description.disabled',
   {
     defaultMessage:
-      "Monitor Management requires a valid API key to run your monitors on Elastic's global managed testing locations. If you already had enabled Monitor Management previously, the API key may no longer be valid.",
+      "Synthetics App requires a valid API key to run your monitors on Elastic's global managed testing locations. If you already had enabled Synthetics App previously, the API key may no longer be valid.",
   }
 );
 
 export const ERROR_HEADING_BODY = i18n.translate(
   'xpack.synthetics.monitorManagement.editMonitorError.description',
   {
-    defaultMessage: 'Monitor Management settings could not be loaded. Please contact Support.',
+    defaultMessage: 'Synthetics App settings could not be loaded. Please contact Support.',
   }
 );
 
 export const SYNTHETICS_ENABLE_LABEL = i18n.translate(
   'xpack.synthetics.monitorManagement.syntheticsEnableLabel.management',
   {
-    defaultMessage: 'Enable Monitor Management',
+    defaultMessage: 'Enable Synthetics App',
   }
 );
 
 export const ERROR_HEADING_LABEL = i18n.translate(
   'xpack.synthetics.monitorManagement.editMonitorError',
   {
-    defaultMessage: 'Error loading Monitor Management',
+    defaultMessage: 'Error loading Synthetics App',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_errors/monitor_async_error.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_errors/monitor_async_error.tsx
index d6dbf0465b066a..ae5a035b76b54c 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_errors/monitor_async_error.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_errors/monitor_async_error.tsx
@@ -24,7 +24,7 @@ export const MonitorAsyncError = () => {
         title={
           <FormattedMessage
             id="xpack.synthetics.monitorManagement.monitorSync.failure.title"
-            defaultMessage="Monitors failed to sync with the Synthetics service"
+            defaultMessage="Some monitors are not running correctly"
           />
         }
         color="warning"
@@ -33,7 +33,7 @@ export const MonitorAsyncError = () => {
         <p>
           <FormattedMessage
             id="xpack.synthetics.monitorManagement.monitorSync.failure.content"
-            defaultMessage="There was a problem syncing your monitors for one or more locations:"
+            defaultMessage="There was a problem running your monitors for one or more locations:"
           />
         </p>
         <ul>
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/labels.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/labels.ts
index 961e0c3782e81d..506e446fe8a740 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/labels.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/labels.ts
@@ -7,47 +7,25 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const SYNTHETICS_ENABLE_SUCCESS = i18n.translate(
-  'xpack.synthetics.monitorManagement.syntheticsEnableSuccess',
+export const SYNTHETICS_APP_ENABLEMENT_TITLE = i18n.translate(
+  'xpack.synthetics.emptyState.enablement.title',
   {
-    defaultMessage: 'Monitor Management enabled successfully.',
+    defaultMessage: 'Monitor the status of your services and applications with Synthetics',
   }
 );
 
-export const SYNTHETICS_DISABLE_SUCCESS = i18n.translate(
-  'xpack.synthetics.monitorManagement.syntheticsDisabledSuccess',
-  {
-    defaultMessage: 'Monitor Management disabled successfully.',
-  }
-);
-
-export const MONITOR_MANAGEMENT_ENABLEMENT_LABEL = i18n.translate(
-  'xpack.synthetics.monitorManagement.emptyState.enablement.enabled.title',
-  {
-    defaultMessage: 'Enable Monitor Management',
-  }
-);
-
-export const SYNTHETICS_APP_DISABLED_LABEL = i18n.translate(
-  'xpack.synthetics.emptyState.enablement.disabled.title',
-  {
-    defaultMessage: 'Synthetics App is disabled',
-  }
-);
-
-export const MONITOR_MANAGEMENT_ENABLEMENT_MESSAGE = i18n.translate(
-  'xpack.synthetics.monitorManagement.emptyState.enablement',
+export const MONITOR_MANAGEMENT_DISABLED_MESSAGE = i18n.translate(
+  'xpack.synthetics.emptyState.enablement.disabledDescription',
   {
     defaultMessage:
-      'Enable Monitor Management to run lightweight and real-browser monitors from hosted testing locations around the world. Enabling Monitor Management will generate an API key to allow the Synthetics Service to write back to your Elasticsearch cluster.',
+      'Run automated checks based on real-browser simulations and lightweight endpoint pings to measure the experience of your users from any location worldwide.',
   }
 );
 
-export const MONITOR_MANAGEMENT_DISABLED_MESSAGE = i18n.translate(
-  'xpack.synthetics.emptyState.enablement.disabledDescription',
+export const MONITOR_MANAGEMENT_CONTACT_ADMINISTRATOR = i18n.translate(
+  'xpack.synthetics.emptyState.enablement.contactAdministrator',
   {
-    defaultMessage:
-      'Synthetics App is currently disabled. Synthetics App allows you to run lightweight and real-browser monitors from hosted testing locations around the world. To enable Synthetics App, please contact an administrator.',
+    defaultMessage: 'Only administrators can enable this feature.',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/synthetics_enablement.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/synthetics_enablement.tsx
index e4fcee12f65a51..4324bba250a1a2 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/synthetics_enablement.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/synthetics_enablement/synthetics_enablement.tsx
@@ -5,55 +5,24 @@
  * 2.0.
  */
 
-import React, { useState, useEffect, useRef } from 'react';
+import React from 'react';
 import { EuiEmptyPrompt, EuiTitle, EuiLink } from '@elastic/eui';
 import { useEnablement } from '../../../../hooks/use_enablement';
-import { kibanaService } from '../../../../../../utils/kibana_service';
 import * as labels from './labels';
 
 export const EnablementEmptyState = () => {
-  const { error, enablement, loading } = useEnablement();
-  const [shouldFocusEnablementButton, setShouldFocusEnablementButton] = useState(false);
-  const [isEnabling, setIsEnabling] = useState(false);
+  const { enablement, loading } = useEnablement();
   const { isEnabled } = enablement;
-  const isEnabledRef = useRef(isEnabled);
-  const buttonRef = useRef<HTMLButtonElement>(null);
-
-  useEffect(() => {
-    if (!isEnabled && isEnabledRef.current === true) {
-      /* shift focus to enable button when enable toggle disappears. Prevent
-       * focus loss on the page */
-      setShouldFocusEnablementButton(true);
-    }
-    isEnabledRef.current = Boolean(isEnabled);
-  }, [isEnabled]);
-
-  useEffect(() => {
-    if (isEnabling && isEnabled) {
-      setIsEnabling(false);
-      kibanaService.toasts.addSuccess({
-        title: labels.SYNTHETICS_ENABLE_SUCCESS,
-        toastLifeTimeMs: 3000,
-      });
-    } else if (isEnabling && error) {
-      setIsEnabling(false);
-      kibanaService.toasts.addSuccess({
-        title: labels.SYNTHETICS_DISABLE_SUCCESS,
-        toastLifeTimeMs: 3000,
-      });
-    }
-  }, [isEnabled, isEnabling, error]);
-
-  useEffect(() => {
-    if (shouldFocusEnablementButton) {
-      buttonRef.current?.focus();
-    }
-  }, [shouldFocusEnablementButton]);
 
   return !isEnabled && !loading ? (
     <EuiEmptyPrompt
-      title={<h2>{labels.SYNTHETICS_APP_DISABLED_LABEL}</h2>}
-      body={<p>{labels.MONITOR_MANAGEMENT_DISABLED_MESSAGE}</p>}
+      title={<h2>{labels.SYNTHETICS_APP_ENABLEMENT_TITLE}</h2>}
+      body={
+        <>
+          <p>{labels.MONITOR_MANAGEMENT_DISABLED_MESSAGE}</p>
+          <p>{labels.MONITOR_MANAGEMENT_CONTACT_ADMINISTRATOR}</p>
+        </>
+      }
       footer={
         <>
           <EuiTitle size="xxs">
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.test.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.test.tsx
index 99f199b52498e5..ce8d29ca345c4c 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.test.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.test.tsx
@@ -140,7 +140,7 @@ describe('ActionsPopover', () => {
         locationId={testMonitor.location.id}
       />
     );
-    const enableButton = getByText('Disable monitor');
+    const enableButton = getByText('Disable monitor (all locations)');
     fireEvent.click(enableButton);
     expect(updateMonitorEnabledState).toHaveBeenCalledTimes(1);
     expect(updateMonitorEnabledState.mock.calls[0]).toEqual([false]);
@@ -162,7 +162,7 @@ describe('ActionsPopover', () => {
         locationId={testMonitor.location.id}
       />
     );
-    const enableButton = getByText('Enable monitor');
+    const enableButton = getByText('Enable monitor (all locations)');
     fireEvent.click(enableButton);
     expect(updateMonitorEnabledState).toHaveBeenCalledTimes(1);
     expect(updateMonitorEnabledState.mock.calls[0]).toEqual([true]);
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
index 019a8c3972d652..26e752f62a274e 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/actions_popover.tsx
@@ -235,7 +235,12 @@ export function ActionsPopover({
       },
     },
     {
-      name: monitor.isStatusAlertEnabled ? disableAlertLabel : enableMonitorAlertLabel,
+      name: (
+        <NoPermissionsTooltip canEditSynthetics={canEditSynthetics}>
+          {monitor.isStatusAlertEnabled ? disableAlertLabel : enableMonitorAlertLabel}
+        </NoPermissionsTooltip>
+      ),
+      disabled: !canEditSynthetics,
       icon: alertLoading ? (
         <EuiLoadingSpinner size="s" />
       ) : monitor.isStatusAlertEnabled ? (
@@ -345,28 +350,28 @@ const loadingLabel = (isEnabled: boolean) =>
 const enableMonitorLabel = i18n.translate(
   'xpack.synthetics.overview.actions.enableLabelEnableMonitor',
   {
-    defaultMessage: 'Enable monitor',
+    defaultMessage: 'Enable monitor (all locations)',
   }
 );
 
 const disableMonitorLabel = i18n.translate(
   'xpack.synthetics.overview.actions.enableLabelDisableMonitor',
   {
-    defaultMessage: 'Disable monitor',
+    defaultMessage: 'Disable monitor (all locations)',
   }
 );
 
 const disableAlertLabel = i18n.translate(
   'xpack.synthetics.overview.actions.disableLabelDisableAlert',
   {
-    defaultMessage: 'Disable status alerts',
+    defaultMessage: 'Disable status alerts (all locations)',
   }
 );
 
 const enableMonitorAlertLabel = i18n.translate(
   'xpack.synthetics.overview.actions.enableLabelDisableAlert',
   {
-    defaultMessage: 'Enable status alerts',
+    defaultMessage: 'Enable status alerts (all locations)',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item_icon.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item_icon.tsx
index a1fdf1e734d5cf..7534d94ebe1b25 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item_icon.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item_icon.tsx
@@ -27,7 +27,7 @@ import { useRef } from 'react';
 import { selectErrorPopoverState, toggleErrorPopoverOpen } from '../../../../state';
 import { useErrorDetailsLink } from '../../../common/links/error_details_link';
 import { MonitorOverviewItem, OverviewPing } from '../../../../../../../common/runtime_types';
-import { manualTestRunSelector } from '../../../../state/manual_test_runs';
+import { manualTestRunSelector, isTestRunning } from '../../../../state/manual_test_runs';
 import { useFormatTestRunAt } from '../../../../utils/monitor_test_result/test_time_formats';
 
 const Container = styled.div`
@@ -62,7 +62,7 @@ export const MetricItemIcon = ({
     dispatch(toggleErrorPopoverOpen(configIdByLocation));
   };
 
-  const inProgress = testNowRun?.status === 'in-progress' || testNowRun?.status === 'loading';
+  const inProgress = isTestRunning(testNowRun);
 
   const errorLink = useErrorDetailsLink({
     configId: monitor.configId,
@@ -75,9 +75,11 @@ export const MetricItemIcon = ({
 
   if (inProgress) {
     return (
-      <EuiToolTip position="top" content="Test is in progress">
-        <EuiLoadingSpinner />
-      </EuiToolTip>
+      <Container>
+        <EuiToolTip position="top" content={TEST_IN_PROGRESS}>
+          <EuiLoadingSpinner />
+        </EuiToolTip>
+      </Container>
     );
   }
 
@@ -164,6 +166,10 @@ const ERROR_DETAILS = i18n.translate('xpack.synthetics.errorDetails.label', {
   defaultMessage: 'Error details',
 });
 
+const TEST_IN_PROGRESS = i18n.translate('xpack.synthetics.inProgress.label', {
+  defaultMessage: 'Manual test run is in progress.',
+});
+
 const StyledIcon = euiStyled.div<{ boxShadow: string }>`
   box-sizing: border-box;
   display: flex;
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/monitor_detail_flyout.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/monitor_detail_flyout.tsx
index 33138c33851c9a..18f7b25055a6bf 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/monitor_detail_flyout.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/monitor_detail_flyout.tsx
@@ -391,7 +391,7 @@ const PREVIOUS_PERIOD_SERIES_NAME = i18n.translate(
 );
 
 const ENABLED_ITEM_TEXT = i18n.translate('xpack.synthetics.monitorList.enabledItemText', {
-  defaultMessage: 'Enabled',
+  defaultMessage: 'Enabled (all locations)',
 });
 
 const CLOSE_FLYOUT_TEXT = i18n.translate('xpack.synthetics.monitorList.closeFlyoutText', {
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/route_config.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/route_config.tsx
index 57f40f56765937..0ac6a3ccc0f7e5 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/route_config.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/monitors_page/route_config.tsx
@@ -44,7 +44,7 @@ export const getMonitorsRoute = (
     },
     {
       title: i18n.translate('xpack.synthetics.monitorManagementRoute.title', {
-        defaultMessage: 'Monitor Management | {baseTitle}',
+        defaultMessage: 'Synthetics Management | {baseTitle}',
         values: { baseTitle },
       }),
       path: MONITORS_ROUTE,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/alert_defaults_form.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/alert_defaults_form.tsx
index 2c81ccf1d86e7a..f87f1267efcc38 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/alert_defaults_form.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/alert_defaults_form.tsx
@@ -93,7 +93,7 @@ export const AlertDefaultsForm = () => {
         description={
           <FormattedMessage
             id="xpack.synthetics.settings.defaultConnectors.description"
-            defaultMessage="Selector one or more connectors to be used for alerts. These settings will be applied to all synthetics based alerts."
+            defaultMessage="Select one or more connectors to be used for alerts. These settings apply to all synthetics-based alerts."
           />
         }
       >
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/translations.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/translations.ts
index 12d30b2d6b9127..a6761c4cc69946 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/translations.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/alerting_defaults/translations.ts
@@ -11,7 +11,7 @@ export const alertFormI18n = {
   inputPlaceHolder: i18n.translate(
     'xpack.synthetics.sourceConfiguration.alertDefaultForm.selectConnector',
     {
-      defaultMessage: 'Please select one or more connectors',
+      defaultMessage: 'Select one or more connectors',
     }
   ),
   emailPlaceHolder: i18n.translate(
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/delete_location.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/delete_location.tsx
index 959520c9114690..cfaf62f8915991 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/delete_location.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/delete_location.tsx
@@ -37,8 +37,8 @@ export const DeleteLocation = ({
   const deleteDisabledReason = !canSaveIntegrations
     ? CANNOT_SAVE_INTEGRATION_LABEL
     : i18n.translate('xpack.synthetics.monitorManagement.cannotDelete.description', {
-        defaultMessage: `This location cannot be deleted, because it has {monCount, number} {monCount, plural,one {monitor} other {monitors}} running.
-                Please remove this location from your monitors before deleting this location.`,
+        defaultMessage: `You can't delete this location because it is used in {monCount, number} {monCount, plural,one {monitor} other {monitors}}.
+                Remove this location from all monitors first.`,
         values: { monCount },
       });
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/view_location_monitors.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/view_location_monitors.tsx
index a008da59751b11..525b088f1f6c04 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/view_location_monitors.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/settings/private_locations/view_location_monitors.tsx
@@ -35,7 +35,7 @@ export const ViewLocationMonitors = ({
     <EuiPopover button={button} isOpen={isPopoverOpen} closePopover={closePopover}>
       <FormattedMessage
         id="xpack.synthetics.monitorManagement.viewMonitors"
-        defaultMessage="Location {name} has {count, number} {count, plural,one {monitor} other {monitors}} running."
+        defaultMessage='Location "{name}" is used in {count, number} {count, plural,one {monitor} other {monitors}}.'
         values={{ count, name: <strong>{locationName}</strong> }}
       />
       <EuiSpacer size="s" />
@@ -66,7 +66,7 @@ export const ViewLocationMonitors = ({
 const VIEW_LOCATION_MONITORS = i18n.translate(
   'xpack.synthetics.monitorManagement.viewLocationMonitors',
   {
-    defaultMessage: 'View location monitors',
+    defaultMessage: 'View monitors',
   }
 );
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
index 7665538d7682ba..6e0ebbf2d4aa8f 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
@@ -174,7 +174,7 @@ export const FAILED_TO_RUN = i18n.translate('xpack.synthetics.monitorManagement.
   defaultMessage: 'Failed to run steps',
 });
 
-export const ERROR_RUNNING_TEST = i18n.translate('xpack.synthetics.testRun.runErrorLabel', {
+export const ERROR_RUNNING_TEST = i18n.translate('xpack.synthetics.testRun.testErrorLabel', {
   defaultMessage: 'Error running test',
 });
 
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/hooks/use_run_once_errors.ts b/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/hooks/use_run_once_errors.ts
index 9859b5b0216bc9..36611914264db5 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/hooks/use_run_once_errors.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/components/test_now_mode/hooks/use_run_once_errors.ts
@@ -7,7 +7,6 @@
 
 import { useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { kibanaService } from '../../../../../utils/kibana_service';
 import { Locations, ServiceLocationErrors } from '../../monitor_add_edit/types';
 
 export function useRunOnceErrors({
@@ -77,7 +76,7 @@ export function useRunOnceErrors({
               title: RunErrorLabel,
             },
           ]
-        : [{ name: 'Error', message: PushErrorService, title: PushErrorLabel }];
+        : [{ name: 'Error', message: PushErrorService, title: RunErrorLabel }];
     } else if (locationErrors?.length > 0) {
       // If only some of the locations were unsuccessful
       return locationErrors
@@ -93,41 +92,25 @@ export function useRunOnceErrors({
     return [];
   }, [locationsById, locationErrors, locationErrorReasons, hasBlockingError]);
 
-  useEffect(() => {
-    if (showErrors) {
-      errorMessages.forEach(
-        ({ name, message, title }: { name: string; message: string; title: string }) => {
-          kibanaService.toasts.addError({ name, message }, { title });
-        }
-      );
-    }
-  }, [errorMessages, showErrors]);
-
   return {
     expectPings,
     hasBlockingError,
-    blockingErrorTitle: hasBlockingError ? PushErrorLabel : null,
-    blockingErrorMessage: hasBlockingError
-      ? `${PushErrorService} ${errorMessages[0]?.message}`
-      : null,
+    blockingErrorTitle: hasBlockingError ? RunErrorLabel : null,
+    blockingErrorMessage: hasBlockingError ? `${errorMessages[0]?.message}` : null,
     errorMessages,
   };
 }
 
-const PushErrorLabel = i18n.translate('xpack.synthetics.testRun.pushErrorLabel', {
-  defaultMessage: 'Push error',
-});
-
 const RunErrorLabel = i18n.translate('xpack.synthetics.testRun.runErrorLabel', {
-  defaultMessage: 'Error running test',
+  defaultMessage: "Can't run the test now",
 });
 
 const getLocationTestErrorLabel = (locationName: string, reason: string) =>
   i18n.translate('xpack.synthetics.testRun.runErrorLocation.reason', {
-    defaultMessage: 'Failed to run monitor on location {locationName}. {reason}',
+    defaultMessage: 'Failed to run test on location {locationName}. {reason}',
     values: { locationName, reason },
   });
 
 const PushErrorService = i18n.translate('xpack.synthetics.testRun.pushError', {
-  defaultMessage: 'Failed to push the monitor to service.',
+  defaultMessage: 'This test cannot be executed at this time. Try again later.',
 });
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/lib/alert_types/monitor_status.tsx b/x-pack/plugins/synthetics/public/apps/synthetics/lib/alert_types/monitor_status.tsx
index 278eb6d522db36..2c4d5055a08914 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/lib/alert_types/monitor_status.tsx
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/lib/alert_types/monitor_status.tsx
@@ -41,7 +41,7 @@ export const initMonitorStatusAlertType: AlertTypeInitializer = ({
   ruleParamsExpression: (paramProps: RuleTypeParamsExpressionProps<StatusRuleParams>) => (
     <MonitorStatusAlert core={core} plugins={plugins} params={paramProps} />
   ),
-  validate: (ruleParams: StatusRuleParams) => {
+  validate: (_ruleParams: StatusRuleParams) => {
     return { errors: {} };
   },
   defaultActionMessage,
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/state/alert_rules/effects.ts b/x-pack/plugins/synthetics/public/apps/synthetics/state/alert_rules/effects.ts
index e49d84ba9c6b6d..fb092adbcab333 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/state/alert_rules/effects.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/state/alert_rules/effects.ts
@@ -39,7 +39,7 @@ export function* updateDefaultAlertingEffect() {
 
 const successMessage = i18n.translate('xpack.synthetics.settings.enableAlerting', {
   defaultMessage:
-    'Monitor status rule type successfully updated. Next rule alerts will take the changes into account.',
+    'Monitor status rule successfully updated. Changes will take effect on the next rule execution.',
 });
 
 const failureMessage = i18n.translate('xpack.synthetics.settings.enabledAlert.fail', {
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/state/manual_test_runs/index.ts b/x-pack/plugins/synthetics/public/apps/synthetics/state/manual_test_runs/index.ts
index 9f1d5a3296f00e..936efc6ada6cab 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/state/manual_test_runs/index.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/state/manual_test_runs/index.ts
@@ -31,6 +31,9 @@ export enum TestRunStatus {
   COMPLETED = 'completed',
 }
 
+export const isTestRunning = (testRun?: ManualTestRun) =>
+  testRun?.status === TestRunStatus.IN_PROGRESS || testRun?.status === TestRunStatus.LOADING;
+
 export interface ManualTestRun {
   configId: string;
   name: string;
diff --git a/x-pack/plugins/synthetics/public/apps/synthetics/state/synthetics_enablement/effects.ts b/x-pack/plugins/synthetics/public/apps/synthetics/state/synthetics_enablement/effects.ts
index 14c912b07ce99a..a840d7d4057bcf 100644
--- a/x-pack/plugins/synthetics/public/apps/synthetics/state/synthetics_enablement/effects.ts
+++ b/x-pack/plugins/synthetics/public/apps/synthetics/state/synthetics_enablement/effects.ts
@@ -29,5 +29,5 @@ export function* fetchSyntheticsEnablementEffect() {
 }
 
 const failureMessage = i18n.translate('xpack.synthetics.settings.enablement.fail', {
-  defaultMessage: 'Failed to enable Monitor Management',
+  defaultMessage: 'Failed to enable Synthetics App',
 });
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/duration_line_bar_list.tsx b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/duration_line_bar_list.tsx
index 3fb96bf0336e1a..29a5a817797d99 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/duration_line_bar_list.tsx
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/charts/duration_line_bar_list.tsx
@@ -8,7 +8,12 @@
 import React from 'react';
 import moment from 'moment';
 import { AnnotationTooltipFormatter, RectAnnotation, RectAnnotationDatum } from '@elastic/charts';
-import { ANOMALY_SEVERITY, getSeverityColor, getSeverityType } from '@kbn/ml-plugin/public';
+
+// Individual deep imports to not consume the whole package bundle.
+import { getSeverityColor } from '@kbn/ml-anomaly-utils/get_severity_color';
+import { getSeverityType } from '@kbn/ml-anomaly-utils/get_severity_type';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
+
 import { AnnotationTooltip } from './annotation_tooltip';
 
 interface Props {
@@ -19,7 +24,7 @@ interface Props {
 export const DurationAnomaliesBar = ({ anomalies, hiddenLegends }: Props) => {
   const anomalyAnnotations: Map<string, { rect: RectAnnotationDatum[]; color: string }> = new Map();
 
-  Object.keys(ANOMALY_SEVERITY).forEach((severityLevel) => {
+  Object.keys(ML_ANOMALY_SEVERITY).forEach((severityLevel) => {
     anomalyAnnotations.set(severityLevel.toLowerCase(), { rect: [], color: '' });
   });
 
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/anomaly_alert/anomaly_alert.tsx b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
index c22aed0c8a9ceb..c4f37cfa65ff24 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/anomaly_alert/anomaly_alert.tsx
@@ -15,7 +15,11 @@ import {
 } from '@elastic/eui';
 import { useSelector } from 'react-redux';
 import React, { useEffect, useState } from 'react';
-import { getSeverityColor, getSeverity } from '@kbn/ml-plugin/public';
+
+// Individual deep imports to not consume the whole package bundle.
+import { getSeverity } from '@kbn/ml-anomaly-utils/get_severity';
+import { getSeverityColor } from '@kbn/ml-anomaly-utils/get_severity_color';
+
 import { AnomalyTranslations } from './translations';
 import { AlertExpressionPopover } from '../alert_expression_popover';
 import { DEFAULT_SEVERITY, SelectSeverity, SEVERITY_OPTIONS } from './select_severity';
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/anomaly_alert/select_severity.tsx b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/anomaly_alert/select_severity.tsx
index 3af35148501c03..68578a1262e807 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/anomaly_alert/select_severity.tsx
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/alerts/anomaly_alert/select_severity.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import { EuiHealth, EuiSpacer, EuiSuperSelect, EuiText } from '@elastic/eui';
-import { getSeverityColor } from '@kbn/ml-plugin/public';
+import { getSeverityColor } from '@kbn/ml-anomaly-utils/get_severity_color';
 
 const warningLabel = i18n.translate('xpack.synthetics.controls.selectSeverity.warningLabel', {
   defaultMessage: 'warning',
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/settings/translations.ts b/x-pack/plugins/synthetics/public/legacy_uptime/components/settings/translations.ts
index 5f5afc048f8402..8d00c6ca948dab 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/settings/translations.ts
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/settings/translations.ts
@@ -28,7 +28,7 @@ export const alertFormI18n = {
   inputPlaceHolder: i18n.translate(
     'xpack.synthetics.sourceConfiguration.alertDefaultForm.selectConnector',
     {
-      defaultMessage: 'Please select one or more connectors',
+      defaultMessage: 'Select one or more connectors',
     }
   ),
   emailPlaceHolder: i18n.translate(
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/state/actions/ml_anomaly.ts b/x-pack/plugins/synthetics/public/legacy_uptime/state/actions/ml_anomaly.ts
index 9f3ddff0e9178e..bfb46f0d0ff64d 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/state/actions/ml_anomaly.ts
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/state/actions/ml_anomaly.ts
@@ -6,11 +6,8 @@
  */
 
 import { createAction } from 'redux-actions';
-import {
-  MlCapabilitiesResponse,
-  AnomaliesTableRecord,
-  JobExistResult,
-} from '@kbn/ml-plugin/public';
+import type { MlAnomaliesTableRecord } from '@kbn/ml-anomaly-utils';
+import type { MlCapabilitiesResponse, JobExistResult } from '@kbn/ml-plugin/public';
 import { createAsyncAction } from './utils';
 import {
   CreateMLJobSuccess,
@@ -46,7 +43,7 @@ export interface AnomalyRecordsParams {
 }
 
 export interface AnomalyRecords {
-  anomalies: AnomaliesTableRecord[];
+  anomalies: MlAnomaliesTableRecord[];
   interval: string;
 }
 
diff --git a/x-pack/plugins/synthetics/server/legacy_uptime/lib/alerts/duration_anomaly.test.ts b/x-pack/plugins/synthetics/server/legacy_uptime/lib/alerts/duration_anomaly.test.ts
index 9203a1c7eff103..f38f5c1e61e293 100644
--- a/x-pack/plugins/synthetics/server/legacy_uptime/lib/alerts/duration_anomaly.test.ts
+++ b/x-pack/plugins/synthetics/server/legacy_uptime/lib/alerts/duration_anomaly.test.ts
@@ -11,17 +11,20 @@ import {
 } from '@kbn/rule-data-utils';
 import { durationAnomalyAlertFactory } from './duration_anomaly';
 import { DURATION_ANOMALY } from '../../../../common/constants/uptime_alerts';
-import { AnomaliesTableRecord, AnomalyRecordDoc } from '@kbn/ml-plugin/common/types/anomalies';
+import {
+  getSeverityType,
+  type MlAnomaliesTableRecord,
+  type MlAnomalyRecordDoc,
+} from '@kbn/ml-anomaly-utils';
 import { createRuleTypeMocks, bootstrapDependencies } from './test_utils';
-import { getSeverityType } from '@kbn/ml-plugin/common/util/anomaly_utils';
 import { Ping } from '../../../../common/runtime_types/ping';
 
 interface MockAnomaly {
-  severity: AnomaliesTableRecord['severity'];
-  source: Partial<AnomalyRecordDoc>;
-  actualSort: AnomaliesTableRecord['actualSort'];
-  typicalSort: AnomaliesTableRecord['typicalSort'];
-  entityValue: AnomaliesTableRecord['entityValue'];
+  severity: MlAnomaliesTableRecord['severity'];
+  source: Partial<MlAnomalyRecordDoc>;
+  actualSort: MlAnomaliesTableRecord['actualSort'];
+  typicalSort: MlAnomaliesTableRecord['typicalSort'];
+  entityValue: MlAnomaliesTableRecord['entityValue'];
 }
 
 interface MockAnomalyResult {
diff --git a/x-pack/plugins/synthetics/server/legacy_uptime/lib/alerts/duration_anomaly.ts b/x-pack/plugins/synthetics/server/legacy_uptime/lib/alerts/duration_anomaly.ts
index 42d81f6e0d0d63..42c6b0e0b512a4 100644
--- a/x-pack/plugins/synthetics/server/legacy_uptime/lib/alerts/duration_anomaly.ts
+++ b/x-pack/plugins/synthetics/server/legacy_uptime/lib/alerts/duration_anomaly.ts
@@ -13,8 +13,7 @@ import {
   ALERT_REASON,
 } from '@kbn/rule-data-utils';
 import { ActionGroupIdsOf } from '@kbn/alerting-plugin/common';
-import { AnomaliesTableRecord } from '@kbn/ml-plugin/common/types/anomalies';
-import { getSeverityType } from '@kbn/ml-plugin/common/util/anomaly_utils';
+import { getSeverityType, type MlAnomaliesTableRecord } from '@kbn/ml-anomaly-utils';
 import { UptimeEsClient } from '../lib';
 import {
   updateState,
@@ -37,7 +36,7 @@ import { ALERT_REASON_MSG, ACTION_VARIABLES, VIEW_IN_APP_URL } from './action_va
 
 export type ActionGroupIds = ActionGroupIdsOf<typeof DURATION_ANOMALY>;
 
-export const getAnomalySummary = (anomaly: AnomaliesTableRecord, monitorInfo: Ping) => {
+export const getAnomalySummary = (anomaly: MlAnomaliesTableRecord, monitorInfo: Ping) => {
   return {
     severity: getSeverityType(anomaly.severity),
     severityScore: Math.round(anomaly.severity),
diff --git a/x-pack/plugins/synthetics/server/synthetics_service/get_api_key.ts b/x-pack/plugins/synthetics/server/synthetics_service/get_api_key.ts
index 79af4d6cfc7187..e92f5956741b5a 100644
--- a/x-pack/plugins/synthetics/server/synthetics_service/get_api_key.ts
+++ b/x-pack/plugins/synthetics/server/synthetics_service/get_api_key.ts
@@ -126,7 +126,7 @@ export const generateAPIKey = async ({
 
   /* Not exposed to the user. May grant as internal user */
   return security.authc.apiKeys?.grantAsInternalUser(request, {
-    name: 'synthetics-api-key (required for monitor management)',
+    name: 'synthetics-api-key (required for Synthetics App)',
     role_descriptors: {
       synthetics_writer: serviceApiKeyPrivileges,
     },
diff --git a/x-pack/plugins/synthetics/tsconfig.json b/x-pack/plugins/synthetics/tsconfig.json
index 61b7fe8d8d19c2..03749d5510b648 100644
--- a/x-pack/plugins/synthetics/tsconfig.json
+++ b/x-pack/plugins/synthetics/tsconfig.json
@@ -79,6 +79,7 @@
     "@kbn/exploratory-view-plugin",
     "@kbn/observability-shared-plugin",
     "@kbn/ml-error-utils",
+    "@kbn/ml-anomaly-utils",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/task_manager/server/config.test.ts b/x-pack/plugins/task_manager/server/config.test.ts
index 54e9562ec62fb3..9e1e89e68624b3 100644
--- a/x-pack/plugins/task_manager/server/config.test.ts
+++ b/x-pack/plugins/task_manager/server/config.test.ts
@@ -44,6 +44,7 @@ describe('config validation', () => {
           "exclude_task_types": Array [],
         },
         "version_conflict_threshold": 80,
+        "worker_utilization_running_average_window": 5,
       }
     `);
   });
@@ -95,6 +96,7 @@ describe('config validation', () => {
           "exclude_task_types": Array [],
         },
         "version_conflict_threshold": 80,
+        "worker_utilization_running_average_window": 5,
       }
     `);
   });
@@ -149,6 +151,7 @@ describe('config validation', () => {
           "exclude_task_types": Array [],
         },
         "version_conflict_threshold": 80,
+        "worker_utilization_running_average_window": 5,
       }
     `);
   });
diff --git a/x-pack/plugins/task_manager/server/config.ts b/x-pack/plugins/task_manager/server/config.ts
index 40b915e8979a2d..ae6c7a9fb41eb9 100644
--- a/x-pack/plugins/task_manager/server/config.ts
+++ b/x-pack/plugins/task_manager/server/config.ts
@@ -18,9 +18,12 @@ export const DEFAULT_MAX_EPHEMERAL_REQUEST_CAPACITY = MAX_WORKERS_LIMIT;
 // ===================
 // Refresh aggregated monitored stats at a default rate of once a minute
 export const DEFAULT_MONITORING_REFRESH_RATE = 60 * 1000;
-export const DEFAULT_MONITORING_STATS_RUNNING_AVERGAE_WINDOW = 50;
+export const DEFAULT_MONITORING_STATS_RUNNING_AVERAGE_WINDOW = 50;
 export const DEFAULT_MONITORING_STATS_WARN_DELAYED_TASK_START_IN_SECONDS = 60;
 
+// At the default poll interval of 3sec, this averages over the last 15sec.
+export const DEFAULT_WORKER_UTILIZATION_RUNNING_AVERAGE_WINDOW = 5;
+
 export const taskExecutionFailureThresholdSchema = schema.object(
   {
     error_threshold: schema.number({
@@ -98,7 +101,7 @@ export const configSchema = schema.object(
     }),
     /* The size of the running average window for monitored stats. */
     monitored_stats_running_average_window: schema.number({
-      defaultValue: DEFAULT_MONITORING_STATS_RUNNING_AVERGAE_WINDOW,
+      defaultValue: DEFAULT_MONITORING_STATS_RUNNING_AVERAGE_WINDOW,
       max: 100,
       min: 10,
     }),
@@ -130,6 +133,11 @@ export const configSchema = schema.object(
       }),
     }),
     event_loop_delay: eventLoopDelaySchema,
+    worker_utilization_running_average_window: schema.number({
+      defaultValue: DEFAULT_WORKER_UTILIZATION_RUNNING_AVERAGE_WINDOW,
+      max: 100,
+      min: 1,
+    }),
     /* These are not designed to be used by most users. Please use caution when changing these */
     unsafe: schema.object({
       exclude_task_types: schema.arrayOf(schema.string(), { defaultValue: [] }),
diff --git a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
index 374a52ea84b2f8..c2c0f6e3aceed4 100644
--- a/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/ephemeral_task_lifecycle.test.ts
@@ -77,6 +77,7 @@ describe('EphemeralTaskLifecycle', () => {
           monitor: true,
           warn_threshold: 5000,
         },
+        worker_utilization_running_average_window: 5,
         ...config,
       },
       elasticsearchAndSOAvailability$,
diff --git a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
index 308aa9f556797f..db8981a186ab4c 100644
--- a/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
+++ b/x-pack/plugins/task_manager/server/integration_tests/managed_configuration.test.ts
@@ -71,6 +71,7 @@ describe('managed configuration', () => {
         monitor: true,
         warn_threshold: 5000,
       },
+      worker_utilization_running_average_window: 5,
     });
     logger = context.logger.get('taskManager');
 
diff --git a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
index 45b29c44b1a4b5..cdd67a07ff9e71 100644
--- a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.test.ts
@@ -9,7 +9,13 @@ import { v4 as uuidv4 } from 'uuid';
 import { Subject, Observable } from 'rxjs';
 import { take, bufferCount, skip, map } from 'rxjs/operators';
 import { ConcreteTaskInstance, TaskStatus } from '../task';
-import { asTaskRunEvent, TaskTiming, TaskPersistence } from '../task_events';
+import {
+  asTaskRunEvent,
+  TaskTiming,
+  TaskPersistence,
+  asTaskManagerStatEvent,
+  TaskManagerStats,
+} from '../task_events';
 import { asOk } from '../lib/result_type';
 import { TaskLifecycleEvent } from '../polling_lifecycle';
 import { TaskRunResult } from '../task_running';
@@ -18,9 +24,10 @@ import { taskPollingLifecycleMock } from '../polling_lifecycle.mock';
 import {
   BackgroundTaskUtilizationStat,
   createBackgroundTaskUtilizationAggregator,
+  summarizeUtilizationStats,
 } from './background_task_utilization_statistics';
 import { AdHocTaskCounter } from '../lib/adhoc_task_counter';
-import { sum } from 'lodash';
+import { sum, mean } from 'lodash';
 
 describe('Task Run Statistics', () => {
   const pollInterval = 3000;
@@ -29,404 +36,586 @@ describe('Task Run Statistics', () => {
     jest.resetAllMocks();
   });
 
-  test('returns a running count of adhoc actual service_time', async () => {
-    const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
-    });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.adhoc.ran.service_time.actual).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      const events = [];
-      const now = Date.now();
-      for (const time of serviceTimes) {
-        events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+  describe('createBackgroundTaskUtilizationAggregator', () => {
+    test('returns a running count of adhoc actual service_time', async () => {
+      const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.adhoc.ran.service_time.actual).toEqual(sum(window));
       }
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(serviceTimes.length),
-        bufferCount(serviceTimes.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], serviceTimes.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], serviceTimes.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], serviceTimes.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], serviceTimes.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], serviceTimes.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], serviceTimes.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], serviceTimes.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], serviceTimes.slice(0, 8));
-        resolve();
+
+      return new Promise<void>((resolve) => {
+        const events = [];
+        const now = Date.now();
+        for (const time of serviceTimes) {
+          events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+        }
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(serviceTimes.length),
+          bufferCount(serviceTimes.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], serviceTimes.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], serviceTimes.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], serviceTimes.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], serviceTimes.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], serviceTimes.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], serviceTimes.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], serviceTimes.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], serviceTimes.slice(0, 8));
+          resolve();
+        });
+
+        for (const event of events) {
+          events$.next(mockTaskRunEvent({}, event));
+        }
       });
+    });
 
-      for (const event of events) {
-        events$.next(mockTaskRunEvent({}, event));
+    test('returns a running count of adhoc adjusted service_time', async () => {
+      const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.adhoc.ran.service_time.adjusted).toEqual(sum(window));
       }
-    });
-  });
 
-  test('returns a running count of adhoc adjusted service_time', async () => {
-    const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
+      return new Promise<void>((resolve) => {
+        const events = [];
+        const now = Date.now();
+        for (const time of serviceTimes) {
+          events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+        }
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(serviceTimes.length),
+          bufferCount(serviceTimes.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], roundUpToNearestSec(serviceTimes.slice(0, 1), 3));
+          expectWindowEqualsUpdate(taskStats[1], roundUpToNearestSec(serviceTimes.slice(0, 2), 3));
+          expectWindowEqualsUpdate(taskStats[2], roundUpToNearestSec(serviceTimes.slice(0, 3), 3));
+          expectWindowEqualsUpdate(taskStats[3], roundUpToNearestSec(serviceTimes.slice(0, 4), 3));
+          expectWindowEqualsUpdate(taskStats[4], roundUpToNearestSec(serviceTimes.slice(0, 5), 3));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], roundUpToNearestSec(serviceTimes.slice(0, 6), 3));
+          expectWindowEqualsUpdate(taskStats[6], roundUpToNearestSec(serviceTimes.slice(0, 7), 3));
+          expectWindowEqualsUpdate(taskStats[7], roundUpToNearestSec(serviceTimes.slice(0, 8), 3));
+          resolve();
+        });
+
+        for (const event of events) {
+          events$.next(mockTaskRunEvent({}, event));
+        }
+      });
     });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.adhoc.ran.service_time.adjusted).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      const events = [];
-      const now = Date.now();
-      for (const time of serviceTimes) {
-        events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+
+    test('returns a running count of adhoc task_counter', async () => {
+      const tasks = [0, 0, 0, 0, 0, 0, 0, 0];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.adhoc.ran.service_time.task_counter).toEqual(window.length);
       }
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(serviceTimes.length),
-        bufferCount(serviceTimes.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], roundUpToNearestSec(serviceTimes.slice(0, 1), 3));
-        expectWindowEqualsUpdate(taskStats[1], roundUpToNearestSec(serviceTimes.slice(0, 2), 3));
-        expectWindowEqualsUpdate(taskStats[2], roundUpToNearestSec(serviceTimes.slice(0, 3), 3));
-        expectWindowEqualsUpdate(taskStats[3], roundUpToNearestSec(serviceTimes.slice(0, 4), 3));
-        expectWindowEqualsUpdate(taskStats[4], roundUpToNearestSec(serviceTimes.slice(0, 5), 3));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], roundUpToNearestSec(serviceTimes.slice(0, 6), 3));
-        expectWindowEqualsUpdate(taskStats[6], roundUpToNearestSec(serviceTimes.slice(0, 7), 3));
-        expectWindowEqualsUpdate(taskStats[7], roundUpToNearestSec(serviceTimes.slice(0, 8), 3));
-        resolve();
+
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(tasks.length),
+          bufferCount(tasks.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
+          resolve();
+        });
+
+        for (const task of tasks) {
+          events$.next(mockTaskRunEvent({}, { start: task, stop: task }));
+        }
       });
+    });
 
-      for (const event of events) {
-        events$.next(mockTaskRunEvent({}, event));
+    test('returns a running count of adhoc created counter', async () => {
+      const tasks = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.adhoc.created.counter).toEqual(sum(window));
       }
-    });
-  });
 
-  test('returns a running count of adhoc task_counter', async () => {
-    const tasks = [0, 0, 0, 0, 0, 0, 0, 0];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
-    });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.adhoc.ran.service_time.task_counter).toEqual(window.length);
-    }
-
-    return new Promise<void>((resolve) => {
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(tasks.length),
-        bufferCount(tasks.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
-        resolve();
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(tasks.length),
+          bufferCount(tasks.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
+          resolve();
+        });
+
+        for (const task of tasks) {
+          adHocTaskCounter.increment(task);
+          events$.next(mockTaskRunEvent({}, { start: 0, stop: 0 }));
+        }
       });
+    });
 
-      for (const task of tasks) {
-        events$.next(mockTaskRunEvent({}, { start: task, stop: task }));
+    test('returns a running count of recurring actual service_time', async () => {
+      const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.recurring.ran.service_time.actual).toEqual(sum(window));
       }
-    });
-  });
 
-  test('returns a running count of adhoc created counter', async () => {
-    const tasks = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
-    });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.adhoc.created.counter).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(tasks.length),
-        bufferCount(tasks.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
-        resolve();
+      return new Promise<void>((resolve) => {
+        const events = [];
+        const now = Date.now();
+        for (const time of serviceTimes) {
+          events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+        }
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(serviceTimes.length),
+          bufferCount(serviceTimes.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], serviceTimes.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], serviceTimes.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], serviceTimes.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], serviceTimes.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], serviceTimes.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], serviceTimes.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], serviceTimes.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], serviceTimes.slice(0, 8));
+          resolve();
+        });
+
+        for (const event of events) {
+          events$.next(mockTaskRunEvent({ schedule: { interval: '1h' } }, event));
+        }
       });
+    });
 
-      for (const task of tasks) {
-        adHocTaskCounter.increment(task);
-        events$.next(mockTaskRunEvent({}, { start: 0, stop: 0 }));
+    test('returns a running count of recurring adjusted service_time', async () => {
+      const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.recurring.ran.service_time.adjusted).toEqual(sum(window));
       }
-    });
-  });
 
-  test('returns a running count of recurring actual service_time', async () => {
-    const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
+      return new Promise<void>((resolve) => {
+        const events = [];
+        const now = Date.now();
+        for (const time of serviceTimes) {
+          events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+        }
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(serviceTimes.length),
+          bufferCount(serviceTimes.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], roundUpToNearestSec(serviceTimes.slice(0, 1), 3));
+          expectWindowEqualsUpdate(taskStats[1], roundUpToNearestSec(serviceTimes.slice(0, 2), 3));
+          expectWindowEqualsUpdate(taskStats[2], roundUpToNearestSec(serviceTimes.slice(0, 3), 3));
+          expectWindowEqualsUpdate(taskStats[3], roundUpToNearestSec(serviceTimes.slice(0, 4), 3));
+          expectWindowEqualsUpdate(taskStats[4], roundUpToNearestSec(serviceTimes.slice(0, 5), 3));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], roundUpToNearestSec(serviceTimes.slice(0, 6), 3));
+          expectWindowEqualsUpdate(taskStats[6], roundUpToNearestSec(serviceTimes.slice(0, 7), 3));
+          expectWindowEqualsUpdate(taskStats[7], roundUpToNearestSec(serviceTimes.slice(0, 8), 3));
+          resolve();
+        });
+
+        for (const event of events) {
+          events$.next(mockTaskRunEvent({ schedule: { interval: '1h' } }, event));
+        }
+      });
     });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.recurring.ran.service_time.actual).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      const events = [];
-      const now = Date.now();
-      for (const time of serviceTimes) {
-        events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
+
+    test('returns a running count of recurring task_counter', async () => {
+      const tasks = [0, 0, 0, 0, 0, 0, 0, 0];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+      const adHocTaskCounter = new AdHocTaskCounter();
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        adHocTaskCounter,
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.recurring.ran.service_time.task_counter).toEqual(window.length);
       }
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(serviceTimes.length),
-        bufferCount(serviceTimes.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], serviceTimes.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], serviceTimes.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], serviceTimes.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], serviceTimes.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], serviceTimes.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], serviceTimes.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], serviceTimes.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], serviceTimes.slice(0, 8));
-        resolve();
+
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          // Use 'summarizeUtilizationStat' to receive summarize stats
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(tasks.length),
+          bufferCount(tasks.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
+          // from the 6th value, begin to drop old values as out window is 5
+          expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
+          expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
+          expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
+          resolve();
+        });
+
+        for (const task of tasks) {
+          events$.next(
+            mockTaskRunEvent({ schedule: { interval: '1h' } }, { start: task, stop: task })
+          );
+        }
       });
+    });
 
-      for (const event of events) {
-        events$.next(mockTaskRunEvent({ schedule: { interval: '1h' } }, event));
+    test('returns a running count of load', async () => {
+      const loads = [40, 80, 100, 100, 10, 10, 60, 40];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
+      });
+
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        new AdHocTaskCounter(),
+        pollInterval
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.load).toEqual(mean(window));
       }
-    });
-  });
 
-  test('returns a running count of recurring adjusted service_time', async () => {
-    const serviceTimes = [1000, 2000, 500, 300, 400, 15000, 20000, 200];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(loads.length),
+          bufferCount(loads.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], loads.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], loads.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], loads.slice(0, 3));
+          expectWindowEqualsUpdate(taskStats[3], loads.slice(0, 4));
+          expectWindowEqualsUpdate(taskStats[4], loads.slice(0, 5));
+          // from the 6th value, begin to drop old values as our window is 5
+          expectWindowEqualsUpdate(taskStats[5], loads.slice(1, 6));
+          expectWindowEqualsUpdate(taskStats[6], loads.slice(2, 7));
+          expectWindowEqualsUpdate(taskStats[7], loads.slice(3, 8));
+          resolve();
+        });
+
+        for (const load of loads) {
+          events$.next(mockTaskStatEvent('workerUtilization', load));
+        }
+      });
     });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.recurring.ran.service_time.adjusted).toEqual(sum(window));
-    }
-
-    return new Promise<void>((resolve) => {
-      const events = [];
-      const now = Date.now();
-      for (const time of serviceTimes) {
-        events.push({ start: runAtMillisecondsAgo(now, time).getTime(), stop: now });
-      }
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(serviceTimes.length),
-        bufferCount(serviceTimes.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], roundUpToNearestSec(serviceTimes.slice(0, 1), 3));
-        expectWindowEqualsUpdate(taskStats[1], roundUpToNearestSec(serviceTimes.slice(0, 2), 3));
-        expectWindowEqualsUpdate(taskStats[2], roundUpToNearestSec(serviceTimes.slice(0, 3), 3));
-        expectWindowEqualsUpdate(taskStats[3], roundUpToNearestSec(serviceTimes.slice(0, 4), 3));
-        expectWindowEqualsUpdate(taskStats[4], roundUpToNearestSec(serviceTimes.slice(0, 5), 3));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], roundUpToNearestSec(serviceTimes.slice(0, 6), 3));
-        expectWindowEqualsUpdate(taskStats[6], roundUpToNearestSec(serviceTimes.slice(0, 7), 3));
-        expectWindowEqualsUpdate(taskStats[7], roundUpToNearestSec(serviceTimes.slice(0, 8), 3));
-        resolve();
+
+    test('returns a running count of load with custom window size', async () => {
+      const loads = [40, 80, 100, 100, 10, 10, 60, 40];
+      const events$ = new Subject<TaskLifecycleEvent>();
+      const taskPollingLifecycle = taskPollingLifecycleMock.create({
+        events$: events$ as Observable<TaskLifecycleEvent>,
       });
 
-      for (const event of events) {
-        events$.next(mockTaskRunEvent({ schedule: { interval: '1h' } }, event));
+      const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
+        taskPollingLifecycle,
+        new AdHocTaskCounter(),
+        pollInterval,
+        3
+      );
+
+      function expectWindowEqualsUpdate(
+        taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
+        window: number[]
+      ) {
+        expect(taskStat.value.load).toEqual(mean(window));
       }
+
+      return new Promise<void>((resolve) => {
+        BackgroundTaskUtilizationAggregator.pipe(
+          // skip initial stat which is just initialized data which
+          // ensures we don't stall on combineLatest
+          skip(1),
+          map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
+            key,
+            value,
+          })),
+          take(loads.length),
+          bufferCount(loads.length)
+        ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
+          expectWindowEqualsUpdate(taskStats[0], loads.slice(0, 1));
+          expectWindowEqualsUpdate(taskStats[1], loads.slice(0, 2));
+          expectWindowEqualsUpdate(taskStats[2], loads.slice(0, 3));
+          // from the 4th value, begin to drop old values as our window is 3
+          expectWindowEqualsUpdate(taskStats[3], loads.slice(1, 4));
+          expectWindowEqualsUpdate(taskStats[4], loads.slice(2, 5));
+          expectWindowEqualsUpdate(taskStats[5], loads.slice(3, 6));
+          expectWindowEqualsUpdate(taskStats[6], loads.slice(4, 7));
+          expectWindowEqualsUpdate(taskStats[7], loads.slice(5, 8));
+          resolve();
+        });
+
+        for (const load of loads) {
+          events$.next(mockTaskStatEvent('workerUtilization', load));
+        }
+      });
     });
   });
 
-  test('returns a running count of recurring task_counter', async () => {
-    const tasks = [0, 0, 0, 0, 0, 0, 0, 0];
-    const events$ = new Subject<TaskLifecycleEvent>();
-    const taskPollingLifecycle = taskPollingLifecycleMock.create({
-      events$: events$ as Observable<TaskLifecycleEvent>,
+  describe('summarizeUtilizationStats', () => {
+    const lastUpdate = '2023-04-02T17:34:41.371Z';
+    const monitoredStats = {
+      timestamp: '2023-04-01T17:34:41.371Z',
+      value: {
+        adhoc: {
+          created: {
+            counter: 1,
+          },
+          ran: {
+            service_time: {
+              actual: 10,
+              adjusted: 7,
+              task_counter: 3,
+            },
+          },
+        },
+        recurring: {
+          ran: {
+            service_time: {
+              actual: 79,
+              adjusted: 66,
+              task_counter: 10,
+            },
+          },
+        },
+        load: 63,
+      },
+    };
+
+    test('should return null if monitoredStats is null', () => {
+      expect(
+        summarizeUtilizationStats({
+          lastUpdate,
+          // @ts-expect-error
+          monitoredStats: null,
+          isInternal: false,
+        })
+      ).toEqual({
+        last_update: lastUpdate,
+        stats: null,
+      });
     });
-    const adHocTaskCounter = new AdHocTaskCounter();
-
-    const runningAverageWindowSize = 5;
-    const BackgroundTaskUtilizationAggregator = createBackgroundTaskUtilizationAggregator(
-      taskPollingLifecycle,
-      runningAverageWindowSize,
-      adHocTaskCounter,
-      pollInterval
-    );
-
-    function expectWindowEqualsUpdate(
-      taskStat: AggregatedStat<BackgroundTaskUtilizationStat>,
-      window: number[]
-    ) {
-      expect(taskStat.value.recurring.ran.service_time.task_counter).toEqual(window.length);
-    }
-
-    return new Promise<void>((resolve) => {
-      BackgroundTaskUtilizationAggregator.pipe(
-        // skip initial stat which is just initialized data which
-        // ensures we don't stall on combineLatest
-        skip(1),
-        // Use 'summarizeUtilizationStat' to receive summarize stats
-        map(({ key, value }: AggregatedStat<BackgroundTaskUtilizationStat>) => ({
-          key,
-          value,
-        })),
-        take(tasks.length),
-        bufferCount(tasks.length)
-      ).subscribe((taskStats: Array<AggregatedStat<BackgroundTaskUtilizationStat>>) => {
-        expectWindowEqualsUpdate(taskStats[0], tasks.slice(0, 1));
-        expectWindowEqualsUpdate(taskStats[1], tasks.slice(0, 2));
-        expectWindowEqualsUpdate(taskStats[2], tasks.slice(0, 3));
-        expectWindowEqualsUpdate(taskStats[3], tasks.slice(0, 4));
-        expectWindowEqualsUpdate(taskStats[4], tasks.slice(0, 5));
-        // from the 6th value, begin to drop old values as out window is 5
-        expectWindowEqualsUpdate(taskStats[5], tasks.slice(0, 6));
-        expectWindowEqualsUpdate(taskStats[6], tasks.slice(0, 7));
-        expectWindowEqualsUpdate(taskStats[7], tasks.slice(0, 8));
-        resolve();
+
+    test('should return null if monitoredStats value is not defined', () => {
+      expect(
+        summarizeUtilizationStats({
+          lastUpdate,
+          // @ts-expect-error
+          monitoredStats: {},
+          isInternal: false,
+        })
+      ).toEqual({
+        last_update: lastUpdate,
+        stats: null,
       });
+    });
 
-      for (const task of tasks) {
-        events$.next(
-          mockTaskRunEvent({ schedule: { interval: '1h' } }, { start: task, stop: task })
-        );
-      }
+    test('should return summary with all stats when isInternal is true', () => {
+      expect(
+        summarizeUtilizationStats({
+          lastUpdate,
+          monitoredStats,
+          isInternal: true,
+        })
+      ).toEqual({
+        last_update: lastUpdate,
+        stats: {
+          timestamp: monitoredStats.timestamp,
+          value: monitoredStats.value,
+        },
+      });
+    });
+
+    test('should return summary with only public stats when isInternal is false', () => {
+      expect(
+        summarizeUtilizationStats({
+          lastUpdate,
+          monitoredStats,
+          isInternal: false,
+        })
+      ).toEqual({
+        last_update: lastUpdate,
+        stats: {
+          timestamp: monitoredStats.timestamp,
+          value: {
+            load: 63,
+          },
+        },
+      });
     });
   });
 });
@@ -440,6 +629,10 @@ function roundUpToNearestSec(duration: number[], s: number): number[] {
   return duration.map((d) => Math.ceil(d / pollInterval) * pollInterval);
 }
 
+const mockTaskStatEvent = (type: TaskManagerStats, value: number) => {
+  return asTaskManagerStatEvent(type, asOk(value));
+};
+
 const mockTaskRunEvent = (
   overrides: Partial<ConcreteTaskInstance> = {},
   timing: TaskTiming,
diff --git a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.ts b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.ts
index 761ad4252ac831..fd116cbdd71d82 100644
--- a/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/background_task_utilization_statistics.ts
@@ -6,17 +6,29 @@
  */
 
 import { JsonObject } from '@kbn/utility-types';
-import { get } from 'lodash';
+import { get, pick } from 'lodash';
+import stats from 'stats-lite';
 import { combineLatest, filter, map, Observable, startWith } from 'rxjs';
 import { AdHocTaskCounter } from '../lib/adhoc_task_counter';
-import { unwrap } from '../lib/result_type';
+import { mapOk, unwrap } from '../lib/result_type';
 import { TaskLifecycleEvent, TaskPollingLifecycle } from '../polling_lifecycle';
 import { ConcreteTaskInstance } from '../task';
-import { isTaskRunEvent, TaskRun, TaskTiming } from '../task_events';
+import {
+  isTaskManagerWorkerUtilizationStatEvent,
+  isTaskRunEvent,
+  TaskRun,
+  TaskTiming,
+} from '../task_events';
 import { MonitoredStat } from './monitoring_stats_stream';
 import { AggregatedStat, AggregatedStatProvider } from './runtime_statistics_aggregator';
+import { createRunningAveragedStat } from './task_run_calcultors';
+import { DEFAULT_WORKER_UTILIZATION_RUNNING_AVERAGE_WINDOW } from '../config';
 
-export interface BackgroundTaskUtilizationStat extends JsonObject {
+export interface PublicBackgroundTaskUtilizationStat extends JsonObject {
+  load: number;
+}
+
+export interface BackgroundTaskUtilizationStat extends PublicBackgroundTaskUtilizationStat {
   adhoc: AdhocTaskStat;
   recurring: TaskStat;
 }
@@ -39,11 +51,11 @@ interface AdhocTaskStat extends TaskStat {
 
 export function createBackgroundTaskUtilizationAggregator(
   taskPollingLifecycle: TaskPollingLifecycle,
-  runningAverageWindowSize: number,
   adHocTaskCounter: AdHocTaskCounter,
-  pollInterval: number
+  pollInterval: number,
+  workerUtilizationRunningAverageWindowSize: number = DEFAULT_WORKER_UTILIZATION_RUNNING_AVERAGE_WINDOW
 ): AggregatedStatProvider<BackgroundTaskUtilizationStat> {
-  const taskRunEventToAdhocStat = createTaskRunEventToAdhocStat(runningAverageWindowSize);
+  const taskRunEventToAdhocStat = createTaskRunEventToAdhocStat();
   const taskRunAdhocEvents$: Observable<Pick<BackgroundTaskUtilizationStat, 'adhoc'>> =
     taskPollingLifecycle.events.pipe(
       filter((taskEvent: TaskLifecycleEvent) => isTaskRunEvent(taskEvent) && hasTiming(taskEvent)),
@@ -57,7 +69,7 @@ export function createBackgroundTaskUtilizationAggregator(
       })
     );
 
-  const taskRunEventToRecurringStat = createTaskRunEventToRecurringStat(runningAverageWindowSize);
+  const taskRunEventToRecurringStat = createTaskRunEventToRecurringStat();
   const taskRunRecurringEvents$: Observable<Pick<BackgroundTaskUtilizationStat, 'recurring'>> =
     taskPollingLifecycle.events.pipe(
       filter((taskEvent: TaskLifecycleEvent) => isTaskRunEvent(taskEvent) && hasTiming(taskEvent)),
@@ -71,6 +83,18 @@ export function createBackgroundTaskUtilizationAggregator(
       })
     );
 
+  const taskManagerUtilizationEventToLoadStat = createTaskRunEventToLoadStat(
+    workerUtilizationRunningAverageWindowSize
+  );
+
+  const taskManagerWorkerUtilizationEvent$: Observable<
+    Pick<BackgroundTaskUtilizationStat, 'load'>
+  > = taskPollingLifecycle.events.pipe(
+    filter(isTaskManagerWorkerUtilizationStatEvent),
+    map((taskEvent: TaskLifecycleEvent) => taskEvent.event),
+    map(mapOk((num: number) => taskManagerUtilizationEventToLoadStat(num)))
+  );
+
   return combineLatest([
     taskRunAdhocEvents$.pipe(
       startWith({
@@ -101,17 +125,24 @@ export function createBackgroundTaskUtilizationAggregator(
         },
       })
     ),
+    taskManagerWorkerUtilizationEvent$.pipe(
+      startWith({
+        load: 0,
+      })
+    ),
   ]).pipe(
     map(
-      ([adhoc, recurring]: [
+      ([adhoc, recurring, load]: [
         Pick<BackgroundTaskUtilizationStat, 'adhoc'>,
-        Pick<BackgroundTaskUtilizationStat, 'recurring'>
+        Pick<BackgroundTaskUtilizationStat, 'recurring'>,
+        Pick<BackgroundTaskUtilizationStat, 'load'>
       ]) => {
         return {
           key: 'utilization',
           value: {
             ...adhoc,
             ...recurring,
+            ...load,
           },
         } as AggregatedStat<BackgroundTaskUtilizationStat>;
       }
@@ -123,31 +154,41 @@ function hasTiming(taskEvent: TaskLifecycleEvent) {
   return !!taskEvent?.timing;
 }
 
-export function summarizeUtilizationStats({
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  last_update,
-  stats,
-}: {
-  last_update: string;
-  stats: MonitoredStat<BackgroundTaskUtilizationStat> | undefined;
-}): {
+interface SummarizeUtilizationStatsOpts {
+  lastUpdate: string;
+  monitoredStats: MonitoredStat<BackgroundTaskUtilizationStat> | undefined;
+  isInternal: boolean;
+}
+
+interface SummarizeUtilizationStatsResult {
   last_update: string;
-  stats: MonitoredStat<BackgroundTaskUtilizationStat> | null;
-} {
-  const utilizationStats = stats?.value;
+  stats:
+    | MonitoredStat<BackgroundTaskUtilizationStat>
+    | MonitoredStat<PublicBackgroundTaskUtilizationStat>
+    | null;
+}
+
+export function summarizeUtilizationStats({
+  lastUpdate,
+  monitoredStats,
+  isInternal,
+}: SummarizeUtilizationStatsOpts): SummarizeUtilizationStatsResult {
+  const utilizationStats = monitoredStats?.value;
+
+  if (!monitoredStats || !utilizationStats) {
+    return { last_update: lastUpdate, stats: null };
+  }
+
   return {
-    last_update,
-    stats:
-      stats && utilizationStats
-        ? {
-            timestamp: stats.timestamp,
-            value: utilizationStats,
-          }
-        : null,
+    last_update: lastUpdate,
+    stats: {
+      timestamp: monitoredStats.timestamp,
+      value: isInternal ? utilizationStats : pick(utilizationStats, 'load'),
+    },
   };
 }
 
-function createTaskRunEventToAdhocStat(runningAverageWindowSize: number) {
+function createTaskRunEventToAdhocStat() {
   let createdCounter = 0;
   let actualCounter = 0;
   let adjustedCounter = 0;
@@ -177,7 +218,7 @@ function createTaskRunEventToAdhocStat(runningAverageWindowSize: number) {
   };
 }
 
-function createTaskRunEventToRecurringStat(runningAverageWindowSize: number) {
+function createTaskRunEventToRecurringStat() {
   let actualCounter = 0;
   let adjustedCounter = 0;
   let taskCounter = 0;
@@ -201,6 +242,16 @@ function createTaskRunEventToRecurringStat(runningAverageWindowSize: number) {
   };
 }
 
+function createTaskRunEventToLoadStat(workerUtilizationRunningAverageWindowSize: number) {
+  const loadQueue = createRunningAveragedStat<number>(workerUtilizationRunningAverageWindowSize);
+  return (load: number): Pick<BackgroundTaskUtilizationStat, 'load'> => {
+    const historicalLoad = loadQueue(load);
+    return {
+      load: stats.mean(historicalLoad),
+    };
+  };
+}
+
 function getServiceTimeStats(timing: TaskTiming, pollInterval: number) {
   const duration = timing!.stop - timing!.start;
   const adjusted = Math.ceil(duration / pollInterval) * pollInterval;
diff --git a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
index 764b7aa15335b6..b63c52893c5d88 100644
--- a/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/configuration_statistics.test.ts
@@ -45,6 +45,7 @@ describe('Configuration Statistics Aggregator', () => {
         monitor: true,
         warn_threshold: 5000,
       },
+      worker_utilization_running_average_window: 5,
     };
 
     const managedConfig = {
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
index 610e0bf080b051..8d6df288e702da 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.test.ts
@@ -49,6 +49,7 @@ describe('createMonitoringStatsStream', () => {
       monitor: true,
       warn_threshold: 5000,
     },
+    worker_utilization_running_average_window: 5,
   };
 
   it('returns the initial config used to configure Task Manager', async () => {
diff --git a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
index e192a72f7092df..e1ff38d1c96078 100644
--- a/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/monitoring_stats_stream.ts
@@ -108,9 +108,9 @@ export function createAggregators(
       createTaskRunAggregator(taskPollingLifecycle, config.monitored_stats_running_average_window),
       createBackgroundTaskUtilizationAggregator(
         taskPollingLifecycle,
-        config.monitored_stats_running_average_window,
         adHocTaskCounter,
-        config.poll_interval
+        config.poll_interval,
+        config.worker_utilization_running_average_window
       )
     );
   }
diff --git a/x-pack/plugins/task_manager/server/plugin.test.ts b/x-pack/plugins/task_manager/server/plugin.test.ts
index ad02e6d7490f5d..fce648c87f6e9d 100644
--- a/x-pack/plugins/task_manager/server/plugin.test.ts
+++ b/x-pack/plugins/task_manager/server/plugin.test.ts
@@ -70,6 +70,7 @@ const pluginInitializerContextParams = {
     monitor: true,
     warn_threshold: 5000,
   },
+  worker_utilization_running_average_window: 5,
 };
 
 describe('TaskManagerPlugin', () => {
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
index 51cac494d3a670..9e62eec402b2dc 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.test.ts
@@ -75,6 +75,7 @@ describe('TaskPollingLifecycle', () => {
         monitor: true,
         warn_threshold: 5000,
       },
+      worker_utilization_running_average_window: 5,
     },
     taskStore: mockTaskStore,
     logger: taskManagerLogger,
diff --git a/x-pack/plugins/task_manager/server/polling_lifecycle.ts b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
index ce5a142dc433e0..e9b9eaca1e5d31 100644
--- a/x-pack/plugins/task_manager/server/polling_lifecycle.ts
+++ b/x-pack/plugins/task_manager/server/polling_lifecycle.ts
@@ -176,8 +176,13 @@ export class TaskPollingLifecycle {
               const capacity = this.pool.availableWorkers;
               if (!capacity) {
                 // if there isn't capacity, emit a load event so that we can expose how often
-                // high load causes the poller to skip work (work isn'tcalled when there is no capacity)
+                // high load causes the poller to skip work (work isn't called when there is no capacity)
                 this.emitEvent(asTaskManagerStatEvent('load', asOk(this.pool.workerLoad)));
+
+                // Emit event indicating task manager utilization
+                this.emitEvent(
+                  asTaskManagerStatEvent('workerUtilization', asOk(this.pool.workerLoad))
+                );
               }
               return capacity;
             },
@@ -187,7 +192,16 @@ export class TaskPollingLifecycle {
             // (such as polling for new work, marking tasks as running etc.) but does not
             // include the time of actually running the task
             workTimeout: pollInterval * maxPollInactivityCycles,
-          }),
+          }).pipe(
+            tap(
+              mapOk(() => {
+                // Emit event indicating task manager utilization % at the end of a polling cycle
+                this.emitEvent(
+                  asTaskManagerStatEvent('workerUtilization', asOk(this.pool.workerLoad))
+                );
+              })
+            )
+          ),
         {
           heartbeatInterval: pollInterval,
           // Time out the poller itself if it has failed to complete the entire stream for a certain amount of time.
diff --git a/x-pack/plugins/task_manager/server/routes/background_task_utilization.test.ts b/x-pack/plugins/task_manager/server/routes/background_task_utilization.test.ts
index 66052b095a2585..1ccc0d89f804a9 100644
--- a/x-pack/plugins/task_manager/server/routes/background_task_utilization.test.ts
+++ b/x-pack/plugins/task_manager/server/routes/background_task_utilization.test.ts
@@ -37,7 +37,7 @@ describe('backgroundTaskUtilizationRoute', () => {
     jest.resetAllMocks();
   });
 
-  it('registers the route', async () => {
+  it('registers internal and public route', async () => {
     const router = httpServiceMock.createRouter();
     backgroundTaskUtilizationRoute({
       router,
@@ -51,11 +51,15 @@ describe('backgroundTaskUtilizationRoute', () => {
       usageCounter: mockUsageCounter,
     });
 
-    const [config] = router.get.mock.calls[0];
+    const [config1] = router.get.mock.calls[0];
 
-    expect(config.path).toMatchInlineSnapshot(
+    expect(config1.path).toMatchInlineSnapshot(
       `"/internal/task_manager/_background_task_utilization"`
     );
+
+    const [config2] = router.get.mock.calls[1];
+
+    expect(config2.path).toMatchInlineSnapshot(`"/api/task_manager/_background_task_utilization"`);
   });
 
   it('checks user privileges and increments usage counter when API is accessed', async () => {
diff --git a/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts b/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
index a1e0f5c4281f94..0d7eabee2a7ce2 100644
--- a/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
+++ b/x-pack/plugins/task_manager/server/routes/background_task_utilization.ts
@@ -21,6 +21,7 @@ import { MonitoringStats } from '../monitoring';
 import { TaskManagerConfig } from '../config';
 import {
   BackgroundTaskUtilizationStat,
+  PublicBackgroundTaskUtilizationStat,
   summarizeUtilizationStats,
 } from '../monitoring/background_task_utilization_statistics';
 import { MonitoredStat } from '../monitoring/monitoring_stats_stream';
@@ -29,7 +30,10 @@ export interface MonitoredUtilization {
   process_uuid: string;
   timestamp: string;
   last_update: string;
-  stats: MonitoredStat<BackgroundTaskUtilizationStat> | null;
+  stats:
+    | MonitoredStat<BackgroundTaskUtilizationStat>
+    | MonitoredStat<PublicBackgroundTaskUtilizationStat>
+    | null;
 }
 
 export interface BackgroundTaskUtilRouteParams {
@@ -44,6 +48,12 @@ export interface BackgroundTaskUtilRouteParams {
   usageCounter?: UsageCounter;
 }
 
+// Create an internal and public route so we can test out experimental metrics
+const routeOptions = [
+  { basePath: 'internal', isInternal: true },
+  { basePath: 'api', isInternal: false },
+];
+
 export function backgroundTaskUtilizationRoute(
   params: BackgroundTaskUtilRouteParams
 ): Observable<MonitoredUtilization> {
@@ -61,10 +71,11 @@ export function backgroundTaskUtilizationRoute(
 
   const requiredHotStatsFreshness: number = config.monitored_stats_required_freshness;
 
-  function getBackgroundTaskUtilization(monitoredStats: MonitoringStats) {
+  function getBackgroundTaskUtilization(monitoredStats: MonitoringStats, isInternal: boolean) {
     const summarizedStats = summarizeUtilizationStats({
-      last_update: monitoredStats.last_update,
-      stats: monitoredStats.stats.utilization,
+      lastUpdate: monitoredStats.last_update,
+      monitoredStats: monitoredStats.stats.utilization,
+      isInternal,
     });
     const now = Date.now();
     const timestamp = new Date(now).toISOString();
@@ -83,7 +94,7 @@ export function backgroundTaskUtilizationRoute(
       }),
       // Only calculate the summarized stats (calculates all running averages and evaluates state)
       // when needed by throttling down to the requiredHotStatsFreshness
-      map((stats) => getBackgroundTaskUtilization(stats))
+      map((stats) => getBackgroundTaskUtilization(stats, true))
     )
     .subscribe((utilizationStats) => {
       monitoredUtilization$.next(utilizationStats);
@@ -92,58 +103,60 @@ export function backgroundTaskUtilizationRoute(
       }
     });
 
-  router.get(
-    {
-      path: '/internal/task_manager/_background_task_utilization',
-      // Uncomment when we determine that we can restrict API usage to Global admins based on telemetry
-      // options: { tags: ['access:taskManager'] },
-      validate: false,
-    },
-    async function (
-      context: RequestHandlerContext,
-      req: KibanaRequest<unknown, unknown, unknown>,
-      res: KibanaResponseFactory
-    ): Promise<IKibanaResponse> {
-      // If we are able to count usage, we want to check whether the user has access to
-      // the `taskManager` feature, which is only available as part of the Global All privilege.
-      if (usageCounter) {
-        const clusterClient = await getClusterClient();
-        const hasPrivilegesResponse = await clusterClient
-          .asScoped(req)
-          .asCurrentUser.security.hasPrivileges({
-            body: {
-              application: [
-                {
-                  application: `kibana-${kibanaIndexName}`,
-                  resources: ['*'],
-                  privileges: [`api:${kibanaVersion}:taskManager`],
-                },
-              ],
-            },
-          });
+  routeOptions.forEach((routeOption) => {
+    router.get(
+      {
+        path: `/${routeOption.basePath}/task_manager/_background_task_utilization`,
+        // Uncomment when we determine that we can restrict API usage to Global admins based on telemetry
+        // options: { tags: ['access:taskManager'] },
+        validate: false,
+      },
+      async function (
+        _: RequestHandlerContext,
+        req: KibanaRequest<unknown, unknown, unknown>,
+        res: KibanaResponseFactory
+      ): Promise<IKibanaResponse> {
+        // If we are able to count usage, we want to check whether the user has access to
+        // the `taskManager` feature, which is only available as part of the Global All privilege.
+        if (usageCounter) {
+          const clusterClient = await getClusterClient();
+          const hasPrivilegesResponse = await clusterClient
+            .asScoped(req)
+            .asCurrentUser.security.hasPrivileges({
+              body: {
+                application: [
+                  {
+                    application: `kibana-${kibanaIndexName}`,
+                    resources: ['*'],
+                    privileges: [`api:${kibanaVersion}:taskManager`],
+                  },
+                ],
+              },
+            });
 
-        // Keep track of total access vs admin access
-        usageCounter.incrementCounter({
-          counterName: `taskManagerBackgroundTaskUtilApiAccess`,
-          counterType: 'taskManagerBackgroundTaskUtilApi',
-          incrementBy: 1,
-        });
-        if (hasPrivilegesResponse.has_all_requested) {
+          // Keep track of total access vs admin access
           usageCounter.incrementCounter({
-            counterName: `taskManagerBackgroundTaskUtilApiAdminAccess`,
+            counterName: `taskManagerBackgroundTaskUtilApiAccess`,
             counterType: 'taskManagerBackgroundTaskUtilApi',
             incrementBy: 1,
           });
+          if (hasPrivilegesResponse.has_all_requested) {
+            usageCounter.incrementCounter({
+              counterName: `taskManagerBackgroundTaskUtilApiAdminAccess`,
+              counterType: 'taskManagerBackgroundTaskUtilApi',
+              incrementBy: 1,
+            });
+          }
         }
-      }
 
-      return res.ok({
-        body: lastMonitoredStats
-          ? getBackgroundTaskUtilization(lastMonitoredStats)
-          : { process_uuid: taskManagerId, timestamp: new Date().toISOString(), stats: {} },
-      });
-    }
-  );
+        return res.ok({
+          body: lastMonitoredStats
+            ? getBackgroundTaskUtilization(lastMonitoredStats, routeOption.isInternal)
+            : { process_uuid: taskManagerId, timestamp: new Date().toISOString(), stats: {} },
+        });
+      }
+    );
+  });
 
   return monitoredUtilization$;
 }
diff --git a/x-pack/plugins/task_manager/server/task_events.ts b/x-pack/plugins/task_manager/server/task_events.ts
index d0bcaf2724188b..e8808322b397a1 100644
--- a/x-pack/plugins/task_manager/server/task_events.ts
+++ b/x-pack/plugins/task_manager/server/task_events.ts
@@ -87,7 +87,8 @@ export type TaskManagerStats =
   | 'pollingDelay'
   | 'claimDuration'
   | 'queuedEphemeralTasks'
-  | 'ephemeralTaskDelay';
+  | 'ephemeralTaskDelay'
+  | 'workerUtilization';
 export type TaskManagerStat = TaskEvent<number, never, TaskManagerStats>;
 
 export type OkResultOf<EventType> = EventType extends TaskEvent<infer OkResult, infer ErrorResult>
@@ -211,6 +212,11 @@ export function isTaskManagerStatEvent(
 ): taskEvent is TaskManagerStat {
   return taskEvent.type === TaskEventType.TASK_MANAGER_STAT;
 }
+export function isTaskManagerWorkerUtilizationStatEvent(
+  taskEvent: TaskEvent<unknown, unknown>
+): taskEvent is TaskManagerStat {
+  return taskEvent.type === TaskEventType.TASK_MANAGER_STAT && taskEvent.id === 'workerUtilization';
+}
 export function isEphemeralTaskRejectedDueToCapacityEvent(
   taskEvent: TaskEvent<unknown, unknown>
 ): taskEvent is EphemeralTaskRejectedDueToCapacity {
diff --git a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
index f41a0598ff50c8..c8cb2787a90fbe 100644
--- a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
+++ b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.test.ts
@@ -19,6 +19,8 @@ import { registerTaskManagerUsageCollector } from './task_manager_usage_collecto
 import { sleep } from '../test_utils';
 import { TaskManagerUsage } from './types';
 import { MonitoredUtilization } from '../routes/background_task_utilization';
+import { MonitoredStat } from '../monitoring/monitoring_stats_stream';
+import { BackgroundTaskUtilizationStat } from '../monitoring/background_task_utilization_statistics';
 
 describe('registerTaskManagerUsageCollector', () => {
   let collector: Collector<unknown>;
@@ -113,18 +115,20 @@ describe('registerTaskManagerUsageCollector', () => {
     const mockHealth = getMockMonitoredHealth();
     monitoringStats$.next(mockHealth);
     const mockUtilization = getMockMonitoredUtilization();
+    const mockUtilizationStats =
+      mockUtilization.stats as MonitoredStat<BackgroundTaskUtilizationStat>;
     monitoringUtilization$.next(mockUtilization);
     await sleep(1001);
 
     expect(usageCollectionMock.makeUsageCollector).toBeCalled();
     const telemetry: TaskManagerUsage = (await collector.fetch(fetchContext)) as TaskManagerUsage;
     expect(telemetry.recurring_tasks).toEqual({
-      actual_service_time: mockUtilization.stats?.value.recurring.ran.service_time.actual,
-      adjusted_service_time: mockUtilization.stats?.value.recurring.ran.service_time.adjusted,
+      actual_service_time: mockUtilizationStats?.value.recurring.ran.service_time.actual,
+      adjusted_service_time: mockUtilizationStats?.value.recurring.ran.service_time.adjusted,
     });
     expect(telemetry.adhoc_tasks).toEqual({
-      actual_service_time: mockUtilization.stats?.value.adhoc.ran.service_time.actual,
-      adjusted_service_time: mockUtilization.stats?.value.adhoc.ran.service_time.adjusted,
+      actual_service_time: mockUtilizationStats?.value.adhoc.ran.service_time.actual,
+      adjusted_service_time: mockUtilizationStats?.value.adhoc.ran.service_time.adjusted,
     });
   });
 
@@ -308,6 +312,7 @@ function getMockMonitoredUtilization(overrides = {}): MonitoredUtilization {
     stats: {
       timestamp: new Date().toISOString(),
       value: {
+        load: 6,
         adhoc: {
           created: {
             counter: 5,
diff --git a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
index a4bd3049a0b499..6c8809c5c3d982 100644
--- a/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
+++ b/x-pack/plugins/task_manager/server/usage/task_manager_usage_collector.ts
@@ -9,6 +9,8 @@ import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/server';
 import { MonitoredHealth } from '../routes/health';
 import { TaskManagerUsage } from './types';
 import { MonitoredUtilization } from '../routes/background_task_utilization';
+import { BackgroundTaskUtilizationStat } from '../monitoring/background_task_utilization_statistics';
+import { MonitoredStat } from '../monitoring/monitoring_stats_stream';
 
 export function createTaskManagerUsageCollector(
   usageCollection: UsageCollectionSetup,
@@ -19,12 +21,13 @@ export function createTaskManagerUsageCollector(
   excludeTaskTypes: string[]
 ) {
   let lastMonitoredHealth: MonitoredHealth | null = null;
-  let lastMonitoredUtilization: MonitoredUtilization | null = null;
+  let lastMonitoredUtilizationStats: MonitoredStat<BackgroundTaskUtilizationStat> | null = null;
   combineLatest([monitoringStats$, monitoredUtilization$])
     .pipe()
     .subscribe(([health, utilization]) => {
       lastMonitoredHealth = health;
-      lastMonitoredUtilization = utilization;
+      lastMonitoredUtilizationStats =
+        (utilization?.stats as MonitoredStat<BackgroundTaskUtilizationStat>) ?? null;
     });
 
   return usageCollection.makeUsageCollector<TaskManagerUsage>({
@@ -69,15 +72,15 @@ export function createTaskManagerUsageCollector(
         ),
         recurring_tasks: {
           actual_service_time:
-            lastMonitoredUtilization?.stats?.value.recurring.ran.service_time.actual ?? 0,
+            lastMonitoredUtilizationStats?.value.recurring.ran.service_time.actual ?? 0,
           adjusted_service_time:
-            lastMonitoredUtilization?.stats?.value.recurring.ran.service_time.adjusted ?? 0,
+            lastMonitoredUtilizationStats?.value.recurring.ran.service_time.adjusted ?? 0,
         },
         adhoc_tasks: {
           actual_service_time:
-            lastMonitoredUtilization?.stats?.value.adhoc.ran.service_time.actual ?? 0,
+            lastMonitoredUtilizationStats?.value.adhoc.ran.service_time.actual ?? 0,
           adjusted_service_time:
-            lastMonitoredUtilization?.stats?.value.adhoc.ran.service_time.adjusted ?? 0,
+            lastMonitoredUtilizationStats?.value.adhoc.ran.service_time.adjusted ?? 0,
         },
         capacity:
           lastMonitoredHealth?.stats.capacity_estimation?.value.observed
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
index beb40203784097..ea19ddad91825f 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx
@@ -63,7 +63,8 @@ const createMockStorage = () => ({
   clear: jest.fn(),
 });
 
-describe('Transform: <DefinePivotForm />', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/150777
+describe.skip('Transform: <DefinePivotForm />', () => {
   test('Minimal initialization', async () => {
     // Arrange
     const mlSharedImports = await getMlSharedImports();
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
index a983b91e27e408..1c756b242c79f2 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx
@@ -278,7 +278,9 @@ export const StepDetailsForm: FC<StepDetailsFormProps> = React.memo(
     // Reset retention policy settings when the user disables the whole option
     useEffect(() => {
       if (!isRetentionPolicyEnabled) {
-        setRetentionPolicyDateField(isRetentionPolicyAvailable ? dateFieldNames[0] : '');
+        setRetentionPolicyDateField(
+          isRetentionPolicyAvailable ? dataViewAvailableTimeFields[0] : ''
+        );
         setRetentionPolicyMaxAge('');
       }
       // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -713,7 +715,7 @@ export const StepDetailsForm: FC<StepDetailsFormProps> = React.memo(
                 )}
               >
                 <EuiSelect
-                  options={dateFieldNames.map((text: string) => ({ text }))}
+                  options={dataViewAvailableTimeFields.map((text: string) => ({ text }))}
                   value={retentionPolicyDateField}
                   onChange={(e) => setRetentionPolicyDateField(e.target.value)}
                   data-test-subj="transformRetentionPolicyDateFieldSelect"
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 285e5b8a1284f3..eac17d48bc9bc9 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -2142,11 +2142,6 @@
     "discover.docTable.totalDocuments": "{totalDocuments} documents",
     "discover.dscTour.stepAddFields.description": "Cliquez sur {plusIcon} pour ajouter les champs qui vous intéressent.",
     "discover.dscTour.stepExpand.description": "Cliquez sur {expandIcon} pour afficher, comparer et filtrer les documents.",
-    "discover.fieldChooser.detailViews.existsInRecordsText": "Existe dans {value} / {totalValue} enregistrements",
-    "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "Exclure {field} : \"{value}\"",
-    "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "Filtrer sur {field} : \"{value}\"",
-    "discover.fieldChooser.detailViews.valueOfRecordsText": "{value} / {totalValue} enregistrements",
-    "discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "Ce champ est présent dans votre mapping Elasticsearch, mais pas dans les {hitsLength} documents affichés dans le tableau des documents. Cependant, vous pouvez toujours le consulter ou effectuer une recherche dessus.",
     "discover.grid.copyClipboardButtonTitle": "Copier la valeur de {column}",
     "discover.grid.copyColumnValuesToClipboard.toastTitle": "Valeurs de la colonne \"{column}\" copiées dans le presse-papiers",
     "discover.grid.filterForAria": "Filtrer sur cette {value}",
@@ -2204,8 +2199,6 @@
     "discover.advancedSettings.sampleSizeTitle": "Lignes max. par tableau",
     "discover.advancedSettings.searchOnPageLoadText": "Détermine si une recherche est exécutée lors du premier chargement de Discover. Ce paramètre n'a pas d'effet lors du chargement d’une recherche enregistrée.",
     "discover.advancedSettings.searchOnPageLoadTitle": "Recherche au chargement de la page",
-    "discover.advancedSettings.showLegacyFieldStatsText": "Pour calculer les valeurs les plus élevées d'un champ dans la barre latérale en utilisant 500 au lieu de 5 000 enregistrements par partition, activez cette option.",
-    "discover.advancedSettings.showLegacyFieldStatsTitle": "Calcul des valeurs les plus élevées",
     "discover.advancedSettings.sortDefaultOrderText": "Détermine le sens de tri par défaut pour les vues de données temporelles dans l'application Discover.",
     "discover.advancedSettings.sortDefaultOrderTitle": "Sens de tri par défaut",
     "discover.advancedSettings.sortOrderAsc": "Croissant",
@@ -2330,18 +2323,14 @@
     "discover.embeddable.search.displayName": "rechercher",
     "discover.fieldChooser.addField.label": "Ajouter un champ",
     "discover.fieldChooser.availableFieldsTooltip": "Champs disponibles pour l'affichage dans le tableau.",
-    "discover.fieldChooser.detailViews.emptyStringText": "Chaîne vide",
     "discover.fieldChooser.discoverField.actions": "Actions",
     "discover.fieldChooser.discoverField.addFieldTooltip": "Ajouter le champ en tant que colonne",
-    "discover.fieldChooser.discoverField.fieldTopValuesLabel": "Top 5 des valeurs",
     "discover.fieldChooser.discoverField.multiField": "champ multiple",
     "discover.fieldChooser.discoverField.multiFields": "Champs multiples",
     "discover.fieldChooser.discoverField.multiFieldTooltipContent": "Les champs multiples peuvent avoir plusieurs valeurs.",
     "discover.fieldChooser.discoverField.name": "Champ",
     "discover.fieldChooser.discoverField.removeFieldTooltip": "Supprimer le champ du tableau",
     "discover.fieldChooser.discoverField.value": "Valeur",
-    "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "L'analyse n'est pas disponible pour les champs géométriques.",
-    "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "L'analyse n'est pas disponible pour les champs d'objet.",
     "discover.fieldChooser.fieldsMobileButtonLabel": "Champs",
     "discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel": "Index et champs",
     "discover.fieldList.flyoutBackIcon": "Retour",
@@ -12170,11 +12159,9 @@
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.submitButton.title": "Enregistrer la configuration",
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.warning.title": "Ce connecteur est lié à votre index Elastic",
     "xpack.enterpriseSearch.content.indices.configurationConnector.configuration.successToast.title": "Configuration mise à jour",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label": "Explorer le référentiel de connecteurs",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.clientExamplesLink": "exemples de clients connecteurs",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.configurationFileLink": "fichier de configuration",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.connectorDeployedText": "Une fois que vous avez configuré le connecteur, déployez-le sur votre infrastructure autogérée.",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph": "Le référentiel de connecteurs contient plusieurs exemples de clients connecteurs pour vous aider à utiliser notre cadre de développement accéléré avec des sources de données personnalisées.",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnector.button.label": "Revérifier maintenant",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorText": "Votre connecteur ne s'est pas connecté à Enterprise Search. Résolvez vos problèmes de configuration et actualisez la page.",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorTitle": "En attente de votre connecteur",
@@ -17888,7 +17875,6 @@
     "xpack.infra.openView.columnNames.actions": "Actions",
     "xpack.infra.openView.columnNames.name": "Nom",
     "xpack.infra.openView.flyoutHeader": "Gérer les vues enregistrées",
-    "xpack.infra.openView.loadButton": "Charger la vue",
     "xpack.infra.registerFeatures.infraOpsDescription": "Explorez les indicateurs et logs d'infrastructure pour les serveurs, conteneurs et services courants.",
     "xpack.infra.registerFeatures.infraOpsTitle": "Indicateurs",
     "xpack.infra.registerFeatures.logsDescription": "Diffusez les logs en temps réel ou faites défiler les vues d'historique comme sur une console.",
@@ -17898,10 +17884,8 @@
     "xpack.infra.savedView.errorOnCreate.duplicateViewName": "Une vue portant ce nom existe déjà.",
     "xpack.infra.savedView.errorOnCreate.title": "Une erreur s'est produite lors de l'enregistrement de la vue.",
     "xpack.infra.savedView.findError.title": "Une erreur s'est produite lors du chargement des vues.",
-    "xpack.infra.savedView.loadView": "Charger la vue",
     "xpack.infra.savedView.manageViews": "Gérer les vues",
     "xpack.infra.savedView.saveNewView": "Enregistrer la nouvelle vue",
-    "xpack.infra.savedView.searchPlaceholder": "Rechercher les vues enregistrées",
     "xpack.infra.savedView.unknownView": "Aucune vue sélectionnée",
     "xpack.infra.savedView.updateView": "Mettre à jour la vue",
     "xpack.infra.showHistory": "Afficher l'historique",
@@ -18014,7 +17998,6 @@
     "xpack.infra.waffle.region": "Tous",
     "xpack.infra.waffle.regionLabel": "Région",
     "xpack.infra.waffle.savedView.createHeader": "Enregistrer la vue",
-    "xpack.infra.waffle.savedView.selectViewHeader": "Sélectionner une vue à charger",
     "xpack.infra.waffle.savedView.updateHeader": "Mettre à jour la vue",
     "xpack.infra.waffle.savedViews.cancel": "annuler",
     "xpack.infra.waffle.savedViews.cancelButton": "Annuler",
@@ -18739,11 +18722,9 @@
     "xpack.lens.breadcrumbsEditInLensFromDashboard": "Conversion de la visualisation {title}",
     "xpack.lens.chartSwitch.noResults": "Résultats introuvables pour {term}.",
     "xpack.lens.configure.configurePanelTitle": "{groupLabel}",
-    "xpack.lens.configure.editConfig": "Modifier la configuration {label}",
     "xpack.lens.configure.suggestedValuee": "Valeur suggérée : {value}",
     "xpack.lens.confirmModal.saveDuplicateButtonLabel": "Enregistrer {name}",
     "xpack.lens.datatable.visualizationOf": "Tableau {operations}",
-    "xpack.lens.editorFrame.colorIndicatorLabel": "Couleur de cette dimension : {hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} {errors, plural, one {erreur} other {erreurs}}",
     "xpack.lens.editorFrame.expressionFailureMessage": "Erreur de requête : {type}, {reason}",
     "xpack.lens.editorFrame.expressionFailureMessageWithContext": "Erreur de requête : {type}, {reason} dans {context}",
@@ -18772,8 +18753,6 @@
     "xpack.lens.indexPattern.fieldNoOperation": "Le champ {field} ne peut pas être utilisé sans opération",
     "xpack.lens.indexPattern.fieldsNotFound": "{count, plural, one {Champ} other {Champs}} {missingFields} {count, plural, one {introuvable} other {introuvables}}.",
     "xpack.lens.indexPattern.fieldsWrongType": "{count, plural, one {Champ} other {Champs}} {invalidFields} {count, plural,  other {}}de type incorrect",
-    "xpack.lens.indexPattern.filters.queryPlaceholderKql": "{example}",
-    "xpack.lens.indexPattern.filters.queryPlaceholderLucene": "{example}",
     "xpack.lens.indexPattern.formulaExpressionNotHandled": "L'opération {operation} dans la formule ne comprend pas les paramètres suivants : {params}",
     "xpack.lens.indexPattern.formulaExpressionParseError": "La formule {expression} ne peut pas être analysée",
     "xpack.lens.indexPattern.formulaExpressionWrongType": "Les paramètres de l'opération {operation} dans la formule sont de type incorrect : {params}",
@@ -18821,7 +18800,6 @@
     "xpack.lens.indexPattern.reducedTimeRangeWithDateHistogram": "Une plage temporelle réduite peut uniquement être utilisée sans histogramme des dates. Retirez la dimension d'histogramme des dates ou retirez la plage temporelle réduite de {column}.",
     "xpack.lens.indexPattern.reducedTimeRangeWithoutTimefield": "Une plage temporelle réduite peut uniquement être utilisée avec un champ temporel par défaut spécifié dans la vue de données. Utilisez une autre vue de données avec un champ temporel par défaut ou retirez la plage temporelle réduite de {column}.",
     "xpack.lens.indexPattern.referenceLineDimensionEditorLabel": "Ligne de référence {groupLabel}",
-    "xpack.lens.indexPattern.removeColumnLabel": "Retirer la configuration de \"{groupLabel}\"",
     "xpack.lens.indexPattern.standardDeviationOf": "Écart-type de {name}",
     "xpack.lens.indexPattern.staticValueError": "La valeur statique de {value} n'est pas un nombre valide",
     "xpack.lens.indexPattern.staticValueLabelWithValue": "Valeur statique : {value}",
@@ -18988,9 +18966,6 @@
     "xpack.lens.collapse.none": "Aucun",
     "xpack.lens.collapse.sum": "Somme",
     "xpack.lens.configPanel.addLayerButton": "Ajouter un calque",
-    "xpack.lens.configPanel.color.tooltip.auto": "Lens choisit automatiquement des couleurs à votre place sauf si vous spécifiez une couleur personnalisée.",
-    "xpack.lens.configPanel.color.tooltip.custom": "Effacez la couleur personnalisée pour revenir au mode \"Auto\".",
-    "xpack.lens.configPanel.color.tooltip.disabled": "Vous ne pouvez pas appliquer de couleurs personnalisées à des séries individuelles lorsque le calque inclut un champ \"Répartir par\".",
     "xpack.lens.configPanel.experimentalLabel": "Version d'évaluation technique",
     "xpack.lens.configPanel.selectLayerType": "Sélectionner le type de calque",
     "xpack.lens.configPanel.selectVisualization": "Sélectionner une visualisation",
@@ -19002,7 +18977,6 @@
     "xpack.lens.configure.invalidConfigTooltipClick": "Cliquez pour en savoir plus.",
     "xpack.lens.configure.invalidReferenceLineDimension": "La ligne de référence est affectée à un axe qui n’existe plus. Vous pouvez déplacer cette ligne de référence vers un autre axe disponible ou la supprimer.",
     "xpack.lens.confirmModal.cancelButtonLabel": "Annuler",
-    "xpack.lens.customBucketContainer.dragToReorder": "Faire glisser pour réorganiser",
     "xpack.lens.dashboardLabel": "Tableau de bord",
     "xpack.lens.datatable.addLayer": "Visualisation",
     "xpack.lens.datatable.breakdownColumn": "Diviser les indicateurs par",
@@ -19026,12 +19000,10 @@
     "xpack.lens.dimensionContainer.close": "Fermer",
     "xpack.lens.dimensionContainer.closeConfiguration": "Fermer la configuration",
     "xpack.lens.discover.visualizeFieldLegend": "Visualiser le champ",
-    "xpack.lens.editorFrame.aggregateIndicatorLabel": "Cette dimension n'est pas visible dans le graphique car toutes les valeurs individuelles sont agrégées en une valeur unique",
     "xpack.lens.editorFrame.applyChanges": "Appliquer les modifications",
     "xpack.lens.editorFrame.applyChangesLabel": "Appliquer les modifications",
     "xpack.lens.editorFrame.applyChangesWorkspacePrompt": "Appliquer les modifications pour générer le rendu de la visualisation",
     "xpack.lens.editorFrame.buildExpressionError": "Une erreur inattendue s'est produite lors de la préparation du graphique",
-    "xpack.lens.editorFrame.customIconIndicatorLabel": "Cette dimension utilise une icône personnalisée",
     "xpack.lens.editorFrame.dataFailure": "Une erreur s'est produite lors du chargement des données.",
     "xpack.lens.editorFrame.dataViewNotFound": "Vue de données introuvable",
     "xpack.lens.editorFrame.dataViewReconfigure": "Recréez-la dans la page de gestion des vues de données.",
@@ -19043,12 +19015,9 @@
     "xpack.lens.editorFrame.expressionMissingDatasource": "Impossible de trouver la source de données pour la visualisation",
     "xpack.lens.editorFrame.expressionMissingVisualizationType": "Type de visualisation non trouvé.",
     "xpack.lens.editorFrame.goToForums": "Formuler des requêtes et donner un retour",
-    "xpack.lens.editorFrame.invisibleIndicatorLabel": "Cette dimension n'est pas visible actuellement dans le graphique",
     "xpack.lens.editorFrame.layerSettingsTitle": "Paramètres du calque",
     "xpack.lens.editorFrame.networkErrorMessage": "Erreur réseau, réessayez plus tard ou contactez votre administrateur.",
-    "xpack.lens.editorFrame.noColorIndicatorLabel": "Cette dimension n'a pas de couleur individuelle",
     "xpack.lens.editorFrame.optionalDimensionLabel": "Facultatif",
-    "xpack.lens.editorFrame.paletteColorIndicatorLabel": "Cette dimension utilise une palette",
     "xpack.lens.editorFrame.previewErrorLabel": "L'aperçu du rendu a échoué",
     "xpack.lens.editorFrame.requiresFieldWarningLabel": "Nécessite un champ.",
     "xpack.lens.editorFrame.suggestionPanelTitle": "Suggestions",
@@ -19075,10 +19044,6 @@
     "xpack.lens.fieldFormats.suffix.m": "/m",
     "xpack.lens.fieldFormats.suffix.s": "/s",
     "xpack.lens.fieldFormats.suffix.title": "Suffixe",
-    "xpack.lens.fieldPicker.fieldPlaceholder": "Sélectionner un champ",
-    "xpack.lens.fieldsBucketContainer.deleteButtonDisabled": "Au moins un élément est requis.",
-    "xpack.lens.fieldsBucketContainer.dragHandleDisabled": "La réorganisation requiert plusieurs éléments.",
-    "xpack.lens.fieldsBucketContainer.dragToReorder": "Faire glisser pour réorganiser",
     "xpack.lens.fittingFunctionsDescription.carry": "Remplit les blancs avec la dernière valeur",
     "xpack.lens.fittingFunctionsDescription.linear": "Remplit les blancs avec une ligne",
     "xpack.lens.fittingFunctionsDescription.lookahead": "Remplit les blancs avec la valeur suivante",
@@ -19199,7 +19164,6 @@
     "xpack.lens.indexPattern.chooseFieldLabel": "Pour utiliser cette fonction, sélectionnez un champ.",
     "xpack.lens.indexPattern.chooseSubFunction": "Choisir une sous-fonction",
     "xpack.lens.indexPattern.columnFormatLabel": "Format de valeur",
-    "xpack.lens.indexPattern.columnLabel": "Nom",
     "xpack.lens.indexPattern.count": "Décompte",
     "xpack.lens.indexPattern.count.documentation.quick": "\nNombre total de documents. Lorsque vous fournissez un champ, le nombre total de valeurs de champ est compté. Lorsque vous utilisez la fonction de décompte pour les champs qui comportent plusieurs valeurs dans un même document, toutes les valeurs sont comptées.\n      ",
     "xpack.lens.indexPattern.count.signature": "[champ : chaîne]",
@@ -19247,9 +19211,7 @@
     "xpack.lens.indexPattern.fieldExploreInDiscover": "Explorer dans Discover",
     "xpack.lens.indexPattern.fieldPlaceholder": "Champ",
     "xpack.lens.indexPattern.fieldStatsNoData": "Lens ne peut pas créer de visualisation avec ce champ, car il ne contient pas de données. Pour créer une visualisation, glissez-déposez un autre champ.",
-    "xpack.lens.indexPattern.filterBy.clickToEdit": "Cliquer pour modifier",
     "xpack.lens.indexPattern.filterBy.emptyFilterQuery": "(vide)",
-    "xpack.lens.indexPattern.filterBy.label": "Filtrer par",
     "xpack.lens.indexPattern.filters": "Filtres",
     "xpack.lens.indexPattern.filters.addaFilter": "Ajouter un filtre",
     "xpack.lens.indexPattern.filters.clickToEdit": "Cliquer pour modifier",
@@ -19783,7 +19745,6 @@
     "xpack.lens.xyChart.legendVisibility.show": "Afficher",
     "xpack.lens.xyChart.lineColor.label": "Couleur",
     "xpack.lens.xyChart.lineMarker.auto": "Auto",
-    "xpack.lens.xyChart.lineMarker.icon": "Décoration de l’icône",
     "xpack.lens.xyChart.lineMarker.position": "Position de la décoration",
     "xpack.lens.xyChart.lineMarker.textVisibility.field": "Champ",
     "xpack.lens.xyChart.lineMarker.textVisibility.name": "Nom",
@@ -19806,8 +19767,6 @@
     "xpack.lens.xyChart.scaleLinear": "Linéaire",
     "xpack.lens.xyChart.scaleLog": "Logarithmique",
     "xpack.lens.xyChart.scaleSquare": "Racine carrée",
-    "xpack.lens.xyChart.seriesColor.auto": "Auto",
-    "xpack.lens.xyChart.seriesColor.label": "Couleur de la série",
     "xpack.lens.xyChart.setScale": "Échelle de l'axe",
     "xpack.lens.xyChart.showCurrenTimeMarker": "Afficher le repère de temps actuel",
     "xpack.lens.xyChart.showEnzones": "Afficher les marqueurs de données partielles",
@@ -21021,7 +20980,6 @@
     "xpack.ml.jobsList.stopDatafeedsConfirmModal.stopButtonLabel": "Arrêter {jobsCount, plural, one {le flux de données} other {les flux de données}}",
     "xpack.ml.jobsList.stopDatafeedsModal.stopDatafeedsTitle": "Arrêter le flux de données pour {jobsCount, plural, one {{jobId}} other {# tâches}} ?",
     "xpack.ml.managedJobsWarningCallout": "{jobsCount, plural, one {Cette tâche} other {Au moins l'une de ces tâches}} est préconfigurée par Elastic. Le fait de {jobsCount, plural, one {la} other {les}} {action} peut avoir un impact sur d'autres éléments du produit.",
-    "xpack.ml.management.jobsList.insufficientLicenseDescription": "Pour utiliser ces fonctionnalités de Machine Learning, vous devez {link}.",
     "xpack.ml.management.jobsSpacesList.updateSpaces.error": "Erreur lors de la mise à jour de {id}",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsAdded.title": "Objets enregistrés sans flux de données ({count})",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsRemoved.title": "Objets enregistrés avec des ID de flux de données sans correspondance ({count})",
@@ -22498,7 +22456,6 @@
     "xpack.ml.management.jobsList.accessDeniedTitle": "Accès refusé",
     "xpack.ml.management.jobsList.analyticsDocsLabel": "Documents de tâches d'analyse",
     "xpack.ml.management.jobsList.anomalyDetectionDocsLabel": "Documents de tâches de détection des anomalies",
-    "xpack.ml.management.jobsList.insufficientLicenseDescription.link": "démarrer un essai ou mettre à niveau votre abonnement",
     "xpack.ml.management.jobsList.insufficientLicenseLabel": "Mettre à niveau pour bénéficier des fonctionnalités d'abonnement",
     "xpack.ml.management.jobsList.jobsListTagline": "Visualisez, exportez et importez des éléments d'analyse de Machine Learning et de détection des anomalies.",
     "xpack.ml.management.jobsList.jobsListTitle": "Machine Learning",
@@ -34754,9 +34711,7 @@
     "xpack.synthetics.monitorManagement.editMonitorCrumb": "Modifier le moniteur",
     "xpack.synthetics.monitorManagement.editMonitorError": "Erreur lors du chargement de la liste Gestion des moniteurs",
     "xpack.synthetics.monitorManagement.editMonitorError.description": "Les paramètres de Gestion des moniteurs n'ont pas pu être chargés. Veuillez contacter le support technique.",
-    "xpack.synthetics.monitorManagement.emptyState.enablement": "Activez la Gestion des moniteurs pour exécuter des moniteurs légers et basés sur un navigateur réel à partir d'emplacements de test hébergés dans le monde entier. L'activation de la Gestion des moniteurs générera une clé d'API pour autoriser le service Synthetics à mettre à jour votre cluster Elasticsearch.",
     "xpack.synthetics.monitorManagement.emptyState.enablement.doc": "Lisez les documents",
-    "xpack.synthetics.monitorManagement.emptyState.enablement.enabled.title": "Activer la Gestion des moniteurs",
     "xpack.synthetics.monitorManagement.emptyState.enablement.learnMore": "Envie d'en savoir plus ?",
     "xpack.synthetics.monitorManagement.emptyState.enablement.title": "Activer",
     "xpack.synthetics.monitorManagement.failed": "ÉCHOUÉ",
@@ -34822,9 +34777,7 @@
     "xpack.synthetics.monitorManagement.startAddingLocationsDescription": "Les emplacements privés vous permettent d'exploiter des moniteurs depuis vos propres locaux. Ils nécessitent un agent Elastic et une politique d'agent que vous pouvez contrôler et maintenir via Fleet.",
     "xpack.synthetics.monitorManagement.steps": "Étapes",
     "xpack.synthetics.monitorManagement.summary.heading": "Résumé",
-    "xpack.synthetics.monitorManagement.syntheticsDisabledSuccess": "Gestion des moniteurs désactivée avec succès.",
     "xpack.synthetics.monitorManagement.syntheticsEnableLabel.management": "Activer la Gestion des moniteurs",
-    "xpack.synthetics.monitorManagement.syntheticsEnableSuccess": "Gestion des moniteurs activée avec succès.",
     "xpack.synthetics.monitorManagement.testResult": "Résultat du test",
     "xpack.synthetics.monitorManagement.testResults": "Résultats de test",
     "xpack.synthetics.monitorManagement.testRuns.label": "Exécutions de test",
@@ -35208,7 +35161,6 @@
     "xpack.synthetics.testResults.expandedRow.response_body.notRecorded": "Corps non enregistré. Définissez l'option du corps de la réponse de l'index sur \"Toujours activé\" dans les options avancées de la configuration du moniteur pour enregistrer le corps.",
     "xpack.synthetics.testRun.description": "Tester votre moniteur et vérifier les résultats avant d'enregistrer",
     "xpack.synthetics.testRun.pushError": "Impossible d'envoyer le moniteur vers le service.",
-    "xpack.synthetics.testRun.pushErrorLabel": "Erreur d'envoi",
     "xpack.synthetics.testRun.pushing.description": "Envoi du moniteur vers le service...",
     "xpack.synthetics.testRun.runErrorLabel": "Erreur lors de l'exécution du test",
     "xpack.synthetics.testRunDetailsRoute.page.title": "Détails de l'exécution du test",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 8c87e175bea63d..8800f9f6547d3c 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2142,11 +2142,6 @@
     "discover.docTable.totalDocuments": "{totalDocuments}ドキュメント",
     "discover.dscTour.stepAddFields.description": "{plusIcon}をクリックして、関心があるフィールドを追加します。",
     "discover.dscTour.stepExpand.description": "{expandIcon}をクリックすると、ドキュメントを表示、比較、フィルタリングできます。",
-    "discover.fieldChooser.detailViews.existsInRecordsText": "{value} / {totalValue}レコードに存在します",
-    "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "{field}を除外：\"{value}\"",
-    "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "{field}のフィルター：\"{value}\"",
-    "discover.fieldChooser.detailViews.valueOfRecordsText": "{value} / {totalValue}レコード",
-    "discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "このフィールドはElasticsearchマッピングに表示されますが、ドキュメントテーブルの{hitsLength}件のドキュメントには含まれません。可視化や検索は可能な場合があります。",
     "discover.grid.copyClipboardButtonTitle": "{column}の値をコピー",
     "discover.grid.copyColumnValuesToClipboard.toastTitle": "\"{column}\"列の値がクリップボードにコピーされました",
     "discover.grid.filterForAria": "この{value}でフィルターを適用",
@@ -2204,8 +2199,6 @@
     "discover.advancedSettings.sampleSizeTitle": "テーブルごとの最大行数",
     "discover.advancedSettings.searchOnPageLoadText": "Discover の最初の読み込み時に検索を実行するかを制御します。この設定は、保存された検索の読み込み時には影響しません。",
     "discover.advancedSettings.searchOnPageLoadTitle": "ページの読み込み時の検索",
-    "discover.advancedSettings.showLegacyFieldStatsText": "シャードごとに5,000レコードではなく、500レコードを使用して、サイドバーのフィールドの上位の値を計算するには、このオプションをオンにします。",
-    "discover.advancedSettings.showLegacyFieldStatsTitle": "上位の値の計算",
     "discover.advancedSettings.sortDefaultOrderText": "Discover アプリのデータビューに基づく時刻のデフォルトの並べ替え方向をコントロールします。",
     "discover.advancedSettings.sortDefaultOrderTitle": "デフォルトの並べ替え方向",
     "discover.advancedSettings.sortOrderAsc": "昇順",
@@ -2330,18 +2323,14 @@
     "discover.embeddable.search.displayName": "検索",
     "discover.fieldChooser.addField.label": "フィールドを追加",
     "discover.fieldChooser.availableFieldsTooltip": "フィールドをテーブルに表示できます。",
-    "discover.fieldChooser.detailViews.emptyStringText": "空の文字列",
     "discover.fieldChooser.discoverField.actions": "アクション",
     "discover.fieldChooser.discoverField.addFieldTooltip": "フィールドを列として追加",
-    "discover.fieldChooser.discoverField.fieldTopValuesLabel": "トップ5の値",
     "discover.fieldChooser.discoverField.multiField": "複数フィールド",
     "discover.fieldChooser.discoverField.multiFields": "マルチフィールド",
     "discover.fieldChooser.discoverField.multiFieldTooltipContent": "複数フィールドにはフィールドごとに複数の値を入力できます",
     "discover.fieldChooser.discoverField.name": "フィールド",
     "discover.fieldChooser.discoverField.removeFieldTooltip": "フィールドを表から削除",
     "discover.fieldChooser.discoverField.value": "値",
-    "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "ジオフィールドは分析できません。",
-    "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "オブジェクトフィールドは分析できません。",
     "discover.fieldChooser.fieldsMobileButtonLabel": "フィールド",
     "discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel": "インデックスとフィールド",
     "discover.fieldList.flyoutBackIcon": "戻る",
@@ -12169,11 +12158,9 @@
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.submitButton.title": "構成を保存",
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.warning.title": "このコネクターは、Elasticインデックスに関連付けられています",
     "xpack.enterpriseSearch.content.indices.configurationConnector.configuration.successToast.title": "構成が更新されました",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label": "コネクターリポジトリを探索",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.clientExamplesLink": "コネクタークライアントの例",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.configurationFileLink": "構成ファイル",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.connectorDeployedText": "コネクターを構成したら、コネクターをセルフマネージドインフラストラクチャーにデプロイします。",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph": "コネクターリポジトリには、複数のコネクタークライアントの例があり、当社のフレームワークを利用して、カスタムデータソースに対する高速デプロイを実施できるようになっています。",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnector.button.label": "今すぐ再確認",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorText": "コネクターエンタープライズ サーチに接続されていません。構成のトラブルシューティングを行い、ページを更新してください。",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorTitle": "コネクターを待機しています",
@@ -17887,7 +17874,6 @@
     "xpack.infra.openView.columnNames.actions": "アクション",
     "xpack.infra.openView.columnNames.name": "名前",
     "xpack.infra.openView.flyoutHeader": "保存されたビューの管理",
-    "xpack.infra.openView.loadButton": "ビューの読み込み",
     "xpack.infra.registerFeatures.infraOpsDescription": "共通のサーバー、コンテナー、サービスのインフラストラクチャメトリックとログを閲覧します。",
     "xpack.infra.registerFeatures.infraOpsTitle": "メトリック",
     "xpack.infra.registerFeatures.logsDescription": "ログをリアルタイムでストリーするか、コンソール式の UI で履歴ビューをスクロールします。",
@@ -17897,10 +17883,8 @@
     "xpack.infra.savedView.errorOnCreate.duplicateViewName": "その名前のビューはすでに存在します。",
     "xpack.infra.savedView.errorOnCreate.title": "ビューの保存中にエラーが発生しました。",
     "xpack.infra.savedView.findError.title": "ビューの読み込み中にエラーが発生しました。",
-    "xpack.infra.savedView.loadView": "ビューの読み込み",
     "xpack.infra.savedView.manageViews": "ビューの管理",
     "xpack.infra.savedView.saveNewView": "新しいビューの保存",
-    "xpack.infra.savedView.searchPlaceholder": "保存されたビューの検索",
     "xpack.infra.savedView.unknownView": "ビューが選択されていません",
     "xpack.infra.savedView.updateView": "ビューの更新",
     "xpack.infra.showHistory": "履歴を表示",
@@ -18013,7 +17997,6 @@
     "xpack.infra.waffle.region": "すべて",
     "xpack.infra.waffle.regionLabel": "地域",
     "xpack.infra.waffle.savedView.createHeader": "ビューを保存",
-    "xpack.infra.waffle.savedView.selectViewHeader": "読み込むビューを選択",
     "xpack.infra.waffle.savedView.updateHeader": "ビューの更新",
     "xpack.infra.waffle.savedViews.cancel": "キャンセル",
     "xpack.infra.waffle.savedViews.cancelButton": "キャンセル",
@@ -18738,11 +18721,9 @@
     "xpack.lens.breadcrumbsEditInLensFromDashboard": "{title}ビジュアライゼーションを変換中",
     "xpack.lens.chartSwitch.noResults": "{term}の結果が見つかりませんでした。",
     "xpack.lens.configure.configurePanelTitle": "{groupLabel}",
-    "xpack.lens.configure.editConfig": "{label}構成の編集",
     "xpack.lens.configure.suggestedValuee": "候補の値：{value}",
     "xpack.lens.confirmModal.saveDuplicateButtonLabel": "{name}を保存",
     "xpack.lens.datatable.visualizationOf": "表 {operations}",
-    "xpack.lens.editorFrame.colorIndicatorLabel": "このディメンションの色：{hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} {errors, plural, other {エラー}}",
     "xpack.lens.editorFrame.expressionFailureMessage": "リクエストエラー：{type}、{reason}",
     "xpack.lens.editorFrame.expressionFailureMessageWithContext": "リクエストエラー：{type}、{context}の{reason}",
@@ -18771,8 +18752,6 @@
     "xpack.lens.indexPattern.fieldNoOperation": "フィールド{field}は演算なしで使用できません",
     "xpack.lens.indexPattern.fieldsNotFound": "{count, plural, other {フィールド}}{missingFields}{count, plural, other {が}}見つかりません",
     "xpack.lens.indexPattern.fieldsWrongType": "{count, plural, other {フィールド}}\"{invalidFields}\"は正しくない型{count, plural, other {です}}",
-    "xpack.lens.indexPattern.filters.queryPlaceholderKql": "{example}",
-    "xpack.lens.indexPattern.filters.queryPlaceholderLucene": "{example}",
     "xpack.lens.indexPattern.formulaExpressionNotHandled": "式{operation}の演算には次のパラメーターがありません：{params}",
     "xpack.lens.indexPattern.formulaExpressionParseError": "式{expression}を解析できません",
     "xpack.lens.indexPattern.formulaExpressionWrongType": "式の演算{operation}のパラメーターの型が正しくありません：{params}",
@@ -18820,7 +18799,6 @@
     "xpack.lens.indexPattern.reducedTimeRangeWithDateHistogram": "時間範囲の縮小は、データヒストグラムなしでのみ使用できます。データヒストグラムディメンションを削除するか、縮小された時間範囲を{column}から削除してください。",
     "xpack.lens.indexPattern.reducedTimeRangeWithoutTimefield": "時間範囲の縮小は、データビューの指定されたデフォルト時間フィールドでのみ使用できます。デフォルト時間フィールドで別のデータビューを使用するか、縮小された時間範囲を{column}から削除してください。",
     "xpack.lens.indexPattern.referenceLineDimensionEditorLabel": "{groupLabel}基準線",
-    "xpack.lens.indexPattern.removeColumnLabel": "\"{groupLabel}\"から構成を削除",
     "xpack.lens.indexPattern.standardDeviationOf": "{name}の標準偏差",
     "xpack.lens.indexPattern.staticValueError": "{value}の固定値が有効な数値ではありません",
     "xpack.lens.indexPattern.staticValueLabelWithValue": "固定値：{value}",
@@ -18988,9 +18966,6 @@
     "xpack.lens.collapse.none": "なし",
     "xpack.lens.collapse.sum": "合計",
     "xpack.lens.configPanel.addLayerButton": "レイヤーを追加",
-    "xpack.lens.configPanel.color.tooltip.auto": "カスタム色を指定しない場合、Lensは自動的に色を選択します。",
-    "xpack.lens.configPanel.color.tooltip.custom": "［自動］モードに戻すには、カスタム色をオフにしてください。",
-    "xpack.lens.configPanel.color.tooltip.disabled": "レイヤーに［内訳の基準］フィールドが含まれている場合は、個別の系列にカスタム色を適用できません。",
     "xpack.lens.configPanel.experimentalLabel": "テクニカルプレビュー",
     "xpack.lens.configPanel.selectLayerType": "レイヤータイプを選択",
     "xpack.lens.configPanel.selectVisualization": "ビジュアライゼーションを選択してください",
@@ -19002,7 +18977,6 @@
     "xpack.lens.configure.invalidConfigTooltipClick": "詳細はクリックしてください。",
     "xpack.lens.configure.invalidReferenceLineDimension": "この基準線は存在しない軸に割り当てられています。この基準線を別の使用可能な軸に移動するか、削除することができます。",
     "xpack.lens.confirmModal.cancelButtonLabel": "キャンセル",
-    "xpack.lens.customBucketContainer.dragToReorder": "ドラッグして並べ替え",
     "xpack.lens.dashboardLabel": "ダッシュボード",
     "xpack.lens.datatable.addLayer": "ビジュアライゼーション",
     "xpack.lens.datatable.breakdownColumn": "メトリックの分割基準",
@@ -19026,12 +19000,10 @@
     "xpack.lens.dimensionContainer.close": "閉じる",
     "xpack.lens.dimensionContainer.closeConfiguration": "構成を閉じる",
     "xpack.lens.discover.visualizeFieldLegend": "Visualize フィールド",
-    "xpack.lens.editorFrame.aggregateIndicatorLabel": "すべての個別の値が1つの値に集約されているため、このディメンションはグラフに表示されません",
     "xpack.lens.editorFrame.applyChanges": "変更を適用",
     "xpack.lens.editorFrame.applyChangesLabel": "変更を適用",
     "xpack.lens.editorFrame.applyChangesWorkspacePrompt": "変更を適用してビジュアライゼーションを表示",
     "xpack.lens.editorFrame.buildExpressionError": "グラフの準備中に予期しないエラーが発生しました",
-    "xpack.lens.editorFrame.customIconIndicatorLabel": "このディメンションはカスタムアイコンを使用しています",
     "xpack.lens.editorFrame.dataFailure": "データの読み込み中にエラーが発生しました。",
     "xpack.lens.editorFrame.dataViewNotFound": "データビューが見つかりません",
     "xpack.lens.editorFrame.dataViewReconfigure": "データビュー管理ページで再作成します。",
@@ -19043,12 +19015,9 @@
     "xpack.lens.editorFrame.expressionMissingDatasource": "ビジュアライゼーションのデータソースが見つかりませんでした",
     "xpack.lens.editorFrame.expressionMissingVisualizationType": "ビジュアライゼーションタイプが見つかりません。",
     "xpack.lens.editorFrame.goToForums": "リクエストとフィードバック",
-    "xpack.lens.editorFrame.invisibleIndicatorLabel": "このディメンションは現在グラフに表示されません",
     "xpack.lens.editorFrame.layerSettingsTitle": "レイヤー設定",
     "xpack.lens.editorFrame.networkErrorMessage": "ネットワークエラーです。しばらくたってから再試行するか、管理者に連絡してください。",
-    "xpack.lens.editorFrame.noColorIndicatorLabel": "このディメンションには個別の色がありません",
     "xpack.lens.editorFrame.optionalDimensionLabel": "オプション",
-    "xpack.lens.editorFrame.paletteColorIndicatorLabel": "このディメンションはパレットを使用しています",
     "xpack.lens.editorFrame.previewErrorLabel": "レンダリングのプレビューに失敗しました",
     "xpack.lens.editorFrame.requiresFieldWarningLabel": "必須フィールド",
     "xpack.lens.editorFrame.suggestionPanelTitle": "提案",
@@ -19075,10 +19044,6 @@
     "xpack.lens.fieldFormats.suffix.m": "/m",
     "xpack.lens.fieldFormats.suffix.s": "/s",
     "xpack.lens.fieldFormats.suffix.title": "接尾辞",
-    "xpack.lens.fieldPicker.fieldPlaceholder": "フィールドを選択",
-    "xpack.lens.fieldsBucketContainer.deleteButtonDisabled": "1つ以上のアイテムが必要です。",
-    "xpack.lens.fieldsBucketContainer.dragHandleDisabled": "並べ替えには1つ以上のアイテムが必要です。",
-    "xpack.lens.fieldsBucketContainer.dragToReorder": "ドラッグして並べ替え",
     "xpack.lens.fittingFunctionsDescription.carry": "ギャップを最後の値で埋める",
     "xpack.lens.fittingFunctionsDescription.linear": "ギャップを線で埋める",
     "xpack.lens.fittingFunctionsDescription.lookahead": "ギャップを次の値で埋める",
@@ -19199,7 +19164,6 @@
     "xpack.lens.indexPattern.chooseFieldLabel": "この関数を使用するには、フィールドを選択してください。",
     "xpack.lens.indexPattern.chooseSubFunction": "サブ関数を選択",
     "xpack.lens.indexPattern.columnFormatLabel": "値の形式",
-    "xpack.lens.indexPattern.columnLabel": "名前",
     "xpack.lens.indexPattern.count": "カウント",
     "xpack.lens.indexPattern.count.documentation.quick": "\nドキュメントの総数。フィールドを入力すると、フィールド値の合計数がカウントされます。1つのドキュメントに複数の値があるフィールドでCount関数を使用すると、すべての値がカウントされます。\n      ",
     "xpack.lens.indexPattern.count.signature": "[field: string]",
@@ -19247,9 +19211,7 @@
     "xpack.lens.indexPattern.fieldExploreInDiscover": "Discoverで探索",
     "xpack.lens.indexPattern.fieldPlaceholder": "フィールド",
     "xpack.lens.indexPattern.fieldStatsNoData": "Lensはこのフィールドのビジュアライゼーションを作成できません。フィールドにデータがありません。ビジュアライゼーションを作成するには、別のフィールドをドラッグします。",
-    "xpack.lens.indexPattern.filterBy.clickToEdit": "クリックして編集",
     "xpack.lens.indexPattern.filterBy.emptyFilterQuery": "（空）",
-    "xpack.lens.indexPattern.filterBy.label": "フィルタリング条件",
     "xpack.lens.indexPattern.filters": "フィルター",
     "xpack.lens.indexPattern.filters.addaFilter": "フィルターを追加",
     "xpack.lens.indexPattern.filters.clickToEdit": "クリックして編集",
@@ -19783,7 +19745,6 @@
     "xpack.lens.xyChart.legendVisibility.show": "表示",
     "xpack.lens.xyChart.lineColor.label": "色",
     "xpack.lens.xyChart.lineMarker.auto": "自動",
-    "xpack.lens.xyChart.lineMarker.icon": "アイコン装飾",
     "xpack.lens.xyChart.lineMarker.position": "装飾位置",
     "xpack.lens.xyChart.lineMarker.textVisibility.field": "フィールド",
     "xpack.lens.xyChart.lineMarker.textVisibility.name": "名前",
@@ -19806,8 +19767,6 @@
     "xpack.lens.xyChart.scaleLinear": "線形",
     "xpack.lens.xyChart.scaleLog": "対数",
     "xpack.lens.xyChart.scaleSquare": "平方根",
-    "xpack.lens.xyChart.seriesColor.auto": "自動",
-    "xpack.lens.xyChart.seriesColor.label": "系列色",
     "xpack.lens.xyChart.setScale": "軸のスケール",
     "xpack.lens.xyChart.showCurrenTimeMarker": "現在時刻マーカーを表示",
     "xpack.lens.xyChart.showEnzones": "部分データマーカーを表示",
@@ -21012,7 +20971,6 @@
     "xpack.ml.jobsList.startDatafeedsModal.startManagedDatafeedsDescription": "{jobsCount, plural, other {これらのジョブのうちの少なくとも1個のジョブ}}はElasticによってあらかじめ構成されています。終了日を指定して{jobsCount, plural, other {それらを}}開始すると、製品の他の部分に影響する可能性があります。",
     "xpack.ml.jobsList.stopDatafeedsConfirmModal.stopButtonLabel": "{jobsCount, plural, other {データフィード}}を終了",
     "xpack.ml.managedJobsWarningCallout": "{jobsCount, plural, other {これらのジョブのうちの少なくとも1個のジョブ}}はElasticによってあらかじめ構成されています。{jobsCount, plural, other {それらを}}{action}すると、製品の他の部分に影響する可能性があります。",
-    "xpack.ml.management.jobsList.insufficientLicenseDescription": "これらの機械学習機能を使用するには、{link}する必要があります。",
     "xpack.ml.management.jobsSpacesList.updateSpaces.error": "{id}の更新エラー",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsAdded.title": "データフィードがない選択されたオブジェクト（{count}）",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsRemoved.title": "データフィードIDが一致しない保存されたオブジェクト（{count}）",
@@ -22484,7 +22442,6 @@
     "xpack.ml.management.jobsList.accessDeniedTitle": "アクセスが拒否されました",
     "xpack.ml.management.jobsList.analyticsDocsLabel": "分析ジョブドキュメント",
     "xpack.ml.management.jobsList.anomalyDetectionDocsLabel": "異常検知ジョブドキュメント",
-    "xpack.ml.management.jobsList.insufficientLicenseDescription.link": "試用版を開始するか、サブスクリプションをアップグレード",
     "xpack.ml.management.jobsList.insufficientLicenseLabel": "サブスクリプション機能のアップグレード",
     "xpack.ml.management.jobsList.jobsListTagline": "機械学習分析と異常検知項目を表示、エクスポート、インポートします。",
     "xpack.ml.management.jobsList.jobsListTitle": "機械学習",
@@ -34733,9 +34690,7 @@
     "xpack.synthetics.monitorManagement.editMonitorCrumb": "モニターを編集",
     "xpack.synthetics.monitorManagement.editMonitorError": "モニター管理の読み込みエラー",
     "xpack.synthetics.monitorManagement.editMonitorError.description": "モニター管理設定を読み込めませんでした。サポートに問い合わせてください。",
-    "xpack.synthetics.monitorManagement.emptyState.enablement": "モニター管理を有効にすると、世界中のホスティングされたテスト場所から軽量でリアルなブラウザーモニターを実行できます。モニター管理を有効にすると、APIキーが生成され、SyntheticsサービスはElasticsearchクラスターに書き込むことができます。",
     "xpack.synthetics.monitorManagement.emptyState.enablement.doc": "<b>ドキュメント</b><b>を読む</b>",
-    "xpack.synthetics.monitorManagement.emptyState.enablement.enabled.title": "モニター管理を有効にする",
     "xpack.synthetics.monitorManagement.emptyState.enablement.learnMore": "詳細について",
     "xpack.synthetics.monitorManagement.emptyState.enablement.title": "有効にする",
     "xpack.synthetics.monitorManagement.failed": "失敗",
@@ -34801,9 +34756,7 @@
     "xpack.synthetics.monitorManagement.startAddingLocationsDescription": "非公開の場所では、独自の施設からモニターを実行できます。Fleet経由で制御および保守できるElasticエージェントとエージェントポリシーが必要です。",
     "xpack.synthetics.monitorManagement.steps": "ステップ",
     "xpack.synthetics.monitorManagement.summary.heading": "まとめ",
-    "xpack.synthetics.monitorManagement.syntheticsDisabledSuccess": "モニター管理は正常に無効にされました。",
     "xpack.synthetics.monitorManagement.syntheticsEnableLabel.management": "モニター管理を有効にする",
-    "xpack.synthetics.monitorManagement.syntheticsEnableSuccess": "モニター管理は正常に有効にされました。",
     "xpack.synthetics.monitorManagement.testResult": "テスト結果",
     "xpack.synthetics.monitorManagement.testResults": "テスト結果",
     "xpack.synthetics.monitorManagement.testRuns.label": "テスト実行",
@@ -35187,7 +35140,6 @@
     "xpack.synthetics.testResults.expandedRow.response_body.notRecorded": "本文が記録されていません。モニター設定の詳細オプションで、インデックス応答オプションを［常時］に設定して、本文を記録します。",
     "xpack.synthetics.testRun.description": "モニターをテストし、保存する前に結果を検証します",
     "xpack.synthetics.testRun.pushError": "モニターをサービスにプッシュできませんでした。",
-    "xpack.synthetics.testRun.pushErrorLabel": "プッシュエラー",
     "xpack.synthetics.testRun.pushing.description": "モニターをサービスにプッシュしています...",
     "xpack.synthetics.testRun.runErrorLabel": "テストの実行エラー",
     "xpack.synthetics.testRunDetailsRoute.page.title": "テスト実行詳細",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 23ecf9913249ee..90564505290d14 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2142,11 +2142,6 @@
     "discover.docTable.totalDocuments": "{totalDocuments} 个文档",
     "discover.dscTour.stepAddFields.description": "单击 {plusIcon} 以添加您感兴趣的字段。",
     "discover.dscTour.stepExpand.description": "单击 {expandIcon} 以查看、比较和筛选文档。",
-    "discover.fieldChooser.detailViews.existsInRecordsText": "存在于 {value}/{totalValue} 条记录中",
-    "discover.fieldChooser.detailViews.filterOutValueButtonAriaLabel": "筛除 {field}“{value}”",
-    "discover.fieldChooser.detailViews.filterValueButtonAriaLabel": "筛留 {field}“{value}”",
-    "discover.fieldChooser.detailViews.valueOfRecordsText": "{value}/{totalValue} 条记录",
-    "discover.fieldChooser.fieldCalculator.fieldIsNotPresentInDocumentsErrorMessage": "此字段在您的 Elasticsearch 映射中，但不在文档表中显示的 {hitsLength} 个文档中。您可能仍能够基于它可视化或搜索。",
     "discover.grid.copyClipboardButtonTitle": "复制 {column} 的值",
     "discover.grid.copyColumnValuesToClipboard.toastTitle": "“{column}”列的值已复制到剪贴板",
     "discover.grid.filterForAria": "筛留此 {value}",
@@ -2204,8 +2199,6 @@
     "discover.advancedSettings.sampleSizeTitle": "每个表的最大行数",
     "discover.advancedSettings.searchOnPageLoadText": "控制在 Discover 首次加载时是否执行搜索。加载已保存搜索时，此设置无效。",
     "discover.advancedSettings.searchOnPageLoadTitle": "在页面加载时搜索",
-    "discover.advancedSettings.showLegacyFieldStatsText": "要在侧边栏中每分片使用 500 条而不是 5,000 条记录计算字段的排名最前值，请打开此选项。",
-    "discover.advancedSettings.showLegacyFieldStatsTitle": "排名最前值计算",
     "discover.advancedSettings.sortDefaultOrderText": "在 Discover 应用中控制基于时间的数据视图的默认排序方向。",
     "discover.advancedSettings.sortDefaultOrderTitle": "默认排序方向",
     "discover.advancedSettings.sortOrderAsc": "升序",
@@ -2330,18 +2323,14 @@
     "discover.embeddable.search.displayName": "搜索",
     "discover.fieldChooser.addField.label": "添加字段",
     "discover.fieldChooser.availableFieldsTooltip": "适用于在表中显示的字段。",
-    "discover.fieldChooser.detailViews.emptyStringText": "空字符串",
     "discover.fieldChooser.discoverField.actions": "操作",
     "discover.fieldChooser.discoverField.addFieldTooltip": "将字段添加为列",
-    "discover.fieldChooser.discoverField.fieldTopValuesLabel": "排名前 5 值",
     "discover.fieldChooser.discoverField.multiField": "多字段",
     "discover.fieldChooser.discoverField.multiFields": "多字段",
     "discover.fieldChooser.discoverField.multiFieldTooltipContent": "多字段的每个字段可以有多个值",
     "discover.fieldChooser.discoverField.name": "字段",
     "discover.fieldChooser.discoverField.removeFieldTooltip": "从表中移除字段",
     "discover.fieldChooser.discoverField.value": "值",
-    "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForGeoFieldsErrorMessage": "分析不适用于地理字段。",
-    "discover.fieldChooser.fieldCalculator.analysisIsNotAvailableForObjectFieldsErrorMessage": "分析不适用于对象字段。",
     "discover.fieldChooser.fieldsMobileButtonLabel": "字段",
     "discover.fieldChooser.filter.indexAndFieldsSectionAriaLabel": "索引和字段",
     "discover.fieldList.flyoutBackIcon": "返回",
@@ -12171,11 +12160,9 @@
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.submitButton.title": "保存配置",
     "xpack.enterpriseSearch.content.indices.configurationConnector.config.warning.title": "此连接器将绑定到您的 Elastic 索引",
     "xpack.enterpriseSearch.content.indices.configurationConnector.configuration.successToast.title": "已更新配置",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.button.label": "浏览连接器存储库",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.clientExamplesLink": "连接器客户端示例",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.configurationFileLink": "配置文件",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.connectorDeployedText": "配置连接器后，请将其部署到您的自管型基础架构。",
-    "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.description.firstParagraph": "连接器存储库包含几个连接器客户端示例，有助于您利用我们的框架针对定制数据源进行加速开发。",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnector.button.label": "立即重新检查",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorText": "您的连接器尚未连接到 Enterprise Search。排除配置故障并刷新页面。",
     "xpack.enterpriseSearch.content.indices.configurationConnector.connectorPackage.waitingForConnectorTitle": "等候您的连接器",
@@ -17889,7 +17876,6 @@
     "xpack.infra.openView.columnNames.actions": "操作",
     "xpack.infra.openView.columnNames.name": "名称",
     "xpack.infra.openView.flyoutHeader": "管理已保存视图",
-    "xpack.infra.openView.loadButton": "加载视图",
     "xpack.infra.registerFeatures.infraOpsDescription": "浏览常用服务器、容器和服务的基础设施指标和日志。",
     "xpack.infra.registerFeatures.infraOpsTitle": "指标",
     "xpack.infra.registerFeatures.logsDescription": "实时流式传输日志或在类似控制台的工具中滚动浏览历史视图。",
@@ -17899,10 +17885,8 @@
     "xpack.infra.savedView.errorOnCreate.duplicateViewName": "具有该名称的视图已存在。",
     "xpack.infra.savedView.errorOnCreate.title": "保存视图时出错。",
     "xpack.infra.savedView.findError.title": "加载视图时出错。",
-    "xpack.infra.savedView.loadView": "加载视图",
     "xpack.infra.savedView.manageViews": "管理视图",
     "xpack.infra.savedView.saveNewView": "保存新视图",
-    "xpack.infra.savedView.searchPlaceholder": "搜索已保存视图",
     "xpack.infra.savedView.unknownView": "未选择视图",
     "xpack.infra.savedView.updateView": "更新视图",
     "xpack.infra.showHistory": "显示历史记录",
@@ -18015,7 +17999,6 @@
     "xpack.infra.waffle.region": "全部",
     "xpack.infra.waffle.regionLabel": "地区",
     "xpack.infra.waffle.savedView.createHeader": "保存视图",
-    "xpack.infra.waffle.savedView.selectViewHeader": "选择要加载的视图",
     "xpack.infra.waffle.savedView.updateHeader": "更新视图",
     "xpack.infra.waffle.savedViews.cancel": "取消",
     "xpack.infra.waffle.savedViews.cancelButton": "取消",
@@ -18740,11 +18723,9 @@
     "xpack.lens.breadcrumbsEditInLensFromDashboard": "正在转换 {title} 可视化",
     "xpack.lens.chartSwitch.noResults": "找不到 {term} 的结果。",
     "xpack.lens.configure.configurePanelTitle": "{groupLabel}",
-    "xpack.lens.configure.editConfig": "编辑 {label} 配置",
     "xpack.lens.configure.suggestedValuee": "建议值：{value}",
     "xpack.lens.confirmModal.saveDuplicateButtonLabel": "保存 {name}",
     "xpack.lens.datatable.visualizationOf": "表 {operations}",
-    "xpack.lens.editorFrame.colorIndicatorLabel": "此维度的颜色：{hex}",
     "xpack.lens.editorFrame.configurationFailureMoreErrors": " +{errors} 个{errors, plural, other {错误}}",
     "xpack.lens.editorFrame.expressionFailureMessage": "请求错误：{type}，{reason}",
     "xpack.lens.editorFrame.expressionFailureMessageWithContext": "请求错误：{type}，{context} 中的 {reason}",
@@ -18773,8 +18754,6 @@
     "xpack.lens.indexPattern.fieldNoOperation": "没有运算，无法使用字段 {field}",
     "xpack.lens.indexPattern.fieldsNotFound": "找不到{count, plural, other {字段}} {missingFields} {count, plural, other {}}。",
     "xpack.lens.indexPattern.fieldsWrongType": "{count, plural, other {字段}} {invalidFields} {count, plural, other {}} 的类型不正确",
-    "xpack.lens.indexPattern.filters.queryPlaceholderKql": "{example}",
-    "xpack.lens.indexPattern.filters.queryPlaceholderLucene": "{example}",
     "xpack.lens.indexPattern.formulaExpressionNotHandled": "公式中的运算 {operation} 缺失以下参数：{params}",
     "xpack.lens.indexPattern.formulaExpressionParseError": "公式 {expression} 无法解析",
     "xpack.lens.indexPattern.formulaExpressionWrongType": "公式中运算 {operation} 的参数的类型不正确：{params}",
@@ -18822,7 +18801,6 @@
     "xpack.lens.indexPattern.reducedTimeRangeWithDateHistogram": "仅在没有 Date Histogram 时才可以使用缩小的时间范围。移除 Date Histogram 维度，或从 {column} 中移除缩小的时间范围。",
     "xpack.lens.indexPattern.reducedTimeRangeWithoutTimefield": "只能将缩小的时间范围用于数据视图上的指定默认时间字段。使用具有默认时间字段的不同数据视图，或从 {column} 中移除缩小的时间范围。",
     "xpack.lens.indexPattern.referenceLineDimensionEditorLabel": "{groupLabel} 参考线",
-    "xpack.lens.indexPattern.removeColumnLabel": "从“{groupLabel}”中删除配置",
     "xpack.lens.indexPattern.standardDeviationOf": "{name} 的标准偏差",
     "xpack.lens.indexPattern.staticValueError": "{value} 的静态值不是有效数字",
     "xpack.lens.indexPattern.staticValueLabelWithValue": "静态值：{value}",
@@ -18990,9 +18968,6 @@
     "xpack.lens.collapse.none": "无",
     "xpack.lens.collapse.sum": "求和",
     "xpack.lens.configPanel.addLayerButton": "添加图层",
-    "xpack.lens.configPanel.color.tooltip.auto": "Lens 自动为您选取颜色，除非您指定定制颜色。",
-    "xpack.lens.configPanel.color.tooltip.custom": "清除定制颜色以返回到“自动”模式。",
-    "xpack.lens.configPanel.color.tooltip.disabled": "图层包括“细分方式”字段时，无法将定制颜色应用于各个序列。",
     "xpack.lens.configPanel.experimentalLabel": "技术预览",
     "xpack.lens.configPanel.selectLayerType": "选择图层类型",
     "xpack.lens.configPanel.selectVisualization": "选择可视化",
@@ -19004,7 +18979,6 @@
     "xpack.lens.configure.invalidConfigTooltipClick": "单击了解更多详情。",
     "xpack.lens.configure.invalidReferenceLineDimension": "此参考线分配给了不再存在的轴。您可以将此参考线移到其他可用的轴，或将其移除。",
     "xpack.lens.confirmModal.cancelButtonLabel": "取消",
-    "xpack.lens.customBucketContainer.dragToReorder": "拖动以重新排序",
     "xpack.lens.dashboardLabel": "仪表板",
     "xpack.lens.datatable.addLayer": "可视化",
     "xpack.lens.datatable.breakdownColumn": "指标拆分依据",
@@ -19028,12 +19002,10 @@
     "xpack.lens.dimensionContainer.close": "关闭",
     "xpack.lens.dimensionContainer.closeConfiguration": "关闭配置",
     "xpack.lens.discover.visualizeFieldLegend": "可视化字段",
-    "xpack.lens.editorFrame.aggregateIndicatorLabel": "此维度在图表中不可见，因为所有个体值都聚合到单一值中",
     "xpack.lens.editorFrame.applyChanges": "应用更改",
     "xpack.lens.editorFrame.applyChangesLabel": "应用更改",
     "xpack.lens.editorFrame.applyChangesWorkspacePrompt": "应用更改以呈现可视化",
     "xpack.lens.editorFrame.buildExpressionError": "准备图表时发生意外错误",
-    "xpack.lens.editorFrame.customIconIndicatorLabel": "此维度正在使用定制图标",
     "xpack.lens.editorFrame.dataFailure": "加载数据时出错。",
     "xpack.lens.editorFrame.dataViewNotFound": "找不到数据视图",
     "xpack.lens.editorFrame.dataViewReconfigure": "在数据视图管理页面中重新创建。",
@@ -19045,12 +19017,9 @@
     "xpack.lens.editorFrame.expressionMissingDatasource": "无法找到可视化的数据源",
     "xpack.lens.editorFrame.expressionMissingVisualizationType": "找不到可视化类型。",
     "xpack.lens.editorFrame.goToForums": "提出请求并提供反馈",
-    "xpack.lens.editorFrame.invisibleIndicatorLabel": "此维度当前在图表中不可见",
     "xpack.lens.editorFrame.layerSettingsTitle": "图层设置",
     "xpack.lens.editorFrame.networkErrorMessage": "网络错误，请稍后重试或联系管理员。",
-    "xpack.lens.editorFrame.noColorIndicatorLabel": "此维度没有单独的颜色",
     "xpack.lens.editorFrame.optionalDimensionLabel": "可选",
-    "xpack.lens.editorFrame.paletteColorIndicatorLabel": "此维度正在使用调色板",
     "xpack.lens.editorFrame.previewErrorLabel": "预览呈现失败",
     "xpack.lens.editorFrame.requiresFieldWarningLabel": "需要字段",
     "xpack.lens.editorFrame.suggestionPanelTitle": "建议",
@@ -19077,10 +19046,6 @@
     "xpack.lens.fieldFormats.suffix.m": "/m",
     "xpack.lens.fieldFormats.suffix.s": "/s",
     "xpack.lens.fieldFormats.suffix.title": "后缀",
-    "xpack.lens.fieldPicker.fieldPlaceholder": "选择字段",
-    "xpack.lens.fieldsBucketContainer.deleteButtonDisabled": "至少需要一个项目。",
-    "xpack.lens.fieldsBucketContainer.dragHandleDisabled": "重新排序需要多个项目。",
-    "xpack.lens.fieldsBucketContainer.dragToReorder": "拖动以重新排序",
     "xpack.lens.fittingFunctionsDescription.carry": "使用最后一个值填充空距",
     "xpack.lens.fittingFunctionsDescription.linear": "使用线填充空距",
     "xpack.lens.fittingFunctionsDescription.lookahead": "使用下一个值填充空距",
@@ -19201,7 +19166,6 @@
     "xpack.lens.indexPattern.chooseFieldLabel": "要使用此函数，请选择字段。",
     "xpack.lens.indexPattern.chooseSubFunction": "选择子函数",
     "xpack.lens.indexPattern.columnFormatLabel": "值格式",
-    "xpack.lens.indexPattern.columnLabel": "名称",
     "xpack.lens.indexPattern.count": "计数",
     "xpack.lens.indexPattern.count.documentation.quick": "\n文档总数。提供字段时，将计算字段值的总数。将计数函数用于单个文档中具有多个值的字段时，将对所有值计数。\n      ",
     "xpack.lens.indexPattern.count.signature": "[字段：字符串]",
@@ -19249,9 +19213,7 @@
     "xpack.lens.indexPattern.fieldExploreInDiscover": "在 Discover 中浏览",
     "xpack.lens.indexPattern.fieldPlaceholder": "字段",
     "xpack.lens.indexPattern.fieldStatsNoData": "Lens 无法使用此字段创建可视化，因为其中未包含数据。要创建可视化，请拖放其他字段。",
-    "xpack.lens.indexPattern.filterBy.clickToEdit": "单击以编辑",
     "xpack.lens.indexPattern.filterBy.emptyFilterQuery": "（空）",
-    "xpack.lens.indexPattern.filterBy.label": "筛选依据",
     "xpack.lens.indexPattern.filters": "筛选",
     "xpack.lens.indexPattern.filters.addaFilter": "添加筛选",
     "xpack.lens.indexPattern.filters.clickToEdit": "单击以编辑",
@@ -19785,7 +19747,6 @@
     "xpack.lens.xyChart.legendVisibility.show": "显示",
     "xpack.lens.xyChart.lineColor.label": "颜色",
     "xpack.lens.xyChart.lineMarker.auto": "自动",
-    "xpack.lens.xyChart.lineMarker.icon": "图标装饰",
     "xpack.lens.xyChart.lineMarker.position": "装饰位置",
     "xpack.lens.xyChart.lineMarker.textVisibility.field": "字段",
     "xpack.lens.xyChart.lineMarker.textVisibility.name": "名称",
@@ -19808,8 +19769,6 @@
     "xpack.lens.xyChart.scaleLinear": "线性",
     "xpack.lens.xyChart.scaleLog": "对数",
     "xpack.lens.xyChart.scaleSquare": "平方根",
-    "xpack.lens.xyChart.seriesColor.auto": "自动",
-    "xpack.lens.xyChart.seriesColor.label": "系列颜色",
     "xpack.lens.xyChart.setScale": "轴刻度",
     "xpack.lens.xyChart.showCurrenTimeMarker": "显示当前时间标记",
     "xpack.lens.xyChart.showEnzones": "显示部分数据标记",
@@ -21020,7 +20979,6 @@
     "xpack.ml.jobsList.stopDatafeedsConfirmModal.stopButtonLabel": "停止{jobsCount, plural, other {数据馈送}}",
     "xpack.ml.jobsList.stopDatafeedsModal.stopDatafeedsTitle": "停止 {jobsCount, plural, one {{jobId}} other {# 个作业}}的数据馈送？",
     "xpack.ml.managedJobsWarningCallout": "{jobsCount, plural, one {此作业} other {至少一个此类作业}}由 Elastic 预配置；{action} {jobsCount, plural, one {此作业} other {这些作业}}可能会影响该产品的其他部分。",
-    "xpack.ml.management.jobsList.insufficientLicenseDescription": "要使用这些 Machine Learning 功能，必须{link}。",
     "xpack.ml.management.jobsSpacesList.updateSpaces.error": "更新 {id} 时出错",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsAdded.title": "缺失数据馈送的已保存对象 ({count})",
     "xpack.ml.management.syncSavedObjectsFlyout.datafeedsRemoved.title": "具有不匹配数据馈送 ID 的已保存对象 ({count})",
@@ -22497,7 +22455,6 @@
     "xpack.ml.management.jobsList.accessDeniedTitle": "访问被拒绝",
     "xpack.ml.management.jobsList.analyticsDocsLabel": "分析作业文档",
     "xpack.ml.management.jobsList.anomalyDetectionDocsLabel": "异常检测作业文档",
-    "xpack.ml.management.jobsList.insufficientLicenseDescription.link": "开始试用或升级您的订阅",
     "xpack.ml.management.jobsList.insufficientLicenseLabel": "升级以使用订阅功能",
     "xpack.ml.management.jobsList.jobsListTagline": "查看、导出和导入 Machine Learning 分析和异常检测项目。",
     "xpack.ml.management.jobsList.jobsListTitle": "Machine Learning",
@@ -34750,9 +34707,7 @@
     "xpack.synthetics.monitorManagement.editMonitorCrumb": "编辑监测",
     "xpack.synthetics.monitorManagement.editMonitorError": "加载监测管理时出错",
     "xpack.synthetics.monitorManagement.editMonitorError.description": "无法加载监测管理设置。请联系支持人员。",
-    "xpack.synthetics.monitorManagement.emptyState.enablement": "启用监测管理以从全球托管测试地点运行轻量级、真正的浏览器监测。启用监测管理将生成 API 密钥，以便 Synthetics 服务回写 Elasticsearch 集群。",
     "xpack.synthetics.monitorManagement.emptyState.enablement.doc": "阅读文档",
-    "xpack.synthetics.monitorManagement.emptyState.enablement.enabled.title": "启用监测管理",
     "xpack.synthetics.monitorManagement.emptyState.enablement.learnMore": "希望了解详情？",
     "xpack.synthetics.monitorManagement.emptyState.enablement.title": "启用",
     "xpack.synthetics.monitorManagement.failed": "失败",
@@ -34818,9 +34773,7 @@
     "xpack.synthetics.monitorManagement.startAddingLocationsDescription": "专用位置供您从自己的场所运行监测。它们需要可以通过 Fleet 进行控制和维护的 Elastic 代理和代理策略。",
     "xpack.synthetics.monitorManagement.steps": "步长",
     "xpack.synthetics.monitorManagement.summary.heading": "摘要",
-    "xpack.synthetics.monitorManagement.syntheticsDisabledSuccess": "已成功禁用监测管理。",
     "xpack.synthetics.monitorManagement.syntheticsEnableLabel.management": "启用监测管理",
-    "xpack.synthetics.monitorManagement.syntheticsEnableSuccess": "已成功启用监测管理。",
     "xpack.synthetics.monitorManagement.testResult": "测试结果",
     "xpack.synthetics.monitorManagement.testResults": "测试结果",
     "xpack.synthetics.monitorManagement.testRuns.label": "测试运行",
@@ -35204,7 +35157,6 @@
     "xpack.synthetics.testResults.expandedRow.response_body.notRecorded": "正文未记录。在监测配置的高级选项中将索引响应正文选项设置为“始终打开”以记录正文。",
     "xpack.synthetics.testRun.description": "请在保存前测试您的监测并验证结果",
     "xpack.synthetics.testRun.pushError": "无法推送监测到服务。",
-    "xpack.synthetics.testRun.pushErrorLabel": "推送错误",
     "xpack.synthetics.testRun.pushing.description": "正在推送监测到服务......",
     "xpack.synthetics.testRun.runErrorLabel": "运行测试时出错",
     "xpack.synthetics.testRunDetailsRoute.page.title": "测试运行详情",
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx
index 682bdbb52d81db..4d99754eb2331a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_alerts_filter_query.tsx
@@ -77,6 +77,7 @@ export const ActionAlertsFilterQuery: React.FC<ActionAlertsFilterQueryProps> = (
             query={query.kql}
             filters={query.filters ?? []}
             onQueryChange={onQueryChange}
+            onQuerySubmit={onQueryChange}
             onFiltersUpdated={onFiltersUpdated}
             showFilterBar
             submitOnBlur
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
index 7557adb4979c01..f5245cd85fb533 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_form.tsx
@@ -562,6 +562,10 @@ export const ActionForm = ({
           actionType={actionTypesIndex[activeActionItem.actionTypeId]}
           onClose={closeAddConnectorModal}
           postSaveEventHandler={(savedAction: ActionConnector) => {
+            // TODO: fix in https://github.com/elastic/kibana/issues/155993
+            // actionTypes with subtypes need to be updated in case they switched to a
+            // subtype that is not the default one
+            actions[0].actionTypeId = savedAction.actionTypeId;
             connectors.push(savedAction);
             const indicesToUpdate = activeActionItem.indices || [];
             indicesToUpdate.forEach((index: number) => setActionIdByIndex(savedAction.id, index));
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/alerts_search_bar.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/alerts_search_bar.tsx
index 49b1f9905cd7f5..64c48606ff916a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/alerts_search_bar.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/alerts_search_bar.tsx
@@ -21,6 +21,7 @@ export function AlertsSearchBar({
   query,
   filters,
   onQueryChange,
+  onQuerySubmit,
   onFiltersUpdated,
   rangeFrom,
   rangeTo,
@@ -39,9 +40,20 @@ export function AlertsSearchBar({
   const [queryLanguage, setQueryLanguage] = useState<QueryLanguageType>('kuery');
   const { value: dataView, loading, error } = useAlertDataView(featureIds);
 
-  const onQuerySubmit = useCallback(
+  const onSearchQuerySubmit = useCallback(
     ({ dateRange, query: nextQuery }: { dateRange: TimeRange; query?: Query }) => {
-      onQueryChange({
+      onQuerySubmit({
+        dateRange,
+        query: typeof nextQuery?.query === 'string' ? nextQuery.query : undefined,
+      });
+      setQueryLanguage((nextQuery?.language ?? 'kuery') as QueryLanguageType);
+    },
+    [onQuerySubmit, setQueryLanguage]
+  );
+
+  const onSearchQueryChange = useCallback(
+    ({ dateRange, query: nextQuery }: { dateRange: TimeRange; query?: Query }) => {
+      onQueryChange?.({
         dateRange,
         query: typeof nextQuery?.query === 'string' ? nextQuery.query : undefined,
       });
@@ -50,7 +62,7 @@ export function AlertsSearchBar({
     [onQueryChange, setQueryLanguage]
   );
   const onRefresh = ({ dateRange }: { dateRange: TimeRange }) => {
-    onQueryChange({
+    onQuerySubmit({
       dateRange,
     });
   };
@@ -66,13 +78,13 @@ export function AlertsSearchBar({
       dateRangeTo={rangeTo}
       displayStyle="inPage"
       showFilterBar={showFilterBar}
-      onQuerySubmit={onQuerySubmit}
+      onQuerySubmit={onSearchQuerySubmit}
       onFiltersUpdated={onFiltersUpdated}
       onRefresh={onRefresh}
       showDatePicker={showDatePicker}
       showSubmitButton={showSubmitButton}
       submitOnBlur={submitOnBlur}
-      onQueryChange={onQuerySubmit}
+      onQueryChange={onSearchQueryChange}
     />
   );
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/types.ts
index b7616333c199a7..958b0e05cbf3ae 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_search_bar/types.ts
@@ -22,7 +22,11 @@ export interface AlertsSearchBarProps {
   showSubmitButton?: boolean;
   placeholder?: string;
   submitOnBlur?: boolean;
-  onQueryChange: (query: {
+  onQueryChange?: (query: {
+    dateRange: { from: string; to: string; mode?: 'absolute' | 'relative' };
+    query?: string;
+  }) => void;
+  onQuerySubmit: (query: {
     dateRange: { from: string; to: string; mode?: 'absolute' | 'relative' };
     query?: string;
   }) => void;
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.scss b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.scss
index fa62ba0307bf04..672ffa2b9d36f8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.scss
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.scss
@@ -1,3 +1,7 @@
+.alertsTableHighlightedRow {
+  background-color: $euiColorHighlight;
+}
+
 .alertsTableActiveRow {
   background-color: tintOrShade($euiColorLightShade, 50%, 0);
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
index e01000507c882b..0ccc05bac858af 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table.tsx
@@ -33,15 +33,19 @@ import { SystemCellId } from './types';
 import { SystemCellFactory, systemCells } from './cells';
 import { triggersActionsUiQueriesKeys } from '../../hooks/constants';
 
-export const ACTIVE_ROW_CLASS = 'alertsTableActiveRow';
-
 const AlertsFlyout = lazy(() => import('./alerts_flyout'));
-const GridStyles: EuiDataGridStyle = {
+const DefaultGridStyle: EuiDataGridStyle = {
   border: 'none',
   header: 'underline',
   fontSize: 's',
 };
 
+const getCellActionsStub = {
+  getCellActions: () => null,
+  visibleCellActions: undefined,
+  disabledCellActions: [],
+};
+
 const basicRenderCellValue = ({
   data,
   columnId,
@@ -63,7 +67,9 @@ const isSystemCell = (columnId: string): columnId is SystemCellId => {
 
 const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTableProps) => {
   const dataGridRef = useRef<EuiDataGridRefProps>(null);
-  const [_, setRowClasses] = useState<EuiDataGridStyle['rowClasses']>({});
+  const [activeRowClasses, setActiveRowClasses] = useState<
+    NonNullable<EuiDataGridStyle['rowClasses']>
+  >({});
   const alertsData = props.useFetchAlertsData();
   const {
     activePage,
@@ -286,11 +292,30 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
   useEffect(() => {
     // Row classes do not deal with visible row indices, so we need to handle page offset
     const rowIndex = flyoutAlertIndex + pagination.pageIndex * pagination.pageSize;
-    setRowClasses({
-      [rowIndex]: ACTIVE_ROW_CLASS,
+    setActiveRowClasses({
+      [rowIndex]: 'alertsTableActiveRow',
     });
   }, [flyoutAlertIndex, pagination.pageIndex, pagination.pageSize]);
 
+  // Update highlighted rows when alerts or pagination changes
+  const highlightedRowClasses = useMemo(() => {
+    let mappedRowClasses: EuiDataGridStyle['rowClasses'] = {};
+    const shouldHighlightRowCheck = props.shouldHighlightRow;
+    if (shouldHighlightRowCheck) {
+      mappedRowClasses = alerts.reduce<NonNullable<EuiDataGridStyle['rowClasses']>>(
+        (rowClasses, alert, index) => {
+          if (shouldHighlightRowCheck(alert)) {
+            rowClasses[index + pagination.pageIndex * pagination.pageSize] =
+              'alertsTableHighlightedRow';
+          }
+          return rowClasses;
+        },
+        {}
+      );
+    }
+    return mappedRowClasses;
+  }, [props.shouldHighlightRow, alerts, pagination.pageIndex, pagination.pageSize]);
+
   const handleFlyoutClose = useCallback(() => setFlyoutAlertIndex(-1), [setFlyoutAlertIndex]);
 
   const renderCellValue = useCallback(
@@ -360,7 +385,7 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
         dataGridRef,
         pageSize: pagination.pageSize,
       })
-    : { getCellActions: () => null, visibleCellActions: undefined, disabledCellActions: [] };
+    : getCellActionsStub;
 
   const columnsWithCellActions = useMemo(() => {
     if (getCellActions) {
@@ -377,6 +402,47 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
     return props.columns;
   }, [getCellActions, disabledCellActions, props.columns, visibleCellActions]);
 
+  // Merges the default grid style with the grid style that comes in through props.
+  const actualGridStyle = useMemo(() => {
+    const propGridStyle: NonNullable<EuiDataGridStyle> = props.gridStyle ?? {};
+    // Merges default row classes, custom ones and adds the active row class style
+    const mergedGridStyle: EuiDataGridStyle = {
+      ...DefaultGridStyle,
+      ...propGridStyle,
+      rowClasses: {
+        // We're spreadind the highlighted row classes first, so that the active
+        // row classed can override the highlighted row classes.
+        ...highlightedRowClasses,
+        ...activeRowClasses,
+      },
+    };
+
+    // If ANY additional rowClasses have been provided, we need to merge them with our internal ones
+    if (propGridStyle.rowClasses) {
+      // Get all row indices with a rowClass.
+      const mergedKeys = [
+        ...Object.keys(mergedGridStyle.rowClasses || {}),
+        ...Object.keys(propGridStyle.rowClasses || {}),
+      ];
+      // Deduplicate keys to avoid extra iterations
+      const dedupedKeys = Array.from(new Set(mergedKeys));
+
+      // For each index, merge row classes
+      const mergedRowClasses = dedupedKeys.reduce<NonNullable<EuiDataGridStyle['rowClasses']>>(
+        (rowClasses, key) => {
+          const intKey = parseInt(key, 10);
+          // Use internal row classes over custom row classes.
+          rowClasses[intKey] =
+            mergedGridStyle.rowClasses?.[intKey] || propGridStyle.rowClasses?.[intKey] || '';
+          return rowClasses;
+        },
+        {}
+      );
+      mergedGridStyle.rowClasses = mergedRowClasses;
+    }
+    return mergedGridStyle;
+  }, [activeRowClasses, highlightedRowClasses, props.gridStyle]);
+
   return (
     <InspectButtonContainer>
       <section style={{ width: '100%' }} data-test-subj={props['data-test-subj']}>
@@ -404,7 +470,7 @@ const AlertsTable: React.FunctionComponent<AlertsTableProps> = (props: AlertsTab
             leadingControlColumns={leadingControlColumns}
             rowCount={alertsCount}
             renderCellValue={handleRenderCellValue}
-            gridStyle={{ ...GridStyles, ...(props.gridStyle ?? {}) }}
+            gridStyle={actualGridStyle}
             sorting={{ columns: sortingColumns, onSort }}
             toolbarVisibility={toolbarVisibility}
             pagination={{
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx
index d9353516c64723..44c560a732b7ab 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/alerts_table_state.tsx
@@ -70,6 +70,10 @@ export type AlertsTableStateProps = {
   onUpdate?: (args: TableUpdateHandlerArgs) => void;
   showAlertStatusWithFlapping?: boolean;
   toolbarVisibility?: EuiDataGridToolBarVisibilityOptions;
+  /**
+   * Allows to consumers of the table to decide to highlight a row based on the current alert.
+   */
+  shouldHighlightRow?: (alert: Alert) => boolean;
 } & Partial<EuiDataGridProps>;
 
 export interface AlertsTableStorage {
@@ -138,6 +142,7 @@ const AlertsTableStateWithQueryProvider = ({
   onUpdate,
   showAlertStatusWithFlapping,
   toolbarVisibility,
+  shouldHighlightRow,
 }: AlertsTableStateProps) => {
   const { cases: casesService } = useKibana<{ cases?: CasesService }>().services;
 
@@ -318,13 +323,18 @@ const AlertsTableStateWithQueryProvider = ({
   const CasesContext = casesService?.ui.getCasesContext();
   const isCasesContextAvailable = casesService && CasesContext;
 
+  const memoizedCases = useMemo(
+    () => ({
+      data: cases ?? new Map(),
+      isLoading: isLoadingCases,
+    }),
+    [cases, isLoadingCases]
+  );
+
   const tableProps: AlertsTableProps = useMemo(
     () => ({
       alertsTableConfiguration,
-      cases: {
-        data: cases ?? new Map(),
-        isLoading: isLoadingCases,
-      },
+      cases: memoizedCases,
       columns,
       bulkActions: [],
       deletedEventIds: [],
@@ -353,11 +363,11 @@ const AlertsTableStateWithQueryProvider = ({
       controls: persistentControls,
       showInspectButton,
       toolbarVisibility,
+      shouldHighlightRow,
     }),
     [
       alertsTableConfiguration,
-      cases,
-      isLoadingCases,
+      memoizedCases,
       columns,
       flyoutSize,
       pagination.pageSize,
@@ -380,6 +390,7 @@ const AlertsTableStateWithQueryProvider = ({
       persistentControls,
       showInspectButton,
       toolbarVisibility,
+      shouldHighlightRow,
     ]
   );
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.ts
index 9caea0dfd26b09..1699a86b78cb6b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alerts_table/hooks/use_columns/use_columns.ts
@@ -233,9 +233,13 @@ export const useColumns = ({
     [columns]
   );
 
+  const visibleColumns = useMemo(() => {
+    return getColumnIds(columns);
+  }, [columns]);
+
   return {
     columns,
-    visibleColumns: getColumnIds(columns),
+    visibleColumns,
     isBrowserFieldDataLoading,
     browserFields,
     onColumnsChange: setColumnsAndSave,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx
index 94d6b1b3988243..b83d2f068e592f 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/rule_form/rule_edit.tsx
@@ -76,6 +76,7 @@ export const RuleEdit = ({
   onClose,
   reloadRules,
   onSave,
+  hideInterval,
   ruleTypeRegistry,
   actionTypeRegistry,
   metadata: initialMetadata,
@@ -233,6 +234,7 @@ export const RuleEdit = ({
                 dispatch={dispatch}
                 errors={ruleErrors}
                 actionTypeRegistry={actionTypeRegistry}
+                hideInterval={hideInterval}
                 ruleTypeRegistry={ruleTypeRegistry}
                 canChangeTrigger={false}
                 setHasActionsDisabled={setHasActionsDisabled}
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
index 756ea14488fadd..4c7d743cb30859 100644
--- a/x-pack/plugins/triggers_actions_ui/public/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -532,6 +532,10 @@ export type AlertsTableProps = {
   controls?: EuiDataGridToolBarAdditionalControlsOptions;
   showInspectButton?: boolean;
   toolbarVisibility?: EuiDataGridToolBarVisibilityOptions;
+  /**
+   * Allows to consumers of the table to decide to highlight a row based on the current alert.
+   */
+  shouldHighlightRow?: (alert: Alert) => boolean;
 } & Partial<Pick<EuiDataGridProps, 'gridStyle' | 'rowHeightsOptions'>>;
 
 // TODO We need to create generic type between our plugin, right now we have different one because of the old alerts table
diff --git a/x-pack/test/accessibility/apps/ingest_node_pipelines.ts b/x-pack/test/accessibility/apps/ingest_node_pipelines.ts
index 88b304f29576c4..85852eb6370b93 100644
--- a/x-pack/test/accessibility/apps/ingest_node_pipelines.ts
+++ b/x-pack/test/accessibility/apps/ingest_node_pipelines.ts
@@ -16,6 +16,7 @@ export default function ({ getService, getPageObjects }: any) {
 
   // FAILING VERSION BUMP: https://github.com/elastic/kibana/issues/155924
   // Failing: See https://github.com/elastic/kibana/issues/155928
+  // Failing: See https://github.com/elastic/kibana/issues/155928
   describe.skip('Ingest Pipelines Accessibility', async () => {
     before(async () => {
       await putSamplePipeline(esClient);
diff --git a/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts b/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
index 912e153f9a8c0d..0ea5a2601f75ad 100644
--- a/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
+++ b/x-pack/test/alerting_api_integration/common/lib/get_event_log.ts
@@ -39,7 +39,7 @@ export async function getEventLog(params: GetEventLogParams): Promise<IValidated
   const supertest = getService('supertest');
 
   const spacePrefix = getUrlPrefix(spaceId);
-  const url = `${spacePrefix}/internal/event_log/${type}/${id}/_find?per_page=5000${
+  const url = `${spacePrefix}/_test/event_log/${type}/${id}/_find?per_page=5000${
     params.filter ? `&filter=${params.filter}` : ''
   }`;
 
diff --git a/x-pack/test/alerting_api_integration/common/plugins/alerts/kibana.jsonc b/x-pack/test/alerting_api_integration/common/plugins/alerts/kibana.jsonc
index 0021b4d2c339fb..d1ae22203b7596 100644
--- a/x-pack/test/alerting_api_integration/common/plugins/alerts/kibana.jsonc
+++ b/x-pack/test/alerting_api_integration/common/plugins/alerts/kibana.jsonc
@@ -12,7 +12,8 @@
       "actions",
       "alerting",
       "encryptedSavedObjects",
-      "ruleRegistry"
+      "ruleRegistry",
+      "eventLog"
     ],
     "optionalPlugins": [
       "security",
diff --git a/x-pack/test/alerting_api_integration/common/plugins/alerts/server/plugin.ts b/x-pack/test/alerting_api_integration/common/plugins/alerts/server/plugin.ts
index e01506baf6adc6..b851b3ac6c7783 100644
--- a/x-pack/test/alerting_api_integration/common/plugins/alerts/server/plugin.ts
+++ b/x-pack/test/alerting_api_integration/common/plugins/alerts/server/plugin.ts
@@ -22,6 +22,7 @@ import { SpacesPluginStart } from '@kbn/spaces-plugin/server';
 import { SecurityPluginStart } from '@kbn/security-plugin/server';
 import { PluginStartContract as ActionsPluginStart } from '@kbn/actions-plugin/server';
 import { RuleRegistryPluginSetupContract } from '@kbn/rule-registry-plugin/server';
+import { IEventLogClientService } from '@kbn/event-log-plugin/server';
 import { defineRoutes } from './routes';
 import { defineActionTypes } from './action_types';
 import { defineAlertTypes } from './alert_types';
@@ -41,6 +42,7 @@ export interface FixtureStartDeps {
   spaces?: SpacesPluginStart;
   actions: ActionsPluginStart;
   taskManager: TaskManagerStartContract;
+  eventLog: IEventLogClientService;
 }
 
 export class FixturePlugin implements Plugin<void, void, FixtureSetupDeps, FixtureStartDeps> {
diff --git a/x-pack/test/alerting_api_integration/common/plugins/alerts/server/routes.ts b/x-pack/test/alerting_api_integration/common/plugins/alerts/server/routes.ts
index 135d3c02b9f8f8..28e0abd955b2c4 100644
--- a/x-pack/test/alerting_api_integration/common/plugins/alerts/server/routes.ts
+++ b/x-pack/test/alerting_api_integration/common/plugins/alerts/server/routes.ts
@@ -24,6 +24,7 @@ import {
   TaskManagerStartContract,
 } from '@kbn/task-manager-plugin/server';
 import { SECURITY_EXTENSION_ID, SPACES_EXTENSION_ID } from '@kbn/core-saved-objects-server';
+import { queryOptionsSchema } from '@kbn/event-log-plugin/server/event_log_client';
 import { FixtureStartDeps } from './plugin';
 import { retryIfConflicts } from './lib/retry_if_conflicts';
 
@@ -449,4 +450,37 @@ export function defineRoutes(
       }
     }
   );
+
+  router.get(
+    {
+      path: '/_test/event_log/{type}/{id}/_find',
+      validate: {
+        params: schema.object({
+          type: schema.string(),
+          id: schema.string(),
+        }),
+        query: queryOptionsSchema,
+      },
+    },
+    async (
+      context: RequestHandlerContext,
+      req: KibanaRequest<any, any, any, any>,
+      res: KibanaResponseFactory
+    ): Promise<IKibanaResponse<any>> => {
+      const [, { eventLog }] = await core.getStartServices();
+      const eventLogClient = eventLog.getClient(req);
+      const {
+        params: { id, type },
+        query,
+      } = req;
+
+      try {
+        return res.ok({
+          body: await eventLogClient.findEventsBySavedObjectIds(type, [id], query),
+        });
+      } catch (err) {
+        return res.notFound();
+      }
+    }
+  );
 }
diff --git a/x-pack/test/api_integration/apis/asset_manager/tests/assets.ts b/x-pack/test/api_integration/apis/asset_manager/tests/assets.ts
index d99fdf9a9746be..cda8ef88fcc468 100644
--- a/x-pack/test/api_integration/apis/asset_manager/tests/assets.ts
+++ b/x-pack/test/api_integration/apis/asset_manager/tests/assets.ts
@@ -5,13 +5,16 @@
  * 2.0.
  */
 
-import { AssetWithoutTimestamp } from '@kbn/assetManager-plugin/common/types_api';
+import { pick, sortBy } from 'lodash';
+
+import { Asset, AssetWithoutTimestamp } from '@kbn/assetManager-plugin/common/types_api';
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { createSampleAssets, deleteSampleAssets, viewSampleAssetDocs } from '../helpers';
 
 const ASSETS_ENDPOINT = '/api/asset-manager/assets';
-const DIFF_ENDPOINT = ASSETS_ENDPOINT + '/diff';
+const DIFF_ENDPOINT = `${ASSETS_ENDPOINT}/diff`;
+const RELATED_ASSETS_ENDPOINT = `${ASSETS_ENDPOINT}/related`;
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
@@ -307,9 +310,252 @@ export default function ({ getService }: FtrProviderContext) {
           delete asset['@timestamp'];
         });
 
-        expect(getResponse.body.onlyInA).to.eql(onlyInA);
-        expect(getResponse.body.onlyInB).to.eql(onlyInB);
-        expect(getResponse.body.inBoth).to.eql(inBoth);
+        const sortByEan = (assets: any[]) => sortBy(assets, (asset) => asset['asset.ean']);
+        expect(sortByEan(getResponse.body.onlyInA)).to.eql(sortByEan(onlyInA));
+        expect(sortByEan(getResponse.body.onlyInB)).to.eql(sortByEan(onlyInB));
+        expect(sortByEan(getResponse.body.inBoth)).to.eql(sortByEan(inBoth));
+      });
+    });
+
+    describe('GET /assets/related', () => {
+      describe('basic validation of all relations', () => {
+        const relations = [
+          {
+            name: 'ancestors',
+            ean: 'k8s.node:node-101',
+            expectedRelatedEans: ['k8s.cluster:cluster-001'],
+          },
+          {
+            name: 'descendants',
+            ean: 'k8s.cluster:cluster-001',
+            expectedRelatedEans: ['k8s.node:node-101', 'k8s.node:node-102', 'k8s.node:node-103'],
+          },
+          {
+            name: 'references',
+            ean: 'k8s.pod:pod-200xrg1',
+            expectedRelatedEans: ['k8s.cluster:cluster-001'],
+          },
+        ];
+
+        relations.forEach((relation) => {
+          it(`should return the ${relation.name} assets`, async () => {
+            await createSampleAssets(supertest);
+
+            const getResponse = await supertest
+              .get(RELATED_ASSETS_ENDPOINT)
+              .query({
+                relation: relation.name,
+                size: sampleAssetDocs.length,
+                from: 'now-1d',
+                ean: relation.ean,
+                maxDistance: 1,
+              })
+              .expect(200);
+
+            const relatedEans = getResponse.body.results[relation.name].map(
+              (asset: Asset) => asset['asset.ean']
+            );
+            expect(relatedEans).to.eql(relation.expectedRelatedEans);
+          });
+        });
+      });
+
+      describe('response validation', () => {
+        it('should return 404 if primary asset not found', async () => {
+          await supertest
+            .get(RELATED_ASSETS_ENDPOINT)
+            .query({
+              relation: 'descendants',
+              size: sampleAssetDocs.length,
+              from: 'now-1d',
+              ean: 'non-existing-ean',
+              maxDistance: 5,
+            })
+            .expect(404);
+        });
+
+        it('should return the primary asset', async () => {
+          await createSampleAssets(supertest);
+
+          const sampleCluster = sampleAssetDocs.find(
+            (asset) => asset['asset.id'] === 'cluster-002'
+          );
+
+          const getResponse = await supertest
+            .get(RELATED_ASSETS_ENDPOINT)
+            .query({
+              relation: 'descendants',
+              size: sampleAssetDocs.length,
+              from: 'now-1d',
+              ean: sampleCluster!['asset.ean'],
+              maxDistance: 5,
+            })
+            .expect(200);
+
+          const {
+            body: { results },
+          } = getResponse;
+          delete results.primary['@timestamp'];
+          expect(results.primary).to.eql(sampleCluster);
+        });
+
+        it('should return empty assets when none matching', async () => {
+          await createSampleAssets(supertest);
+
+          const sampleCluster = sampleAssetDocs.find(
+            (asset) => asset['asset.id'] === 'cluster-002'
+          );
+
+          const getResponse = await supertest
+            .get(RELATED_ASSETS_ENDPOINT)
+            .query({
+              relation: 'descendants',
+              size: sampleAssetDocs.length,
+              from: 'now-1d',
+              ean: sampleCluster!['asset.ean'],
+              maxDistance: 5,
+            })
+            .expect(200);
+
+          const {
+            body: { results },
+          } = getResponse;
+          expect(results).to.have.property('descendants');
+          expect(results.descendants).to.have.length(0);
+        });
+
+        it('breaks circular dependency', async () => {
+          await createSampleAssets(supertest);
+
+          // pods reference a node that references the pods
+          const sampleNode = sampleAssetDocs.find((asset) => asset['asset.id'] === 'pod-203ugg5');
+
+          const getResponse = await supertest
+            .get(RELATED_ASSETS_ENDPOINT)
+            .query({
+              relation: 'references',
+              size: sampleAssetDocs.length,
+              from: 'now-1d',
+              ean: sampleNode!['asset.ean'],
+              maxDistance: 5,
+            })
+            .expect(200);
+
+          const {
+            body: { results },
+          } = getResponse;
+          expect(
+            results.references.map((asset: Asset) => pick(asset, ['asset.ean', 'distance']))
+          ).to.eql([
+            { 'asset.ean': 'k8s.node:node-203', distance: 1 },
+            { 'asset.ean': 'k8s.pod:pod-203ugg9', distance: 2 },
+          ]);
+        });
+      });
+
+      describe('no asset.type filters', () => {
+        it('should return all descendants of a provided ean at maxDistance 1', async () => {
+          await createSampleAssets(supertest);
+
+          const sampleCluster = sampleAssetDocs.find(
+            (asset) => asset['asset.id'] === 'cluster-001'
+          );
+
+          const getResponse = await supertest
+            .get(RELATED_ASSETS_ENDPOINT)
+            .query({
+              relation: 'descendants',
+              size: sampleAssetDocs.length,
+              from: 'now-1d',
+              ean: sampleCluster!['asset.ean'],
+              maxDistance: 1,
+            })
+            .expect(200);
+
+          const {
+            body: { results },
+          } = getResponse;
+          expect(results.descendants).to.have.length(3);
+          expect(results.descendants.every((asset: { distance: number }) => asset.distance === 1));
+        });
+
+        it('should return all descendants of a provided ean at maxDistance 2', async () => {
+          await createSampleAssets(supertest);
+
+          const sampleCluster = sampleAssetDocs.find(
+            (asset) => asset['asset.id'] === 'cluster-001'
+          );
+
+          const getResponse = await supertest
+            .get(RELATED_ASSETS_ENDPOINT)
+            .query({
+              relation: 'descendants',
+              size: sampleAssetDocs.length,
+              from: 'now-1d',
+              ean: sampleCluster!['asset.ean'],
+              maxDistance: 2,
+            })
+            .expect(200);
+
+          const {
+            body: { results },
+          } = getResponse;
+          expect(results.descendants).to.have.length(12);
+        });
+      });
+
+      describe('with asset.type filters', () => {
+        it('should filter by the provided asset type', async () => {
+          await createSampleAssets(supertest);
+
+          const sampleCluster = sampleAssetDocs.find(
+            (asset) => asset['asset.id'] === 'cluster-001'
+          );
+
+          const getResponse = await supertest
+            .get(RELATED_ASSETS_ENDPOINT)
+            .query({
+              relation: 'descendants',
+              size: sampleAssetDocs.length,
+              from: 'now-1d',
+              ean: sampleCluster!['asset.ean'],
+              maxDistance: 1,
+              type: ['k8s.pod'],
+            })
+            .expect(200);
+
+          const {
+            body: { results },
+          } = getResponse;
+          expect(results.descendants).to.have.length(0);
+        });
+
+        it('should return all descendants of a provided ean at maxDistance 2', async () => {
+          await createSampleAssets(supertest);
+
+          const sampleCluster = sampleAssetDocs.find(
+            (asset) => asset['asset.id'] === 'cluster-001'
+          );
+
+          const getResponse = await supertest
+            .get(RELATED_ASSETS_ENDPOINT)
+            .query({
+              relation: 'descendants',
+              size: sampleAssetDocs.length,
+              from: 'now-1d',
+              ean: sampleCluster!['asset.ean'],
+              maxDistance: 2,
+              type: ['k8s.pod'],
+            })
+            .expect(200);
+
+          const {
+            body: { results },
+          } = getResponse;
+          expect(results.descendants).to.have.length(9);
+          expect(results.descendants.every((asset: { distance: number }) => asset.distance === 2));
+          expect(results.descendants.every((asset: Asset) => asset['asset.type'] === 'k8s.pod'));
+        });
       });
     });
   });
diff --git a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
index 3a515321f1a3dc..92b2fe2a1401ff 100644
--- a/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/results/get_categorizer_stats.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { Datafeed } from '@kbn/ml-plugin/common/types/anomaly_detection_jobs';
-import { AnomalyCategorizerStatsDoc } from '@kbn/ml-plugin/common/types/anomalies';
+import type { MlAnomalyCategorizerStatsDoc } from '@kbn/ml-anomaly-utils';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../../functional/services/ml/security_common';
 import { COMMON_REQUEST_HEADERS } from '../../../../functional/services/ml/common_api';
@@ -71,7 +71,7 @@ export default ({ getService }: FtrProviderContext) => {
         .set(COMMON_REQUEST_HEADERS);
       ml.api.assertResponseStatusCode(200, status, body);
 
-      body.forEach((doc: AnomalyCategorizerStatsDoc) => {
+      body.forEach((doc: MlAnomalyCategorizerStatsDoc) => {
         expect(doc.job_id).to.eql(jobId);
         expect(doc.result_type).to.eql('categorizer_stats');
         expect(doc.partition_field_name).to.be(PARTITION_FIELD_NAME);
@@ -86,7 +86,7 @@ export default ({ getService }: FtrProviderContext) => {
         .set(COMMON_REQUEST_HEADERS);
       ml.api.assertResponseStatusCode(200, status, body);
 
-      body.forEach((doc: AnomalyCategorizerStatsDoc) => {
+      body.forEach((doc: MlAnomalyCategorizerStatsDoc) => {
         expect(doc.job_id).to.eql(jobId);
         expect(doc.result_type).to.eql('categorizer_stats');
         expect(doc.partition_field_name).to.be(PARTITION_FIELD_NAME);
@@ -113,7 +113,7 @@ export default ({ getService }: FtrProviderContext) => {
         .set(COMMON_REQUEST_HEADERS);
       ml.api.assertResponseStatusCode(200, status, body);
 
-      body.forEach((doc: AnomalyCategorizerStatsDoc) => {
+      body.forEach((doc: MlAnomalyCategorizerStatsDoc) => {
         expect(doc.job_id).to.eql(jobId);
         expect(doc.result_type).to.eql('categorizer_stats');
         expect(doc.partition_field_name).to.be(PARTITION_FIELD_NAME);
@@ -129,7 +129,7 @@ export default ({ getService }: FtrProviderContext) => {
         .set(COMMON_REQUEST_HEADERS);
       ml.api.assertResponseStatusCode(200, status, body);
 
-      body.forEach((doc: AnomalyCategorizerStatsDoc) => {
+      body.forEach((doc: MlAnomalyCategorizerStatsDoc) => {
         expect(doc.job_id).to.eql(jobId);
         expect(doc.result_type).to.eql('categorizer_stats');
         expect(doc.partition_field_name).to.be(PARTITION_FIELD_NAME);
diff --git a/x-pack/test/api_integration/apis/synthetics/synthetics_enablement.ts b/x-pack/test/api_integration/apis/synthetics/synthetics_enablement.ts
index bf68da4c148f5b..3a0713431efb44 100644
--- a/x-pack/test/api_integration/apis/synthetics/synthetics_enablement.ts
+++ b/x-pack/test/api_integration/apis/synthetics/synthetics_enablement.ts
@@ -248,7 +248,7 @@ export default function ({ getService }: FtrProviderContext) {
             overwrite: true,
             attributes: {
               id: apiKeyResult.body.id,
-              name: 'synthetics-api-key (required for monitor management)',
+              name: 'synthetics-api-key (required for Synthetics App)',
               apiKey: apiKeyResult.body.api_key,
             },
           });
diff --git a/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts b/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
index a9593658feabc2..6464bafd263979 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/anomaly_alert.spec.ts
@@ -9,7 +9,7 @@ import { ApmRuleType } from '@kbn/apm-plugin/common/rules/apm_rule_types';
 import { apm, timerange } from '@kbn/apm-synthtrace-client';
 import expect from '@kbn/expect';
 import { range } from 'lodash';
-import { ANOMALY_SEVERITY } from '@kbn/apm-plugin/common/ml_constants';
+import { ML_ANOMALY_SEVERITY } from '@kbn/ml-anomaly-utils/anomaly_severity';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { createAndRunApmMlJobs } from '../../common/utils/create_and_run_apm_ml_jobs';
 import { createApmRule } from './alerting_api_helper';
@@ -90,7 +90,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               environment: 'production',
               windowSize: 99,
               windowUnit: 'y',
-              anomalySeverityType: ANOMALY_SEVERITY.WARNING,
+              anomalySeverityType: ML_ANOMALY_SEVERITY.WARNING,
             },
             ruleTypeId: ApmRuleType.Anomaly,
           });
diff --git a/x-pack/test/apm_api_integration/tests/metrics/memory/generate_data.ts b/x-pack/test/apm_api_integration/tests/metrics/memory/generate_data.ts
new file mode 100644
index 00000000000000..22abd719892064
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/metrics/memory/generate_data.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { apm, timerange } from '@kbn/apm-synthtrace-client';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+
+const gigabytesToBytes = (value: number) => value * Math.pow(1024, 3);
+
+export const config = {
+  memoryTotal: gigabytesToBytes(64),
+  memoryFree: gigabytesToBytes(5.5),
+  cGroupMemoryLimit: gigabytesToBytes(8),
+  cGroupMemoryUsage: gigabytesToBytes(1.5),
+};
+
+export const expectedValues = {
+  expectedMemoryUsedRate: (config.memoryTotal - config.memoryFree) / config.memoryTotal,
+  expectedMemoryUsed: config.memoryTotal - config.memoryFree,
+};
+
+export async function generateData({
+  synthtraceEsClient,
+  start,
+  end,
+}: {
+  synthtraceEsClient: ApmSynthtraceEsClient;
+  start: number;
+  end: number;
+}) {
+  const { memoryTotal, memoryFree, cGroupMemoryLimit, cGroupMemoryUsage } = config;
+
+  const systemMetricOnlyInstance = apm
+    .service({ name: 'system-metric-only-service', environment: 'production', agentName: 'go' })
+    .instance('system-metric-only-production');
+
+  const cGroupMemoryOnlyInstance = apm
+    .service({ name: 'cgroup-memory-only-service', environment: 'production', agentName: 'go' })
+    .instance('cgroup-memory-only-production');
+
+  const cGroupMemoryWithLimitInstance = apm
+    .service({
+      name: 'cgroup-memory-with-limit-production',
+      environment: 'production',
+      agentName: 'go',
+    })
+    .instance('cgroup-memory-with-limit-production');
+
+  const transactionsEvents = timerange(start, end)
+    .ratePerMinute(1)
+    .generator((timestamp) => [
+      systemMetricOnlyInstance
+        .appMetrics({
+          'system.memory.actual.free': memoryFree,
+          'system.memory.total': memoryTotal,
+        })
+        .timestamp(timestamp),
+      cGroupMemoryOnlyInstance
+        .appMetrics({
+          'system.process.cgroup.memory.mem.usage.bytes': cGroupMemoryUsage,
+        })
+        .timestamp(timestamp),
+
+      cGroupMemoryWithLimitInstance
+        .appMetrics({
+          'system.process.cgroup.memory.mem.usage.bytes': cGroupMemoryUsage,
+          'system.process.cgroup.memory.mem.limit.bytes': cGroupMemoryLimit,
+          'system.memory.total': memoryTotal,
+          'system.memory.actual.free': memoryFree,
+        })
+        .timestamp(timestamp),
+    ]);
+
+  await synthtraceEsClient.index(transactionsEvents);
+}
diff --git a/x-pack/test/apm_api_integration/tests/metrics/memory/memory_metrics.spec.ts b/x-pack/test/apm_api_integration/tests/metrics/memory/memory_metrics.spec.ts
new file mode 100644
index 00000000000000..d67451e4d1abc5
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/metrics/memory/memory_metrics.spec.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { config, generateData } from './generate_data';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const registry = getService('registry');
+  const apmApiClient = getService('apmApiClient');
+  const synthtraceEsClient = getService('synthtraceEsClient');
+
+  const start = new Date('2023-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2023-01-01T00:15:00.000Z').getTime() - 1;
+
+  async function callMetricChartsAPI(serviceName: string) {
+    return await apmApiClient.readUser({
+      endpoint: `GET /internal/apm/services/{serviceName}/metrics/charts`,
+      params: {
+        path: { serviceName },
+        query: {
+          environment: 'production',
+          start: new Date(start).toISOString(),
+          end: new Date(end).toISOString(),
+          kuery: '',
+          agentName: 'go',
+        },
+      },
+    });
+  }
+
+  registry.when('Memory', { config: 'trial', archives: [] }, () => {
+    before(async () => {
+      await generateData({ start, end, synthtraceEsClient });
+    });
+
+    after(() => synthtraceEsClient.clean());
+
+    it('returns system memory stats', async () => {
+      const expectedFreeMemory = 1 - config.memoryFree / config.memoryTotal;
+
+      const { status, body } = await callMetricChartsAPI('system-metric-only-service');
+      const memoryChart = body.charts.find(({ key }) => key === 'memory_usage_chart');
+
+      expect(status).to.be(200);
+      [
+        { title: 'Max', expectedValue: expectedFreeMemory },
+        { title: 'Average', expectedValue: expectedFreeMemory },
+      ].map(({ title, expectedValue }) => {
+        const series = memoryChart?.series.find((item) => item.title === title);
+        expect(series?.overallValue).to.eql(expectedValue);
+      });
+    });
+
+    it('returns cgroup memory with system.process.cgroup.memory.mem.limit.bytes', async () => {
+      const expectedFreeMemory = config.cGroupMemoryUsage / config.cGroupMemoryLimit;
+
+      const { status, body } = await callMetricChartsAPI('cgroup-memory-with-limit-production');
+      const memoryChart = body.charts.find(({ key }) => key === 'memory_usage_chart');
+
+      expect(status).to.be(200);
+      [
+        { title: 'Max', expectedValue: expectedFreeMemory },
+        { title: 'Average', expectedValue: expectedFreeMemory },
+      ].map(({ title, expectedValue }) => {
+        const series = memoryChart?.series.find((item) => item.title === title);
+        expect(series?.overallValue).to.eql(expectedValue);
+      });
+    });
+
+    it('handles cgroup memory stats when system.process.cgroup.memory.mem.limit.bytes and system.memory.total are not present', async () => {
+      const { status, body } = await callMetricChartsAPI('cgroup-memory-only-production');
+      expect(status).to.be(200);
+
+      const memoryChart = body.charts.find(({ key }) => key === 'memory_usage_chart');
+      expect(memoryChart?.series).to.eql([]);
+    });
+  });
+}
diff --git a/x-pack/test/apm_api_integration/tests/mobile/mobile_location_stats.spec.ts b/x-pack/test/apm_api_integration/tests/mobile/mobile_location_stats.spec.ts
index 171b43b1f1a0d5..356dbb0a5397b9 100644
--- a/x-pack/test/apm_api_integration/tests/mobile/mobile_location_stats.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/mobile/mobile_location_stats.spec.ts
@@ -96,7 +96,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('when filters are applied', () => {
+    // FAILING: https://github.com/elastic/kibana/issues/156207
+    describe.skip('when filters are applied', () => {
       it('returns empty state for filters', async () => {
         const response = await getMobileLocationStats({
           serviceName: 'synth-android',
diff --git a/x-pack/test/apm_api_integration/tests/mobile/mobile_stats.spec.ts b/x-pack/test/apm_api_integration/tests/mobile/mobile_stats.spec.ts
index c52c13ea64cae9..2517c906c4cb47 100644
--- a/x-pack/test/apm_api_integration/tests/mobile/mobile_stats.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/mobile/mobile_stats.spec.ts
@@ -98,7 +98,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('when filters are applied', () => {
+    // FAILING: https://github.com/elastic/kibana/issues/156218
+    describe.skip('when filters are applied', () => {
       it('returns empty state for filters', async () => {
         const response = await getMobileStats({
           serviceName: 'synth-android',
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
index 7a5e2f2f407802..f215882c09bd21 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/instances_main_statistics.spec.ts
@@ -418,6 +418,16 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             expect(javaStats).to.be(undefined);
           });
 
+          it('does not return metrics', () => {
+            const goAStats = body.currentPeriod.find(
+              (stat) => stat.serviceNodeName === 'go-instance-a'
+            );
+
+            expect(goAStats).to.not.be(undefined);
+            expect(goAStats?.memoryUsage).to.be(undefined);
+            expect(goAStats?.cpuUsage).to.be(undefined);
+          });
+
           it('does not return data for missing service node name', () => {
             const missingNameStats = body.currentPeriod.find(
               (stat) => stat.serviceNodeName === SERVICE_NODE_NAME_MISSING
diff --git a/x-pack/test/cases_api_integration/common/lib/alerts.ts b/x-pack/test/cases_api_integration/common/lib/alerts.ts
index c949b805f45d0f..be0ee606f503d5 100644
--- a/x-pack/test/cases_api_integration/common/lib/alerts.ts
+++ b/x-pack/test/cases_api_integration/common/lib/alerts.ts
@@ -12,7 +12,7 @@ import { ToolingLog } from '@kbn/tooling-log';
 import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
 import { DetectionAlert } from '@kbn/security-solution-plugin/common/detection_engine/schemas/alerts';
 import { RiskEnrichmentFields } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/utils/enrichments/types';
-import { CaseResponse, CommentType } from '@kbn/cases-plugin/common';
+import { Case, CommentType } from '@kbn/cases-plugin/common';
 import { ALERT_CASE_IDS } from '@kbn/rule-data-utils';
 import {
   getRuleForSignalTesting,
@@ -199,7 +199,7 @@ export const createCaseAndAttachAlert = async ({
   owner: string;
   alerts: Alerts;
   getAlerts: (alerts: Alerts) => Promise<Array<Record<string, unknown>>>;
-}): Promise<CaseResponse[]> => {
+}): Promise<Case[]> => {
   const cases = await Promise.all(
     [...Array(totalCases).keys()].map((index) =>
       createCase(
diff --git a/x-pack/test/cases_api_integration/common/lib/api/attachments.ts b/x-pack/test/cases_api_integration/common/lib/api/attachments.ts
index f9e8f2658db81b..944c2415ec38eb 100644
--- a/x-pack/test/cases_api_integration/common/lib/api/attachments.ts
+++ b/x-pack/test/cases_api_integration/common/lib/api/attachments.ts
@@ -11,7 +11,7 @@ import {
   AllCommentsResponse,
   BulkCreateCommentRequest,
   BulkGetAttachmentsResponse,
-  CaseResponse,
+  Case,
   CommentPatchRequest,
   CommentRequest,
   CommentResponse,
@@ -63,7 +63,7 @@ export const createComment = async ({
   auth?: { user: User; space: string | null } | null;
   expectedHttpCode?: number;
   headers?: Record<string, unknown>;
-}): Promise<CaseResponse> => {
+}): Promise<Case> => {
   const apiCall = supertest.post(
     `${getSpaceUrlPrefix(auth?.space)}${CASES_URL}/${caseId}/comments`
   );
@@ -91,7 +91,7 @@ export const bulkCreateAttachments = async ({
   params: BulkCreateCommentRequest;
   auth?: { user: User; space: string | null };
   expectedHttpCode?: number;
-}): Promise<CaseResponse> => {
+}): Promise<Case> => {
   const { body: theCase } = await supertest
     .post(
       `${getSpaceUrlPrefix(auth.space)}${CASES_INTERNAL_URL}/${caseId}/attachments/_bulk_create`
@@ -114,7 +114,7 @@ export const createCaseAndBulkCreateAttachments = async ({
   numberOfAttachments?: number;
   auth?: { user: User; space: string | null };
   expectedHttpCode?: number;
-}): Promise<{ theCase: CaseResponse; attachments: BulkCreateCommentRequest }> => {
+}): Promise<{ theCase: Case; attachments: BulkCreateCommentRequest }> => {
   const postedCase = await createCase(supertest, postCaseReq);
   const attachments = getAttachments(numberOfAttachments);
   const patchedCase = await bulkCreateAttachments({
@@ -247,7 +247,7 @@ export const updateComment = async ({
   expectedHttpCode?: number;
   auth?: { user: User; space: string | null } | null;
   headers?: Record<string, unknown>;
-}): Promise<CaseResponse> => {
+}): Promise<Case> => {
   const apiCall = supertest.patch(
     `${getSpaceUrlPrefix(auth?.space)}${CASES_URL}/${caseId}/comments`
   );
diff --git a/x-pack/test/cases_api_integration/common/lib/api/case.ts b/x-pack/test/cases_api_integration/common/lib/api/case.ts
index 9485ea3a797b77..29e813c9dd7c12 100644
--- a/x-pack/test/cases_api_integration/common/lib/api/case.ts
+++ b/x-pack/test/cases_api_integration/common/lib/api/case.ts
@@ -6,7 +6,7 @@
  */
 
 import { CASES_URL } from '@kbn/cases-plugin/common';
-import { CasePostRequest, CaseResponse } from '@kbn/cases-plugin/common/api';
+import { CasePostRequest, Case } from '@kbn/cases-plugin/common/api';
 import type SuperTest from 'supertest';
 import { User } from '../authentication/types';
 
@@ -19,7 +19,7 @@ export const createCase = async (
   expectedHttpCode: number = 200,
   auth: { user: User; space: string | null } | null = { user: superUser, space: null },
   headers: Record<string, unknown> = {}
-): Promise<CaseResponse> => {
+): Promise<Case> => {
   const apiCall = supertest.post(`${getSpaceUrlPrefix(auth?.space)}${CASES_URL}`);
 
   setupAuth({ apiCall, headers, auth });
diff --git a/x-pack/test/cases_api_integration/common/lib/api/connectors.ts b/x-pack/test/cases_api_integration/common/lib/api/connectors.ts
index eee179df52d2bf..0a2b00b7acbb13 100644
--- a/x-pack/test/cases_api_integration/common/lib/api/connectors.ts
+++ b/x-pack/test/cases_api_integration/common/lib/api/connectors.ts
@@ -15,7 +15,7 @@ import {
   CaseConnector,
   ConnectorTypes,
   CasePostRequest,
-  CaseResponse,
+  Case,
   GetCaseConnectorsResponse,
   getCaseConnectorsUrl,
 } from '@kbn/cases-plugin/common/api';
@@ -219,7 +219,7 @@ export const createCaseWithConnector = async ({
   createCaseReq?: CasePostRequest;
   headers?: Record<string, unknown>;
 }): Promise<{
-  postedCase: CaseResponse;
+  postedCase: Case;
   connector: CreateConnectorResponse;
   configuration: CasesConfigureResponse;
 }> => {
diff --git a/x-pack/test/cases_api_integration/common/lib/api/index.ts b/x-pack/test/cases_api_integration/common/lib/api/index.ts
index 4b7cbe7e9bfc45..8a52b2db08e6dd 100644
--- a/x-pack/test/cases_api_integration/common/lib/api/index.ts
+++ b/x-pack/test/cases_api_integration/common/lib/api/index.ts
@@ -27,9 +27,9 @@ import {
 } from '@kbn/cases-plugin/common/constants';
 import {
   CasesConfigureResponse,
-  CaseResponse,
+  Case,
   CaseStatuses,
-  CasesResponse,
+  Cases,
   CasesFindResponse,
   CasesPatchRequest,
   CasesConfigurePatch,
@@ -45,9 +45,9 @@ import {
 } from '@kbn/cases-plugin/common/api';
 import { SignalHit } from '@kbn/security-solution-plugin/server/lib/detection_engine/rule_types/types';
 import { ActionResult } from '@kbn/actions-plugin/server/types';
-import { ESCasesConfigureAttributes } from '@kbn/cases-plugin/server/services/configure/types';
-import { ESCaseAttributes } from '@kbn/cases-plugin/server/services/cases/types';
+import { CasePersistedAttributes } from '@kbn/cases-plugin/server/common/types/case';
 import type { SavedObjectsRawDocSource } from '@kbn/core/server';
+import type { ConfigurePersistedAttributes } from '@kbn/cases-plugin/server/common/types/configure';
 import { User } from '../authentication/types';
 import { superUser } from '../authentication/users';
 import { getSpaceUrlPrefix, setupAuth } from './helpers';
@@ -130,8 +130,8 @@ export const setStatus = async ({
 }: {
   supertest: SuperTest.SuperTest<SuperTest.Test>;
   cases: SetStatusCasesParams[];
-}): Promise<CasesResponse> => {
-  const { body }: { body: CasesResponse } = await supertest
+}): Promise<Cases> => {
+  const { body }: { body: Cases } = await supertest
     .patch(CASES_URL)
     .set('kbn-xsrf', 'true')
     .send({ cases })
@@ -312,7 +312,7 @@ export const getConnectorMappingsFromES = async ({ es }: { es: Client }) => {
 };
 
 interface ConfigureSavedObject {
-  'cases-configure': ESCasesConfigureAttributes;
+  'cases-configure': ConfigurePersistedAttributes;
 }
 
 /**
@@ -343,7 +343,7 @@ export const getConfigureSavedObjectsFromES = async ({ es }: { es: Client }) =>
 
 export const getCaseSavedObjectsFromES = async ({ es }: { es: Client }) => {
   const cases: TransportResult<
-    estypes.SearchResponse<{ cases: ESCaseAttributes }>,
+    estypes.SearchResponse<{ cases: CasePersistedAttributes }>,
     unknown
   > = await es.search(
     {
@@ -366,7 +366,7 @@ export const getCaseSavedObjectsFromES = async ({ es }: { es: Client }) => {
 
 export const getCaseCommentSavedObjectsFromES = async ({ es }: { es: Client }) => {
   const comments: TransportResult<
-    estypes.SearchResponse<{ ['cases-comments']: ESCaseAttributes }>,
+    estypes.SearchResponse<{ ['cases-comments']: CasePersistedAttributes }>,
     unknown
   > = await es.search(
     {
@@ -389,7 +389,7 @@ export const getCaseCommentSavedObjectsFromES = async ({ es }: { es: Client }) =
 
 export const getCaseUserActionsSavedObjectsFromES = async ({ es }: { es: Client }) => {
   const userActions: TransportResult<
-    estypes.SearchResponse<{ ['cases-user-actions']: ESCaseAttributes }>,
+    estypes.SearchResponse<{ ['cases-user-actions']: CasePersistedAttributes }>,
     unknown
   > = await es.search(
     {
@@ -422,7 +422,7 @@ export const updateCase = async ({
   expectedHttpCode?: number;
   auth?: { user: User; space: string | null } | null;
   headers?: Record<string, unknown>;
-}): Promise<CaseResponse[]> => {
+}): Promise<Case[]> => {
   const apiCall = supertest.patch(`${getSpaceUrlPrefix(auth?.space)}${CASES_URL}`);
 
   setupAuth({ apiCall, headers, auth });
@@ -514,7 +514,7 @@ export const getCase = async ({
   includeComments?: boolean;
   expectedHttpCode?: number;
   auth?: { user: User; space: string | null };
-}): Promise<CaseResponse> => {
+}): Promise<Case> => {
   const { body: theCase } = await supertest
     .get(
       `${getSpaceUrlPrefix(auth?.space)}${CASES_URL}/${caseId}?includeComments=${includeComments}`
@@ -674,7 +674,7 @@ export const pushCase = async ({
   expectedHttpCode?: number;
   auth?: { user: User; space: string | null } | null;
   headers?: Record<string, unknown>;
-}): Promise<CaseResponse> => {
+}): Promise<Case> => {
   const apiCall = supertest.post(
     `${getSpaceUrlPrefix(auth?.space)}${CASES_URL}/${caseId}/connector/${connectorId}/_push`
   );
diff --git a/x-pack/test/cases_api_integration/common/lib/api/omit.ts b/x-pack/test/cases_api_integration/common/lib/api/omit.ts
index 0b069f409157b1..4f0b3402b847dc 100644
--- a/x-pack/test/cases_api_integration/common/lib/api/omit.ts
+++ b/x-pack/test/cases_api_integration/common/lib/api/omit.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { CaseResponse, CommentResponse } from '@kbn/cases-plugin/common/api';
+import { Case, CommentResponse } from '@kbn/cases-plugin/common/api';
 import { omit } from 'lodash';
 
 interface CommonSavedObjectAttributes {
@@ -36,10 +36,8 @@ export const removeServerGeneratedPropertiesFromSavedObject = <
   ]);
 };
 
-export const removeServerGeneratedPropertiesFromCase = (
-  theCase: CaseResponse
-): Partial<CaseResponse> => {
-  return removeServerGeneratedPropertiesFromSavedObject<CaseResponse>(theCase, ['closed_at']);
+export const removeServerGeneratedPropertiesFromCase = (theCase: Case): Partial<Case> => {
+  return removeServerGeneratedPropertiesFromSavedObject<Case>(theCase, ['closed_at']);
 };
 
 export const removeServerGeneratedPropertiesFromComments = (
diff --git a/x-pack/test/cases_api_integration/common/lib/mock.ts b/x-pack/test/cases_api_integration/common/lib/mock.ts
index 1ea6c1b1e13591..8b8562e145395f 100644
--- a/x-pack/test/cases_api_integration/common/lib/mock.ts
+++ b/x-pack/test/cases_api_integration/common/lib/mock.ts
@@ -7,7 +7,7 @@
 
 import {
   CasePostRequest,
-  CaseResponse,
+  Case,
   CasesFindResponse,
   CommentResponse,
   ConnectorTypes,
@@ -161,7 +161,7 @@ export const persistableStateAttachment: CommentRequestPersistableStateType = {
 export const postCaseResp = (
   id?: string | null,
   req: CasePostRequest = postCaseReq
-): Partial<CaseResponse> => ({
+): Partial<Case> => ({
   ...req,
   ...(id != null ? { id } : {}),
   comments: [],
diff --git a/x-pack/test/cases_api_integration/common/lib/validation.ts b/x-pack/test/cases_api_integration/common/lib/validation.ts
index e022beb5a597a5..dd1ca12a2db15f 100644
--- a/x-pack/test/cases_api_integration/common/lib/validation.ts
+++ b/x-pack/test/cases_api_integration/common/lib/validation.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import {
   AttachmentTotals,
-  CaseResponse,
+  Case,
   CasesByAlertId,
   RelatedCaseInfo,
 } from '@kbn/cases-plugin/common/api';
@@ -17,7 +17,7 @@ import { xorWith, isEqual } from 'lodash';
 type AttachmentTotalsKeys = keyof AttachmentTotals;
 
 export interface TestCaseWithTotals {
-  caseInfo: CaseResponse;
+  caseInfo: Case;
   totals?: Partial<AttachmentTotals>;
 }
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
index ba3ad76740d290..07ea283247d910 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 import { CASES_URL } from '@kbn/cases-plugin/common/constants';
-import { CaseResponse } from '@kbn/cases-plugin/common/api';
+import { Case } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -71,14 +71,14 @@ export default ({ getService }: FtrProviderContext): void => {
       // if there are more than 100 responses, the implementation sets the aggregation size to the
       // specific value
       const numCases = 102;
-      const createCasePromises: Array<Promise<CaseResponse>> = [];
+      const createCasePromises: Array<Promise<Case>> = [];
       for (let i = 0; i < numCases; i++) {
         createCasePromises.push(createCase(supertest, getPostCaseRequest()));
       }
 
       const cases = await Promise.all(createCasePromises);
 
-      const commentPromises: Array<Promise<CaseResponse>> = [];
+      const commentPromises: Array<Promise<Case>> = [];
       for (const caseInfo of cases) {
         commentPromises.push(
           createComment({ supertest, caseId: caseInfo.id, params: postCommentAlertReq })
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
index c0e6322f638e55..38893e313a11fd 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
@@ -9,13 +9,8 @@ import { v1 as uuidv1 } from 'uuid';
 
 import expect from '@kbn/expect';
 import { CASES_URL } from '@kbn/cases-plugin/common/constants';
+import { Case, CaseSeverity, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
 import { ALERTING_CASES_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
-import {
-  CaseResponse,
-  CaseSeverity,
-  CaseStatuses,
-  CommentType,
-} from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import {
@@ -243,7 +238,7 @@ export default ({ getService }: FtrProviderContext): void => {
         const postedCase = await createCase(supertest, postCaseReq);
         // all fields that contain the UserRt definition must be included here (aka created_by, closed_by, and updated_by)
         // see https://github.com/elastic/kibana/issues/139503
-        const queryFields: Array<keyof CaseResponse | Array<keyof CaseResponse>> = [
+        const queryFields: Array<keyof Case | Array<keyof Case>> = [
           ['title', 'created_by', 'closed_by', 'updated_by'],
           ['title', 'description', 'created_by', 'closed_by', 'updated_by'],
         ];
@@ -501,7 +496,7 @@ export default ({ getService }: FtrProviderContext): void => {
         await deleteAllCaseItems(es);
       });
 
-      const createCasesWithTitleAsNumber = async (total: number): Promise<CaseResponse[]> => {
+      const createCasesWithTitleAsNumber = async (total: number): Promise<Case[]> => {
         const responsePromises = [];
         for (let i = 0; i < total; i++) {
           // this doesn't guarantee that the cases will be created in order that the for-loop executes,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
index 1a3dd08e369d0c..b030b0ea5db4d9 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/import_export.ts
@@ -28,7 +28,10 @@ import {
   CaseSeverity,
   CaseUserActionAttributesWithoutConnectorId,
 } from '@kbn/cases-plugin/common/api';
-import { ESCaseSeverity, ESCaseStatus } from '@kbn/cases-plugin/server/services/cases/types';
+import {
+  CasePersistedSeverity,
+  CasePersistedStatus,
+} from '@kbn/cases-plugin/server/common/types/case';
 import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
 import {
   deleteAllCaseItems,
@@ -211,8 +214,8 @@ const expectExportToHaveCaseSavedObject = (
   expect(createdCaseSO.attributes.connector.name).to.eql(caseRequest.connector.name);
   expect(createdCaseSO.attributes.connector.fields).to.eql([]);
   expect(createdCaseSO.attributes.settings).to.eql(caseRequest.settings);
-  expect(createdCaseSO.attributes.status).to.eql(ESCaseStatus.OPEN);
-  expect(createdCaseSO.attributes.severity).to.eql(ESCaseSeverity.LOW);
+  expect(createdCaseSO.attributes.status).to.eql(CasePersistedStatus.OPEN);
+  expect(createdCaseSO.attributes.severity).to.eql(CasePersistedSeverity.LOW);
   expect(createdCaseSO.attributes.duration).to.eql(null);
   expect(createdCaseSO.attributes.tags).to.eql(caseRequest.tags);
 };
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
index a63e1b3be5c672..f908e90c58afb2 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/migrations.ts
@@ -8,7 +8,10 @@
 import expect from '@kbn/expect';
 import { CASES_URL, SECURITY_SOLUTION_OWNER } from '@kbn/cases-plugin/common/constants';
 import { AttributesTypeUser } from '@kbn/cases-plugin/common/api';
-import { ESCaseSeverity, ESCaseStatus } from '@kbn/cases-plugin/server/services/cases/types';
+import {
+  CasePersistedSeverity,
+  CasePersistedStatus,
+} from '@kbn/cases-plugin/server/common/types/case';
 import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 import {
   deleteAllCaseItems,
@@ -499,11 +502,11 @@ export default function createGetTests({ getService }: FtrProviderContext) {
 
       describe('severity', () => {
         it('severity keyword values are converted to matching short', async () => {
-          const expectedSeverityValues: Record<string, ESCaseSeverity> = {
-            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf6': ESCaseSeverity.LOW,
-            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf7': ESCaseSeverity.MEDIUM,
-            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf8': ESCaseSeverity.HIGH,
-            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf9': ESCaseSeverity.CRITICAL,
+          const expectedSeverityValues: Record<string, CasePersistedSeverity> = {
+            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf6': CasePersistedSeverity.LOW,
+            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf7': CasePersistedSeverity.MEDIUM,
+            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf8': CasePersistedSeverity.HIGH,
+            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf9': CasePersistedSeverity.CRITICAL,
           };
 
           const casesFromES = await getCaseSavedObjectsFromES({ es });
@@ -518,11 +521,11 @@ export default function createGetTests({ getService }: FtrProviderContext) {
 
       describe('status', () => {
         it('status keyword values are converted to matching short', async () => {
-          const expectedStatusValues: Record<string, ESCaseStatus> = {
-            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf6': ESCaseStatus.OPEN,
-            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf7': ESCaseStatus.OPEN,
-            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf8': ESCaseStatus.IN_PROGRESS,
-            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf9': ESCaseStatus.CLOSED,
+          const expectedStatusValues: Record<string, CasePersistedStatus> = {
+            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf6': CasePersistedStatus.OPEN,
+            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf7': CasePersistedStatus.OPEN,
+            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf8': CasePersistedStatus.IN_PROGRESS,
+            'cases:063d5820-1284-11ed-81af-63a2bdfb2bf9': CasePersistedStatus.CLOSED,
           };
 
           const casesFromES = await getCaseSavedObjectsFromES({ es });
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
index 8f784d2e9c6976..34b4c0dbaa0191 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
@@ -11,7 +11,7 @@ import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '@kbn/security-solution-plugin/common/constants';
 import {
   CaseSeverity,
-  CasesResponse,
+  Cases,
   CaseStatuses,
   CommentType,
   ConnectorTypes,
@@ -597,7 +597,7 @@ export default ({ getService }: FtrProviderContext): void => {
           );
 
           // does NOT updates alert status when the status is updated and syncAlerts=false
-          const updatedIndWithStatus: CasesResponse = (await setStatus({
+          const updatedIndWithStatus: Cases = (await setStatus({
             supertest,
             cases: [
               {
@@ -611,7 +611,7 @@ export default ({ getService }: FtrProviderContext): void => {
                 status: CaseStatuses['in-progress'],
               },
             ],
-          })) as CasesResponse;
+          })) as Cases;
 
           await es.indices.refresh({ index: defaultSignalsIndex });
 
@@ -730,7 +730,7 @@ export default ({ getService }: FtrProviderContext): void => {
             signals.get(signalsIndex2)?.get(signalIDInSecondIndex)?._source?.signal?.status
           ).to.be(CaseStatuses.open);
 
-          const updatedIndWithStatus: CasesResponse = (await setStatus({
+          const updatedIndWithStatus: Cases = (await setStatus({
             supertest,
             cases: [
               {
@@ -739,7 +739,7 @@ export default ({ getService }: FtrProviderContext): void => {
                 status: CaseStatuses.closed,
               },
             ],
-          })) as CasesResponse;
+          })) as Cases;
 
           await es.indices.refresh({ index: defaultSignalsIndex });
           await es.indices.refresh({ index: signalsIndex2 });
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
index 6926b3e088ad1c..be47e250c7a9f5 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { CasesResponse, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
+import { Cases, CaseStatuses, CommentType } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
 
 import { postCaseReq } from '../../../../common/lib/mock';
@@ -96,7 +96,7 @@ export default ({ getService }: FtrProviderContext): void => {
       // does NOT updates alert status when the status is updated and syncAlerts=false
       // this performs the cases update through the test plugin that leverages the cases client instead
       // of going through RESTful API of the cases plugin
-      const { body: updatedIndWithStatus }: { body: CasesResponse } = await supertest
+      const { body: updatedIndWithStatus }: { body: Cases } = await supertest
         .patch('/api/cases_user/cases')
         .set('kbn-xsrf', 'true')
         .send({
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts
index a26031124ca452..74b2799d232acd 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_create_attachments.ts
@@ -11,7 +11,7 @@ import { ALERT_CASE_IDS, ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 
 import {
   BulkCreateCommentRequest,
-  CaseResponse,
+  Case,
   CaseStatuses,
   CommentRequestExternalReferenceSOType,
   CommentType,
@@ -80,7 +80,7 @@ export default ({ getService }: FtrProviderContext): void => {
   const log = getService('log');
 
   const validateCommentsIgnoringOrder = (
-    comments: CaseResponse['comments'],
+    comments: Case['comments'],
     attachments: BulkCreateCommentRequest
   ) => {
     expect(comments?.length).to.eql(attachments.length);
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_delete_file_attachments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_delete_file_attachments.ts
index bd2a4b8f854565..3c0c1b39c5a932 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_delete_file_attachments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_delete_file_attachments.ts
@@ -6,7 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import { CaseResponse } from '@kbn/cases-plugin/common';
+import { Case } from '@kbn/cases-plugin/common';
 import { constructFileKindIdByOwner } from '@kbn/cases-plugin/common/files';
 import { Owner } from '@kbn/cases-plugin/common/constants/types';
 import { CASES_TEST_FIXTURE_FILE_KIND_ID } from '@kbn/cases-api-integration-test-plugin/server/files';
@@ -62,7 +62,7 @@ export default ({ getService }: FtrProviderContext): void => {
     });
 
     describe('failures', () => {
-      let postedCase: CaseResponse;
+      let postedCase: Case;
 
       before(async () => {
         postedCase = await createCase(supertest, getPostCaseRequest());
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_get_attachments.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_get_attachments.ts
index c5751ebf99a19f..2d1a7c2ab69a6b 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_get_attachments.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/internal/bulk_get_attachments.ts
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 import {
   AttributesTypeExternalReference,
   AttributesTypeExternalReferenceSO,
-  CaseResponse,
+  Case,
   CommentResponseTypePersistableState,
 } from '@kbn/cases-plugin/common/api';
 import { FtrProviderContext } from '../../../../common/ftr_provider_context';
@@ -50,7 +50,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
   describe('bulk_get_attachments', () => {
     describe('setup using two comments', () => {
-      let updatedCase: CaseResponse;
+      let updatedCase: Case;
 
       before(async () => {
         const postedCase = await createCase(supertest, postCaseReq);
@@ -212,8 +212,8 @@ export default ({ getService }: FtrProviderContext): void => {
       });
 
       describe('security and observability cases', () => {
-        let secCase: CaseResponse;
-        let obsCase: CaseResponse;
+        let secCase: Case;
+        let obsCase: Case;
         let secAttachmentId: string;
         let obsAttachmentId: string;
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/find_user_actions.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/find_user_actions.ts
index ea7b41be84d898..28bab81a70bee1 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/find_user_actions.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/find_user_actions.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import {
   ActionTypes,
-  CaseResponse,
+  Case,
   CaseSeverity,
   CaseStatuses,
   CommentUserAction,
@@ -131,7 +131,7 @@ export default ({ getService }: FtrProviderContext): void => {
     });
 
     describe('pagination', () => {
-      let theCase: CaseResponse;
+      let theCase: Case;
 
       beforeEach(async () => {
         theCase = await createCase(supertest, getPostCaseRequest());
@@ -793,9 +793,9 @@ export default ({ getService }: FtrProviderContext): void => {
       describe('rbac', () => {
         const supertestWithoutAuth = getService('supertestWithoutAuth');
 
-        let secCase: CaseResponse;
-        let obsCase: CaseResponse;
-        let secCaseSpace2: CaseResponse;
+        let secCase: Case;
+        let obsCase: Case;
+        let secCaseSpace2: Case;
 
         beforeEach(async () => {
           [secCase, obsCase, secCaseSpace2] = await Promise.all([
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
index fc8ab00e63c64b..744e70d3809a6d 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 
 import {
-  CaseResponse,
+  Case,
   CaseSeverity,
   CaseStatuses,
   CommentType,
@@ -342,7 +342,7 @@ export default ({ getService }: FtrProviderContext): void => {
     describe('rbac', () => {
       const supertestWithoutAuth = getService('supertestWithoutAuth');
 
-      let caseInfo: CaseResponse;
+      let caseInfo: Case;
       beforeEach(async () => {
         caseInfo = await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, {
           user: superUser,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_user_action_stats.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_user_action_stats.ts
index 8448f22b7f9e08..6801fa4fe37858 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_user_action_stats.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/user_actions/get_user_action_stats.ts
@@ -6,12 +6,7 @@
  */
 
 import expect from '@kbn/expect';
-import {
-  CaseResponse,
-  CaseSeverity,
-  CaseStatuses,
-  ConnectorTypes,
-} from '@kbn/cases-plugin/common/api';
+import { Case, CaseSeverity, CaseStatuses, ConnectorTypes } from '@kbn/cases-plugin/common/api';
 
 import {
   globalRead,
@@ -140,7 +135,7 @@ export default ({ getService }: FtrProviderContext): void => {
     describe('rbac', () => {
       const supertestWithoutAuth = getService('supertestWithoutAuth');
 
-      let theCase: CaseResponse;
+      let theCase: Case;
       beforeEach(async () => {
         theCase = await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, {
           user: superUser,
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/no_public_base_url/push.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/no_public_base_url/push.ts
index f0b07da1606744..062a697ebb22e3 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/no_public_base_url/push.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/no_public_base_url/push.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import { RecordingServiceNowSimulator } from '@kbn/actions-simulators-plugin/server/servicenow_simulation';
+import { arraysToEqual } from '../../../common/lib/validation';
 import {
   postCommentUserReq,
   postCommentAlertReq,
@@ -32,8 +33,7 @@ export default ({ getService }: FtrProviderContext): void => {
   const supertest = getService('supertest');
   const es = getService('es');
 
-  // Failing: See https://github.com/elastic/kibana/issues/154640
-  describe.skip('push_case', () => {
+  describe('push_case', () => {
     describe('incident recorder server', () => {
       const actionsRemover = new ActionsRemover(supertest);
       let serviceNowSimulatorURL: string = '';
@@ -114,6 +114,14 @@ export default ({ getService }: FtrProviderContext): void => {
           Boolean(request.work_notes)
         );
 
+        const allWorkNotes = allCommentRequests.map((request) => request.work_notes);
+        const expectedNotes = [
+          'This is a cool comment\n\nAdded by elastic.',
+          'Isolated host host-name with comment: comment text\n\nAdded by elastic.',
+          'Released host host-name with comment: comment text\n\nAdded by elastic.',
+          'Elastic Alerts attached to the case: 3',
+        ];
+
         /**
          * For each of these comments a request is made:
          * postCommentUserReq, postCommentActionsReq, postCommentActionsReleaseReq, and a comment with the
@@ -122,21 +130,9 @@ export default ({ getService }: FtrProviderContext): void => {
          */
         expect(allCommentRequests.length).be(4);
 
-        // User comment: postCommentUserReq
-        expect(allCommentRequests[0].work_notes).eql('This is a cool comment\n\nAdded by elastic.');
-
-        // Isolate host comment: postCommentActionsReq
-        expect(allCommentRequests[1].work_notes).eql(
-          'Isolated host host-name with comment: comment text\n\nAdded by elastic.'
-        );
-
-        // Unisolate host comment: postCommentActionsReleaseReq
-        expect(allCommentRequests[2].work_notes).eql(
-          'Released host host-name with comment: comment text\n\nAdded by elastic.'
-        );
-
-        // Total alerts
-        expect(allCommentRequests[3].work_notes).eql('Elastic Alerts attached to the case: 3');
+        // since we're using a bulk create we can't guarantee the ordering so we'll check that the values exist but not
+        // there specific order in the results
+        expect(arraysToEqual(allWorkNotes, expectedNotes)).to.be(true);
       });
     });
   });
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
index a9d4382fc08bc1..608153386ffe54 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
@@ -60,6 +60,7 @@ import {
   secOnlyRead,
   superUser,
 } from '../../../../common/lib/authentication/users';
+import { arraysToEqual } from '../../../../common/lib/validation';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
@@ -217,6 +218,14 @@ export default ({ getService }: FtrProviderContext): void => {
           Boolean(request.work_notes)
         );
 
+        const allWorkNotes = allCommentRequests.map((request) => request.work_notes);
+        const expectedNotes = [
+          'This is a cool comment\n\nAdded by elastic.',
+          'Isolated host host-name with comment: comment text\n\nAdded by elastic.',
+          'Released host host-name with comment: comment text\n\nAdded by elastic.',
+          `Elastic Alerts attached to the case: 3\n\nFor more details, view the alerts in Kibana\nAlerts URL: https://localhost:5601/app/management/insightsAndAlerting/cases/${patchedCase.id}/?tabId=alerts`,
+        ];
+
         /**
          * For each of these comments a request is made:
          * postCommentUserReq, postCommentActionsReq, postCommentActionsReleaseReq, and a comment with the
@@ -225,23 +234,9 @@ export default ({ getService }: FtrProviderContext): void => {
          */
         expect(allCommentRequests.length).be(4);
 
-        // User comment: postCommentUserReq
-        expect(allCommentRequests[0].work_notes).eql('This is a cool comment\n\nAdded by elastic.');
-
-        // Isolate host comment: postCommentActionsReq
-        expect(allCommentRequests[1].work_notes).eql(
-          'Isolated host host-name with comment: comment text\n\nAdded by elastic.'
-        );
-
-        // Unisolate host comment: postCommentActionsReleaseReq
-        expect(allCommentRequests[2].work_notes).eql(
-          'Released host host-name with comment: comment text\n\nAdded by elastic.'
-        );
-
-        // Total alerts
-        expect(allCommentRequests[3].work_notes).eql(
-          `Elastic Alerts attached to the case: 3\n\nFor more details, view the alerts in Kibana\nAlerts URL: https://localhost:5601/app/management/insightsAndAlerting/cases/${patchedCase.id}/?tabId=alerts`
-        );
+        // since we're using a bulk create we can't guarantee the ordering so we'll check that the values exist but not
+        // there specific order in the results
+        expect(arraysToEqual(allWorkNotes, expectedNotes)).to.be(true);
       });
 
       it('should format the totalAlerts with spaceId correctly', async () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/rule_execution_logic/threat_match.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/rule_execution_logic/threat_match.ts
index c381c216bbf71e..912fa62e8447d3 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/rule_execution_logic/threat_match.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/rule_execution_logic/threat_match.ts
@@ -145,7 +145,8 @@ export default ({ getService }: FtrProviderContext) => {
   /**
    * Specific api integration tests for threat matching rule type
    */
-  describe('Threat match type rules', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/155304
+  describe.skip('Threat match type rules', () => {
     before(async () => {
       // await deleteSignalsIndex(supertest, log);
       // await deleteAllAlerts(supertest, log);
diff --git a/x-pack/test/examples/search_examples/partial_results_example.ts b/x-pack/test/examples/search_examples/partial_results_example.ts
index f7d199463e2568..269b2e79ab38f7 100644
--- a/x-pack/test/examples/search_examples/partial_results_example.ts
+++ b/x-pack/test/examples/search_examples/partial_results_example.ts
@@ -14,8 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common']);
   const retry = getService('retry');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/116038
-  describe.skip('Partial results example', () => {
+  describe('Partial results example', () => {
     before(async () => {
       await PageObjects.common.navigateToApp('searchExamples');
       await testSubjects.click('/search');
diff --git a/x-pack/test/fleet_api_integration/apis/epm/bulk_install.ts b/x-pack/test/fleet_api_integration/apis/epm/bulk_install.ts
new file mode 100644
index 00000000000000..7b483c06e36b5d
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/epm/bulk_install.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+import { setupFleetAndAgents } from '../agents/services';
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+
+  const pkgName = 'multiple_versions';
+  const pkgOlderVersion = '0.1.0';
+  const pkgLatestVersion = '0.3.0';
+
+  const uninstallPackage = async (name: string, version: string) => {
+    await supertest.delete(`/api/fleet/epm/packages/${name}/${version}`).set('kbn-xsrf', 'xxxx');
+  };
+
+  describe('bulk package install api', async () => {
+    skipIfNoDockerRegistry(providerContext);
+    setupFleetAndAgents(providerContext);
+
+    it('should install the latest version by default', async () => {
+      const response = await supertest
+        .post(`/api/fleet/epm/packages/_bulk?prerelease=true`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ packages: [pkgName] })
+        .expect(200);
+
+      expect(response.body.items.length).equal(1);
+      expect(response.body.items[0].version).equal(pkgLatestVersion);
+
+      await uninstallPackage(pkgName, pkgLatestVersion);
+    });
+
+    it('should install an older version if force is true', async () => {
+      const response = await supertest
+        .post(`/api/fleet/epm/packages/_bulk?prerelease=true`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ packages: [{ name: pkgName, version: pkgOlderVersion }], force: true })
+        .expect(200);
+
+      expect(response.body.items.length).equal(1);
+      expect(response.body.items[0].version).equal(pkgOlderVersion);
+
+      await uninstallPackage(pkgName, pkgOlderVersion);
+    });
+
+    it('should reject installing an older version if force is false', async () => {
+      const response = await supertest
+        .post(`/api/fleet/epm/packages/_bulk?prerelease=true`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ packages: [{ name: pkgName, version: pkgOlderVersion }] })
+        .expect(200);
+
+      expect(response.body.response[0].statusCode).equal(400);
+      expect(response.body.response[0].error).equal(
+        'multiple_versions-0.1.0 is out-of-date and cannot be installed or updated'
+      );
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts b/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts
index 3ce3f9a7b9f364..d062eb8feb432e 100644
--- a/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts
+++ b/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts
@@ -67,12 +67,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     await testSubjects.existOrFail('csvDownloadStarted'); // validate toast panel
   };
 
-  // Failing: See https://github.com/elastic/kibana/issues/150561
-  // Failing: See https://github.com/elastic/kibana/issues/150562
-  // Failing: See https://github.com/elastic/kibana/issues/148314
-  // Failing: See https://github.com/elastic/kibana/issues/150563
-  // Failing: See https://github.com/elastic/kibana/issues/150561
-  describe.skip('Download CSV', () => {
+  describe('Download CSV', () => {
     before('initialize tests', async () => {
       log.debug('ReportingPage:initTests');
       await browser.setWindowSize(1600, 850);
diff --git a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
index aa798a0cd7d98e..2d42e85c9f2b2a 100644
--- a/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
+++ b/x-pack/test/functional/apps/discover/feature_controls/discover_security.ts
@@ -431,6 +431,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           full_name: 'test user',
         });
 
+        // Navigate home before attempting to login or we may get redirected to
+        // Discover with a forbidden error, which hides the chrome and causes
+        // PageObjects.security.login to fail when checking for the logout button
+        await PageObjects.common.navigateToUrl('home', '', {
+          ensureCurrentUrl: false,
+          shouldLoginIfPrompted: false,
+        });
+
         await PageObjects.security.login(
           'no_discover_privileges_user',
           'no_discover_privileges_user-password',
diff --git a/x-pack/test/functional/apps/infra/home_page.ts b/x-pack/test/functional/apps/infra/home_page.ts
index 54435f11a33e12..13acd911cfbea7 100644
--- a/x-pack/test/functional/apps/infra/home_page.ts
+++ b/x-pack/test/functional/apps/infra/home_page.ts
@@ -19,6 +19,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const retry = getService('retry');
   const pageObjects = getPageObjects(['common', 'header', 'infraHome', 'infraSavedViews']);
   const kibanaServer = getService('kibanaServer');
+  const testSubjects = getService('testSubjects');
 
   describe('Home page', function () {
     this.tags('includeFirefox');
@@ -220,36 +221,54 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         await pageObjects.infraHome.ensurePopoverClosed();
       });
     });
-    // Failing: See https://github.com/elastic/kibana/issues/106650
-    describe.skip('Saved Views', () => {
-      before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
-      after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
-      it('should have save and load controls', async () => {
+
+    describe('Saved Views', () => {
+      before(async () => {
+        esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         await pageObjects.common.navigateToApp('infraOps');
         await pageObjects.infraHome.waitForLoading();
-        await pageObjects.infraHome.goToTime(DATE_WITH_DATA);
-        await pageObjects.infraSavedViews.getSavedViewsButton();
+      });
+
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+
+      it('should render a button with the view name', async () => {
         await pageObjects.infraSavedViews.ensureViewIsLoaded('Default view');
       });
 
-      it('should open popover', async () => {
+      it('should open/close the views popover menu on button click', async () => {
         await pageObjects.infraSavedViews.clickSavedViewsButton();
+        testSubjects.existOrFail('savedViews-popover');
         await pageObjects.infraSavedViews.closeSavedViewsPopover();
       });
 
-      it('should create new saved view and load it', async () => {
-        await pageObjects.infraSavedViews.clickSavedViewsButton();
-        await pageObjects.infraSavedViews.clickSaveNewViewButton();
-        await pageObjects.infraSavedViews.getCreateSavedViewModal();
-        await pageObjects.infraSavedViews.createNewSavedView('view1');
+      it('should create a new saved view and load it', async () => {
+        await pageObjects.infraSavedViews.createView('view1');
         await pageObjects.infraSavedViews.ensureViewIsLoaded('view1');
       });
 
-      it('should new views should be listed in the load views list', async () => {
-        await pageObjects.infraSavedViews.clickSavedViewsButton();
-        await pageObjects.infraSavedViews.clickLoadViewButton();
-        await pageObjects.infraSavedViews.ensureViewIsLoadable('view1');
-        await pageObjects.infraSavedViews.closeSavedViewsLoadModal();
+      it('should laod a clicked view from the manage views section', async () => {
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('view1');
+        const views = await pageObjects.infraSavedViews.getManageViewsEntries();
+        await views[0].click();
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('Default view');
+      });
+
+      it('should update the current saved view and load it', async () => {
+        let views = await pageObjects.infraSavedViews.getManageViewsEntries();
+        expect(views.length).to.equal(2);
+        await pageObjects.infraSavedViews.pressEsc();
+
+        await pageObjects.infraSavedViews.createView('view2');
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('view2');
+        views = await pageObjects.infraSavedViews.getManageViewsEntries();
+        expect(views.length).to.equal(3);
+        await pageObjects.infraSavedViews.pressEsc();
+
+        await pageObjects.infraSavedViews.updateView('view3');
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('view3');
+        views = await pageObjects.infraSavedViews.getManageViewsEntries();
+        expect(views.length).to.equal(3);
+        await pageObjects.infraSavedViews.pressEsc();
       });
     });
   });
diff --git a/x-pack/test/functional/apps/infra/hosts_view.ts b/x-pack/test/functional/apps/infra/hosts_view.ts
index e9000a9cf3e6db..a0b11335d9768a 100644
--- a/x-pack/test/functional/apps/infra/hosts_view.ts
+++ b/x-pack/test/functional/apps/infra/hosts_view.ts
@@ -149,9 +149,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const enableHostView = () => pageObjects.infraHostsView.clickEnableHostViewButton();
 
   // Tests
-
-  // Failing: See https://github.com/elastic/kibana/issues/155429
-  describe.skip('Hosts View', function () {
+  describe('Hosts View', function () {
     this.tags('includeFirefox');
 
     before(async () => {
@@ -328,6 +326,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           START_DATE.format(timepickerFormat),
           END_DATE.format(timepickerFormat)
         );
+
+        await retry.waitFor(
+          'wait for table and KPI charts to load',
+          async () =>
+            (await pageObjects.infraHostsView.isHostTableLoading()) &&
+            (await pageObjects.infraHostsView.isKPIChartsLoaded())
+        );
       });
 
       after(async () => {
@@ -361,7 +366,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
       describe('KPI tiles', () => {
         it('should render 5 metrics trend tiles', async () => {
-          const hosts = await pageObjects.infraHostsView.getAllMetricsTrendTiles();
+          const hosts = await pageObjects.infraHostsView.getAllKPITiles();
           expect(hosts.length).to.equal(5);
         });
 
@@ -373,15 +378,17 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           { metric: 'rx', value: 'N/A' },
         ].forEach(({ metric, value }) => {
           it(`${metric} tile should show ${value}`, async () => {
-            const tileValue = await pageObjects.infraHostsView.getMetricsTrendTileValue(metric);
-            expect(tileValue).to.eql(value);
+            await retry.try(async () => {
+              const tileValue = await pageObjects.infraHostsView.getKPITileValue(metric);
+              expect(tileValue).to.eql(value);
+            });
           });
         });
       });
 
       describe('Metrics Tab', () => {
         before(async () => {
-          browser.scrollTop();
+          await browser.scrollTop();
           await pageObjects.infraHostsView.visitMetricsTab();
         });
 
@@ -391,18 +398,18 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         });
 
         it('should have an option to open the chart in lens', async () => {
-          await pageObjects.infraHostsView.getOpenInLensOption();
+          await pageObjects.infraHostsView.clickAndValidateMetriChartActionOptions();
         });
       });
 
       describe('Logs Tab', () => {
         before(async () => {
-          browser.scrollTop();
+          await browser.scrollTop();
           await pageObjects.infraHostsView.visitLogsTab();
         });
 
         it('should load the Logs tab section when clicking on it', async () => {
-          testSubjects.existOrFail('hostsView-logs');
+          await testSubjects.existOrFail('hostsView-logs');
         });
       });
 
@@ -413,7 +420,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         const COLUMNS = 5;
 
         before(async () => {
-          browser.scrollTop();
+          await browser.scrollTop();
           await pageObjects.infraHostsView.visitAlertTab();
         });
 
@@ -474,7 +481,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         const query = filtererEntries.map((entry) => `host.name :"${entry.title}"`).join(' or ');
 
         before(async () => {
+          await browser.scrollTop();
           await pageObjects.infraHostsView.submitQuery(query);
+          await retry.waitFor(
+            'wait for table and KPI charts to load',
+            async () =>
+              (await pageObjects.infraHostsView.isHostTableLoading()) &&
+              (await pageObjects.infraHostsView.isKPIChartsLoaded())
+          );
         });
 
         after(async () => {
@@ -502,8 +516,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
               { metric: 'tx', value: 'N/A' },
               { metric: 'rx', value: 'N/A' },
             ].map(async ({ metric, value }) => {
-              const tileValue = await pageObjects.infraHostsView.getMetricsTrendTileValue(metric);
-              expect(tileValue).to.eql(value);
+              await retry.try(async () => {
+                const tileValue = await pageObjects.infraHostsView.getKPITileValue(metric);
+                expect(tileValue).to.eql(value);
+              });
             })
           );
         });
@@ -531,6 +547,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
 
       describe('Pagination and Sorting', () => {
+        before(async () => {
+          await browser.scrollTop();
+        });
+
         beforeEach(async () => {
           await pageObjects.infraHostsView.changePageSize(5);
         });
diff --git a/x-pack/test/functional/apps/infra/metrics_explorer.ts b/x-pack/test/functional/apps/infra/metrics_explorer.ts
index 4d6859a4e99e74..650040b95f4204 100644
--- a/x-pack/test/functional/apps/infra/metrics_explorer.ts
+++ b/x-pack/test/functional/apps/infra/metrics_explorer.ts
@@ -24,6 +24,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     'timePicker',
     'infraSavedViews',
   ]);
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
 
   describe('Metrics Explorer', function () {
     this.tags('includeFirefox');
@@ -78,8 +80,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
 
       it('should display multple charts', async () => {
-        const charts = await pageObjects.infraMetricsExplorer.getCharts();
-        expect(charts.length).to.equal(6);
+        await retry.try(async () => {
+          const charts = await pageObjects.infraMetricsExplorer.getCharts();
+          expect(charts.length).to.equal(6);
+        });
       });
 
       it('should render as area chart by default', async () => {
@@ -97,35 +101,51 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     });
 
     describe('Saved Views', () => {
-      before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+      before(async () => {
+        esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
+        await pageObjects.infraHome.goToMetricExplorer();
+      });
+
       after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
-      describe('save functionality', () => {
-        it('should have saved views component', async () => {
-          await pageObjects.common.navigateToApp('infraOps');
-          await pageObjects.infraHome.goToMetricExplorer();
-          await pageObjects.infraSavedViews.getSavedViewsButton();
-          await pageObjects.infraSavedViews.ensureViewIsLoaded('Default view');
-        });
 
-        it('should open popover', async () => {
-          await pageObjects.infraSavedViews.clickSavedViewsButton();
-          await pageObjects.infraSavedViews.closeSavedViewsPopover();
-        });
+      it('should render a button with the view name', async () => {
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('Default view');
+      });
 
-        it('should create new saved view and load it', async () => {
-          await pageObjects.infraSavedViews.clickSavedViewsButton();
-          await pageObjects.infraSavedViews.clickSaveNewViewButton();
-          await pageObjects.infraSavedViews.getCreateSavedViewModal();
-          await pageObjects.infraSavedViews.createNewSavedView('view1');
-          await pageObjects.infraSavedViews.ensureViewIsLoaded('view1');
-        });
+      it('should open/close the views popover menu on button click', async () => {
+        await pageObjects.infraSavedViews.clickSavedViewsButton();
+        testSubjects.existOrFail('savedViews-popover');
+        await pageObjects.infraSavedViews.closeSavedViewsPopover();
+      });
 
-        it('should new views should be listed in the load views list', async () => {
-          await pageObjects.infraSavedViews.clickSavedViewsButton();
-          await pageObjects.infraSavedViews.clickLoadViewButton();
-          await pageObjects.infraSavedViews.ensureViewIsLoadable('view1');
-          await pageObjects.infraSavedViews.closeSavedViewsLoadModal();
-        });
+      it('should create a new saved view and load it', async () => {
+        await pageObjects.infraSavedViews.createView('view1');
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('view1');
+      });
+
+      it('should laod a clicked view from the manage views section', async () => {
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('view1');
+        const views = await pageObjects.infraSavedViews.getManageViewsEntries();
+        await views[0].click();
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('Default view');
+      });
+
+      it('should update the current saved view and load it', async () => {
+        let views = await pageObjects.infraSavedViews.getManageViewsEntries();
+        expect(views.length).to.equal(2);
+        await pageObjects.infraSavedViews.pressEsc();
+
+        await pageObjects.infraSavedViews.createView('view2');
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('view2');
+        views = await pageObjects.infraSavedViews.getManageViewsEntries();
+        expect(views.length).to.equal(3);
+        await pageObjects.infraSavedViews.pressEsc();
+
+        await pageObjects.infraSavedViews.updateView('view3');
+        await pageObjects.infraSavedViews.ensureViewIsLoaded('view3');
+        views = await pageObjects.infraSavedViews.getManageViewsEntries();
+        expect(views.length).to.equal(3);
+        await pageObjects.infraSavedViews.pressEsc();
       });
     });
   });
diff --git a/x-pack/test/functional/apps/lens/group1/index.ts b/x-pack/test/functional/apps/lens/group1/index.ts
index a129a66c519d94..67d4e8023e4fc0 100644
--- a/x-pack/test/functional/apps/lens/group1/index.ts
+++ b/x-pack/test/functional/apps/lens/group1/index.ts
@@ -37,7 +37,7 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
     };
     let indexPatternString: string;
     before(async () => {
-      await log.debug('Starting lens before method');
+      log.debug('Starting lens before method');
       await browser.setWindowSize(1280, 1200);
       await kibanaServer.savedObjects.cleanStandardList();
       try {
@@ -74,16 +74,9 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
     if (config.get('esTestCluster.ccs')) {
       loadTestFile(require.resolve('./smokescreen'));
     } else {
-      loadTestFile(require.resolve('./smokescreen'));
-      loadTestFile(require.resolve('./ad_hoc_data_view'));
-      loadTestFile(require.resolve('./partition'));
-      loadTestFile(require.resolve('./persistent_context'));
-      loadTestFile(require.resolve('./table_dashboard'));
-      loadTestFile(require.resolve('./table'));
-      loadTestFile(require.resolve('./text_based_languages'));
-      loadTestFile(require.resolve('./fields_list'));
-      loadTestFile(require.resolve('./layer_actions'));
-      loadTestFile(require.resolve('./field_formatters'));
+      // total run time ~16 min
+      loadTestFile(require.resolve('./smokescreen')); // 12m 12s
+      loadTestFile(require.resolve('./ad_hoc_data_view')); // 3m 40s
     }
   });
 };
diff --git a/x-pack/test/functional/apps/lens/group1/field_formatters.ts b/x-pack/test/functional/apps/lens/group2/field_formatters.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group1/field_formatters.ts
rename to x-pack/test/functional/apps/lens/group2/field_formatters.ts
diff --git a/x-pack/test/functional/apps/lens/group1/fields_list.ts b/x-pack/test/functional/apps/lens/group2/fields_list.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group1/fields_list.ts
rename to x-pack/test/functional/apps/lens/group2/fields_list.ts
diff --git a/x-pack/test/functional/apps/lens/group2/index.ts b/x-pack/test/functional/apps/lens/group2/index.ts
index 277b415a9ab492..18302745362ab3 100644
--- a/x-pack/test/functional/apps/lens/group2/index.ts
+++ b/x-pack/test/functional/apps/lens/group2/index.ts
@@ -14,22 +14,14 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const PageObjects = getPageObjects(['timePicker']);
-  const config = getService('config');
-  let remoteEsArchiver;
 
   describe('lens app - group 2', () => {
     const esArchive = 'x-pack/test/functional/es_archives/logstash_functional';
     const localIndexPatternString = 'logstash-*';
-    const remoteIndexPatternString = 'ftr-remote:logstash-*';
     const localFixtures = {
       lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/lens_basic.json',
       lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/default',
     };
-
-    const remoteFixtures = {
-      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/lens_basic.json',
-      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/default',
-    };
     let esNode: EsArchiver;
     let fixtureDirs: {
       lensBasic: string;
@@ -37,21 +29,12 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
     };
     let indexPatternString: string;
     before(async () => {
-      await log.debug('Starting lens before method');
+      log.debug('Starting lens before method');
       await browser.setWindowSize(1280, 1200);
       await kibanaServer.savedObjects.cleanStandardList();
-      try {
-        config.get('esTestCluster.ccs');
-        remoteEsArchiver = getService('remoteEsArchiver' as 'esArchiver');
-        esNode = remoteEsArchiver;
-        fixtureDirs = remoteFixtures;
-        indexPatternString = remoteIndexPatternString;
-      } catch (error) {
-        esNode = esArchiver;
-        fixtureDirs = localFixtures;
-        indexPatternString = localIndexPatternString;
-      }
-
+      esNode = esArchiver;
+      fixtureDirs = localFixtures;
+      indexPatternString = localIndexPatternString;
       await esNode.load(esArchive);
       // changing the timepicker default here saves us from having to set it in Discover (~8s)
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
@@ -64,21 +47,21 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
     });
 
     after(async () => {
-      await esArchiver.unload(esArchive);
+      await esNode.unload(esArchive);
       await PageObjects.timePicker.resetDefaultAbsoluteRangeViaUiSettings();
       await kibanaServer.importExport.unload(fixtureDirs.lensBasic);
       await kibanaServer.importExport.unload(fixtureDirs.lensDefault);
       await kibanaServer.savedObjects.cleanStandardList();
     });
 
-    loadTestFile(require.resolve('./add_to_dashboard'));
-    loadTestFile(require.resolve('./runtime_fields'));
-    loadTestFile(require.resolve('./dashboard'));
-    loadTestFile(require.resolve('./terms'));
-    loadTestFile(require.resolve('./epoch_millis'));
-    loadTestFile(require.resolve('./show_underlying_data'));
-    loadTestFile(require.resolve('./show_underlying_data_dashboard'));
-    loadTestFile(require.resolve('./share'));
-    loadTestFile(require.resolve('./tsdb'));
+    // total run time ~ 16m 20s
+    loadTestFile(require.resolve('./partition')); // 1m 40s
+    loadTestFile(require.resolve('./persistent_context')); // 1m
+    loadTestFile(require.resolve('./table_dashboard')); // 3m 10s
+    loadTestFile(require.resolve('./table')); // 1m 40s
+    loadTestFile(require.resolve('./text_based_languages')); // 3m 40s
+    loadTestFile(require.resolve('./fields_list')); // 2m 7s
+    loadTestFile(require.resolve('./layer_actions')); // 1m 45s
+    loadTestFile(require.resolve('./field_formatters')); // 1m 30s
   });
 };
diff --git a/x-pack/test/functional/apps/lens/group1/layer_actions.ts b/x-pack/test/functional/apps/lens/group2/layer_actions.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group1/layer_actions.ts
rename to x-pack/test/functional/apps/lens/group2/layer_actions.ts
diff --git a/x-pack/test/functional/apps/lens/group1/partition.ts b/x-pack/test/functional/apps/lens/group2/partition.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group1/partition.ts
rename to x-pack/test/functional/apps/lens/group2/partition.ts
diff --git a/x-pack/test/functional/apps/lens/group1/persistent_context.ts b/x-pack/test/functional/apps/lens/group2/persistent_context.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group1/persistent_context.ts
rename to x-pack/test/functional/apps/lens/group2/persistent_context.ts
diff --git a/x-pack/test/functional/apps/lens/group1/table.ts b/x-pack/test/functional/apps/lens/group2/table.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group1/table.ts
rename to x-pack/test/functional/apps/lens/group2/table.ts
diff --git a/x-pack/test/functional/apps/lens/group1/table_dashboard.ts b/x-pack/test/functional/apps/lens/group2/table_dashboard.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group1/table_dashboard.ts
rename to x-pack/test/functional/apps/lens/group2/table_dashboard.ts
diff --git a/x-pack/test/functional/apps/lens/group1/text_based_languages.ts b/x-pack/test/functional/apps/lens/group2/text_based_languages.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group1/text_based_languages.ts
rename to x-pack/test/functional/apps/lens/group2/text_based_languages.ts
diff --git a/x-pack/test/functional/apps/lens/group2/tsdb.ts b/x-pack/test/functional/apps/lens/group2/tsdb.ts
deleted file mode 100644
index 02b96a74f444e3..00000000000000
--- a/x-pack/test/functional/apps/lens/group2/tsdb.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-
-export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const PageObjects = getPageObjects(['common', 'timePicker', 'lens', 'dashboard']);
-  const testSubjects = getService('testSubjects');
-  const es = getService('es');
-  const log = getService('log');
-  const indexPatterns = getService('indexPatterns');
-  const kibanaServer = getService('kibanaServer');
-  const esArchiver = getService('esArchiver');
-
-  describe('lens tsdb', function () {
-    const dataViewTitle = 'sample-01';
-    const rollupDataViewTitle = 'sample-01,sample-01-rollup';
-    const fromTime = 'Jun 17, 2022 @ 00:00:00.000';
-    const toTime = 'Jun 23, 2022 @ 00:00:00.000';
-    const testArchive = 'test/functional/fixtures/es_archiver/search/downsampled';
-    const testIndex = 'sample-01';
-    const testRollupIndex = 'sample-01-rollup';
-
-    before(async () => {
-      // create rollup data
-      log.info(`loading ${testIndex} index...`);
-      await esArchiver.loadIfNeeded(testArchive);
-      log.info(`add write block to ${testIndex} index...`);
-      await es.indices.addBlock({ index: testIndex, block: 'write' });
-      try {
-        log.info(`rolling up ${testIndex} index...`);
-        // es client currently does not have method for downsample
-        await es.transport.request<void>({
-          method: 'POST',
-          path: '/sample-01/_downsample/sample-01-rollup',
-          body: { fixed_interval: '1h' },
-        });
-      } catch (err) {
-        log.info(`ignoring resource_already_exists_exception...`);
-        if (!err.message.match(/resource_already_exists_exception/)) {
-          throw err;
-        }
-      }
-
-      log.info(`creating ${rollupDataViewTitle} data view...`);
-      await indexPatterns.create(
-        {
-          title: rollupDataViewTitle,
-          timeFieldName: '@timestamp',
-        },
-        { override: true }
-      );
-      await indexPatterns.create(
-        {
-          title: dataViewTitle,
-          timeFieldName: '@timestamp',
-        },
-        { override: true }
-      );
-      await kibanaServer.uiSettings.update({
-        'dateFormat:tz': 'UTC',
-        defaultIndex: '0ae0bc7a-e4ca-405c-ab67-f2b5913f2a51',
-        'timepicker:timeDefaults': '{ "from": "now-1y", "to": "now" }',
-      });
-    });
-
-    after(async () => {
-      await kibanaServer.savedObjects.cleanStandardList();
-      await kibanaServer.uiSettings.replace({});
-      await es.indices.delete({ index: [testIndex, testRollupIndex] });
-    });
-
-    describe('for regular metric', () => {
-      it('defaults to median for non-rolled up metric', async () => {
-        await PageObjects.common.navigateToApp('lens');
-        await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-        await PageObjects.lens.switchDataPanelIndexPattern(dataViewTitle);
-        await PageObjects.lens.waitForField('kubernetes.container.memory.available.bytes');
-        await PageObjects.lens.dragFieldToWorkspace(
-          'kubernetes.container.memory.available.bytes',
-          'xyVisChart'
-        );
-        expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
-          'Median of kubernetes.container.memory.available.bytes'
-        );
-      });
-
-      it('does not show a warning', async () => {
-        await PageObjects.lens.openDimensionEditor('lnsXY_yDimensionPanel');
-        await testSubjects.missingOrFail('median-partial-warning');
-        await PageObjects.lens.assertNoEditorWarning();
-        await PageObjects.lens.closeDimensionEditor();
-      });
-    });
-
-    describe('for rolled up metric', () => {
-      it('defaults to average for rolled up metric', async () => {
-        await PageObjects.lens.switchDataPanelIndexPattern(rollupDataViewTitle);
-        await PageObjects.lens.removeLayer();
-        await PageObjects.lens.waitForField('kubernetes.container.memory.available.bytes');
-        await PageObjects.lens.dragFieldToWorkspace(
-          'kubernetes.container.memory.available.bytes',
-          'xyVisChart'
-        );
-        expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
-          'Average of kubernetes.container.memory.available.bytes'
-        );
-      });
-      it('shows warnings in editor when using median', async () => {
-        await PageObjects.lens.openDimensionEditor('lnsXY_yDimensionPanel');
-        await testSubjects.existOrFail('median-partial-warning');
-        await testSubjects.click('lns-indexPatternDimension-median');
-        await PageObjects.lens.waitForVisualization('xyVisChart');
-        await PageObjects.lens.assertMessageListContains(
-          'Median of kubernetes.container.memory.available.bytes uses a function that is unsupported by rolled up data. Select a different function or change the time range.',
-          'warning'
-        );
-      });
-      it('shows warnings in dashboards as well', async () => {
-        await PageObjects.lens.save('New', false, false, false, 'new');
-
-        await PageObjects.dashboard.waitForRenderComplete();
-        await PageObjects.lens.assertMessageListContains(
-          'Median of kubernetes.container.memory.available.bytes uses a function that is unsupported by rolled up data. Select a different function or change the time range.',
-          'warning'
-        );
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/lens/group2/add_to_dashboard.ts b/x-pack/test/functional/apps/lens/group3/add_to_dashboard.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group2/add_to_dashboard.ts
rename to x-pack/test/functional/apps/lens/group3/add_to_dashboard.ts
diff --git a/x-pack/test/functional/apps/lens/group2/epoch_millis.ts b/x-pack/test/functional/apps/lens/group3/epoch_millis.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group2/epoch_millis.ts
rename to x-pack/test/functional/apps/lens/group3/epoch_millis.ts
diff --git a/x-pack/test/functional/apps/lens/group3/index.ts b/x-pack/test/functional/apps/lens/group3/index.ts
index 315d905f300e99..aa2112f248f71b 100644
--- a/x-pack/test/functional/apps/lens/group3/index.ts
+++ b/x-pack/test/functional/apps/lens/group3/index.ts
@@ -71,25 +71,10 @@ export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext
       await kibanaServer.savedObjects.cleanStandardList();
     });
 
-    loadTestFile(require.resolve('./colors'));
-    loadTestFile(require.resolve('./chart_data'));
-    loadTestFile(require.resolve('./time_shift'));
-    loadTestFile(require.resolve('./drag_and_drop'));
-    loadTestFile(require.resolve('./disable_auto_apply'));
-    loadTestFile(require.resolve('./geo_field'));
-    loadTestFile(require.resolve('./formula'));
-    loadTestFile(require.resolve('./heatmap'));
-    loadTestFile(require.resolve('./gauge'));
-    loadTestFile(require.resolve('./metric'));
-    loadTestFile(require.resolve('./legacy_metric'));
-    loadTestFile(require.resolve('./reference_lines'));
-    loadTestFile(require.resolve('./annotations'));
-    loadTestFile(require.resolve('./inspector'));
-    loadTestFile(require.resolve('./error_handling'));
-    loadTestFile(require.resolve('./lens_tagging'));
-    loadTestFile(require.resolve('./lens_reporting'));
-    // keep these two last in the group in this order because they are messing with the default saved objects
-    loadTestFile(require.resolve('./rollup'));
-    loadTestFile(require.resolve('./no_data'));
+    // total run time ~16 min
+    loadTestFile(require.resolve('./add_to_dashboard')); // 12m 50s
+    loadTestFile(require.resolve('./runtime_fields')); // 1m
+    loadTestFile(require.resolve('./terms')); // 1m 35s
+    loadTestFile(require.resolve('./epoch_millis')); // 30s
   });
 };
diff --git a/x-pack/test/functional/apps/lens/group2/runtime_fields.ts b/x-pack/test/functional/apps/lens/group3/runtime_fields.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group2/runtime_fields.ts
rename to x-pack/test/functional/apps/lens/group3/runtime_fields.ts
diff --git a/x-pack/test/functional/apps/lens/group2/terms.ts b/x-pack/test/functional/apps/lens/group3/terms.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group2/terms.ts
rename to x-pack/test/functional/apps/lens/group3/terms.ts
diff --git a/x-pack/test/functional/apps/lens/group3/chart_data.ts b/x-pack/test/functional/apps/lens/group4/chart_data.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/chart_data.ts
rename to x-pack/test/functional/apps/lens/group4/chart_data.ts
diff --git a/x-pack/test/functional/apps/lens/group3/colors.ts b/x-pack/test/functional/apps/lens/group4/colors.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/colors.ts
rename to x-pack/test/functional/apps/lens/group4/colors.ts
diff --git a/x-pack/test/functional/apps/lens/group4/config.ts b/x-pack/test/functional/apps/lens/group4/config.ts
new file mode 100644
index 00000000000000..d927f93adeffd0
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group4/config.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/x-pack/test/functional/apps/lens/group2/dashboard.ts b/x-pack/test/functional/apps/lens/group4/dashboard.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group2/dashboard.ts
rename to x-pack/test/functional/apps/lens/group4/dashboard.ts
diff --git a/x-pack/test/functional/apps/lens/group4/index.ts b/x-pack/test/functional/apps/lens/group4/index.ts
new file mode 100644
index 00000000000000..13cfa3fe421e15
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group4/index.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EsArchiver } from '@kbn/es-archiver';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext) => {
+  const browser = getService('browser');
+  const log = getService('log');
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+  const PageObjects = getPageObjects(['timePicker']);
+  const config = getService('config');
+  let remoteEsArchiver;
+
+  describe('lens app - group 4', () => {
+    const esArchive = 'x-pack/test/functional/es_archives/logstash_functional';
+    const localIndexPatternString = 'logstash-*';
+    const remoteIndexPatternString = 'ftr-remote:logstash-*';
+    const localFixtures = {
+      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/lens_basic.json',
+      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/default',
+    };
+
+    const remoteFixtures = {
+      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/lens_basic.json',
+      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/default',
+    };
+    let esNode: EsArchiver;
+    let fixtureDirs: {
+      lensBasic: string;
+      lensDefault: string;
+    };
+    let indexPatternString: string;
+    before(async () => {
+      await log.debug('Starting lens before method');
+      await browser.setWindowSize(1280, 1200);
+      await kibanaServer.savedObjects.cleanStandardList();
+      try {
+        config.get('esTestCluster.ccs');
+        remoteEsArchiver = getService('remoteEsArchiver' as 'esArchiver');
+        esNode = remoteEsArchiver;
+        fixtureDirs = remoteFixtures;
+        indexPatternString = remoteIndexPatternString;
+      } catch (error) {
+        esNode = esArchiver;
+        fixtureDirs = localFixtures;
+        indexPatternString = localIndexPatternString;
+      }
+
+      await esNode.load(esArchive);
+      // changing the timepicker default here saves us from having to set it in Discover (~8s)
+      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
+      await kibanaServer.uiSettings.update({
+        defaultIndex: indexPatternString,
+        'dateFormat:tz': 'UTC',
+      });
+      await kibanaServer.importExport.load(fixtureDirs.lensBasic);
+      await kibanaServer.importExport.load(fixtureDirs.lensDefault);
+    });
+
+    after(async () => {
+      await esArchiver.unload(esArchive);
+      await PageObjects.timePicker.resetDefaultAbsoluteRangeViaUiSettings();
+      await kibanaServer.importExport.unload(fixtureDirs.lensBasic);
+      await kibanaServer.importExport.unload(fixtureDirs.lensDefault);
+      await kibanaServer.savedObjects.cleanStandardList();
+    });
+
+    // total run time ~16m 30s
+    loadTestFile(require.resolve('./colors')); // 1m 2s
+    loadTestFile(require.resolve('./chart_data')); // 1m 10s
+    loadTestFile(require.resolve('./time_shift')); // 1m
+    loadTestFile(require.resolve('./dashboard')); // 6m 45s
+    loadTestFile(require.resolve('./show_underlying_data')); // 2m
+    loadTestFile(require.resolve('./show_underlying_data_dashboard')); // 2m 10s
+    loadTestFile(require.resolve('./share')); // 1m 20s
+    // keep it last in the group
+    loadTestFile(require.resolve('./tsdb')); // 1m
+  });
+};
diff --git a/x-pack/test/functional/apps/lens/group2/share.ts b/x-pack/test/functional/apps/lens/group4/share.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group2/share.ts
rename to x-pack/test/functional/apps/lens/group4/share.ts
diff --git a/x-pack/test/functional/apps/lens/group2/show_underlying_data.ts b/x-pack/test/functional/apps/lens/group4/show_underlying_data.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group2/show_underlying_data.ts
rename to x-pack/test/functional/apps/lens/group4/show_underlying_data.ts
diff --git a/x-pack/test/functional/apps/lens/group2/show_underlying_data_dashboard.ts b/x-pack/test/functional/apps/lens/group4/show_underlying_data_dashboard.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group2/show_underlying_data_dashboard.ts
rename to x-pack/test/functional/apps/lens/group4/show_underlying_data_dashboard.ts
diff --git a/x-pack/test/functional/apps/lens/group3/time_shift.ts b/x-pack/test/functional/apps/lens/group4/time_shift.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/time_shift.ts
rename to x-pack/test/functional/apps/lens/group4/time_shift.ts
diff --git a/x-pack/test/functional/apps/lens/group4/tsdb.ts b/x-pack/test/functional/apps/lens/group4/tsdb.ts
new file mode 100644
index 00000000000000..3828ef875d3af0
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group4/tsdb.ts
@@ -0,0 +1,288 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 { partition } from 'lodash';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'timePicker', 'lens', 'dashboard']);
+  const testSubjects = getService('testSubjects');
+  const es = getService('es');
+  const find = getService('find');
+  const log = getService('log');
+  const indexPatterns = getService('indexPatterns');
+  const kibanaServer = getService('kibanaServer');
+  const esArchiver = getService('esArchiver');
+
+  describe('lens tsdb', function () {
+    describe('downsampling', () => {
+      const dataViewTitle = 'sample-01';
+      const rollupDataViewTitle = 'sample-01,sample-01-rollup';
+      const fromTime = 'Jun 17, 2022 @ 00:00:00.000';
+      const toTime = 'Jun 23, 2022 @ 00:00:00.000';
+      const testArchive = 'test/functional/fixtures/es_archiver/search/downsampled';
+      const testIndex = 'sample-01';
+      const testRollupIndex = 'sample-01-rollup';
+
+      before(async () => {
+        // create rollup data
+        log.info(`loading ${testIndex} index...`);
+        await esArchiver.loadIfNeeded(testArchive);
+        log.info(`add write block to ${testIndex} index...`);
+        await es.indices.addBlock({ index: testIndex, block: 'write' });
+        try {
+          log.info(`rolling up ${testIndex} index...`);
+          // es client currently does not have method for downsample
+          await es.transport.request<void>({
+            method: 'POST',
+            path: '/sample-01/_downsample/sample-01-rollup',
+            body: { fixed_interval: '1h' },
+          });
+        } catch (err) {
+          log.info(`ignoring resource_already_exists_exception...`);
+          if (!err.message.match(/resource_already_exists_exception/)) {
+            throw err;
+          }
+        }
+
+        log.info(`creating ${rollupDataViewTitle} data view...`);
+        await indexPatterns.create(
+          {
+            title: rollupDataViewTitle,
+            timeFieldName: '@timestamp',
+          },
+          { override: true }
+        );
+        await indexPatterns.create(
+          {
+            title: dataViewTitle,
+            timeFieldName: '@timestamp',
+          },
+          { override: true }
+        );
+        await kibanaServer.uiSettings.update({
+          'dateFormat:tz': 'UTC',
+          defaultIndex: '0ae0bc7a-e4ca-405c-ab67-f2b5913f2a51',
+          'timepicker:timeDefaults': '{ "from": "now-1y", "to": "now" }',
+        });
+      });
+
+      after(async () => {
+        await kibanaServer.savedObjects.cleanStandardList();
+        await kibanaServer.uiSettings.replace({});
+        await es.indices.delete({ index: [testIndex, testRollupIndex] });
+      });
+
+      describe('for regular metric', () => {
+        it('defaults to median for non-rolled up metric', async () => {
+          await PageObjects.common.navigateToApp('lens');
+          await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
+          await PageObjects.lens.switchDataPanelIndexPattern(dataViewTitle);
+          await PageObjects.lens.waitForField('kubernetes.container.memory.available.bytes');
+          await PageObjects.lens.dragFieldToWorkspace(
+            'kubernetes.container.memory.available.bytes',
+            'xyVisChart'
+          );
+          expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+            'Median of kubernetes.container.memory.available.bytes'
+          );
+        });
+
+        it('does not show a warning', async () => {
+          await PageObjects.lens.openDimensionEditor('lnsXY_yDimensionPanel');
+          await testSubjects.missingOrFail('median-partial-warning');
+          await PageObjects.lens.assertNoEditorWarning();
+          await PageObjects.lens.closeDimensionEditor();
+        });
+      });
+
+      describe('for rolled up metric', () => {
+        it('defaults to average for rolled up metric', async () => {
+          await PageObjects.lens.switchDataPanelIndexPattern(rollupDataViewTitle);
+          await PageObjects.lens.removeLayer();
+          await PageObjects.lens.waitForField('kubernetes.container.memory.available.bytes');
+          await PageObjects.lens.dragFieldToWorkspace(
+            'kubernetes.container.memory.available.bytes',
+            'xyVisChart'
+          );
+          expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+            'Average of kubernetes.container.memory.available.bytes'
+          );
+        });
+        it('shows warnings in editor when using median', async () => {
+          await PageObjects.lens.openDimensionEditor('lnsXY_yDimensionPanel');
+          await testSubjects.existOrFail('median-partial-warning');
+          await testSubjects.click('lns-indexPatternDimension-median');
+          await PageObjects.lens.waitForVisualization('xyVisChart');
+          await PageObjects.lens.assertMessageListContains(
+            'Median of kubernetes.container.memory.available.bytes uses a function that is unsupported by rolled up data. Select a different function or change the time range.',
+            'warning'
+          );
+        });
+        it('shows warnings in dashboards as well', async () => {
+          await PageObjects.lens.save('New', false, false, false, 'new');
+
+          await PageObjects.dashboard.waitForRenderComplete();
+          await PageObjects.lens.assertMessageListContains(
+            'Median of kubernetes.container.memory.available.bytes uses a function that is unsupported by rolled up data. Select a different function or change the time range.',
+            'warning'
+          );
+        });
+      });
+    });
+
+    describe('field types support', () => {
+      before(async () => {
+        log.info(`loading sample TSDB index...`);
+        await esArchiver.load('test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb');
+        log.info(`creating the TSDB data view...`);
+        await kibanaServer.importExport.load(
+          'test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb'
+        );
+        log.info(`setting the TSDB dataView as default...`);
+        await kibanaServer.uiSettings.replace({
+          defaultIndex: '90943e30-9a47-11e8-b64d-95841ca0c247',
+        });
+        await PageObjects.common.navigateToApp('lens');
+        await PageObjects.lens.goToTimeRange();
+      });
+
+      after(async () => {
+        log.info(`removing the TSDB index...`);
+        await esArchiver.unload(
+          'test/functional/fixtures/es_archiver/kibana_sample_data_logs_tsdb'
+        );
+        log.info(`removing the TSDB dataView...`);
+        await kibanaServer.importExport.unload(
+          'test/functional/fixtures/kbn_archiver/kibana_sample_data_logs_tsdb'
+        );
+        log.info(`unsetting the TSDB dataView default...`);
+        await kibanaServer.uiSettings.unset('defaultIndex');
+      });
+
+      afterEach(async () => {
+        await PageObjects.lens.removeLayer();
+      });
+
+      // skip count for now as it's a special function and will
+      // change automatically the unsupported field to Records when detected
+      const operationsByFieldSupport = [
+        'average',
+        'max',
+        'last_value',
+        'median',
+        'percentile',
+        'percentile_rank',
+        'standard_deviation',
+        'sum',
+        'unique_count',
+      ].map((name) => ({
+        name,
+        label: `${name[0].toUpperCase()}${name.slice(1).replace('_', ' ')}`,
+        counter: ['max', 'counter_rate'].includes(name),
+        gauge: true,
+      }));
+
+      for (const fieldType of ['counter', 'gauge'] as const) {
+        const [supportedOperations, unsupportedOperatons] = partition(
+          operationsByFieldSupport,
+          (op) => op[fieldType]
+        );
+        if (supportedOperations.length) {
+          it(`should allow operations when supported by ${fieldType} field type`, async () => {
+            // Counter rate requires a date histogram dimension configured to work
+            await PageObjects.lens.configureDimension({
+              dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+              operation: 'date_histogram',
+              field: '@timestamp',
+            });
+
+            // minimum supports all tsdb field types
+            await PageObjects.lens.configureDimension({
+              dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+              operation: 'min',
+              field: `bytes_${fieldType}`,
+              keepOpen: true,
+            });
+
+            // now check if the provided function has no incompatibility tooltip
+            for (const supportedOp of supportedOperations) {
+              expect(
+                testSubjects.exists(`lns-indexPatternDimension-${supportedOp.name} incompatible`, {
+                  timeout: 500,
+                })
+              ).to.eql(supportedOp[fieldType]);
+            }
+
+            for (const supportedOp of supportedOperations) {
+              // try to change to the provided function and check all is ok
+              await PageObjects.lens.selectOperation(supportedOp.name);
+
+              expect(
+                await find.existsByCssSelector(
+                  '[data-test-subj="indexPattern-field-selection-row"] .euiFormErrorText'
+                )
+              ).to.be(false);
+
+              // return in a clean state before checking the next operation
+              await PageObjects.lens.selectOperation('min');
+            }
+            await PageObjects.lens.closeDimensionEditor();
+          });
+        }
+        if (unsupportedOperatons.length) {
+          it(`should notify the incompatibility of unsupported operations for the ${fieldType} field type`, async () => {
+            // Counter rate requires a date histogram dimension configured to work
+            await PageObjects.lens.configureDimension({
+              dimension: 'lnsXY_xDimensionPanel > lns-empty-dimension',
+              operation: 'date_histogram',
+              field: '@timestamp',
+            });
+
+            // minimum supports all tsdb field types
+            await PageObjects.lens.configureDimension({
+              dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
+              operation: 'min',
+              field: `bytes_${fieldType}`,
+              keepOpen: true,
+            });
+
+            // now check if the provided function has the incompatibility tooltip
+            for (const unsupportedOp of unsupportedOperatons) {
+              expect(
+                testSubjects.exists(
+                  `lns-indexPatternDimension-${unsupportedOp.name} incompatible`,
+                  {
+                    timeout: 500,
+                  }
+                )
+              ).to.eql(!unsupportedOp[fieldType]);
+            }
+
+            for (const unsupportedOp of unsupportedOperatons) {
+              // try to change to the provided function and check if it's in an incompatibility state
+              await PageObjects.lens.selectOperation(unsupportedOp.name, true);
+
+              const fieldSelectErrorEl = await find.byCssSelector(
+                '[data-test-subj="indexPattern-field-selection-row"] .euiFormErrorText'
+              );
+
+              expect(await fieldSelectErrorEl.getVisibleText()).to.be(
+                'This field does not work with the selected function.'
+              );
+
+              // return in a clean state before checking the next operation
+              await PageObjects.lens.selectOperation('min');
+            }
+            await PageObjects.lens.closeDimensionEditor();
+          });
+        }
+      }
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/lens/group5/config.ts b/x-pack/test/functional/apps/lens/group5/config.ts
new file mode 100644
index 00000000000000..d927f93adeffd0
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group5/config.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/x-pack/test/functional/apps/lens/group3/drag_and_drop.ts b/x-pack/test/functional/apps/lens/group5/drag_and_drop.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/drag_and_drop.ts
rename to x-pack/test/functional/apps/lens/group5/drag_and_drop.ts
diff --git a/x-pack/test/functional/apps/lens/group3/formula.ts b/x-pack/test/functional/apps/lens/group5/formula.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/formula.ts
rename to x-pack/test/functional/apps/lens/group5/formula.ts
diff --git a/x-pack/test/functional/apps/lens/group3/gauge.ts b/x-pack/test/functional/apps/lens/group5/gauge.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/gauge.ts
rename to x-pack/test/functional/apps/lens/group5/gauge.ts
diff --git a/x-pack/test/functional/apps/lens/group3/geo_field.ts b/x-pack/test/functional/apps/lens/group5/geo_field.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/geo_field.ts
rename to x-pack/test/functional/apps/lens/group5/geo_field.ts
diff --git a/x-pack/test/functional/apps/lens/group3/heatmap.ts b/x-pack/test/functional/apps/lens/group5/heatmap.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/heatmap.ts
rename to x-pack/test/functional/apps/lens/group5/heatmap.ts
diff --git a/x-pack/test/functional/apps/lens/group5/index.ts b/x-pack/test/functional/apps/lens/group5/index.ts
new file mode 100644
index 00000000000000..5dabfd4a714993
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group5/index.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EsArchiver } from '@kbn/es-archiver';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext) => {
+  const browser = getService('browser');
+  const log = getService('log');
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+  const PageObjects = getPageObjects(['timePicker']);
+  const config = getService('config');
+  let remoteEsArchiver;
+
+  describe('lens app - group 5', () => {
+    const esArchive = 'x-pack/test/functional/es_archives/logstash_functional';
+    const localIndexPatternString = 'logstash-*';
+    const remoteIndexPatternString = 'ftr-remote:logstash-*';
+    const localFixtures = {
+      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/lens_basic.json',
+      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/default',
+    };
+
+    const remoteFixtures = {
+      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/lens_basic.json',
+      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/default',
+    };
+    let esNode: EsArchiver;
+    let fixtureDirs: {
+      lensBasic: string;
+      lensDefault: string;
+    };
+    let indexPatternString: string;
+    before(async () => {
+      log.debug('Starting lens before method');
+      await browser.setWindowSize(1280, 1200);
+      await kibanaServer.savedObjects.cleanStandardList();
+      try {
+        config.get('esTestCluster.ccs');
+        remoteEsArchiver = getService('remoteEsArchiver' as 'esArchiver');
+        esNode = remoteEsArchiver;
+        fixtureDirs = remoteFixtures;
+        indexPatternString = remoteIndexPatternString;
+      } catch (error) {
+        esNode = esArchiver;
+        fixtureDirs = localFixtures;
+        indexPatternString = localIndexPatternString;
+      }
+
+      await esNode.load(esArchive);
+      // changing the timepicker default here saves us from having to set it in Discover (~8s)
+      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
+      await kibanaServer.uiSettings.update({
+        defaultIndex: indexPatternString,
+        'dateFormat:tz': 'UTC',
+      });
+      await kibanaServer.importExport.load(fixtureDirs.lensBasic);
+      await kibanaServer.importExport.load(fixtureDirs.lensDefault);
+    });
+
+    after(async () => {
+      await esArchiver.unload(esArchive);
+      await PageObjects.timePicker.resetDefaultAbsoluteRangeViaUiSettings();
+      await kibanaServer.importExport.unload(fixtureDirs.lensBasic);
+      await kibanaServer.importExport.unload(fixtureDirs.lensDefault);
+      await kibanaServer.savedObjects.cleanStandardList();
+    });
+
+    // total run time ~ 16m
+    loadTestFile(require.resolve('./drag_and_drop')); // 7m 40s
+    loadTestFile(require.resolve('./geo_field')); // 26s
+    loadTestFile(require.resolve('./formula')); // 5m 52s
+    loadTestFile(require.resolve('./heatmap')); // 51s
+    loadTestFile(require.resolve('./gauge')); // 1m 17s
+  });
+};
diff --git a/x-pack/test/functional/apps/lens/group3/annotations.ts b/x-pack/test/functional/apps/lens/group6/annotations.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/annotations.ts
rename to x-pack/test/functional/apps/lens/group6/annotations.ts
diff --git a/x-pack/test/functional/apps/lens/group6/config.ts b/x-pack/test/functional/apps/lens/group6/config.ts
new file mode 100644
index 00000000000000..d927f93adeffd0
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group6/config.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrConfigProviderContext } from '@kbn/test';
+
+export default async function ({ readConfigFile }: FtrConfigProviderContext) {
+  const functionalConfig = await readConfigFile(require.resolve('../../../config.base.js'));
+
+  return {
+    ...functionalConfig.getAll(),
+    testFiles: [require.resolve('.')],
+  };
+}
diff --git a/x-pack/test/functional/apps/lens/group3/disable_auto_apply.ts b/x-pack/test/functional/apps/lens/group6/disable_auto_apply.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/disable_auto_apply.ts
rename to x-pack/test/functional/apps/lens/group6/disable_auto_apply.ts
diff --git a/x-pack/test/functional/apps/lens/group3/error_handling.ts b/x-pack/test/functional/apps/lens/group6/error_handling.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/error_handling.ts
rename to x-pack/test/functional/apps/lens/group6/error_handling.ts
diff --git a/x-pack/test/functional/apps/lens/group6/index.ts b/x-pack/test/functional/apps/lens/group6/index.ts
new file mode 100644
index 00000000000000..bc59c2878805ea
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/group6/index.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 { EsArchiver } from '@kbn/es-archiver';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default ({ getService, loadTestFile, getPageObjects }: FtrProviderContext) => {
+  const browser = getService('browser');
+  const log = getService('log');
+  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
+  const PageObjects = getPageObjects(['timePicker']);
+  const config = getService('config');
+  let remoteEsArchiver;
+
+  describe('lens app - group 6', () => {
+    const esArchive = 'x-pack/test/functional/es_archives/logstash_functional';
+    const localIndexPatternString = 'logstash-*';
+    const remoteIndexPatternString = 'ftr-remote:logstash-*';
+    const localFixtures = {
+      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/lens_basic.json',
+      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/default',
+    };
+
+    const remoteFixtures = {
+      lensBasic: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/lens_basic.json',
+      lensDefault: 'x-pack/test/functional/fixtures/kbn_archiver/lens/ccs/default',
+    };
+    let esNode: EsArchiver;
+    let fixtureDirs: {
+      lensBasic: string;
+      lensDefault: string;
+    };
+    let indexPatternString: string;
+    before(async () => {
+      log.debug('Starting lens before method');
+      await browser.setWindowSize(1280, 1200);
+      await kibanaServer.savedObjects.cleanStandardList();
+      try {
+        config.get('esTestCluster.ccs');
+        remoteEsArchiver = getService('remoteEsArchiver' as 'esArchiver');
+        esNode = remoteEsArchiver;
+        fixtureDirs = remoteFixtures;
+        indexPatternString = remoteIndexPatternString;
+      } catch (error) {
+        esNode = esArchiver;
+        fixtureDirs = localFixtures;
+        indexPatternString = localIndexPatternString;
+      }
+
+      await esNode.load(esArchive);
+      // changing the timepicker default here saves us from having to set it in Discover (~8s)
+      await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
+      await kibanaServer.uiSettings.update({
+        defaultIndex: indexPatternString,
+        'dateFormat:tz': 'UTC',
+      });
+      await kibanaServer.importExport.load(fixtureDirs.lensBasic);
+      await kibanaServer.importExport.load(fixtureDirs.lensDefault);
+    });
+
+    after(async () => {
+      await esArchiver.unload(esArchive);
+      await PageObjects.timePicker.resetDefaultAbsoluteRangeViaUiSettings();
+      await kibanaServer.importExport.unload(fixtureDirs.lensBasic);
+      await kibanaServer.importExport.unload(fixtureDirs.lensDefault);
+      await kibanaServer.savedObjects.cleanStandardList();
+    });
+
+    // total run time ~16m
+    loadTestFile(require.resolve('./metric')); // 4m 7s
+    loadTestFile(require.resolve('./legacy_metric')); // 29s
+    loadTestFile(require.resolve('./disable_auto_apply')); // 1m 6s
+    loadTestFile(require.resolve('./reference_lines')); // 1m
+    loadTestFile(require.resolve('./annotations')); // 1m
+    loadTestFile(require.resolve('./inspector')); // 1m 19s
+    loadTestFile(require.resolve('./error_handling')); // 1m 8s
+    loadTestFile(require.resolve('./lens_tagging')); // 1m 9s
+    loadTestFile(require.resolve('./lens_reporting')); // 3m
+    // keep these two last in the group in this order because they are messing with the default saved objects
+    loadTestFile(require.resolve('./rollup')); // 1m 30s
+    loadTestFile(require.resolve('./no_data')); // 36s
+  });
+};
diff --git a/x-pack/test/functional/apps/lens/group3/inspector.ts b/x-pack/test/functional/apps/lens/group6/inspector.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/inspector.ts
rename to x-pack/test/functional/apps/lens/group6/inspector.ts
diff --git a/x-pack/test/functional/apps/lens/group3/legacy_metric.ts b/x-pack/test/functional/apps/lens/group6/legacy_metric.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/legacy_metric.ts
rename to x-pack/test/functional/apps/lens/group6/legacy_metric.ts
diff --git a/x-pack/test/functional/apps/lens/group3/lens_reporting.ts b/x-pack/test/functional/apps/lens/group6/lens_reporting.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/lens_reporting.ts
rename to x-pack/test/functional/apps/lens/group6/lens_reporting.ts
diff --git a/x-pack/test/functional/apps/lens/group3/lens_tagging.ts b/x-pack/test/functional/apps/lens/group6/lens_tagging.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/lens_tagging.ts
rename to x-pack/test/functional/apps/lens/group6/lens_tagging.ts
diff --git a/x-pack/test/functional/apps/lens/group3/metric.ts b/x-pack/test/functional/apps/lens/group6/metric.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/metric.ts
rename to x-pack/test/functional/apps/lens/group6/metric.ts
diff --git a/x-pack/test/functional/apps/lens/group3/no_data.ts b/x-pack/test/functional/apps/lens/group6/no_data.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/no_data.ts
rename to x-pack/test/functional/apps/lens/group6/no_data.ts
diff --git a/x-pack/test/functional/apps/lens/group3/reference_lines.ts b/x-pack/test/functional/apps/lens/group6/reference_lines.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/reference_lines.ts
rename to x-pack/test/functional/apps/lens/group6/reference_lines.ts
diff --git a/x-pack/test/functional/apps/lens/group3/rollup.ts b/x-pack/test/functional/apps/lens/group6/rollup.ts
similarity index 100%
rename from x-pack/test/functional/apps/lens/group3/rollup.ts
rename to x-pack/test/functional/apps/lens/group6/rollup.ts
diff --git a/x-pack/test/functional/apps/management/feature_controls/management_security.ts b/x-pack/test/functional/apps/management/feature_controls/management_security.ts
index f6f71ad827d1c5..d88e2fd8ebe7a4 100644
--- a/x-pack/test/functional/apps/management/feature_controls/management_security.ts
+++ b/x-pack/test/functional/apps/management/feature_controls/management_security.ts
@@ -64,7 +64,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         expect(sections).to.have.length(2);
         expect(sections[0]).to.eql({
           sectionId: 'insightsAndAlerting',
-          sectionLinks: ['triggersActions', 'cases', 'triggersActionsConnectors', 'jobsListLink'],
+          sectionLinks: [
+            'triggersActions',
+            'cases',
+            'triggersActionsConnectors',
+            'jobsListLink',
+            'maintenanceWindows',
+          ],
         });
         expect(sections[1]).to.eql({
           sectionId: 'kibana',
diff --git a/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts b/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
index 6ec33c155a813c..1a95d0cb9caab4 100644
--- a/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
+++ b/x-pack/test/functional/apps/ml/stack_management_jobs/export_jobs.ts
@@ -251,9 +251,9 @@ export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const ml = getService('ml');
 
-  // Failing: See https://github.com/elastic/kibana/issues/150557
-  describe.skip('export jobs', function () {
+  describe('export jobs', function () {
     this.tags(['ml']);
+
     before(async () => {
       await ml.api.cleanMlIndices();
       await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
@@ -282,6 +282,7 @@ export default function ({ getService }: FtrProviderContext) {
       await ml.navigation.navigateToStackManagement();
       await ml.navigation.navigateToStackManagementJobsListPage();
     });
+
     after(async () => {
       await ml.api.cleanMlIndices();
       ml.stackManagementJobs.deleteExportedFiles([
diff --git a/x-pack/test/functional/apps/transform/edit_clone/cloning.ts b/x-pack/test/functional/apps/transform/edit_clone/cloning.ts
index 6b3bbac3f7b3db..152ea8c9caa662 100644
--- a/x-pack/test/functional/apps/transform/edit_clone/cloning.ts
+++ b/x-pack/test/functional/apps/transform/edit_clone/cloning.ts
@@ -35,12 +35,19 @@ function getTransformConfig(): TransformPivotConfig {
     source: { index: ['ft_ecommerce'] },
     pivot: {
       group_by: { category: { terms: { field: 'category.keyword' } } },
-      aggregations: { 'products.base_price.avg': { avg: { field: 'products.base_price' } } },
+      aggregations: {
+        'products.base_price.avg': { avg: { field: 'products.base_price' } },
+        'order_date.max': {
+          max: {
+            field: 'order_date',
+          },
+        },
+      },
     },
     description:
       'ecommerce batch transform with avg(products.base_price) grouped by terms(category)',
     frequency: '3s',
-    retention_policy: { time: { field: 'order_date', max_age: '1d' } },
+    retention_policy: { time: { field: 'order_date.max', max_age: '1d' } },
     settings: {
       max_page_search_size: 250,
       num_failure_retries: 0,
@@ -75,11 +82,16 @@ function getTransformConfigWithRuntimeMappings(): TransformPivotConfig {
         'rt_total_charge.avg': { avg: { field: 'rt_total_charge' } },
         'rt_total_charge.min': { min: { field: 'rt_total_charge' } },
         'rt_total_charge.max': { max: { field: 'rt_total_charge' } },
+        max_order_date: {
+          max: {
+            field: 'order_date',
+          },
+        },
       },
     },
     description: 'ecommerce batch transform grouped by terms(rt_gender_lower)',
     frequency: '3s',
-    retention_policy: { time: { field: 'order_date', max_age: '3d' } },
+    retention_policy: { time: { field: 'max_order_date', max_age: '3d' } },
     settings: {
       max_page_search_size: 250,
       num_failure_retries: 5,
@@ -155,11 +167,16 @@ function getTransformConfigWithBoolFilterAgg(): TransformPivotConfig {
             },
           },
         },
+        max_order_date: {
+          max: {
+            field: 'order_date',
+          },
+        },
       },
     },
     description: 'ecommerce batch transform with filter aggregations',
     frequency: '3s',
-    retention_policy: { time: { field: 'order_date', max_age: '3d' } },
+    retention_policy: { time: { field: 'max_order_date', max_age: '3d' } },
     settings: {
       max_page_search_size: 250,
       num_failure_retries: 5,
@@ -253,7 +270,7 @@ export default function ({ getService }: FtrProviderContext) {
             ],
           },
           retentionPolicySwitchEnabled: true,
-          retentionPolicyField: 'order_date',
+          retentionPolicyField: 'order_date.max',
           retentionPolicyMaxAge: '1d',
           numFailureRetries: getNumFailureRetriesStr(
             transformConfigWithPivot.settings?.num_failure_retries
@@ -288,7 +305,7 @@ export default function ({ getService }: FtrProviderContext) {
             values: [`female`, `male`],
           },
           retentionPolicySwitchEnabled: true,
-          retentionPolicyField: 'order_date',
+          retentionPolicyField: 'max_order_date',
           retentionPolicyMaxAge: '3d',
           numFailureRetries: getNumFailureRetriesStr(
             transformConfigWithRuntimeMapping.settings?.num_failure_retries
@@ -341,7 +358,7 @@ export default function ({ getService }: FtrProviderContext) {
             ],
           },
           retentionPolicySwitchEnabled: true,
-          retentionPolicyField: 'order_date',
+          retentionPolicyField: 'max_order_date',
           retentionPolicyMaxAge: '3d',
           numFailureRetries: getNumFailureRetriesStr(
             transformConfigWithBoolFilterAgg.settings?.num_failure_retries
diff --git a/x-pack/test/functional/page_objects/infra_hosts_view.ts b/x-pack/test/functional/page_objects/infra_hosts_view.ts
index 6478d208226ad8..6b0efc8ce0944b 100644
--- a/x-pack/test/functional/page_objects/infra_hosts_view.ts
+++ b/x-pack/test/functional/page_objects/infra_hosts_view.ts
@@ -73,8 +73,16 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
       return await testSubjects.click('hostsView-enable-feature-button');
     },
 
+    async getHostsTable() {
+      return testSubjects.find('hostsView-table');
+    },
+
+    async isHostTableLoading() {
+      return !(await testSubjects.exists('tbody[class*=euiBasicTableBodyLoading]'));
+    },
+
     async getHostsTableData() {
-      const table = await testSubjects.find('hostsView-table');
+      const table = await this.getHostsTable();
       return table.findAllByTestSubject('hostsView-tableRow');
     },
 
@@ -95,7 +103,7 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
       return cellContent.getVisibleText();
     },
 
-    async getMetricsTrendContainer() {
+    async getKPIContainer() {
       return testSubjects.find('hostsView-metricsTrend');
     },
 
@@ -103,25 +111,14 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
       return testSubjects.find('hostsView-metricChart');
     },
 
-    getMetricsTab() {
+    // MetricsTtab
+    async getMetricsTab() {
       return testSubjects.find('hostsView-tabs-metrics');
     },
 
     async visitMetricsTab() {
       const metricsTab = await this.getMetricsTab();
-      metricsTab.click();
-    },
-
-    async getAllMetricsTrendTiles() {
-      const container = await this.getMetricsTrendContainer();
-      return container.findAllByCssSelector('[data-test-subj*="hostsView-metricsTrend-"]');
-    },
-
-    async getMetricsTrendTileValue(type: string) {
-      const container = await this.getMetricsTrendContainer();
-      const element = await container.findByTestSubject(`hostsView-metricsTrend-${type}`);
-      const div = await element.findByClassName('echMetricText__value');
-      return await div.getAttribute('title');
+      await metricsTab.click();
     },
 
     async getAllMetricsCharts() {
@@ -129,14 +126,32 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
       return container.findAllByCssSelector('[data-test-subj*="hostsView-metricChart-"]');
     },
 
-    async getOpenInLensOption() {
-      const metricCharts = await this.getAllMetricsCharts();
-      const chart = metricCharts.at(-1)!;
-      await chart.moveMouseTo();
-      const button = await testSubjects.findDescendant('embeddablePanelToggleMenuIcon', chart);
+    async clickAndValidateMetriChartActionOptions() {
+      const element = await testSubjects.find('hostsView-metricChart-diskIOWrite');
+      await element.moveMouseTo();
+      const button = await element.findByTestSubject('embeddablePanelToggleMenuIcon');
       await button.click();
-      await testSubjects.existOrFail('embeddablePanelContextMenuOpen');
-      return testSubjects.existOrFail('embeddablePanelAction-openInLens');
+      await testSubjects.existOrFail('embeddablePanelAction-openInLens');
+      // forces the modal to close
+      await element.click();
+    },
+
+    // KPIs
+    async isKPIChartsLoaded() {
+      return !(await testSubjects.exists(
+        '[data-test-subj=hostsView-metricsTrend] .echChartStatus[data-ech-render-complete=true]'
+      ));
+    },
+
+    async getAllKPITiles() {
+      const container = await this.getKPIContainer();
+      return container.findAllByCssSelector('[data-test-subj*="hostsView-metricsTrend-"]');
+    },
+
+    async getKPITileValue(type: string) {
+      const element = await testSubjects.find(`hostsView-metricsTrend-${type}`);
+      const div = await element.findByClassName('echMetricText__value');
+      return await div.getAttribute('title');
     },
 
     // Flyout Tabs
@@ -187,7 +202,7 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
 
     async visitLogsTab() {
       const logsTab = await this.getLogsTab();
-      logsTab.click();
+      await logsTab.click();
     },
 
     async getLogEntries() {
@@ -212,7 +227,7 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
 
     async visitAlertTab() {
       const alertsTab = await this.getAlertsTab();
-      alertsTab.click();
+      await alertsTab.click();
     },
 
     setAlertStatusFilter(alertStatus?: AlertStatus) {
@@ -232,22 +247,14 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
       return testSubjects.find('queryInput');
     },
 
-    async clearQueryBar() {
-      const queryBar = await this.getQueryBar();
-
-      return queryBar.clearValueWithKeyboard();
-    },
-
     async typeInQueryBar(query: string) {
       const queryBar = await this.getQueryBar();
-
       await queryBar.clearValueWithKeyboard();
       return queryBar.type(query);
     },
 
     async submitQuery(query: string) {
       await this.typeInQueryBar(query);
-
       await testSubjects.click('querySubmitButton');
     },
 
@@ -288,13 +295,13 @@ export function InfraHostsViewProvider({ getService }: FtrProviderContext) {
     async sortByDiskLatency() {
       const diskLatency = await this.getDiskLatencyHeader();
       const button = await testSubjects.findDescendant('tableHeaderSortButton', diskLatency);
-      return button.click();
+      await button.click();
     },
 
     async sortByTitle() {
       const titleHeader = await this.getTitleHeader();
       const button = await testSubjects.findDescendant('tableHeaderSortButton', titleHeader);
-      return button.click();
+      await button.click();
     },
   };
 }
diff --git a/x-pack/test/functional/page_objects/infra_saved_views.ts b/x-pack/test/functional/page_objects/infra_saved_views.ts
index 839b10fef1c685..2097be3d083a80 100644
--- a/x-pack/test/functional/page_objects/infra_saved_views.ts
+++ b/x-pack/test/functional/page_objects/infra_saved_views.ts
@@ -15,57 +15,67 @@ export function InfraSavedViewsProvider({ getService }: FtrProviderContext) {
   const browser = getService('browser');
 
   return {
-    async getSavedViewsButton() {
-      return await testSubjects.find('savedViews-openPopover');
+    getSavedViewsButton() {
+      return testSubjects.find('savedViews-openPopover');
     },
 
-    async clickSavedViewsButton() {
-      return await testSubjects.click('savedViews-openPopover');
+    clickSavedViewsButton() {
+      return testSubjects.click('savedViews-openPopover');
     },
 
-    async getSavedViewsPopoer() {
-      return await testSubjects.find('savedViews-popover');
+    getSavedViewsPopover() {
+      return testSubjects.find('savedViews-popover');
+    },
+
+    pressEsc() {
+      return browser.pressKeys([Key.ESCAPE]);
     },
 
     async closeSavedViewsPopover() {
       await testSubjects.find('savedViews-popover');
-      return await browser.pressKeys([Key.ESCAPE]);
+      return this.pressEsc();
+    },
+
+    getLoadViewButton() {
+      return testSubjects.find('savedViews-loadView');
     },
 
-    async getLoadViewButton() {
-      return await testSubjects.find('savedViews-loadView');
+    getManageViewsButton() {
+      return testSubjects.find('savedViews-manageViews');
     },
 
-    async clickLoadViewButton() {
-      return await testSubjects.click('savedViews-loadView');
+    clickManageViewsButton() {
+      return testSubjects.click('savedViews-manageViews');
     },
 
-    async getManageViewsButton() {
-      return await testSubjects.find('savedViews-manageViews');
+    getManageViewsFlyout() {
+      return testSubjects.find('loadViewsFlyout');
     },
 
-    async clickManageViewsButton() {
-      return await testSubjects.click('savedViews-manageViews');
+    async getManageViewsEntries() {
+      await this.clickSavedViewsButton();
+      await this.clickManageViewsButton();
+      return testSubjects.findAll('infraRenderNameButton');
     },
 
-    async getUpdateViewButton() {
-      return await testSubjects.find('savedViews-updateView');
+    getUpdateViewButton() {
+      return testSubjects.find('savedViews-updateView');
     },
 
-    async clickUpdateViewButton() {
-      return await testSubjects.click('savedViews-updateView');
+    clickUpdateViewButton() {
+      return testSubjects.click('savedViews-updateView');
     },
 
-    async getSaveNewViewButton() {
-      return await testSubjects.find('savedViews-saveNewView');
+    getSaveNewViewButton() {
+      return testSubjects.find('savedViews-saveNewView');
     },
 
-    async clickSaveNewViewButton() {
-      return await testSubjects.click('savedViews-saveNewView');
+    clickSaveNewViewButton() {
+      return testSubjects.click('savedViews-saveNewView');
     },
 
-    async getCreateSavedViewModal() {
-      return await testSubjects.find('savedViews-upsertModal');
+    getCreateSavedViewModal() {
+      return testSubjects.find('savedViews-upsertModal');
     },
 
     async createNewSavedView(name: string) {
@@ -74,6 +84,18 @@ export function InfraSavedViewsProvider({ getService }: FtrProviderContext) {
       await testSubjects.missingOrFail('savedViews-upsertModal');
     },
 
+    async createView(name: string) {
+      await this.clickSavedViewsButton();
+      await this.clickSaveNewViewButton();
+      await this.createNewSavedView(name);
+    },
+
+    async updateView(name: string) {
+      await this.clickSavedViewsButton();
+      await this.clickUpdateViewButton();
+      await this.createNewSavedView(name);
+    },
+
     async ensureViewIsLoaded(name: string) {
       await retry.try(async () => {
         const subject = await testSubjects.find('savedViews-openPopover');
@@ -86,8 +108,8 @@ export function InfraSavedViewsProvider({ getService }: FtrProviderContext) {
       await subject.findByCssSelector(`li[title="${name}"]`);
     },
 
-    async closeSavedViewsLoadModal() {
-      return await testSubjects.click('cancelSavedViewModal');
+    closeSavedViewsLoadModal() {
+      return testSubjects.click('cancelSavedViewModal');
     },
   };
 }
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 6db18af0abeaae..751ca0d6dcde3e 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -191,22 +191,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       if (opts.operation === 'formula') {
         await this.switchToFormula();
       } else {
-        const operationSelector = opts.isPreviousIncompatible
-          ? `lns-indexPatternDimension-${opts.operation} incompatible`
-          : `lns-indexPatternDimension-${opts.operation}`;
-        async function getAriaPressed() {
-          const operationSelectorContainer = await testSubjects.find(operationSelector);
-          await testSubjects.click(operationSelector);
-          const ariaPressed = await operationSelectorContainer.getAttribute('aria-pressed');
-          return ariaPressed;
-        }
-
-        // adding retry here as it seems that there is a flakiness of the operation click
-        // it seems that the aria-pressed attribute is updated to true when the button is clicked
-        await retry.waitFor('aria pressed to be true', async () => {
-          const ariaPressedStatus = await getAriaPressed();
-          return ariaPressedStatus === 'true';
-        });
+        await this.selectOperation(opts.operation, opts.isPreviousIncompatible);
       }
       if (opts.field) {
         await this.selectOptionFromComboBox('indexPattern-dimension-field', opts.field);
@@ -574,6 +559,25 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       });
     },
 
+    async selectOperation(operation: string, isPreviousIncompatible: boolean = false) {
+      const operationSelector = isPreviousIncompatible
+        ? `lns-indexPatternDimension-${operation} incompatible`
+        : `lns-indexPatternDimension-${operation}`;
+      async function getAriaPressed() {
+        const operationSelectorContainer = await testSubjects.find(operationSelector);
+        await testSubjects.click(operationSelector);
+        const ariaPressed = await operationSelectorContainer.getAttribute('aria-pressed');
+        return ariaPressed;
+      }
+
+      // adding retry here as it seems that there is a flakiness of the operation click
+      // it seems that the aria-pressed attribute is updated to true when the button is clicked
+      await retry.waitFor('aria pressed to be true', async () => {
+        const ariaPressedStatus = await getAriaPressed();
+        return ariaPressedStatus === 'true';
+      });
+    },
+
     async enableTimeShift() {
       await testSubjects.click('indexPattern-advanced-accordion');
     },
diff --git a/x-pack/test/functional/services/cases/api.ts b/x-pack/test/functional/services/cases/api.ts
index 743037fed22c5b..2322c8b798eb54 100644
--- a/x-pack/test/functional/services/cases/api.ts
+++ b/x-pack/test/functional/services/cases/api.ts
@@ -6,12 +6,7 @@
  */
 
 import pMap from 'p-map';
-import {
-  CasePostRequest,
-  CaseResponse,
-  CaseSeverity,
-  CaseStatuses,
-} from '@kbn/cases-plugin/common/api';
+import { CasePostRequest, Case, CaseSeverity, CaseStatuses } from '@kbn/cases-plugin/common/api';
 import {
   createCase as createCaseAPI,
   deleteAllCaseItems,
@@ -36,7 +31,7 @@ export function CasesAPIServiceProvider({ getService }: FtrProviderContext) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   return {
-    async createCase(overwrites: Partial<CasePostRequest> = {}): Promise<CaseResponse> {
+    async createCase(overwrites: Partial<CasePostRequest> = {}): Promise<Case> {
       const caseData = {
         ...generateRandomCaseWithoutConnector(),
         ...overwrites,
@@ -66,7 +61,7 @@ export function CasesAPIServiceProvider({ getService }: FtrProviderContext) {
     }: {
       caseId: Parameters<typeof createComment>[0]['caseId'];
       params: Parameters<typeof createComment>[0]['params'];
-    }): Promise<CaseResponse> {
+    }): Promise<Case> {
       return createComment({ supertest: kbnSupertest, params, caseId });
     },
 
@@ -100,7 +95,7 @@ export function CasesAPIServiceProvider({ getService }: FtrProviderContext) {
       return suggestUserProfiles({ supertest: kbnSupertest, req: options });
     },
 
-    async getCase({ caseId }: OmitSupertest<Parameters<typeof getCase>[0]>): Promise<CaseResponse> {
+    async getCase({ caseId }: OmitSupertest<Parameters<typeof getCase>[0]>): Promise<Case> {
       return getCase({ supertest: kbnSupertest, caseId });
     },
 
diff --git a/x-pack/test/functional/services/cases/single_case_view.ts b/x-pack/test/functional/services/cases/single_case_view.ts
index 237881f2af78b4..c3e668557af573 100644
--- a/x-pack/test/functional/services/cases/single_case_view.ts
+++ b/x-pack/test/functional/services/cases/single_case_view.ts
@@ -41,7 +41,7 @@ export function CasesSingleViewServiceProvider({ getService, getPageObject }: Ft
     },
 
     async getCommentCount(): Promise<number> {
-      const commentsContainer = await testSubjects.find('user-actions');
+      const commentsContainer = await testSubjects.find('user-actions-list');
       const comments = await commentsContainer.findAllByClassName('euiComment');
       return comments.length - 1; // don't count the element for adding a new comment
     },
@@ -58,13 +58,22 @@ export function CasesSingleViewServiceProvider({ getService, getPageObject }: Ft
       });
     },
 
-    async addVisualization(visName: string) {
+    async addVisualizationToNewComment(visName: string) {
       // open saved object finder
       const addCommentElement = await testSubjects.find('add-comment');
       const addVisualizationButton = await addCommentElement.findByCssSelector(
         '[data-test-subj="euiMarkdownEditorToolbarButton"][aria-label="Visualization"]'
       );
       await addVisualizationButton.click();
+
+      await this.findAndSaveVisualization(visName);
+
+      await testSubjects.existOrFail('cases-app', { timeout: 10 * 1000 });
+
+      await this.submitComment();
+    },
+
+    async findAndSaveVisualization(visName: string) {
       await testSubjects.existOrFail('savedObjectsFinderTable', { timeout: 10 * 1000 });
 
       // select visualization
@@ -78,8 +87,6 @@ export function CasesSingleViewServiceProvider({ getService, getPageObject }: Ft
 
       // save and return to cases app, add comment
       await lensPage.saveAndReturn();
-      await testSubjects.existOrFail('cases-app', { timeout: 10 * 1000 });
-      await this.submitComment();
     },
 
     async openVisualizationButtonTooltip() {
diff --git a/x-pack/test/functional/services/ml/stack_management_jobs.ts b/x-pack/test/functional/services/ml/stack_management_jobs.ts
index 48a783de583899..67daafb1088680 100644
--- a/x-pack/test/functional/services/ml/stack_management_jobs.ts
+++ b/x-pack/test/functional/services/ml/stack_management_jobs.ts
@@ -327,7 +327,7 @@ export function MachineLearningStackManagementJobsProvider({
 
     async getDownload(filePath: string) {
       return retry.tryForTime(5000, async () => {
-        expect(fs.existsSync(filePath)).to.be(true);
+        expect(fs.existsSync(filePath)).to.eql(true, `File path ${filePath} should exist`);
         return fs.readFileSync(filePath).toString();
       });
     },
diff --git a/x-pack/test/functional_with_es_ssl/apps/cases/group1/view_case.ts b/x-pack/test/functional_with_es_ssl/apps/cases/group1/view_case.ts
index 8c9f7a4450f837..d2d6d7b6a4396a 100644
--- a/x-pack/test/functional_with_es_ssl/apps/cases/group1/view_case.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/cases/group1/view_case.ts
@@ -272,16 +272,6 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
         });
 
         it('shows unsaved comment message when page is refreshed', async () => {
-          const commentArea = await find.byCssSelector(
-            '[data-test-subj="add-comment"] textarea.euiMarkdownEditorTextArea'
-          );
-          await commentArea.focus();
-          await commentArea.type('Test comment from automation');
-
-          await testSubjects.click('submit-comment');
-
-          await header.waitUntilLoadingHasFinished();
-
           await testSubjects.click('property-actions-user-action-ellipses');
 
           await header.waitUntilLoadingHasFinished();
@@ -299,6 +289,8 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
           await editCommentTextArea.focus();
           await editCommentTextArea.type('Edited comment');
 
+          await header.waitUntilLoadingHasFinished();
+
           await browser.refresh();
 
           await header.waitUntilLoadingHasFinished();
@@ -341,6 +333,104 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
       });
     });
 
+    describe('Lens visualization', () => {
+      before(async () => {
+        await cases.testResources.installKibanaSampleData('logs');
+      });
+
+      after(async () => {
+        await cases.testResources.removeKibanaSampleData('logs');
+      });
+
+      createOneCaseBeforeDeleteAllAfter(getPageObject, getService);
+
+      it('adds lens visualization in description', async () => {
+        await testSubjects.click('description-edit-icon');
+
+        await header.waitUntilLoadingHasFinished();
+
+        const editCommentTextArea = await find.byCssSelector(
+          '[data-test-subj*="editable-markdown-form"] textarea.euiMarkdownEditorTextArea'
+        );
+
+        await header.waitUntilLoadingHasFinished();
+
+        await editCommentTextArea.focus();
+
+        const editableDescription = await testSubjects.find('editable-markdown-form');
+
+        const addVisualizationButton = await editableDescription.findByCssSelector(
+          '[data-test-subj="euiMarkdownEditorToolbarButton"][aria-label="Visualization"]'
+        );
+        await addVisualizationButton.click();
+
+        await cases.singleCase.findAndSaveVisualization('[Logs] Bytes distribution');
+
+        await header.waitUntilLoadingHasFinished();
+
+        await testSubjects.click('editable-save-markdown');
+
+        await header.waitUntilLoadingHasFinished();
+
+        const description = await find.byCssSelector('[data-test-subj="description"]');
+
+        await description.findByCssSelector('[data-test-subj="xyVisChart"]');
+      });
+
+      it('adds lens visualization in existing comment', async () => {
+        const commentArea = await find.byCssSelector(
+          '[data-test-subj="add-comment"] textarea.euiMarkdownEditorTextArea'
+        );
+        await commentArea.focus();
+        await commentArea.type('Test comment from automation');
+
+        await header.waitUntilLoadingHasFinished();
+
+        await testSubjects.click('submit-comment');
+
+        await header.waitUntilLoadingHasFinished();
+
+        await testSubjects.click('property-actions-user-action-ellipses');
+
+        await header.waitUntilLoadingHasFinished();
+
+        await testSubjects.click('property-actions-user-action-pencil');
+
+        await header.waitUntilLoadingHasFinished();
+
+        const editComment = await find.byCssSelector('[data-test-subj*="editable-markdown-form"]');
+
+        const addVisualizationButton = await editComment.findByCssSelector(
+          '[data-test-subj="euiMarkdownEditorToolbarButton"][aria-label="Visualization"]'
+        );
+        await addVisualizationButton.click();
+
+        await cases.singleCase.findAndSaveVisualization('[Logs] Bytes distribution');
+
+        await header.waitUntilLoadingHasFinished();
+
+        await testSubjects.click('editable-save-markdown');
+
+        await header.waitUntilLoadingHasFinished();
+
+        const createdComment = await find.byCssSelector(
+          '[data-test-subj*="comment-create-action"] [data-test-subj="scrollable-markdown"]'
+        );
+
+        await createdComment.findByCssSelector('[data-test-subj="xyVisChart"]');
+      });
+
+      it('adds lens visualization in new comment', async () => {
+        await cases.singleCase.addVisualizationToNewComment('[Logs] Bytes distribution');
+
+        await header.waitUntilLoadingHasFinished();
+
+        const newComment = await find.byCssSelector('[data-test-subj*="comment-create-action"]');
+
+        await newComment.findByCssSelector('[data-test-subj="xyVisChart"]');
+      });
+    });
+
     describe('Severity field', () => {
       createOneCaseBeforeDeleteAllAfter(getPageObject, getService);
 
diff --git a/x-pack/test/functional_with_es_ssl/apps/cases/group2/attachment_framework.ts b/x-pack/test/functional_with_es_ssl/apps/cases/group2/attachment_framework.ts
index 9b18dcbca8ebc9..a81f862b54b650 100644
--- a/x-pack/test/functional_with_es_ssl/apps/cases/group2/attachment_framework.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/cases/group2/attachment_framework.ts
@@ -9,7 +9,7 @@ import type SuperTest from 'supertest';
 import {
   ExternalReferenceStorageType,
   CommentType,
-  CaseResponse,
+  Case,
   CommentRequest,
 } from '@kbn/cases-plugin/common/api';
 import { expect } from 'expect';
@@ -84,7 +84,7 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
    */
   describe('Attachment framework', () => {
     describe('External reference attachments', () => {
-      let caseWithAttachment: CaseResponse;
+      let caseWithAttachment: Case;
 
       before(async () => {
         caseWithAttachment = await createAttachmentAndNavigate({
@@ -180,7 +180,7 @@ export default ({ getPageObject, getService }: FtrProviderContext) => {
         },
       });
 
-      let caseWithAttachment: CaseResponse;
+      let caseWithAttachment: Case;
       let dataViewId = '';
 
       before(async () => {
diff --git a/x-pack/test/observability_functional/apps/observability/pages/alerts/add_to_case.ts b/x-pack/test/observability_functional/apps/observability/pages/alerts/add_to_case.ts
index 40cfb2977850e2..e43305267ffb05 100644
--- a/x-pack/test/observability_functional/apps/observability/pages/alerts/add_to_case.ts
+++ b/x-pack/test/observability_functional/apps/observability/pages/alerts/add_to_case.ts
@@ -12,8 +12,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
   const observability = getService('observability');
   const retry = getService('retry');
 
-  // Failing: See https://github.com/elastic/kibana/issues/154726
-  describe.skip('Observability alerts / Add to case >', function () {
+  describe('Observability alerts / Add to case >', function () {
     this.tags('includeFirefox');
 
     before(async () => {
@@ -26,7 +25,7 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
       await esArchiver.unload('x-pack/test/functional/es_archives/observability/alerts');
     });
 
-    describe('When user has all priviledges for cases', () => {
+    describe('When user has all privileges for cases', () => {
       before(async () => {
         await observability.users.setTestUserRole(
           observability.users.defineBasicObservabilityRole({
@@ -49,8 +48,10 @@ export default ({ getService, getPageObjects }: FtrProviderContext) => {
         });
       });
 
-      it('opens a flyout when Add to new case is clicked', async () => {
-        await observability.alerts.addToCase.addToNewCaseButtonClick();
+      it('opens a flyout when "Add to new case" is clicked', async () => {
+        await retry.try(async () => {
+          await observability.alerts.addToCase.addToNewCaseButtonClick();
+        });
 
         await retry.try(async () => {
           await observability.alerts.addToCase.getCreateCaseFlyoutOrFail();
diff --git a/x-pack/test/observability_functional/apps/observability/pages/cases/case_details.ts b/x-pack/test/observability_functional/apps/observability/pages/cases/case_details.ts
index 96e989a9173e7e..2fe088f7951549 100644
--- a/x-pack/test/observability_functional/apps/observability/pages/cases/case_details.ts
+++ b/x-pack/test/observability_functional/apps/observability/pages/cases/case_details.ts
@@ -16,6 +16,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const observability = getService('observability');
   const find = getService('find');
   const PageObjects = getPageObjects(['common', 'header']);
+  const retry = getService('retry');
 
   describe('Observability cases', () => {
     before(async () => {
@@ -38,25 +39,29 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         );
 
         const owner = 'observability';
-        const caseData = await cases.api.createCase({
-          title: 'Sample case',
-          owner,
-        });
-        await cases.api.createAttachment({
-          caseId: caseData.id,
-          params: {
-            alertId: ['alert-id'],
-            index: ['.internal.alerts-observability.alerts-default-000001'],
-            rule: { id: 'rule-id', name: 'My rule name' },
-            type: CommentType.alert,
+        await retry.try(async () => {
+          const caseData = await cases.api.createCase({
+            title: 'Sample case',
             owner,
-          },
+          });
+          await cases.api.createAttachment({
+            caseId: caseData.id,
+            params: {
+              alertId: ['alert-id'],
+              index: ['.internal.alerts-observability.alerts-default-000001'],
+              rule: { id: 'rule-id', name: 'My rule name' },
+              type: CommentType.alert,
+              owner,
+            },
+          });
         });
       });
 
       after(async () => {
-        await cases.api.deleteAllCases();
-        await observability.users.restoreDefaultTestUserRole();
+        await retry.try(async () => {
+          await cases.api.deleteAllCases();
+          await observability.users.restoreDefaultTestUserRole();
+        });
       });
 
       it('should link to observability rule pages in case details', async () => {
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
index f4cbc4ad31ffc9..f08a58848311ee 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/init_routes.ts
@@ -6,6 +6,7 @@
  */
 
 import {
+  CoreSetup,
   RequestHandlerContext,
   KibanaRequest,
   KibanaResponseFactory,
@@ -16,6 +17,9 @@ import {
 } from '@kbn/core/server';
 import { IEventLogService, IEventLogger } from '@kbn/event-log-plugin/server';
 import { IValidatedEvent } from '@kbn/event-log-plugin/server/types';
+import { schema } from '@kbn/config-schema';
+import { queryOptionsSchema } from '@kbn/event-log-plugin/server/event_log_client';
+import { EventLogFixtureStartDeps } from './plugin';
 
 export const logEventRoute = (router: IRouter, eventLogger: IEventLogger, logger: Logger) => {
   router.post(
@@ -205,3 +209,81 @@ export const isEventLogServiceLoggingEntriesRoute = (
     }
   );
 };
+
+export const getEventLogRoute = (router: IRouter, core: CoreSetup<EventLogFixtureStartDeps>) => {
+  router.get(
+    {
+      path: '/_test/event_log/{type}/{id}/_find',
+      validate: {
+        params: schema.object({
+          type: schema.string(),
+          id: schema.string(),
+        }),
+        query: queryOptionsSchema,
+      },
+    },
+    async (
+      context: RequestHandlerContext,
+      req: KibanaRequest<any, any, any, any>,
+      res: KibanaResponseFactory
+    ): Promise<IKibanaResponse<any>> => {
+      const [, { eventLog }] = await core.getStartServices();
+      const eventLogClient = eventLog.getClient(req);
+      const {
+        params: { id, type },
+        query,
+      } = req;
+
+      try {
+        return res.ok({
+          body: await eventLogClient.findEventsBySavedObjectIds(type, [id], query),
+        });
+      } catch (err) {
+        return res.notFound();
+      }
+    }
+  );
+};
+
+export const getEventLogByIdsRoute = (
+  router: IRouter,
+  core: CoreSetup<EventLogFixtureStartDeps>
+) => {
+  router.post(
+    {
+      path: '/_test/event_log/{type}/_find',
+      validate: {
+        params: schema.object({
+          type: schema.string(),
+        }),
+        query: queryOptionsSchema,
+        body: schema.object({
+          ids: schema.arrayOf(schema.string(), { defaultValue: [] }),
+          legacyIds: schema.arrayOf(schema.string(), { defaultValue: [] }),
+        }),
+      },
+    },
+    router.handleLegacyErrors(async function (
+      context: RequestHandlerContext,
+      req: KibanaRequest<any, any, any, any>,
+      res: KibanaResponseFactory
+    ): Promise<IKibanaResponse> {
+      const [, { eventLog }] = await core.getStartServices();
+      const eventLogClient = eventLog.getClient(req);
+
+      const {
+        params: { type },
+        body: { ids, legacyIds },
+        query,
+      } = req;
+
+      try {
+        return res.ok({
+          body: await eventLogClient.findEventsBySavedObjectIds(type, ids, query, legacyIds),
+        });
+      } catch (err) {
+        return res.notFound();
+      }
+    })
+  );
+};
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts b/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
index 87bb7de7f2f413..cfb78197d3aef4 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/server/plugin.ts
@@ -15,6 +15,8 @@ import {
   isIndexingEntriesRoute,
   isEventLogServiceLoggingEntriesRoute,
   isEventLogServiceEnabledRoute,
+  getEventLogRoute,
+  getEventLogByIdsRoute,
 } from './init_routes';
 
 // this plugin's dependendencies
@@ -34,7 +36,7 @@ export class EventLogFixturePlugin
     this.logger = initializerContext.logger.get('plugins', 'eventLogFixture');
   }
 
-  public setup(core: CoreSetup, { eventLog }: EventLogFixtureSetupDeps) {
+  public setup(core: CoreSetup<EventLogFixtureStartDeps>, { eventLog }: EventLogFixtureSetupDeps) {
     const router = core.http.createRouter();
 
     eventLog.registerProviderActions('event_log_fixture', ['test']);
@@ -60,6 +62,8 @@ export class EventLogFixturePlugin
     isIndexingEntriesRoute(router, eventLog, this.logger);
     isEventLogServiceLoggingEntriesRoute(router, eventLog, this.logger);
     isEventLogServiceEnabledRoute(router, eventLog, this.logger);
+    getEventLogRoute(router, core);
+    getEventLogByIdsRoute(router, core);
   }
 
   public start() {}
diff --git a/x-pack/test/plugin_api_integration/plugins/event_log/tsconfig.json b/x-pack/test/plugin_api_integration/plugins/event_log/tsconfig.json
index f1fc9d89272586..1276cb52b01098 100644
--- a/x-pack/test/plugin_api_integration/plugins/event_log/tsconfig.json
+++ b/x-pack/test/plugin_api_integration/plugins/event_log/tsconfig.json
@@ -12,6 +12,7 @@
   ],
   "kbn_references": [
     "@kbn/core",
-    "@kbn/event-log-plugin"
+    "@kbn/event-log-plugin",
+    "@kbn/config-schema"
   ]
 }
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
index 04c3907cde5885..ed7d31efe1c104 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
@@ -240,7 +240,7 @@ export default function ({ getService }: FtrProviderContext) {
     query: Record<string, any> = {}
   ) {
     const urlPrefix = urlPrefixFromNamespace(namespace);
-    const url = `${urlPrefix}/internal/event_log/event_log_test/${id}/_find${
+    const url = `${urlPrefix}/_test/event_log/event_log_test/${id}/_find${
       isEmpty(query)
         ? ''
         : `?${Object.entries(query)
@@ -261,7 +261,7 @@ export default function ({ getService }: FtrProviderContext) {
     legacyIds: string[] = []
   ) {
     const urlPrefix = urlPrefixFromNamespace(namespace);
-    const url = `${urlPrefix}/internal/event_log/event_log_test/_find${
+    const url = `${urlPrefix}/_test/event_log/event_log_test/_find${
       isEmpty(query)
         ? ''
         : `?${Object.entries(query)
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
index dc244a51bb1839..c5d95ba8453022 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
@@ -260,7 +260,7 @@ export default function ({ getService }: FtrProviderContext) {
   async function fetchEvents(savedObjectType: string, savedObjectId: string) {
     log.debug(`Fetching events of Saved Object ${savedObjectId}`);
     return await supertest
-      .get(`/internal/event_log/${savedObjectType}/${savedObjectId}/_find`)
+      .get(`/_test/event_log/${savedObjectType}/${savedObjectId}/_find`)
       .set('kbn-xsrf', 'foo')
       .expect(200);
   }
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/background_task_utilization_route.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/background_task_utilization_route.ts
index f58a5d473ca790..9c9dcbbe15126a 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/background_task_utilization_route.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/background_task_utilization_route.ts
@@ -8,39 +8,11 @@
 import expect from '@kbn/expect';
 import url from 'url';
 import supertest from 'supertest';
+import { MonitoredUtilization } from '@kbn/task-manager-plugin/server/routes/background_task_utilization';
+import { MonitoredStat } from '@kbn/task-manager-plugin/server/monitoring/monitoring_stats_stream';
+import { BackgroundTaskUtilizationStat } from '@kbn/task-manager-plugin/server/monitoring/background_task_utilization_statistics';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-interface MonitoringStats {
-  last_update: string;
-  status: string;
-  stats: {
-    timestamp: string;
-    value: {
-      adhoc: {
-        created: {
-          counter: number;
-        };
-        ran: {
-          service_time: {
-            actual: number;
-            adjusted: number;
-            task_counter: number;
-          };
-        };
-      };
-      recurring: {
-        ran: {
-          service_time: {
-            actual: number;
-            adjusted: number;
-            task_counter: number;
-          };
-        };
-      };
-    };
-  };
-}
-
 export default function ({ getService }: FtrProviderContext) {
   const config = getService('config');
   const retry = getService('retry');
@@ -48,21 +20,21 @@ export default function ({ getService }: FtrProviderContext) {
 
   const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
-  function getUtilizationRequest() {
+  function getUtilizationRequest(isInternal: boolean = true) {
     return request
-      .get('/internal/task_manager/_background_task_utilization')
+      .get(`/${isInternal ? 'internal' : 'api'}/task_manager/_background_task_utilization`)
       .set('kbn-xsrf', 'foo');
   }
 
-  function getUtilization(): Promise<MonitoringStats> {
-    return getUtilizationRequest()
+  function getUtilization(isInternal: boolean = true): Promise<MonitoredUtilization> {
+    return getUtilizationRequest(isInternal)
       .expect(200)
       .then((response) => response.body);
   }
 
-  function getBackgroundTaskUtilization(): Promise<MonitoringStats> {
+  function getBackgroundTaskUtilization(isInternal: boolean = true): Promise<MonitoredUtilization> {
     return retry.try(async () => {
-      const utilization = await getUtilization();
+      const utilization = await getUtilization(isInternal);
 
       if (utilization.stats) {
         return utilization;
@@ -79,7 +51,8 @@ export default function ({ getService }: FtrProviderContext) {
         value: {
           recurring: { ran },
         },
-      } = (await getBackgroundTaskUtilization()).stats;
+      } = (await getBackgroundTaskUtilization(true))
+        .stats as MonitoredStat<BackgroundTaskUtilizationStat>;
       const serviceTime = ran.service_time;
       expect(typeof serviceTime.actual).to.eql('number');
       expect(typeof serviceTime.adjusted).to.eql('number');
@@ -91,7 +64,8 @@ export default function ({ getService }: FtrProviderContext) {
         value: {
           adhoc: { created, ran },
         },
-      } = (await getBackgroundTaskUtilization()).stats;
+      } = (await getBackgroundTaskUtilization(true))
+        .stats as MonitoredStat<BackgroundTaskUtilizationStat>;
       const serviceTime = ran.service_time;
       expect(typeof created.counter).to.eql('number');
 
@@ -99,5 +73,31 @@ export default function ({ getService }: FtrProviderContext) {
       expect(typeof serviceTime.adjusted).to.eql('number');
       expect(typeof serviceTime.task_counter).to.eql('number');
     });
+
+    it('should include load stat', async () => {
+      const {
+        value: { load },
+      } = (await getBackgroundTaskUtilization(true))
+        .stats as MonitoredStat<BackgroundTaskUtilizationStat>;
+      expect(typeof load).to.eql('number');
+    });
+
+    it('should return expected fields for internal route', async () => {
+      const monitoredStat = (await getBackgroundTaskUtilization(true)).stats;
+      expect(monitoredStat?.timestamp).not.to.be(undefined);
+      expect(monitoredStat?.value).not.to.be(undefined);
+      expect(monitoredStat?.value?.adhoc).not.to.be(undefined);
+      expect(monitoredStat?.value?.recurring).not.to.be(undefined);
+      expect(monitoredStat?.value?.load).not.to.be(undefined);
+    });
+
+    it('should return expected fields for public route', async () => {
+      const monitoredStat = (await getBackgroundTaskUtilization(false)).stats;
+      expect(monitoredStat?.timestamp).not.to.be(undefined);
+      expect(monitoredStat?.value).not.to.be(undefined);
+      expect(monitoredStat?.value?.adhoc).to.be(undefined);
+      expect(monitoredStat?.value?.recurring).to.be(undefined);
+      expect(monitoredStat?.value?.load).not.to.be(undefined);
+    });
   });
 }
diff --git a/x-pack/test/rule_registry/common/config.ts b/x-pack/test/rule_registry/common/config.ts
index 01d71b6ab82908..703e71a8613b38 100644
--- a/x-pack/test/rule_registry/common/config.ts
+++ b/x-pack/test/rule_registry/common/config.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import path from 'path';
 import { CA_CERT_PATH } from '@kbn/dev-utils';
-import { FtrConfigProviderContext } from '@kbn/test';
+import { FtrConfigProviderContext, findTestPluginPaths } from '@kbn/test';
 
 import { getAllExternalServiceSimulatorPaths } from '@kbn/actions-simulators-plugin/server/plugin';
 import { services } from './services';
@@ -83,6 +84,9 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           ...disabledPlugins
             .filter((k) => k !== 'security')
             .map((key) => `--xpack.${key}.enabled=false`),
+          ...findTestPluginPaths([
+            path.resolve(__dirname, '../../alerting_api_integration/common/plugins'),
+          ]),
           '--xpack.ruleRegistry.write.enabled=true',
           `--server.xsrf.allowlist=${JSON.stringify(getAllExternalServiceSimulatorPaths())}`,
           ...(ssl
diff --git a/x-pack/test/saved_object_tagging/functional/tests/discover_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/discover_integration.ts
index b2772cec74ea17..4529bf260fef15 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/discover_integration.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/discover_integration.ts
@@ -20,6 +20,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     'timePicker',
     'discover',
   ]);
+  const retry = getService('retry');
 
   /**
    * Select tags in the searchbar's tag filter.
@@ -118,6 +119,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('allows to create a tag from the tag selector', async () => {
         await PageObjects.discover.clickSaveSearchButton();
+        const searchName = 'search-with-new-tag';
+        // preventing an occasional flakiness when the saved object wasn't set and the form can't be submitted
+        await retry.waitFor(
+          `saved search title is set to ${searchName} and save button is clickable`,
+          async () => {
+            const saveButton = await testSubjects.find('confirmSaveSavedObjectButton');
+            await testSubjects.setValue('savedObjectTitle', searchName);
+            return (await saveButton.getAttribute('disabled')) !== 'true';
+          }
+        );
         await testSubjects.setValue('savedObjectTitle', 'search-with-new-tag');
         await testSubjects.click('savedObjectTagSelector');
         await testSubjects.click(`tagSelectorOption-action__create`);
diff --git a/x-pack/test/screenshot_creation/apps/response_ops_docs/stack_cases/details_view.ts b/x-pack/test/screenshot_creation/apps/response_ops_docs/stack_cases/details_view.ts
index 522d6d2516b1c4..79e4d3345cdc54 100644
--- a/x-pack/test/screenshot_creation/apps/response_ops_docs/stack_cases/details_view.ts
+++ b/x-pack/test/screenshot_creation/apps/response_ops_docs/stack_cases/details_view.ts
@@ -31,7 +31,7 @@ export default function ({ getService }: FtrProviderContext) {
     it('cases visualization screenshot', async () => {
       await cases.navigation.navigateToApp();
       await cases.navigation.navigateToSingleCase('cases', CASE_ID);
-      await cases.singleCase.addVisualization('[Logs] Bytes distribution');
+      await cases.singleCase.addVisualizationToNewComment('[Logs] Bytes distribution');
 
       await cases.singleCase.openVisualizationButtonTooltip();
       await commonScreenshots.takeScreenshot(
diff --git a/x-pack/test/security_solution_cypress/es_archives/query_alert/data.json b/x-pack/test/security_solution_cypress/es_archives/query_alert/data.json
new file mode 100644
index 00000000000000..551f3a376033d2
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/es_archives/query_alert/data.json
@@ -0,0 +1,419 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "eabbdefc23da981f2b74ab58b82622a97bb9878caa11bc914e2adfacc94780f1",
+    "index": ".internal.alerts-security.alerts-default-000001",
+    "source": {
+      "@timestamp": "2023-04-27T11:03:57.906Z",
+      "Endpoint": {
+        "capabilities": [
+          "isolation",
+          "kill_process",
+          "suspend_process",
+          "running_processes",
+          "get_file",
+          "execute"
+        ],
+        "configuration": {
+          "isolation": true
+        },
+        "policy": {
+          "applied": {
+            "endpoint_policy_version": 3,
+            "id": "C2A9093E-E289-4C0A-AA44-8C32A414FA7A",
+            "name": "With Eventing",
+            "status": "success",
+            "version": 5
+          }
+        },
+        "state": {
+          "isolation": true
+        },
+        "status": "enrolled"
+      },
+      "agent": {
+        "id": "b563ce99-e373-4a1f-a5fe-97e956140aeb",
+        "type": "endpoint",
+        "version": "8.8.0"
+      },
+      "data_stream": {
+        "dataset": "endpoint.alerts",
+        "namespace": "default",
+        "type": "logs"
+      },
+      "dll": [
+        {
+          "Ext": {
+            "compile_time": 1534424710,
+            "malware_classification": {
+              "identifier": "Whitelisted",
+              "score": 0,
+              "threshold": 0,
+              "version": "3.0.0"
+            },
+            "mapped_address": 5362483200,
+            "mapped_size": 0
+          },
+          "code_signature": {
+            "subject_name": "Cybereason Inc",
+            "trusted": true
+          },
+          "hash": {
+            "md5": "1f2d082566b0fc5f2c238a5180db7451",
+            "sha1": "ca85243c0af6a6471bdaa560685c51eefd6dbc0d",
+            "sha256": "8ad40c90a611d36eb8f9eb24fa04f7dbca713db383ff55a03aa0f382e92061a2"
+          },
+          "path": "C:\\Program Files\\Cybereason ActiveProbe\\AmSvc.exe",
+          "pe": {
+            "architecture": "x64"
+          }
+        }
+      ],
+      "ecs": {
+        "version": "1.4.0"
+      },
+      "elastic": {
+        "agent": {
+          "id": "b563ce99-e373-4a1f-a5fe-97e956140aeb"
+        }
+      },
+      "event.action": "creation",
+      "event.agent_id_status": "auth_metadata_missing",
+      "event.category": "malware",
+      "event.code": "malicious_file",
+      "event.dataset": "endpoint",
+      "event.id": "b28993d4-8b8a-4f0f-9f54-84a89bad66ae",
+      "event.ingested": "2023-04-27T10:58:03Z",
+      "event.kind": "signal",
+      "event.module": "endpoint",
+      "event.sequence": 5826,
+      "event.type": "creation",
+      "file": {
+        "Ext": {
+          "code_signature": [
+            {
+              "subject_name": "bad signer",
+              "trusted": false
+            }
+          ],
+          "malware_classification": {
+            "identifier": "endpointpe",
+            "score": 1,
+            "threshold": 0.66,
+            "version": "3.0.33"
+          },
+          "quarantine_message": "fake quarantine message",
+          "quarantine_result": true,
+          "temp_file_path": "C:/temp/fake_malware.exe"
+        },
+        "accessed": 1682752652103,
+        "created": 1682752652103,
+        "hash": {
+          "md5": "fake file md5",
+          "sha1": "fake file sha1",
+          "sha256": "fake file sha256"
+        },
+        "mtime": 1682752652103,
+        "name": "fake_malware.exe",
+        "owner": "SYSTEM",
+        "path": "C:/fake_malware.exe",
+        "size": 3456
+      },
+      "host": {
+        "architecture": "wtnozeqvub",
+        "hostname": "Host-fwarau82er",
+        "id": "4260adf9-5e63-445d-92c6-e03359bcd342",
+        "ip": [
+          "10.249.37.72",
+          "10.150.39.243",
+          "10.186.17.170"
+        ],
+        "mac": [
+          "f5-f-97-dc-20-67",
+          "b5-56-ca-98-81-ca",
+          "22-86-39-4c-87-33"
+        ],
+        "name": "Host-fwarau82er",
+        "os": {
+          "Ext": {
+            "variant": "Darwin"
+          },
+          "family": "Darwin",
+          "full": "macOS Monterey",
+          "name": "macOS",
+          "platform": "macOS",
+          "version": "12.6.1"
+        }
+      },
+      "kibana.alert.ancestors": [
+        {
+          "depth": 0,
+          "id": "vT9cwocBh3b8EMpD8lsi",
+          "index": ".ds-logs-endpoint.alerts-default-2023.04.27-000001",
+          "type": "event"
+        }
+      ],
+      "kibana.alert.depth": 1,
+      "kibana.alert.last_detected": "2023-04-27T11:03:57.993Z",
+      "kibana.alert.original_event.action": "creation",
+      "kibana.alert.original_event.agent_id_status": "auth_metadata_missing",
+      "kibana.alert.original_event.category": "malware",
+      "kibana.alert.original_event.code": "malicious_file",
+      "kibana.alert.original_event.dataset": "endpoint",
+      "kibana.alert.original_event.id": "b28993d4-8b8a-4f0f-9f54-84a89bad66ae",
+      "kibana.alert.original_event.ingested": "2023-04-27T10:58:03Z",
+      "kibana.alert.original_event.kind": "alert",
+      "kibana.alert.original_event.module": "endpoint",
+      "kibana.alert.original_event.sequence": 5826,
+      "kibana.alert.original_event.type": "creation",
+      "kibana.alert.original_time": "2023-04-29T07:17:32.103Z",
+      "kibana.alert.reason": "malware event with process malware writer, file fake_malware.exe, on Host-fwarau82er created medium alert Endpoint Security.",
+      "kibana.alert.risk_score": 47,
+      "kibana.alert.rule.actions": [
+      ],
+      "kibana.alert.rule.author": [
+        "Elastic"
+      ],
+      "kibana.alert.rule.category": "Custom Query Rule",
+      "kibana.alert.rule.consumer": "siem",
+      "kibana.alert.rule.created_at": "2023-04-27T10:58:27.546Z",
+      "kibana.alert.rule.created_by": "elastic",
+      "kibana.alert.rule.description": "Generates a detection alert each time an Elastic Endpoint Security alert is received. Enabling this rule allows you to immediately begin investigating your Endpoint alerts.",
+      "kibana.alert.rule.enabled": true,
+      "kibana.alert.rule.exceptions_list": [
+        {
+          "id": "endpoint_list",
+          "list_id": "endpoint_list",
+          "namespace_type": "agnostic",
+          "type": "endpoint"
+        }
+      ],
+      "kibana.alert.rule.execution.uuid": "ebf843ff-e0e1-47f8-9ed2-cc8066afbcef",
+      "kibana.alert.rule.false_positives": [
+      ],
+      "kibana.alert.rule.from": "now-10m",
+      "kibana.alert.rule.immutable": true,
+      "kibana.alert.rule.indices": [
+        "logs-endpoint.alerts-*"
+      ],
+      "kibana.alert.rule.interval": "5m",
+      "kibana.alert.rule.license": "Elastic License v2",
+      "kibana.alert.rule.max_signals": 10000,
+      "kibana.alert.rule.name": "Endpoint Security",
+      "kibana.alert.rule.parameters": {
+        "author": [
+          "Elastic"
+        ],
+        "description": "Generates a detection alert each time an Elastic Endpoint Security alert is received. Enabling this rule allows you to immediately begin investigating your Endpoint alerts.",
+        "exceptions_list": [
+          {
+            "id": "endpoint_list",
+            "list_id": "endpoint_list",
+            "namespace_type": "agnostic",
+            "type": "endpoint"
+          }
+        ],
+        "false_positives": [
+        ],
+        "from": "now-10m",
+        "immutable": true,
+        "index": [
+          "logs-endpoint.alerts-*"
+        ],
+        "language": "kuery",
+        "license": "Elastic License v2",
+        "max_signals": 10000,
+        "query": "event.kind:alert and event.module:(endpoint and not endgame)\n",
+        "references": [
+        ],
+        "related_integrations": [
+          {
+            "package": "endpoint",
+            "version": "^8.2.0"
+          }
+        ],
+        "required_fields": [
+          {
+            "ecs": true,
+            "name": "event.kind",
+            "type": "keyword"
+          },
+          {
+            "ecs": true,
+            "name": "event.module",
+            "type": "keyword"
+          }
+        ],
+        "risk_score": 47,
+        "risk_score_mapping": [
+          {
+            "field": "event.risk_score",
+            "operator": "equals",
+            "value": ""
+          }
+        ],
+        "rule_id": "9a1a2dae-0b5f-4c3d-8305-a268d404c306",
+        "rule_name_override": "message",
+        "setup": "",
+        "severity": "medium",
+        "severity_mapping": [
+          {
+            "field": "event.severity",
+            "operator": "equals",
+            "severity": "low",
+            "value": "21"
+          },
+          {
+            "field": "event.severity",
+            "operator": "equals",
+            "severity": "medium",
+            "value": "47"
+          },
+          {
+            "field": "event.severity",
+            "operator": "equals",
+            "severity": "high",
+            "value": "73"
+          },
+          {
+            "field": "event.severity",
+            "operator": "equals",
+            "severity": "critical",
+            "value": "99"
+          }
+        ],
+        "threat": [
+        ],
+        "timestamp_override": "event.ingested",
+        "to": "now",
+        "type": "query",
+        "version": 101
+      },
+      "kibana.alert.rule.producer": "siem",
+      "kibana.alert.rule.references": [
+      ],
+      "kibana.alert.rule.revision": 0,
+      "kibana.alert.rule.risk_score": 47,
+      "kibana.alert.rule.risk_score_mapping": [
+        {
+          "field": "event.risk_score",
+          "operator": "equals",
+          "value": ""
+        }
+      ],
+      "kibana.alert.rule.rule_id": "9a1a2dae-0b5f-4c3d-8305-a268d404c306",
+      "kibana.alert.rule.rule_name_override": "message",
+      "kibana.alert.rule.rule_type_id": "siem.queryRule",
+      "kibana.alert.rule.severity": "medium",
+      "kibana.alert.rule.severity_mapping": [
+        {
+          "field": "event.severity",
+          "operator": "equals",
+          "severity": "low",
+          "value": "21"
+        },
+        {
+          "field": "event.severity",
+          "operator": "equals",
+          "severity": "medium",
+          "value": "47"
+        },
+        {
+          "field": "event.severity",
+          "operator": "equals",
+          "severity": "high",
+          "value": "73"
+        },
+        {
+          "field": "event.severity",
+          "operator": "equals",
+          "severity": "critical",
+          "value": "99"
+        }
+      ],
+      "kibana.alert.rule.tags": [
+        "Elastic",
+        "Endpoint Security"
+      ],
+      "kibana.alert.rule.threat": [
+      ],
+      "kibana.alert.rule.timestamp_override": "event.ingested",
+      "kibana.alert.rule.to": "now",
+      "kibana.alert.rule.type": "query",
+      "kibana.alert.rule.updated_at": "2023-04-27T10:58:27.546Z",
+      "kibana.alert.rule.updated_by": "elastic",
+      "kibana.alert.rule.uuid": "7015a3e2-e4ea-11ed-8c11-49608884878f",
+      "kibana.alert.rule.version": 101,
+      "kibana.alert.severity": "medium",
+      "kibana.alert.start": "2023-04-27T11:03:57.993Z",
+      "kibana.alert.status": "active",
+      "kibana.alert.url": "http://localhost:5601/app/security/alerts/redirect/eabbdefc23da981f2b74ab58b82622a97bb9878caa11bc914e2adfacc94780f1?index=.alerts-security.alerts-default&timestamp=2023-04-27T11:03:57.906Z",
+      "kibana.alert.uuid": "eabbdefc23da981f2b74ab58b82622a97bb9878caa11bc914e2adfacc94780f1",
+      "kibana.alert.workflow_status": "open",
+      "kibana.space_ids": [
+        "default"
+      ],
+      "kibana.version": "8.8.0",
+      "process": {
+        "Ext": {
+          "ancestry": [
+            "qa5jgw1wr7",
+            "5k1hclygc6"
+          ],
+          "code_signature": [
+            {
+              "subject_name": "bad signer",
+              "trusted": false
+            }
+          ],
+          "token": {
+            "domain": "NT AUTHORITY",
+            "integrity_level": 16384,
+            "integrity_level_name": "system",
+            "privileges": [
+              {
+                "description": "Replace a process level token",
+                "enabled": false,
+                "name": "SeAssignPrimaryTokenPrivilege"
+              }
+            ],
+            "sid": "S-1-5-18",
+            "type": "tokenPrimary",
+            "user": "SYSTEM"
+          },
+          "user": "SYSTEM"
+        },
+        "entity_id": "nqh8ts6ves",
+        "entry_leader": {
+          "entity_id": "jnm38bel0w",
+          "name": "fake entry",
+          "pid": 791
+        },
+        "executable": "C:/malware.exe",
+        "group_leader": {
+          "entity_id": "jnm38bel0w",
+          "name": "fake leader",
+          "pid": 848
+        },
+        "hash": {
+          "md5": "fake md5",
+          "sha1": "fake sha1",
+          "sha256": "fake sha256"
+        },
+        "name": "malware writer",
+        "parent": {
+          "entity_id": "qa5jgw1wr7",
+          "pid": 1
+        },
+        "pid": 2,
+        "session_leader": {
+          "entity_id": "jnm38bel0w",
+          "name": "fake session",
+          "pid": 909
+        },
+        "start": 1682752652103,
+        "uptime": 0
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/security_solution_cypress/es_archives/query_alert/mappings.json b/x-pack/test/security_solution_cypress/es_archives/query_alert/mappings.json
new file mode 100644
index 00000000000000..f346eee132104c
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/es_archives/query_alert/mappings.json
@@ -0,0 +1,7904 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".alerts-security.alerts-default": {
+        "is_write_index": true
+      },
+      ".siem-signals-default": {
+        "is_write_index": false
+      }
+    },
+    "index": ".internal.alerts-security.alerts-default-000001",
+    "mappings": {
+      "_meta": {
+        "kibana": {
+          "version": "8.8.0"
+        },
+        "managed": true,
+        "namespace": "default"
+      },
+      "dynamic": "false",
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "agent": {
+          "properties": {
+            "build": {
+              "properties": {
+                "original": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "client": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cloud": {
+          "properties": {
+            "account": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "availability_zone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "instance": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "machine": {
+              "properties": {
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "origin": {
+              "properties": {
+                "account": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "availability_zone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "instance": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "machine": {
+                  "properties": {
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "project": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "provider": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "service": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "project": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "region": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "service": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "target": {
+              "properties": {
+                "account": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "availability_zone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "instance": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "machine": {
+                  "properties": {
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "project": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "provider": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "service": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "container": {
+          "properties": {
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "image": {
+              "properties": {
+                "hash": {
+                  "properties": {
+                    "all": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tag": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "labels": {
+              "type": "object"
+            },
+            "memory": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "runtime": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "destination": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "device": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "manufacturer": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "model": {
+              "properties": {
+                "identifier": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "dll": {
+          "properties": {
+            "code_signature": {
+              "properties": {
+                "digest_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exists": {
+                  "type": "boolean"
+                },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "date"
+                },
+                "trusted": {
+                  "type": "boolean"
+                },
+                "valid": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha384": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tlsh": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "pe": {
+              "properties": {
+                "architecture": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "company": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "description": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "file_version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "imphash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "original_file_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pehash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "product": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "dns": {
+          "properties": {
+            "answers": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "data": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ttl": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "header_flags": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "op_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "question": {
+              "properties": {
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "registered_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subdomain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "top_level_domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "resolved_ip": {
+              "type": "ip"
+            },
+            "response_code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "ecs": {
+          "properties": {
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "email": {
+          "properties": {
+            "attachments": {
+              "properties": {
+                "file": {
+                  "properties": {
+                    "extension": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "hash": {
+                      "properties": {
+                        "md5": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "sha1": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "sha256": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "sha384": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "sha512": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "ssdeep": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "tlsh": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "mime_type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "size": {
+                      "type": "long"
+                    }
+                  }
+                }
+              },
+              "type": "nested"
+            },
+            "bcc": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "cc": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "content_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "delivery_timestamp": {
+              "type": "date"
+            },
+            "direction": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "from": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "local_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "message_id": {
+              "type": "wildcard"
+            },
+            "origination_timestamp": {
+              "type": "date"
+            },
+            "reply_to": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "sender": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "subject": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "to": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "x_mailer": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "error": {
+          "properties": {
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "message": {
+              "type": "match_only_text"
+            },
+            "stack_trace": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "type": "wildcard"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "action": {
+              "type": "keyword"
+            },
+            "agent_id_status": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "code": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "created": {
+              "type": "date"
+            },
+            "dataset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "duration": {
+              "type": "long"
+            },
+            "end": {
+              "type": "date"
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ingested": {
+              "type": "date"
+            },
+            "kind": {
+              "type": "keyword"
+            },
+            "module": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "type": "keyword"
+            },
+            "outcome": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "provider": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reason": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk_score": {
+              "type": "float"
+            },
+            "risk_score_norm": {
+              "type": "float"
+            },
+            "sequence": {
+              "type": "long"
+            },
+            "severity": {
+              "type": "long"
+            },
+            "start": {
+              "type": "date"
+            },
+            "timezone": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "url": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "faas": {
+          "properties": {
+            "coldstart": {
+              "type": "boolean"
+            },
+            "execution": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "trigger": {
+              "properties": {
+                "request_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "file": {
+          "properties": {
+            "accessed": {
+              "type": "date"
+            },
+            "attributes": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "code_signature": {
+              "properties": {
+                "digest_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exists": {
+                  "type": "boolean"
+                },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "date"
+                },
+                "trusted": {
+                  "type": "boolean"
+                },
+                "valid": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "created": {
+              "type": "date"
+            },
+            "ctime": {
+              "type": "date"
+            },
+            "device": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "directory": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "drive_letter": {
+              "ignore_above": 1,
+              "type": "keyword"
+            },
+            "elf": {
+              "properties": {
+                "architecture": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "byte_order": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cpu_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "creation_date": {
+                  "type": "date"
+                },
+                "exports": {
+                  "type": "flattened"
+                },
+                "header": {
+                  "properties": {
+                    "abi_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "class": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "data": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "entrypoint": {
+                      "type": "long"
+                    },
+                    "object_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "os_abi": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "imports": {
+                  "type": "flattened"
+                },
+                "sections": {
+                  "properties": {
+                    "chi2": {
+                      "type": "long"
+                    },
+                    "entropy": {
+                      "type": "long"
+                    },
+                    "flags": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "physical_offset": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "physical_size": {
+                      "type": "long"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "virtual_address": {
+                      "type": "long"
+                    },
+                    "virtual_size": {
+                      "type": "long"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "segments": {
+                  "properties": {
+                    "sections": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "shared_libraries": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "telfhash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fork_name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "gid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha384": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tlsh": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "inode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mime_type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mode": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "mtime": {
+              "type": "date"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "owner": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "pe": {
+              "properties": {
+                "architecture": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "company": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "description": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "file_version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "imphash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "original_file_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pehash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "product": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "size": {
+              "type": "long"
+            },
+            "target_path": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "x509": {
+              "properties": {
+                "alternative_names": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "issuer": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "distinguished_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "locality": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "state_or_province": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "public_key_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "public_key_curve": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "public_key_exponent": {
+                  "type": "long"
+                },
+                "public_key_size": {
+                  "type": "long"
+                },
+                "serial_number": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "signature_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "properties": {
+                    "common_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "distinguished_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "locality": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organization": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "organizational_unit": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "state_or_province": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "version_number": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "group": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "host": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "boot": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "cpu": {
+              "properties": {
+                "usage": {
+                  "scaling_factor": 1000,
+                  "type": "scaled_float"
+                }
+              }
+            },
+            "disk": {
+              "properties": {
+                "read": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "write": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "network": {
+              "properties": {
+                "egress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "ingress": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pid_ns_ino": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk": {
+              "properties": {
+                "calculated_level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "calculated_score": {
+                  "type": "float"
+                },
+                "calculated_score_norm": {
+                  "type": "float"
+                },
+                "static_level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "static_score": {
+                  "type": "float"
+                },
+                "static_score_norm": {
+                  "type": "float"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uptime": {
+              "type": "long"
+            }
+          }
+        },
+        "http": {
+          "properties": {
+            "request": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "type": "wildcard"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "method": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "referrer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "response": {
+              "properties": {
+                "body": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "content": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "type": "wildcard"
+                    }
+                  }
+                },
+                "bytes": {
+                  "type": "long"
+                },
+                "mime_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status_code": {
+                  "type": "long"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "kibana": {
+          "properties": {
+            "alert": {
+              "properties": {
+                "action_group": {
+                  "type": "keyword"
+                },
+                "ancestors": {
+                  "properties": {
+                    "depth": {
+                      "type": "long"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "index": {
+                      "type": "keyword"
+                    },
+                    "rule": {
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "building_block_type": {
+                  "type": "keyword"
+                },
+                "case_ids": {
+                  "type": "keyword"
+                },
+                "depth": {
+                  "type": "long"
+                },
+                "duration": {
+                  "properties": {
+                    "us": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "end": {
+                  "type": "date"
+                },
+                "flapping": {
+                  "type": "boolean"
+                },
+                "flapping_history": {
+                  "type": "boolean"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "index": {
+                      "type": "integer"
+                    }
+                  }
+                },
+                "instance": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "last_detected": {
+                  "type": "date"
+                },
+                "maintenance_window_ids": {
+                  "type": "keyword"
+                },
+                "new_terms": {
+                  "type": "keyword"
+                },
+                "original_event": {
+                  "properties": {
+                    "action": {
+                      "type": "keyword"
+                    },
+                    "agent_id_status": {
+                      "type": "keyword"
+                    },
+                    "category": {
+                      "type": "keyword"
+                    },
+                    "code": {
+                      "type": "keyword"
+                    },
+                    "created": {
+                      "type": "date"
+                    },
+                    "dataset": {
+                      "type": "keyword"
+                    },
+                    "duration": {
+                      "type": "keyword"
+                    },
+                    "end": {
+                      "type": "date"
+                    },
+                    "hash": {
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "ingested": {
+                      "type": "date"
+                    },
+                    "kind": {
+                      "type": "keyword"
+                    },
+                    "module": {
+                      "type": "keyword"
+                    },
+                    "original": {
+                      "type": "keyword"
+                    },
+                    "outcome": {
+                      "type": "keyword"
+                    },
+                    "provider": {
+                      "type": "keyword"
+                    },
+                    "reason": {
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "type": "keyword"
+                    },
+                    "risk_score": {
+                      "type": "float"
+                    },
+                    "risk_score_norm": {
+                      "type": "float"
+                    },
+                    "sequence": {
+                      "type": "long"
+                    },
+                    "severity": {
+                      "type": "long"
+                    },
+                    "start": {
+                      "type": "date"
+                    },
+                    "timezone": {
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    },
+                    "url": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "original_time": {
+                  "type": "date"
+                },
+                "reason": {
+                  "type": "keyword"
+                },
+                "risk_score": {
+                  "type": "float"
+                },
+                "rule": {
+                  "properties": {
+                    "author": {
+                      "type": "keyword"
+                    },
+                    "building_block_type": {
+                      "type": "keyword"
+                    },
+                    "category": {
+                      "type": "keyword"
+                    },
+                    "consumer": {
+                      "type": "keyword"
+                    },
+                    "created_at": {
+                      "type": "date"
+                    },
+                    "created_by": {
+                      "type": "keyword"
+                    },
+                    "description": {
+                      "type": "keyword"
+                    },
+                    "enabled": {
+                      "type": "keyword"
+                    },
+                    "exceptions_list": {
+                      "type": "object"
+                    },
+                    "execution": {
+                      "properties": {
+                        "uuid": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "false_positives": {
+                      "type": "keyword"
+                    },
+                    "from": {
+                      "type": "keyword"
+                    },
+                    "immutable": {
+                      "type": "keyword"
+                    },
+                    "interval": {
+                      "type": "keyword"
+                    },
+                    "license": {
+                      "type": "keyword"
+                    },
+                    "max_signals": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "type": "keyword"
+                    },
+                    "note": {
+                      "type": "keyword"
+                    },
+                    "parameters": {
+                      "ignore_above": 4096,
+                      "type": "flattened"
+                    },
+                    "producer": {
+                      "type": "keyword"
+                    },
+                    "references": {
+                      "type": "keyword"
+                    },
+                    "revision": {
+                      "type": "long"
+                    },
+                    "rule_id": {
+                      "type": "keyword"
+                    },
+                    "rule_name_override": {
+                      "type": "keyword"
+                    },
+                    "rule_type_id": {
+                      "type": "keyword"
+                    },
+                    "tags": {
+                      "type": "keyword"
+                    },
+                    "threat": {
+                      "properties": {
+                        "framework": {
+                          "type": "keyword"
+                        },
+                        "tactic": {
+                          "properties": {
+                            "id": {
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "type": "keyword"
+                            },
+                            "reference": {
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "technique": {
+                          "properties": {
+                            "id": {
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "type": "keyword"
+                            },
+                            "reference": {
+                              "type": "keyword"
+                            },
+                            "subtechnique": {
+                              "properties": {
+                                "id": {
+                                  "type": "keyword"
+                                },
+                                "name": {
+                                  "type": "keyword"
+                                },
+                                "reference": {
+                                  "type": "keyword"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "timeline_id": {
+                      "type": "keyword"
+                    },
+                    "timeline_title": {
+                      "type": "keyword"
+                    },
+                    "timestamp_override": {
+                      "type": "keyword"
+                    },
+                    "to": {
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    },
+                    "updated_at": {
+                      "type": "date"
+                    },
+                    "updated_by": {
+                      "type": "keyword"
+                    },
+                    "uuid": {
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "severity": {
+                  "type": "keyword"
+                },
+                "start": {
+                  "type": "date"
+                },
+                "status": {
+                  "type": "keyword"
+                },
+                "suppression": {
+                  "properties": {
+                    "docs_count": {
+                      "type": "long"
+                    },
+                    "end": {
+                      "type": "date"
+                    },
+                    "start": {
+                      "type": "date"
+                    },
+                    "terms": {
+                      "properties": {
+                        "field": {
+                          "type": "keyword"
+                        },
+                        "value": {
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "system_status": {
+                  "type": "keyword"
+                },
+                "threshold_result": {
+                  "properties": {
+                    "cardinality": {
+                      "properties": {
+                        "field": {
+                          "type": "keyword"
+                        },
+                        "value": {
+                          "type": "long"
+                        }
+                      }
+                    },
+                    "count": {
+                      "type": "long"
+                    },
+                    "from": {
+                      "type": "date"
+                    },
+                    "terms": {
+                      "properties": {
+                        "field": {
+                          "type": "keyword"
+                        },
+                        "value": {
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "time_range": {
+                  "format": "epoch_millis||strict_date_optional_time",
+                  "type": "date_range"
+                },
+                "url": {
+                  "ignore_above": 2048,
+                  "index": false,
+                  "type": "keyword"
+                },
+                "uuid": {
+                  "type": "keyword"
+                },
+                "workflow_reason": {
+                  "type": "keyword"
+                },
+                "workflow_status": {
+                  "type": "keyword"
+                },
+                "workflow_user": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "space_ids": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "version"
+            }
+          }
+        },
+        "labels": {
+          "type": "object"
+        },
+        "log": {
+          "properties": {
+            "file": {
+              "properties": {
+                "path": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "level": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "logger": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "origin": {
+              "properties": {
+                "file": {
+                  "properties": {
+                    "line": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "function": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "syslog": {
+              "properties": {
+                "appname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "facility": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hostname": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "msgid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "priority": {
+                  "type": "long"
+                },
+                "procid": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "severity": {
+                  "properties": {
+                    "code": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "structured_data": {
+                  "type": "flattened"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "message": {
+          "type": "match_only_text"
+        },
+        "network": {
+          "properties": {
+            "application": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "community_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "direction": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "forwarded_ip": {
+              "type": "ip"
+            },
+            "iana_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "inner": {
+              "properties": {
+                "vlan": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "packets": {
+              "type": "long"
+            },
+            "protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "transport": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vlan": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "observer": {
+          "properties": {
+            "egress": {
+              "properties": {
+                "interface": {
+                  "properties": {
+                    "alias": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "vlan": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "zone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hostname": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ingress": {
+              "properties": {
+                "interface": {
+                  "properties": {
+                    "alias": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "vlan": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "zone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "product": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "serial_number": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "vendor": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "orchestrator": {
+          "properties": {
+            "api_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "cluster": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "namespace": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "organization": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resource": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ip": {
+                  "type": "ip"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "parent": {
+                  "properties": {
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "organization": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "package": {
+          "properties": {
+            "architecture": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "build_version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "checksum": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "install_scope": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "installed": {
+              "type": "date"
+            },
+            "license": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "size": {
+              "type": "long"
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "process": {
+          "properties": {
+            "args": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "args_count": {
+              "type": "long"
+            },
+            "code_signature": {
+              "properties": {
+                "digest_algorithm": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exists": {
+                  "type": "boolean"
+                },
+                "signing_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "team_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timestamp": {
+                  "type": "date"
+                },
+                "trusted": {
+                  "type": "boolean"
+                },
+                "valid": {
+                  "type": "boolean"
+                }
+              }
+            },
+            "command_line": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "type": "wildcard"
+            },
+            "elf": {
+              "properties": {
+                "architecture": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "byte_order": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cpu_type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "creation_date": {
+                  "type": "date"
+                },
+                "exports": {
+                  "type": "flattened"
+                },
+                "header": {
+                  "properties": {
+                    "abi_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "class": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "data": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "entrypoint": {
+                      "type": "long"
+                    },
+                    "object_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "os_abi": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "imports": {
+                  "type": "flattened"
+                },
+                "sections": {
+                  "properties": {
+                    "chi2": {
+                      "type": "long"
+                    },
+                    "entropy": {
+                      "type": "long"
+                    },
+                    "flags": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "physical_offset": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "physical_size": {
+                      "type": "long"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "virtual_address": {
+                      "type": "long"
+                    },
+                    "virtual_size": {
+                      "type": "long"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "segments": {
+                  "properties": {
+                    "sections": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "shared_libraries": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "telfhash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "end": {
+              "type": "date"
+            },
+            "entity_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "entry_leader": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "attested_groups": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "attested_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "command_line": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "type": "wildcard"
+                },
+                "entity_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "entry_meta": {
+                  "properties": {
+                    "source": {
+                      "properties": {
+                        "ip": {
+                          "type": "ip"
+                        }
+                      }
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "interactive": {
+                  "type": "boolean"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "parent": {
+                  "properties": {
+                    "entity_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "pid": {
+                      "type": "long"
+                    },
+                    "session_leader": {
+                      "properties": {
+                        "entity_id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "pid": {
+                          "type": "long"
+                        },
+                        "start": {
+                          "type": "date"
+                        }
+                      }
+                    },
+                    "start": {
+                      "type": "date"
+                    }
+                  }
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "real_group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "real_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "same_as_process": {
+                  "type": "boolean"
+                },
+                "saved_group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "saved_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "start": {
+                  "type": "date"
+                },
+                "supplemental_groups": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "tty": {
+                  "properties": {
+                    "char_device": {
+                      "properties": {
+                        "major": {
+                          "type": "long"
+                        },
+                        "minor": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "working_directory": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "env_vars": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "executable": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "exit_code": {
+              "type": "long"
+            },
+            "group_leader": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "command_line": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "type": "wildcard"
+                },
+                "entity_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "interactive": {
+                  "type": "boolean"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "real_group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "real_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "same_as_process": {
+                  "type": "boolean"
+                },
+                "saved_group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "saved_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "start": {
+                  "type": "date"
+                },
+                "supplemental_groups": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "tty": {
+                  "properties": {
+                    "char_device": {
+                      "properties": {
+                        "major": {
+                          "type": "long"
+                        },
+                        "minor": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "working_directory": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hash": {
+              "properties": {
+                "md5": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha1": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha256": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha384": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sha512": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ssdeep": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tlsh": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "interactive": {
+              "type": "boolean"
+            },
+            "io": {
+              "properties": {
+                "bytes_skipped": {
+                  "properties": {
+                    "length": {
+                      "type": "long"
+                    },
+                    "offset": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "max_bytes_per_process_exceeded": {
+                  "type": "boolean"
+                },
+                "text": {
+                  "type": "wildcard"
+                },
+                "total_bytes_captured": {
+                  "type": "long"
+                },
+                "total_bytes_skipped": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "parent": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "code_signature": {
+                  "properties": {
+                    "digest_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "exists": {
+                      "type": "boolean"
+                    },
+                    "signing_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "status": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subject_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "team_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "timestamp": {
+                      "type": "date"
+                    },
+                    "trusted": {
+                      "type": "boolean"
+                    },
+                    "valid": {
+                      "type": "boolean"
+                    }
+                  }
+                },
+                "command_line": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "type": "wildcard"
+                },
+                "elf": {
+                  "properties": {
+                    "architecture": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "byte_order": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "cpu_type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "creation_date": {
+                      "type": "date"
+                    },
+                    "exports": {
+                      "type": "flattened"
+                    },
+                    "header": {
+                      "properties": {
+                        "abi_version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "class": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "data": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "entrypoint": {
+                          "type": "long"
+                        },
+                        "object_version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "os_abi": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "imports": {
+                      "type": "flattened"
+                    },
+                    "sections": {
+                      "properties": {
+                        "chi2": {
+                          "type": "long"
+                        },
+                        "entropy": {
+                          "type": "long"
+                        },
+                        "flags": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "physical_offset": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "physical_size": {
+                          "type": "long"
+                        },
+                        "type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "virtual_address": {
+                          "type": "long"
+                        },
+                        "virtual_size": {
+                          "type": "long"
+                        }
+                      },
+                      "type": "nested"
+                    },
+                    "segments": {
+                      "properties": {
+                        "sections": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      },
+                      "type": "nested"
+                    },
+                    "shared_libraries": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "telfhash": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "end": {
+                  "type": "date"
+                },
+                "entity_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "exit_code": {
+                  "type": "long"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "group_leader": {
+                  "properties": {
+                    "entity_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "pid": {
+                      "type": "long"
+                    },
+                    "start": {
+                      "type": "date"
+                    }
+                  }
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha384": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha512": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "ssdeep": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "tlsh": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "interactive": {
+                  "type": "boolean"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pe": {
+                  "properties": {
+                    "architecture": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "company": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "description": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "file_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "imphash": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "original_file_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "pehash": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "product": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "pgid": {
+                  "type": "long"
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "real_group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "real_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "saved_group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "saved_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "start": {
+                  "type": "date"
+                },
+                "supplemental_groups": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "thread": {
+                  "properties": {
+                    "id": {
+                      "type": "long"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "title": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "tty": {
+                  "properties": {
+                    "char_device": {
+                      "properties": {
+                        "major": {
+                          "type": "long"
+                        },
+                        "minor": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "uptime": {
+                  "type": "long"
+                },
+                "user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "working_directory": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pe": {
+              "properties": {
+                "architecture": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "company": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "description": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "file_version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "imphash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "original_file_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "pehash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "product": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "pgid": {
+              "type": "long"
+            },
+            "pid": {
+              "type": "long"
+            },
+            "previous": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "real_group": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "real_user": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "saved_group": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "saved_user": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "session_leader": {
+              "properties": {
+                "args": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "args_count": {
+                  "type": "long"
+                },
+                "command_line": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "type": "wildcard"
+                },
+                "entity_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "executable": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "interactive": {
+                  "type": "boolean"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "parent": {
+                  "properties": {
+                    "entity_id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "pid": {
+                      "type": "long"
+                    },
+                    "session_leader": {
+                      "properties": {
+                        "entity_id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "pid": {
+                          "type": "long"
+                        },
+                        "start": {
+                          "type": "date"
+                        }
+                      }
+                    },
+                    "start": {
+                      "type": "date"
+                    }
+                  }
+                },
+                "pid": {
+                  "type": "long"
+                },
+                "real_group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "real_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "same_as_process": {
+                  "type": "boolean"
+                },
+                "saved_group": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "saved_user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "start": {
+                  "type": "date"
+                },
+                "supplemental_groups": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "tty": {
+                  "properties": {
+                    "char_device": {
+                      "properties": {
+                        "major": {
+                          "type": "long"
+                        },
+                        "minor": {
+                          "type": "long"
+                        }
+                      }
+                    }
+                  }
+                },
+                "user": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "working_directory": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "start": {
+              "type": "date"
+            },
+            "supplemental_groups": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "thread": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "title": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "tty": {
+              "properties": {
+                "char_device": {
+                  "properties": {
+                    "major": {
+                      "type": "long"
+                    },
+                    "minor": {
+                      "type": "long"
+                    }
+                  }
+                },
+                "columns": {
+                  "type": "long"
+                },
+                "rows": {
+                  "type": "long"
+                }
+              }
+            },
+            "uptime": {
+              "type": "long"
+            },
+            "user": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "working_directory": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "registry": {
+          "properties": {
+            "data": {
+              "properties": {
+                "bytes": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "strings": {
+                  "type": "wildcard"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hive": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "key": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "value": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "related": {
+          "properties": {
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "hosts": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "user": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "rule": {
+          "properties": {
+            "author": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "license": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ruleset": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "uuid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "service": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "environment": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "ephemeral_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "node": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "role": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "origin": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "environment": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ephemeral_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "node": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "role": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "roles": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "state": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "address": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "environment": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ephemeral_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "node": {
+                  "properties": {
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "role": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "roles": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "type": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "signal": {
+          "properties": {
+            "ancestors": {
+              "properties": {
+                "depth": {
+                  "path": "kibana.alert.ancestors.depth",
+                  "type": "alias"
+                },
+                "id": {
+                  "path": "kibana.alert.ancestors.id",
+                  "type": "alias"
+                },
+                "index": {
+                  "path": "kibana.alert.ancestors.index",
+                  "type": "alias"
+                },
+                "type": {
+                  "path": "kibana.alert.ancestors.type",
+                  "type": "alias"
+                }
+              }
+            },
+            "depth": {
+              "path": "kibana.alert.depth",
+              "type": "alias"
+            },
+            "group": {
+              "properties": {
+                "id": {
+                  "path": "kibana.alert.group.id",
+                  "type": "alias"
+                },
+                "index": {
+                  "path": "kibana.alert.group.index",
+                  "type": "alias"
+                }
+              }
+            },
+            "original_event": {
+              "properties": {
+                "action": {
+                  "path": "kibana.alert.original_event.action",
+                  "type": "alias"
+                },
+                "category": {
+                  "path": "kibana.alert.original_event.category",
+                  "type": "alias"
+                },
+                "code": {
+                  "path": "kibana.alert.original_event.code",
+                  "type": "alias"
+                },
+                "created": {
+                  "path": "kibana.alert.original_event.created",
+                  "type": "alias"
+                },
+                "dataset": {
+                  "path": "kibana.alert.original_event.dataset",
+                  "type": "alias"
+                },
+                "duration": {
+                  "path": "kibana.alert.original_event.duration",
+                  "type": "alias"
+                },
+                "end": {
+                  "path": "kibana.alert.original_event.end",
+                  "type": "alias"
+                },
+                "hash": {
+                  "path": "kibana.alert.original_event.hash",
+                  "type": "alias"
+                },
+                "id": {
+                  "path": "kibana.alert.original_event.id",
+                  "type": "alias"
+                },
+                "kind": {
+                  "path": "kibana.alert.original_event.kind",
+                  "type": "alias"
+                },
+                "module": {
+                  "path": "kibana.alert.original_event.module",
+                  "type": "alias"
+                },
+                "outcome": {
+                  "path": "kibana.alert.original_event.outcome",
+                  "type": "alias"
+                },
+                "provider": {
+                  "path": "kibana.alert.original_event.provider",
+                  "type": "alias"
+                },
+                "reason": {
+                  "path": "kibana.alert.original_event.reason",
+                  "type": "alias"
+                },
+                "risk_score": {
+                  "path": "kibana.alert.original_event.risk_score",
+                  "type": "alias"
+                },
+                "risk_score_norm": {
+                  "path": "kibana.alert.original_event.risk_score_norm",
+                  "type": "alias"
+                },
+                "sequence": {
+                  "path": "kibana.alert.original_event.sequence",
+                  "type": "alias"
+                },
+                "severity": {
+                  "path": "kibana.alert.original_event.severity",
+                  "type": "alias"
+                },
+                "start": {
+                  "path": "kibana.alert.original_event.start",
+                  "type": "alias"
+                },
+                "timezone": {
+                  "path": "kibana.alert.original_event.timezone",
+                  "type": "alias"
+                },
+                "type": {
+                  "path": "kibana.alert.original_event.type",
+                  "type": "alias"
+                }
+              }
+            },
+            "original_time": {
+              "path": "kibana.alert.original_time",
+              "type": "alias"
+            },
+            "reason": {
+              "path": "kibana.alert.reason",
+              "type": "alias"
+            },
+            "rule": {
+              "properties": {
+                "author": {
+                  "path": "kibana.alert.rule.author",
+                  "type": "alias"
+                },
+                "building_block_type": {
+                  "path": "kibana.alert.building_block_type",
+                  "type": "alias"
+                },
+                "created_at": {
+                  "path": "kibana.alert.rule.created_at",
+                  "type": "alias"
+                },
+                "created_by": {
+                  "path": "kibana.alert.rule.created_by",
+                  "type": "alias"
+                },
+                "description": {
+                  "path": "kibana.alert.rule.description",
+                  "type": "alias"
+                },
+                "enabled": {
+                  "path": "kibana.alert.rule.enabled",
+                  "type": "alias"
+                },
+                "false_positives": {
+                  "path": "kibana.alert.rule.false_positives",
+                  "type": "alias"
+                },
+                "from": {
+                  "path": "kibana.alert.rule.from",
+                  "type": "alias"
+                },
+                "id": {
+                  "path": "kibana.alert.rule.uuid",
+                  "type": "alias"
+                },
+                "immutable": {
+                  "path": "kibana.alert.rule.immutable",
+                  "type": "alias"
+                },
+                "interval": {
+                  "path": "kibana.alert.rule.interval",
+                  "type": "alias"
+                },
+                "license": {
+                  "path": "kibana.alert.rule.license",
+                  "type": "alias"
+                },
+                "max_signals": {
+                  "path": "kibana.alert.rule.max_signals",
+                  "type": "alias"
+                },
+                "name": {
+                  "path": "kibana.alert.rule.name",
+                  "type": "alias"
+                },
+                "note": {
+                  "path": "kibana.alert.rule.note",
+                  "type": "alias"
+                },
+                "references": {
+                  "path": "kibana.alert.rule.references",
+                  "type": "alias"
+                },
+                "risk_score": {
+                  "path": "kibana.alert.risk_score",
+                  "type": "alias"
+                },
+                "rule_id": {
+                  "path": "kibana.alert.rule.rule_id",
+                  "type": "alias"
+                },
+                "rule_name_override": {
+                  "path": "kibana.alert.rule.rule_name_override",
+                  "type": "alias"
+                },
+                "severity": {
+                  "path": "kibana.alert.severity",
+                  "type": "alias"
+                },
+                "tags": {
+                  "path": "kibana.alert.rule.tags",
+                  "type": "alias"
+                },
+                "threat": {
+                  "properties": {
+                    "framework": {
+                      "path": "kibana.alert.rule.threat.framework",
+                      "type": "alias"
+                    },
+                    "tactic": {
+                      "properties": {
+                        "id": {
+                          "path": "kibana.alert.rule.threat.tactic.id",
+                          "type": "alias"
+                        },
+                        "name": {
+                          "path": "kibana.alert.rule.threat.tactic.name",
+                          "type": "alias"
+                        },
+                        "reference": {
+                          "path": "kibana.alert.rule.threat.tactic.reference",
+                          "type": "alias"
+                        }
+                      }
+                    },
+                    "technique": {
+                      "properties": {
+                        "id": {
+                          "path": "kibana.alert.rule.threat.technique.id",
+                          "type": "alias"
+                        },
+                        "name": {
+                          "path": "kibana.alert.rule.threat.technique.name",
+                          "type": "alias"
+                        },
+                        "reference": {
+                          "path": "kibana.alert.rule.threat.technique.reference",
+                          "type": "alias"
+                        },
+                        "subtechnique": {
+                          "properties": {
+                            "id": {
+                              "path": "kibana.alert.rule.threat.technique.subtechnique.id",
+                              "type": "alias"
+                            },
+                            "name": {
+                              "path": "kibana.alert.rule.threat.technique.subtechnique.name",
+                              "type": "alias"
+                            },
+                            "reference": {
+                              "path": "kibana.alert.rule.threat.technique.subtechnique.reference",
+                              "type": "alias"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "timeline_id": {
+                  "path": "kibana.alert.rule.timeline_id",
+                  "type": "alias"
+                },
+                "timeline_title": {
+                  "path": "kibana.alert.rule.timeline_title",
+                  "type": "alias"
+                },
+                "timestamp_override": {
+                  "path": "kibana.alert.rule.timestamp_override",
+                  "type": "alias"
+                },
+                "to": {
+                  "path": "kibana.alert.rule.to",
+                  "type": "alias"
+                },
+                "type": {
+                  "path": "kibana.alert.rule.type",
+                  "type": "alias"
+                },
+                "updated_at": {
+                  "path": "kibana.alert.rule.updated_at",
+                  "type": "alias"
+                },
+                "updated_by": {
+                  "path": "kibana.alert.rule.updated_by",
+                  "type": "alias"
+                },
+                "version": {
+                  "path": "kibana.alert.rule.version",
+                  "type": "alias"
+                }
+              }
+            },
+            "status": {
+              "path": "kibana.alert.workflow_status",
+              "type": "alias"
+            },
+            "threshold_result": {
+              "properties": {
+                "cardinality": {
+                  "properties": {
+                    "field": {
+                      "path": "kibana.alert.threshold_result.cardinality.field",
+                      "type": "alias"
+                    },
+                    "value": {
+                      "path": "kibana.alert.threshold_result.cardinality.value",
+                      "type": "alias"
+                    }
+                  }
+                },
+                "count": {
+                  "path": "kibana.alert.threshold_result.count",
+                  "type": "alias"
+                },
+                "from": {
+                  "path": "kibana.alert.threshold_result.from",
+                  "type": "alias"
+                },
+                "terms": {
+                  "properties": {
+                    "field": {
+                      "path": "kibana.alert.threshold_result.terms.field",
+                      "type": "alias"
+                    },
+                    "value": {
+                      "path": "kibana.alert.threshold_result.terms.value",
+                      "type": "alias"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "source": {
+          "properties": {
+            "address": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "as": {
+              "properties": {
+                "number": {
+                  "type": "long"
+                },
+                "organization": {
+                  "properties": {
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "bytes": {
+              "type": "long"
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "geo": {
+              "properties": {
+                "city_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "continent_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "country_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "location": {
+                  "type": "geo_point"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "postal_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_iso_code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "region_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "timezone": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "ip": {
+              "type": "ip"
+            },
+            "mac": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "nat": {
+              "properties": {
+                "ip": {
+                  "type": "ip"
+                },
+                "port": {
+                  "type": "long"
+                }
+              }
+            },
+            "packets": {
+              "type": "long"
+            },
+            "port": {
+              "type": "long"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "user": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "span": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "tags": {
+          "type": "keyword"
+        },
+        "threat": {
+          "properties": {
+            "enrichments": {
+              "properties": {
+                "indicator": {
+                  "properties": {
+                    "as": {
+                      "properties": {
+                        "number": {
+                          "type": "long"
+                        },
+                        "organization": {
+                          "properties": {
+                            "name": {
+                              "fields": {
+                                "text": {
+                                  "type": "match_only_text"
+                                }
+                              },
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "confidence": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "description": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "email": {
+                      "properties": {
+                        "address": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "file": {
+                      "properties": {
+                        "accessed": {
+                          "type": "date"
+                        },
+                        "attributes": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "code_signature": {
+                          "properties": {
+                            "digest_algorithm": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "exists": {
+                              "type": "boolean"
+                            },
+                            "signing_id": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "status": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "subject_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "team_id": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "timestamp": {
+                              "type": "date"
+                            },
+                            "trusted": {
+                              "type": "boolean"
+                            },
+                            "valid": {
+                              "type": "boolean"
+                            }
+                          }
+                        },
+                        "created": {
+                          "type": "date"
+                        },
+                        "ctime": {
+                          "type": "date"
+                        },
+                        "device": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "directory": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "drive_letter": {
+                          "ignore_above": 1,
+                          "type": "keyword"
+                        },
+                        "elf": {
+                          "properties": {
+                            "architecture": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "byte_order": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "cpu_type": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "creation_date": {
+                              "type": "date"
+                            },
+                            "exports": {
+                              "type": "flattened"
+                            },
+                            "header": {
+                              "properties": {
+                                "abi_version": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "class": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "data": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "entrypoint": {
+                                  "type": "long"
+                                },
+                                "object_version": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "os_abi": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "type": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "version": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                }
+                              }
+                            },
+                            "imports": {
+                              "type": "flattened"
+                            },
+                            "sections": {
+                              "properties": {
+                                "chi2": {
+                                  "type": "long"
+                                },
+                                "entropy": {
+                                  "type": "long"
+                                },
+                                "flags": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "name": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "physical_offset": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "physical_size": {
+                                  "type": "long"
+                                },
+                                "type": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "virtual_address": {
+                                  "type": "long"
+                                },
+                                "virtual_size": {
+                                  "type": "long"
+                                }
+                              },
+                              "type": "nested"
+                            },
+                            "segments": {
+                              "properties": {
+                                "sections": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "type": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                }
+                              },
+                              "type": "nested"
+                            },
+                            "shared_libraries": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "telfhash": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "extension": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "fork_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "gid": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "group": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "hash": {
+                          "properties": {
+                            "md5": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "sha1": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "sha256": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "sha384": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "sha512": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "ssdeep": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "tlsh": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "inode": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "mime_type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "mode": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "mtime": {
+                          "type": "date"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "owner": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "fields": {
+                            "text": {
+                              "type": "match_only_text"
+                            }
+                          },
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "pe": {
+                          "properties": {
+                            "architecture": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "company": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "description": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "file_version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "imphash": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "original_file_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "pehash": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "product": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "size": {
+                          "type": "long"
+                        },
+                        "target_path": {
+                          "fields": {
+                            "text": {
+                              "type": "match_only_text"
+                            }
+                          },
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "uid": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "x509": {
+                          "properties": {
+                            "alternative_names": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "issuer": {
+                              "properties": {
+                                "common_name": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "country": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "distinguished_name": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "locality": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "organization": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "organizational_unit": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "state_or_province": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                }
+                              }
+                            },
+                            "not_after": {
+                              "type": "date"
+                            },
+                            "not_before": {
+                              "type": "date"
+                            },
+                            "public_key_algorithm": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "public_key_curve": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "public_key_exponent": {
+                              "type": "long"
+                            },
+                            "public_key_size": {
+                              "type": "long"
+                            },
+                            "serial_number": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "signature_algorithm": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "subject": {
+                              "properties": {
+                                "common_name": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "country": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "distinguished_name": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "locality": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "organization": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "organizational_unit": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                },
+                                "state_or_province": {
+                                  "ignore_above": 1024,
+                                  "type": "keyword"
+                                }
+                              }
+                            },
+                            "version_number": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "first_seen": {
+                      "type": "date"
+                    },
+                    "geo": {
+                      "properties": {
+                        "city_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "continent_code": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "continent_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country_iso_code": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "location": {
+                          "type": "geo_point"
+                        },
+                        "name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "postal_code": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "region_iso_code": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "region_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "timezone": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "ip": {
+                      "type": "ip"
+                    },
+                    "last_seen": {
+                      "type": "date"
+                    },
+                    "marking": {
+                      "properties": {
+                        "tlp": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "tlp_version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "modified_at": {
+                      "type": "date"
+                    },
+                    "port": {
+                      "type": "long"
+                    },
+                    "provider": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "registry": {
+                      "properties": {
+                        "data": {
+                          "properties": {
+                            "bytes": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "strings": {
+                              "type": "wildcard"
+                            },
+                            "type": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "hive": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "key": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "value": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "scanner_stats": {
+                      "type": "long"
+                    },
+                    "sightings": {
+                      "type": "long"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "url": {
+                      "properties": {
+                        "domain": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "extension": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "fragment": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "full": {
+                          "fields": {
+                            "text": {
+                              "type": "match_only_text"
+                            }
+                          },
+                          "type": "wildcard"
+                        },
+                        "original": {
+                          "fields": {
+                            "text": {
+                              "type": "match_only_text"
+                            }
+                          },
+                          "type": "wildcard"
+                        },
+                        "password": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "type": "wildcard"
+                        },
+                        "port": {
+                          "type": "long"
+                        },
+                        "query": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "registered_domain": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "scheme": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "subdomain": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "top_level_domain": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "username": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "x509": {
+                      "properties": {
+                        "alternative_names": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "issuer": {
+                          "properties": {
+                            "common_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "country": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "distinguished_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "locality": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "organization": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "organizational_unit": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "state_or_province": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "not_after": {
+                          "type": "date"
+                        },
+                        "not_before": {
+                          "type": "date"
+                        },
+                        "public_key_algorithm": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "public_key_curve": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "public_key_exponent": {
+                          "type": "long"
+                        },
+                        "public_key_size": {
+                          "type": "long"
+                        },
+                        "serial_number": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "signature_algorithm": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "subject": {
+                          "properties": {
+                            "common_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "country": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "distinguished_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "locality": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "organization": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "organizational_unit": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "state_or_province": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "version_number": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "matched": {
+                  "properties": {
+                    "atomic": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "field": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "index": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "occurred": {
+                      "type": "date"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              },
+              "type": "nested"
+            },
+            "feed": {
+              "properties": {
+                "dashboard_id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "description": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "framework": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "properties": {
+                "alias": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "indicator": {
+              "properties": {
+                "as": {
+                  "properties": {
+                    "number": {
+                      "type": "long"
+                    },
+                    "organization": {
+                      "properties": {
+                        "name": {
+                          "fields": {
+                            "text": {
+                              "type": "match_only_text"
+                            }
+                          },
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "confidence": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "description": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "properties": {
+                    "address": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "file": {
+                  "properties": {
+                    "accessed": {
+                      "type": "date"
+                    },
+                    "attributes": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "code_signature": {
+                      "properties": {
+                        "digest_algorithm": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "exists": {
+                          "type": "boolean"
+                        },
+                        "signing_id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "status": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "subject_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "team_id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "timestamp": {
+                          "type": "date"
+                        },
+                        "trusted": {
+                          "type": "boolean"
+                        },
+                        "valid": {
+                          "type": "boolean"
+                        }
+                      }
+                    },
+                    "created": {
+                      "type": "date"
+                    },
+                    "ctime": {
+                      "type": "date"
+                    },
+                    "device": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "directory": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "drive_letter": {
+                      "ignore_above": 1,
+                      "type": "keyword"
+                    },
+                    "elf": {
+                      "properties": {
+                        "architecture": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "byte_order": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "cpu_type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "creation_date": {
+                          "type": "date"
+                        },
+                        "exports": {
+                          "type": "flattened"
+                        },
+                        "header": {
+                          "properties": {
+                            "abi_version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "class": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "data": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "entrypoint": {
+                              "type": "long"
+                            },
+                            "object_version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "os_abi": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "type": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "version": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "imports": {
+                          "type": "flattened"
+                        },
+                        "sections": {
+                          "properties": {
+                            "chi2": {
+                              "type": "long"
+                            },
+                            "entropy": {
+                              "type": "long"
+                            },
+                            "flags": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "physical_offset": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "physical_size": {
+                              "type": "long"
+                            },
+                            "type": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "virtual_address": {
+                              "type": "long"
+                            },
+                            "virtual_size": {
+                              "type": "long"
+                            }
+                          },
+                          "type": "nested"
+                        },
+                        "segments": {
+                          "properties": {
+                            "sections": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "type": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          },
+                          "type": "nested"
+                        },
+                        "shared_libraries": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "telfhash": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "extension": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "fork_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "gid": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "group": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "hash": {
+                      "properties": {
+                        "md5": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "sha1": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "sha256": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "sha384": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "sha512": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "ssdeep": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "tlsh": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "inode": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "mime_type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "mode": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "mtime": {
+                      "type": "date"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "owner": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "path": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "pe": {
+                      "properties": {
+                        "architecture": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "company": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "description": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "file_version": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "imphash": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "original_file_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "pehash": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "product": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "size": {
+                      "type": "long"
+                    },
+                    "target_path": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "uid": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "x509": {
+                      "properties": {
+                        "alternative_names": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "issuer": {
+                          "properties": {
+                            "common_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "country": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "distinguished_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "locality": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "organization": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "organizational_unit": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "state_or_province": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "not_after": {
+                          "type": "date"
+                        },
+                        "not_before": {
+                          "type": "date"
+                        },
+                        "public_key_algorithm": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "public_key_curve": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "public_key_exponent": {
+                          "type": "long"
+                        },
+                        "public_key_size": {
+                          "type": "long"
+                        },
+                        "serial_number": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "signature_algorithm": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "subject": {
+                          "properties": {
+                            "common_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "country": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "distinguished_name": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "locality": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "organization": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "organizational_unit": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            },
+                            "state_or_province": {
+                              "ignore_above": 1024,
+                              "type": "keyword"
+                            }
+                          }
+                        },
+                        "version_number": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    }
+                  }
+                },
+                "first_seen": {
+                  "type": "date"
+                },
+                "geo": {
+                  "properties": {
+                    "city_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "continent_code": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "continent_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country_iso_code": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "country_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "location": {
+                      "type": "geo_point"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "postal_code": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "region_iso_code": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "region_name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "timezone": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "ip": {
+                  "type": "ip"
+                },
+                "last_seen": {
+                  "type": "date"
+                },
+                "marking": {
+                  "properties": {
+                    "tlp": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "tlp_version": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "modified_at": {
+                  "type": "date"
+                },
+                "port": {
+                  "type": "long"
+                },
+                "provider": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "registry": {
+                  "properties": {
+                    "data": {
+                      "properties": {
+                        "bytes": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "strings": {
+                          "type": "wildcard"
+                        },
+                        "type": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "hive": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "key": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "path": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "value": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "scanner_stats": {
+                  "type": "long"
+                },
+                "sightings": {
+                  "type": "long"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "url": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "extension": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "fragment": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "full": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "type": "wildcard"
+                    },
+                    "original": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "type": "wildcard"
+                    },
+                    "password": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "path": {
+                      "type": "wildcard"
+                    },
+                    "port": {
+                      "type": "long"
+                    },
+                    "query": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "registered_domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "scheme": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subdomain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "top_level_domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "username": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "x509": {
+                  "properties": {
+                    "alternative_names": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "issuer": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "distinguished_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "state_or_province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "not_after": {
+                      "type": "date"
+                    },
+                    "not_before": {
+                      "type": "date"
+                    },
+                    "public_key_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_curve": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_exponent": {
+                      "type": "long"
+                    },
+                    "public_key_size": {
+                      "type": "long"
+                    },
+                    "serial_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "signature_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subject": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "distinguished_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "state_or_province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "version_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "software": {
+              "properties": {
+                "alias": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platforms": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "tactic": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "technique": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "reference": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subtechnique": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "fields": {
+                        "text": {
+                          "type": "match_only_text"
+                        }
+                      },
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "reference": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "tls": {
+          "properties": {
+            "cipher": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "client": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "server_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "supported_ciphers": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "x509": {
+                  "properties": {
+                    "alternative_names": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "issuer": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "distinguished_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "state_or_province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "not_after": {
+                      "type": "date"
+                    },
+                    "not_before": {
+                      "type": "date"
+                    },
+                    "public_key_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_curve": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_exponent": {
+                      "type": "long"
+                    },
+                    "public_key_size": {
+                      "type": "long"
+                    },
+                    "serial_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "signature_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subject": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "distinguished_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "state_or_province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "version_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "curve": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "established": {
+              "type": "boolean"
+            },
+            "next_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "resumed": {
+              "type": "boolean"
+            },
+            "server": {
+              "properties": {
+                "certificate": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "certificate_chain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "hash": {
+                  "properties": {
+                    "md5": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha1": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "sha256": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "issuer": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "ja3s": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "not_after": {
+                  "type": "date"
+                },
+                "not_before": {
+                  "type": "date"
+                },
+                "subject": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "x509": {
+                  "properties": {
+                    "alternative_names": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "issuer": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "distinguished_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "state_or_province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "not_after": {
+                      "type": "date"
+                    },
+                    "not_before": {
+                      "type": "date"
+                    },
+                    "public_key_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_curve": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "public_key_exponent": {
+                      "type": "long"
+                    },
+                    "public_key_size": {
+                      "type": "long"
+                    },
+                    "serial_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "signature_algorithm": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "subject": {
+                      "properties": {
+                        "common_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "country": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "distinguished_name": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "locality": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organization": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "organizational_unit": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "state_or_province": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "version_number": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "version_protocol": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "trace": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "transaction": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "url": {
+          "properties": {
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "extension": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "fragment": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "type": "wildcard"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "type": "wildcard"
+            },
+            "password": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "path": {
+              "type": "wildcard"
+            },
+            "port": {
+              "type": "long"
+            },
+            "query": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "registered_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scheme": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "subdomain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "top_level_domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "username": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "user": {
+          "properties": {
+            "changes": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "domain": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "effective": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "email": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "full_name": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "group": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "hash": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "risk": {
+              "properties": {
+                "calculated_level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "calculated_score": {
+                  "type": "float"
+                },
+                "calculated_score_norm": {
+                  "type": "float"
+                },
+                "static_level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "static_score": {
+                  "type": "float"
+                },
+                "static_score_norm": {
+                  "type": "float"
+                }
+              }
+            },
+            "roles": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "target": {
+              "properties": {
+                "domain": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "email": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "group": {
+                  "properties": {
+                    "domain": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "name": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "hash": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "roles": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "user_agent": {
+          "properties": {
+            "device": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "original": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "os": {
+              "properties": {
+                "family": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "full": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "kernel": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "fields": {
+                    "text": {
+                      "type": "match_only_text"
+                    }
+                  },
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "platform": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "version": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "vulnerability": {
+          "properties": {
+            "category": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "classification": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "description": {
+              "fields": {
+                "text": {
+                  "type": "match_only_text"
+                }
+              },
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "enumeration": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "reference": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "report_id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "scanner": {
+              "properties": {
+                "vendor": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "score": {
+              "properties": {
+                "base": {
+                  "type": "float"
+                },
+                "environmental": {
+                  "type": "float"
+                },
+                "temporal": {
+                  "type": "float"
+                },
+                "version": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
+              }
+            },
+            "severity": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "hidden": "true",
+        "lifecycle": {
+          "name": ".alerts-ilm-policy",
+          "rollover_alias": ".alerts-security.alerts-default"
+        },
+        "mapping": {
+          "total_fields": {
+            "limit": "2500"
+          }
+        },
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index 735285753ea235..afe19d1d51e462 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -33,17 +33,27 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       'Actions',
     ],
     [
-      'Host-9qenwrl9ko',
+      'Host-bhdpuumusb',
+      'x',
+      'x',
+      'Unsupported',
+      'Windows',
+      '10.20.160.71, 10.67.81.87',
+      'x',
+      'x',
+      '',
+    ],
+    [
+      'Host-okyc8te0ki',
       'x',
       'x',
       'Warning',
-      'Linux',
-      '10.56.228.101, 10.201.120.140,10.236.180.146',
+      'Windows',
+      '10.244.187.97, 10.45.118.67',
       'x',
       'x',
       '',
     ],
-    ['Host-qw2bti801m', 'x', 'x', 'Failure', 'macOS', '10.244.59.227', 'x', 'x', ''],
     [
       'Host-u5jy6j0pwb',
       'x',
diff --git a/x-pack/test/spaces_api_integration/common/config.ts b/x-pack/test/spaces_api_integration/common/config.ts
index da29de4033eb89..3e0cd4b0a38bb0 100644
--- a/x-pack/test/spaces_api_integration/common/config.ts
+++ b/x-pack/test/spaces_api_integration/common/config.ts
@@ -13,10 +13,11 @@ import { FtrConfigProviderContext } from '@kbn/test';
 interface CreateTestConfigOptions {
   license: string;
   disabledPlugins?: string[];
+  testFiles?: string[];
 }
 
 export function createTestConfig(name: string, options: CreateTestConfigOptions) {
-  const { license, disabledPlugins = [] } = options;
+  const { license, disabledPlugins = [], testFiles } = options;
 
   return async ({ readConfigFile }: FtrConfigProviderContext) => {
     const config = {
@@ -32,7 +33,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     };
 
     return {
-      testFiles: [require.resolve(`../${name}/apis/`)],
+      testFiles: testFiles ?? [require.resolve(`../${name}/apis/`)],
       servers: config.xpack.api.get('servers'),
       services: {
         es: config.kibana.api.get('services.es'),
diff --git a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
index 4c5ae878bbf6e0..2325e0259c8dd1 100644
--- a/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/copy_to_space.ts
@@ -182,6 +182,7 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
                 icon: 'dashboardApp',
               },
               destinationId: dashboardDestinationId,
+              managed: false,
             },
           ],
         },
@@ -229,24 +230,28 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
                 title: `Copy to Space index pattern 1 from ${spaceId} space`,
               },
               destinationId: indexPatternDestinationId,
+              managed: false,
             },
             {
               id: `cts_vis_1_${spaceId}`,
               type: 'visualization',
               meta: { icon: 'visualizeApp', title: `CTS vis 1 from ${spaceId} space` },
               destinationId: vis1DestinationId,
+              managed: false,
             },
             {
               id: `cts_vis_2_${spaceId}`,
               type: 'visualization',
               meta: { icon: 'visualizeApp', title: `CTS vis 2 from ${spaceId} space` },
               destinationId: vis2DestinationId,
+              managed: false,
             },
             {
               id: `cts_vis_3_${spaceId}`,
               type: 'visualization',
               meta: { icon: 'visualizeApp', title: `CTS vis 3 from ${spaceId} space` },
               destinationId: vis3DestinationId,
+              managed: false,
             },
             {
               id: `cts_dashboard_${spaceId}`,
@@ -256,6 +261,7 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
                 title: `This is the ${spaceId} test space CTS dashboard`,
               },
               destinationId: dashboardDestinationId,
+              managed: false,
             },
           ],
         },
@@ -357,18 +363,21 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
               },
               overwrite: true,
               destinationId: `cts_ip_1_${destination}`, // this conflicted with another index pattern in the destination space because of a shared originId
+              managed: false,
             },
             {
               id: `cts_vis_1_${spaceId}`,
               type: 'visualization',
               meta: { icon: 'visualizeApp', title: `CTS vis 1 from ${spaceId} space` },
               destinationId: vis1DestinationId,
+              managed: false,
             },
             {
               id: `cts_vis_2_${spaceId}`,
               type: 'visualization',
               meta: { icon: 'visualizeApp', title: `CTS vis 2 from ${spaceId} space` },
               destinationId: vis2DestinationId,
+              managed: false,
             },
             {
               id: `cts_vis_3_${spaceId}`,
@@ -376,6 +385,7 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
               meta: { icon: 'visualizeApp', title: `CTS vis 3 from ${spaceId} space` },
               overwrite: true,
               destinationId: `cts_vis_3_${destination}`, // this conflicted with another visualization in the destination space because of a shared originId
+              managed: false,
             },
             {
               id: `cts_dashboard_${spaceId}`,
@@ -386,6 +396,7 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
               },
               overwrite: true,
               destinationId: `cts_dashboard_${destination}`, // this conflicted with another dashboard in the destination space because of a shared originId
+              managed: false,
             },
           ],
         },
@@ -419,12 +430,14 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
           type: 'visualization',
           meta: { icon: 'visualizeApp', title: `CTS vis 1 from ${spaceId} space` },
           destinationId: vis1DestinationId,
+          managed: false,
         },
         {
           id: `cts_vis_2_${spaceId}`,
           type: 'visualization',
           meta: { icon: 'visualizeApp', title: `CTS vis 2 from ${spaceId} space` },
           destinationId: vis2DestinationId,
+          managed: false,
         },
       ];
       const expectedErrors = [
@@ -522,7 +535,8 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
         const destinationId = successResults![0].destinationId;
         expect(destinationId).to.match(UUID_PATTERN);
         const meta = { title, icon: 'beaker' };
-        expect(successResults).to.eql([{ type, id: sourceId, meta, destinationId }]);
+        const managed = false; // default added By `create`
+        expect(successResults).to.eql([{ type, id: sourceId, meta, destinationId, managed }]);
         expect(errors).to.be(undefined);
       };
 
@@ -594,7 +608,14 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
                 expect(success).to.eql(true);
                 expect(successCount).to.eql(1);
                 expect(successResults).to.eql([
-                  { type, id: inexactMatchIdA, meta, overwrite: true, destinationId },
+                  {
+                    type,
+                    id: inexactMatchIdA,
+                    meta,
+                    overwrite: true,
+                    destinationId,
+                    managed: false,
+                  },
                 ]);
                 expect(errors).to.be(undefined);
               } else {
@@ -635,7 +656,14 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
                 expect(success).to.eql(true);
                 expect(successCount).to.eql(1);
                 expect(successResults).to.eql([
-                  { type, id: inexactMatchIdB, meta, overwrite: true, destinationId },
+                  {
+                    type,
+                    id: inexactMatchIdB,
+                    meta,
+                    overwrite: true,
+                    destinationId,
+                    managed: false,
+                  },
                 ]);
                 expect(errors).to.be(undefined);
               } else {
@@ -676,7 +704,14 @@ export function copyToSpaceTestSuiteFactory(context: FtrProviderContext) {
                 expect(success).to.eql(true);
                 expect(successCount).to.eql(1);
                 expect(successResults).to.eql([
-                  { type, id: inexactMatchIdC, meta, overwrite: true, destinationId },
+                  {
+                    type,
+                    id: inexactMatchIdC,
+                    meta,
+                    overwrite: true,
+                    destinationId,
+                    managed: false,
+                  },
                 ]);
                 expect(errors).to.be(undefined);
               } else {
diff --git a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
index 5f2c361714c49e..0a71beb9bffa0a 100644
--- a/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/resolve_copy_to_space_conflicts.ts
@@ -108,6 +108,7 @@ export function resolveCopyToSpaceConflictsSuite(context: FtrProviderContext) {
               },
               destinationId: `cts_ip_1_${destination}`, // this conflicted with another index pattern in the destination space because of a shared originId
               overwrite: true,
+              managed: false,
             },
             {
               id: `cts_vis_3_${sourceSpaceId}`,
@@ -118,6 +119,7 @@ export function resolveCopyToSpaceConflictsSuite(context: FtrProviderContext) {
               },
               destinationId: `cts_vis_3_${destination}`, // this conflicted with another visualization in the destination space because of a shared originId
               overwrite: true,
+              managed: false,
             },
           ],
         },
@@ -147,6 +149,7 @@ export function resolveCopyToSpaceConflictsSuite(context: FtrProviderContext) {
               },
               destinationId: `cts_dashboard_${destinationSpaceId}`, // this conflicted with another dashboard in the destination space because of a shared originId
               overwrite: true,
+              managed: false,
             },
           ],
         },
@@ -380,7 +383,14 @@ export function resolveCopyToSpaceConflictsSuite(context: FtrProviderContext) {
         })();
         const meta = { title, icon: 'beaker' };
         expect(successResults).to.eql([
-          { type, id, meta, overwrite: true, ...(destinationId && { destinationId }) },
+          {
+            type,
+            id,
+            meta,
+            overwrite: true,
+            ...(destinationId && { destinationId }),
+            managed: false,
+          },
         ]);
       };
 
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space/copy_to_space.ts
similarity index 96%
rename from x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space.ts
rename to x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space/copy_to_space.ts
index 2a99ae8afceb61..90b2cc67439d70 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space/copy_to_space.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { AUTHENTICATION } from '../../common/lib/authentication';
-import { SPACES } from '../../common/lib/spaces';
-import { copyToSpaceTestSuiteFactory } from '../../common/suites/copy_to_space';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { AUTHENTICATION } from '../../../common/lib/authentication';
+import { SPACES } from '../../../common/lib/spaces';
+import { copyToSpaceTestSuiteFactory } from '../../../common/suites/copy_to_space';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function copyToSpaceSpacesAndSecuritySuite(context: FtrProviderContext) {
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space/index.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space/index.ts
new file mode 100644
index 00000000000000..c1edb1e5e5ac1c
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/copy_to_space/index.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 { createUsersAndRoles } from '../../../common/lib/create_users_and_roles';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ loadTestFile, getService }: FtrProviderContext) {
+  const es = getService('es');
+  const supertest = getService('supertest');
+
+  describe('copy to space with security', function () {
+    before(async () => {
+      await createUsersAndRoles(es, supertest);
+    });
+
+    loadTestFile(require.resolve('./copy_to_space')); // ~ 19m 20s
+  });
+}
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts b/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts
index 75381f35dacd3d..ae5f7b48a28093 100644
--- a/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/apis/index.ts
@@ -18,15 +18,15 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
       await createUsersAndRoles(es, supertest);
     });
 
-    loadTestFile(require.resolve('./copy_to_space'));
-    loadTestFile(require.resolve('./resolve_copy_to_space_conflicts'));
-    loadTestFile(require.resolve('./create'));
-    loadTestFile(require.resolve('./delete'));
-    loadTestFile(require.resolve('./get_all'));
-    loadTestFile(require.resolve('./get_shareable_references'));
-    loadTestFile(require.resolve('./get'));
-    loadTestFile(require.resolve('./update'));
-    loadTestFile(require.resolve('./update_objects_spaces'));
-    loadTestFile(require.resolve('./disable_legacy_url_aliases'));
+    // total runtime ~ 17m
+    loadTestFile(require.resolve('./resolve_copy_to_space_conflicts')); // ~ 10m
+    loadTestFile(require.resolve('./create')); // ~ 2m
+    loadTestFile(require.resolve('./delete')); // ~ 1m 20s
+    loadTestFile(require.resolve('./get_all')); // ~ 50s
+    loadTestFile(require.resolve('./get_shareable_references')); // ~ 30s
+    loadTestFile(require.resolve('./get')); // ~ 30s
+    loadTestFile(require.resolve('./update')); // ~ 30s
+    loadTestFile(require.resolve('./update_objects_spaces')); // ~ 1m
+    loadTestFile(require.resolve('./disable_legacy_url_aliases')); // ~ 30s
   });
 }
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts b/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
new file mode 100644
index 00000000000000..609d747fa8861c
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.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 { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('security_and_spaces', {
+  license: 'basic',
+  testFiles: [require.resolve('./apis/copy_to_space')],
+});
diff --git a/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts b/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
new file mode 100644
index 00000000000000..da8834134f2585
--- /dev/null
+++ b/x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.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 { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('security_and_spaces', {
+  license: 'trial',
+  testFiles: [require.resolve('./apis/copy_to_space')],
+});
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index dc897995119271..91a8e991fcddaf 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -124,5 +124,6 @@
     "@kbn/assetManager-plugin",
     "@kbn/guided-onboarding-plugin",
     "@kbn/field-formats-plugin",
+    "@kbn/ml-anomaly-utils",
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index d8fe1cb566adc9..5aa75006e8c025 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1543,10 +1543,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@77.1.1":
-  version "77.1.1"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-77.1.1.tgz#82f4294bf3239d5d825c1d939c49d125bfdbeb72"
-  integrity sha512-guJmHoGDbvKh/738taKDZGSdNk+OXMse513oPaPf4NoXpQUeYvl3gLT50mX5J4nwILS1LFKNGrbU2Es77HM1cQ==
+"@elastic/eui@77.1.2":
+  version "77.1.2"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-77.1.2.tgz#85c20c682058ada1a9478af2894c290cc20c1678"
+  integrity sha512-cq7TI/rOomifh/KXU1V+wGirClomkMcQ166K9/7eMyqJb50AAuweu5JkjiDRNvB06uX1lDP6GjSb+oGvf8885A==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"
@@ -1570,6 +1570,7 @@
     react-focus-on "^3.7.0"
     react-input-autosize "^3.0.0"
     react-is "^17.0.2"
+    react-remove-scroll-bar "^2.3.4"
     react-virtualized-auto-sizer "^1.0.6"
     react-window "^1.8.6"
     refractor "^3.5.0"
@@ -2969,6 +2970,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/check-mappings-update-cli@link:packages/kbn-check-mappings-update-cli":
+  version "0.0.0"
+  uid ""
+
 "@kbn/ci-stats-core@link:packages/kbn-ci-stats-core":
   version "0.0.0"
   uid ""
@@ -4557,6 +4562,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/ml-anomaly-utils@link:x-pack/packages/ml/anomaly_utils":
+  version "0.0.0"
+  uid ""
+
 "@kbn/ml-date-picker@link:x-pack/packages/ml/date_picker":
   version "0.0.0"
   uid ""
@@ -4737,6 +4746,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/random-sampling@link:x-pack/packages/kbn-random-sampling":
+  version "0.0.0"
+  uid ""
+
 "@kbn/react-field@link:packages/kbn-react-field":
   version "0.0.0"
   uid ""
@@ -5012,6 +5025,10 @@
 "@kbn/server-route-repository@link:packages/kbn-server-route-repository":
   version "0.0.0"
   uid ""
+  
+"@kbn/serverless-observability@link:x-pack/plugins/serverless_observability":
+  version "0.0.0"
+  uid ""
 
 "@kbn/serverless-project-switcher@link:packages/serverless/project_switcher":
   version "0.0.0"
@@ -5025,6 +5042,14 @@
   version "0.0.0"
   uid ""
 
+"@kbn/serverless-search@link:x-pack/plugins/serverless_search":
+  version "0.0.0"
+  uid ""
+
+"@kbn/serverless-security@link:x-pack/plugins/serverless_security":
+  version "0.0.0"
+  uid ""
+
 "@kbn/serverless@link:x-pack/plugins/serverless":
   version "0.0.0"
   uid ""
@@ -5089,6 +5114,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/shared-ux-chrome-navigation@link:packages/shared-ux/chrome/navigation":
+  version "0.0.0"
+  uid ""
+
 "@kbn/shared-ux-file-context@link:packages/shared-ux/file/context":
   version "0.0.0"
   uid ""
@@ -5593,6 +5622,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/visualization-ui-components@link:src/plugins/visualization_ui_components":
+  version "0.0.0"
+  uid ""
+
 "@kbn/visualizations-plugin@link:src/plugins/visualizations":
   version "0.0.0"
   uid ""
@@ -9870,12 +9903,12 @@
   resolved "https://registry.yarnpkg.com/@xobotyi/scrollbar-width/-/scrollbar-width-1.9.5.tgz#80224a6919272f405b87913ca13b92929bdf3c4d"
   integrity sha512-N8tkAACJx2ww8vFMneJmaAgmjAG1tnVBZJRLRcx061tmsLRZHSEZSLuGWnwPtunsSLvSqXQ2wfp7Mgqg1I+2dQ==
 
-"@xstate/react@^3.0.2":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@xstate/react/-/react-3.0.2.tgz#7907f1e2df464c14b1cac2120a25070a0c81e111"
-  integrity sha512-sFbnMyi+FHF6bXbdvOF6RKVJ9VxrhhUz7KJ/8qKwpqFs0h+EoGOXdfAeuS3aEy29JsFaRclozBxDpsEJd/vlkg==
+"@xstate/react@^3.2.1":
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/@xstate/react/-/react-3.2.2.tgz#ddf0f9d75e2c19375b1e1b7335e72cb99762aed8"
+  integrity sha512-feghXWLedyq8JeL13yda3XnHPZKwYDN5HPBLykpLeuNpr9178tQd2/3d0NrH6gSd0sG5mLuLeuD+ck830fgzLQ==
   dependencies:
-    use-isomorphic-layout-effect "^1.0.0"
+    use-isomorphic-layout-effect "^1.1.2"
     use-sync-external-store "^1.0.0"
 
 "@xtuc/ieee754@^1.2.0":
@@ -12340,7 +12373,7 @@ commander@^4.0.1, commander@^4.1.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^5.0.0, commander@^5.1.0:
+commander@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
@@ -13051,23 +13084,23 @@ cyclist@~0.2.2:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
   integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
-cypress-axe@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.3.0.tgz#255ef8ef8e88747f2a72ceb7f7c60e8185b7852b"
-  integrity sha512-b2zAva1+uRwGA7r/JzP7C/64YHu9Fa8RsHRIrapUDzJeGLEQImz86FbwRW/lBamrEt7YHzGRwuJizXKTyQBsfQ==
+cypress-axe@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.4.0.tgz#e67482bfe9e740796bf77c7823f19781a8a2faff"
+  integrity sha512-Ut7NKfzjyKm0BEbt2WxuKtLkIXmx6FD2j0RwdvO/Ykl7GmB/qRQkwbKLk3VP35+83hiIr8GKD04PDdrTK5BnyA==
 
 cypress-file-upload@^5.0.8:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1"
   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==
 
-cypress-multi-reporters@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/cypress-multi-reporters/-/cypress-multi-reporters-1.6.2.tgz#129dfeffa00d4deca3e9f58d84570b9962c28c2b"
-  integrity sha512-lvwGwHqZG5CwGxBJ6UJXWaxlWGkJgxBjP0h+IVLrrwRlJpT4coSwwt+UzMdeqEMrzT4IDfhbtmUNOiDleisOYA==
+cypress-multi-reporters@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/cypress-multi-reporters/-/cypress-multi-reporters-1.6.3.tgz#0f0da8db4caf8d7a21f94e5209148348416d7c71"
+  integrity sha512-klb9pf6oAF4WCLHotu9gdB8ukYBdeTzbEMuESKB3KT54HhrZj65vQxubAgrULV5H2NWqxHdUhlntPbKZChNvEw==
   dependencies:
-    debug "^4.1.1"
-    lodash "^4.17.15"
+    debug "^4.3.4"
+    lodash "^4.17.21"
 
 cypress-pipe@^2.0.0:
   version "2.0.0"
@@ -13086,17 +13119,17 @@ cypress-real-events@^1.7.6:
   resolved "https://registry.yarnpkg.com/cypress-real-events/-/cypress-real-events-1.7.6.tgz#6f17e0b2ceea1d6dc60f6737d8f84cc517bbbb4c"
   integrity sha512-yP6GnRrbm6HK5q4DH6Nnupz37nOfZu/xn1xFYqsE2o4G73giPWQOdu6375QYpwfU1cvHNCgyD2bQ2hPH9D7NMw==
 
-cypress-recurse@^1.27.0:
-  version "1.27.0"
-  resolved "https://registry.yarnpkg.com/cypress-recurse/-/cypress-recurse-1.27.0.tgz#0c61e809c5f7740a7e907714614c49c72dcb5c1f"
-  integrity sha512-BCD83UqaxlD+JiqZn1PvIhHRXasgfCt57vLC1Fcyifvxh4QklELRcYUJV3MdhKamMkmajaErLfnCNbZ8VJ5SIg==
+cypress-recurse@^1.31.2:
+  version "1.31.2"
+  resolved "https://registry.yarnpkg.com/cypress-recurse/-/cypress-recurse-1.31.2.tgz#c926b28207c9d49acb1caf89b818cb4910af43eb"
+  integrity sha512-McSjAaL95bq6NSg0vLA0GI5rMShqKmNlCQXpuQcAga5n2Yf/t3NgELBjPk1mXE0RfpLwymVFjiFQgmxkBgwK7A==
   dependencies:
     humanize-duration "^3.27.3"
 
-cypress@^12.6.0:
-  version "12.6.0"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.6.0.tgz#d71a82639756173c0682b3d467eb9f0523460e91"
-  integrity sha512-WdHSVaS1lumSd5XpVTslZd8ui9GIGphrzvXq9+3DtVhqjRZC5M70gu5SW/Y/SLPq3D1wiXGZoHC6HJ7ESVE2lw==
+cypress@^12.10.0:
+  version "12.10.0"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.10.0.tgz#b6264f77c214d63530ebac2b33c4d099bd40b715"
+  integrity sha512-Y0wPc221xKKW1/4iAFCphkrG2jNR4MjOne3iGn4mcuCaE7Y5EtXL83N8BzRsAht7GYfWVjJ/UeTqEdDKHz39HQ==
   dependencies:
     "@cypress/request" "^2.88.10"
     "@cypress/xvfb" "^1.2.4"
@@ -13112,7 +13145,7 @@ cypress@^12.6.0:
     check-more-types "^2.24.0"
     cli-cursor "^3.1.0"
     cli-table3 "~0.6.1"
-    commander "^5.1.0"
+    commander "^6.2.1"
     common-tags "^1.8.0"
     dayjs "^1.10.4"
     debug "^4.3.4"
@@ -13130,7 +13163,7 @@ cypress@^12.6.0:
     listr2 "^3.8.3"
     lodash "^4.17.21"
     log-symbols "^4.0.0"
-    minimist "^1.2.6"
+    minimist "^1.2.8"
     ospath "^1.2.2"
     pretty-bytes "^5.6.0"
     proxy-from-env "1.0.0"
@@ -14997,10 +15030,10 @@ eslint-plugin-ban@^1.5.2:
   dependencies:
     requireindex "~1.2.0"
 
-eslint-plugin-cypress@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz#9aeee700708ca8c058e00cdafe215199918c2632"
-  integrity sha512-c2W/uPADl5kospNDihgiLc7n87t5XhUbFDoTl6CfVkmG+kDAb5Ux10V9PoLPu9N+r7znpc+iQlcmAqT1A/89HA==
+eslint-plugin-cypress@^2.13.2:
+  version "2.13.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.13.2.tgz#b42b763f449ff713cecf6bdf1903e7cee6e48bfc"
+  integrity sha512-LlwjnBTzuKuC0A4H0RxVjs0YeAWK+CD1iM9Dp8un3lzT713ePQxfpPstCD+9HSAss8emuE3b2hCNUST+NrUwKw==
   dependencies:
     globals "^11.12.0"
 
@@ -21097,6 +21130,11 @@ minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
+minimist@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
@@ -24244,7 +24282,7 @@ react-refresh@^0.11.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.11.0.tgz#77198b944733f0f1f1a90e791de4541f9f074046"
   integrity sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==
 
-react-remove-scroll-bar@^2.3.3:
+react-remove-scroll-bar@^2.3.3, react-remove-scroll-bar@^2.3.4:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.4.tgz#53e272d7a5cb8242990c7f144c44d8bd8ab5afd9"
   integrity sha512-63C4YQBUt0m6ALadE9XV56hV8BgJWDmmTPY758iIJjfQKt2nYwoUrPk0LXRXcB/yIj82T1/Ixfdpdk68LwIB0A==
@@ -28247,7 +28285,7 @@ use-composed-ref@^1.3.0:
   resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.3.0.tgz#3d8104db34b7b264030a9d916c5e94fbe280dbda"
   integrity sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ==
 
-use-isomorphic-layout-effect@^1.0.0, use-isomorphic-layout-effect@^1.1.1:
+use-isomorphic-layout-effect@^1.1.1, use-isomorphic-layout-effect@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb"
   integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==
@@ -29623,10 +29661,10 @@ xpath@0.0.32:
   resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af"
   integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==
 
-xstate@^4.35.2:
-  version "4.35.2"
-  resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.35.2.tgz#92916638e315c448f1d26e920273187907256817"
-  integrity sha512-5X7EyJv5OHHtGQwN7DsmCAbSnDs3Mxl1cXQ4PVaLwi+7p/RRapERnd1dFyHjYin+KQoLLfuXpl1dPBThgyIGNg==
+xstate@^4.37.1:
+  version "4.37.2"
+  resolved "https://registry.yarnpkg.com/xstate/-/xstate-4.37.2.tgz#c5f4c1d8062784238b91e2dfddca05f821cb4eac"
+  integrity sha512-Qm337O49CRTZ3PRyRuK6b+kvI+D3JGxXIZCTul+xEsyFCVkTFDt5jixaL1nBWcUBcaTQ9um/5CRGVItPi7fveg==
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"